From f6b4f033e72468fa31276f555cda02d0ee015b93 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Tue, 9 Jun 2015 14:51:51 +0200
Subject: [PATCH] cups: update to 2.0.3

---
 cups/.footprint |  1 +
 cups/.md5sum    |  4 ++--
 cups/Pkgfile    |  6 +++---
 cups/cups       | 23 ++++++++++++++++++-----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/cups/.footprint b/cups/.footprint
index a3e8cabac..1a6c7bea8 100644
--- a/cups/.footprint
+++ b/cups/.footprint
@@ -263,6 +263,7 @@ drwxr-xr-x	root/root	usr/share/cups/doc/images/
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups-postscript-chain.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups-raster-chain.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups.png
+-rw-r--r--	root/root	usr/share/cups/doc/images/generic.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/left.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/raster-organization.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/raster.png
diff --git a/cups/.md5sum b/cups/.md5sum
index ffd18b7bc..afc73945f 100644
--- a/cups/.md5sum
+++ b/cups/.md5sum
@@ -1,3 +1,3 @@
-4965028855c65ea97d8064de568e3d0d  cups
-6e0ea72dbafcf5baaa1cf4178e71096d  cups-2.0.2-source.tar.bz2
+a416044375fa7c0318fcfdc5ecb0028f  cups
+8d98b85edbdab7ab03739c9622f570e8  cups-2.0.3-source.tar.bz2
 0325f63759c09c347622a14f4940bb86  cups-busy-loop.patch
diff --git a/cups/Pkgfile b/cups/Pkgfile
index 906f949d7..6eca86305 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -1,10 +1,10 @@
 # Description: CUPS - Common UNIX Printing System
 # URL:         http://www.cups.org
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  acl tcp_wrappers libusb openssl zlib
+# Depends on:  acl tcp_wrappers libusb zlib
 
 name=cups
-version=2.0.2
+version=2.0.3
 release=2
 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2
         cups-busy-loop.patch cups)
@@ -14,7 +14,7 @@ build () {
 
     # https://crux.nu/bugs/index.php?do=details&task_id=1143
     # http://pkgs.fedoraproject.org/cgit/cups.git/commit/?id=746dd9cf56e9522ca51c4cc669fc65b46e2d4866
-    patch -p1 -i $SRC/cups-busy-loop.patch
+    #patch -p1 -i $SRC/cups-busy-loop.patch
 
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
diff --git a/cups/cups b/cups/cups
index aee717d56..0cb52ff11 100644
--- a/cups/cups
+++ b/cups/cups
@@ -1,22 +1,35 @@
 #!/bin/sh
 #
-# /etc/rc.d/cups: start/stop/reload CUPS daemon
+# /etc/rc.d/cups: start/stop CUPS printer daemon
 #
 
+SSD=/sbin/start-stop-daemon
+PROG=/usr/sbin/cupsd
+PID=/var/run/cups.pid
+OPTS="-f"
+
 case $1 in
 start)
-	/usr/sbin/cupsd
+	$SSD --start -bm --pidfile $PID --exec $PROG -- $OPTS
 	;;
 stop)
-	killall -q /usr/sbin/cupsd
+	$SSD --stop --remove-pidfile --retry 10 --pidfile $PID
 	;;
 restart)
 	$0 stop
-	sleep 2
 	$0 start
 	;;
+status)
+	$SSD --status --pidfile $PID
+	case $? in
+	0) echo "$PROG is running with pid $(cat $PID)" ;;
+	1) echo "$PROG is not running but the pid file $PID exists" ;;
+	3) echo "$PROG is not running" ;;
+	4) echo "Unable to determine the program status" ;;
+	esac
+	;;
 *)
-	echo "Usage: $0 [start|stop|restart]"
+	echo "usage: $0 [start|stop|restart|status]"
 	;;
 esac