From 63f181c026fcee12600f7700417327405a9d4417 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Tue, 4 Aug 2015 12:09:18 +0200
Subject: [PATCH] cups: update to 2.0.4

---
 cups/.footprint           |  2 +-
 cups/.md5sum              |  3 +--
 cups/Pkgfile              | 10 +++-------
 cups/cups-busy-loop.patch | 34 ----------------------------------
 4 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 cups/cups-busy-loop.patch

diff --git a/cups/.footprint b/cups/.footprint
index 1a6c7bea8..cef6c84fd 100644
--- a/cups/.footprint
+++ b/cups/.footprint
@@ -120,6 +120,7 @@ drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/client.conf.5.gz
 -rw-r--r--	root/root	usr/man/man5/cups-files.conf.5.gz
 -rw-r--r--	root/root	usr/man/man5/cups-snmp.conf.5.gz
+-rw-r--r--	root/root	usr/man/man5/cupsd-logs.5.gz
 -rw-r--r--	root/root	usr/man/man5/cupsd.conf.5.gz
 -rw-r--r--	root/root	usr/man/man5/ipptoolfile.5.gz
 -rw-r--r--	root/root	usr/man/man5/mailto.conf.5.gz
@@ -143,7 +144,6 @@ lrwxrwxrwx	root/root	usr/man/man8/cups-exec.8.gz -> cupsd-helper.8.gz
 -rw-r--r--	root/root	usr/man/man8/cupsaddsmb.8.gz
 -rw-r--r--	root/root	usr/man/man8/cupsctl.8.gz
 -rw-r--r--	root/root	usr/man/man8/cupsd-helper.8.gz
--rw-r--r--	root/root	usr/man/man8/cupsd-logs.8.gz
 -rw-r--r--	root/root	usr/man/man8/cupsd.8.gz
 lrwxrwxrwx	root/root	usr/man/man8/cupsdisable.8.gz -> cupsenable.8.gz
 -rw-r--r--	root/root	usr/man/man8/cupsenable.8.gz
diff --git a/cups/.md5sum b/cups/.md5sum
index afc73945f..6d9a3ac14 100644
--- a/cups/.md5sum
+++ b/cups/.md5sum
@@ -1,3 +1,2 @@
 a416044375fa7c0318fcfdc5ecb0028f  cups
-8d98b85edbdab7ab03739c9622f570e8  cups-2.0.3-source.tar.bz2
-0325f63759c09c347622a14f4940bb86  cups-busy-loop.patch
+f5c847d9a4fac6c4c66fb0526a7afaae  cups-2.0.4-source.tar.bz2
diff --git a/cups/Pkgfile b/cups/Pkgfile
index 6eca86305..d63b7b96a 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -4,18 +4,14 @@
 # Depends on:  acl tcp_wrappers libusb zlib
 
 name=cups
-version=2.0.3
-release=2
+version=2.0.4
+release=1
 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2
-        cups-busy-loop.patch cups)
+        cups)
 
 build () {
     cd $name-$version
 
-    # 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
-
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --libdir=/usr/lib \
diff --git a/cups/cups-busy-loop.patch b/cups/cups-busy-loop.patch
deleted file mode 100644
index 8c95546ab..000000000
--- a/cups/cups-busy-loop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up cups-2.0.2/scheduler/client.c.busy-loop cups-2.0.2/scheduler/client.c
---- cups-2.0.2/scheduler/client.c.busy-loop	2014-08-28 16:37:22.000000000 +0100
-+++ cups-2.0.2/scheduler/client.c	2015-03-16 17:24:32.506232983 +0000
-@@ -585,6 +585,17 @@ cupsdReadClient(cupsd_client_t *con)	/*
-     * connection and we need to shut it down...
-     */
- 
-+    if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
-+    {
-+     /*
-+      * Connection closed...
-+      */
-+
-+      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
-+      cupsdCloseClient(con);
-+      return;
-+    }
-+
-     cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.",
- 		   httpStateString(httpGetState(con->http)));
-     cupsdCloseClient(con);
-@@ -1979,12 +1990,6 @@ cupsdReadClient(cupsd_client_t *con)	/*
- 
- 	if (httpGetState(con->http) == HTTP_STATE_POST_SEND)
- 	{
--	 /*
--	  * Don't listen for activity until we decide to do something with this...
--	  */
--
--          cupsdAddSelect(httpGetFd(con->http), NULL, NULL, con);
--
- 	  if (con->file >= 0)
- 	  {
- 	    fstat(con->file, &filestats);