cups: update to 2.0.1

5 files changed, 90 insertions, 5 deletions

diff --git a/cups/.md5sum b/cups/.md5sum
index 246608449..80059e25f 100644
--- a/cups/.md5sum
+++ b/cups/.md5sum
@@ -1,3 +1,6 @@
 01b6a755c5b0fb7df2d2c94571f67e1d  cups
-2cdd81fea23e9e29555c24bdfd0d7c89  cups-2.0.0-source.tar.bz2
+7f7c33071035fb20d0879929a42da711  cups-2.0.1-source.tar.bz2
 fd78a2c51a2e206ea85d21d2dc9dde69  cups-config.patch
+791140e281a0c73fe85e9ee6ebeb444b  str4523.patch
+7ba9b00f1686283abdcd490ca4114e0b  str4531-1.patch
+a93bacb523e0dc5551b6b14d0e31dce4  str4531.patch
diff --git a/cups/Pkgfile b/cups/Pkgfile
index acd1ead78..1f36ed12f 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -4,14 +4,19 @@
 # Depends on:  acl tcp_wrappers libusb openssl zlib
 
 name=cups
-version=2.0.0
+version=2.0.1
 release=1
 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2
-        cups-config.patch cups)
+        cups-config.patch cups
+        str4523.patch str4531.patch str4531-1.patch)
 
 build () {
     cd $name-$version
 
+    patch -p0 -i $SRC/str4523.patch
+    patch -p0 -i $SRC/str4531.patch
+    patch -p1 -i $SRC/str4531-1.patch
+
     patch -p1 -i $SRC/cups-config.patch
 
     ./configure --prefix=/usr \
@@ -30,8 +35,7 @@ build () {
                 --enable-ssl --disable-gnutls \
                 --enable-tcp-wrappers \
                 --enable-acl \
-                --disable-pam \
-                --disable-dbus
+                --disable-{pam,dbus,avahi,systemd}
 
     make
     make BUILDROOT=$PKG install
diff --git a/cups/str4523.patch b/cups/str4523.patch
new file mode 100644
index 000000000..789ad3003
--- /dev/null
+++ b/cups/str4523.patch
@@ -0,0 +1,20 @@
+Index: test/ippserver.c
+===================================================================
+--- test/ippserver.c	(revision 12268)
++++ test/ippserver.c	(working copy)
+@@ -419,12 +419,12 @@
+  * Globals...
+  */
+ 
+-#  ifdef HAVE_DNSSD
++#ifdef HAVE_DNSSD
+ static DNSServiceRef	DNSSDMaster = NULL;
+-#  else /* HAVE_AVAHI */
++#elif defined(HAVE_AVAHI)
+ static AvahiThreadedPoll *DNSSDMaster = NULL;
+ static AvahiClient	*DNSSDClient = NULL;
+-#  endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD */
+ 
+ static int		KeepFiles = 0,
+ 			Verbosity = 0;
diff --git a/cups/str4531-1.patch b/cups/str4531-1.patch
new file mode 100644
index 000000000..6bedaf463
--- /dev/null
+++ b/cups/str4531-1.patch
@@ -0,0 +1,29 @@
+commit 0c124a183ab2b56f85c98374ea0bdec1f5f89845
+Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
+Date:   Tue Dec 9 17:58:18 2014 +0000
+
+    Additional fix for STR #4531.
+    
+    
+    git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12313 a1ca3aef-8c08-0410-bb20-df032aa958be
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 9f22b40..352546e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -2934,6 +2934,7 @@ read_cupsd_conf(cups_file_t *fp)	/* I - File to read from */
+ 		      "FaxRetryLimit is deprecated; use "
+ 		      "JobRetryLimit on line %d.", linenum);
+     }
++#ifdef HAVE_SSL
+     else if (!_cups_strcasecmp(line, "SSLOptions"))
+     {
+      /*
+@@ -2977,6 +2978,7 @@ read_cupsd_conf(cups_file_t *fp)	/* I - File to read from */
+ 
+       _httpTLSSetOptions(options);
+     }
++#endif /* HAVE_SSL */
+     else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")
+ #ifdef HAVE_SSL
+              || !_cups_strcasecmp(line, "SSLPort") || !_cups_strcasecmp(line, "SSLListen")
diff --git a/cups/str4531.patch b/cups/str4531.patch
new file mode 100644
index 000000000..697566819
--- /dev/null
+++ b/cups/str4531.patch
@@ -0,0 +1,29 @@
+Index: cups/usersys.c
+===================================================================
+--- cups/usersys.c	(revision 12310)
++++ cups/usersys.c	(working copy)
+@@ -955,6 +955,8 @@
+ #endif /* HAVE_GSSAPI */
+ 
+ 
++  (void)ssl_options; /* Silence compiler warning */
++
+  /*
+   * Read from the file...
+   */
+@@ -1009,6 +1011,7 @@
+       cups_gssservicename = gss_service_name;
+     }
+ #endif /* HAVE_GSSAPI */
++#ifdef HAVE_SSL
+     else if (ssl_options && !_cups_strcasecmp(line, "SSLOptions") && value)
+     {
+      /*
+@@ -1046,6 +1049,7 @@
+ 
+       _httpTLSSetOptions(options);
+     }
++#endif /* HAVE_SSL */
+   }
+ 
+  /*