cups: update to 2.0.2

8 files changed, 4 insertions, 127 deletions

diff --git a/cups/.footprint b/cups/.footprint
index da44b9886..a3e8cabac 100644
--- a/cups/.footprint
+++ b/cups/.footprint
@@ -11,11 +11,6 @@ drwxr-xr-x	root/root	etc/modprobe.d/
 -rw-r--r--	root/root	etc/modprobe.d/cups.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/cups
-drwxr-xr-x	root/root	etc/ssl/
-drwxr-xr-x	root/root	etc/ssl/certs/
--rw-------	root/root	etc/ssl/certs/cups.crt (EMPTY)
-drwxr-xr-x	root/root	etc/ssl/keys/
--rw-------	root/root	etc/ssl/keys/cups.key (EMPTY)
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cancel
diff --git a/cups/.md5sum b/cups/.md5sum
index 80059e25f..9e6110e6c 100644
--- a/cups/.md5sum
+++ b/cups/.md5sum
@@ -1,6 +1,2 @@
-01b6a755c5b0fb7df2d2c94571f67e1d  cups
-7f7c33071035fb20d0879929a42da711  cups-2.0.1-source.tar.bz2
-fd78a2c51a2e206ea85d21d2dc9dde69  cups-config.patch
-791140e281a0c73fe85e9ee6ebeb444b  str4523.patch
-7ba9b00f1686283abdcd490ca4114e0b  str4531-1.patch
-a93bacb523e0dc5551b6b14d0e31dce4  str4531.patch
+4965028855c65ea97d8064de568e3d0d  cups
+6e0ea72dbafcf5baaa1cf4178e71096d  cups-2.0.2-source.tar.bz2
diff --git a/cups/Pkgfile b/cups/Pkgfile
index 1f36ed12f..24aa9a852 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -4,21 +4,14 @@
 # Depends on:  acl tcp_wrappers libusb openssl zlib
 
 name=cups
-version=2.0.1
+version=2.0.2
 release=1
 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2
-        cups-config.patch cups
-        str4523.patch str4531.patch str4531-1.patch)
+        cups)
 
 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 \
                 --sysconfdir=/etc \
                 --libdir=/usr/lib \
@@ -32,7 +25,6 @@ build () {
                 --without-{java,perl,php,python} \
                 --without-rcdir \
                 --with-optim="$CFLAGS" \
-                --enable-ssl --disable-gnutls \
                 --enable-tcp-wrappers \
                 --enable-acl \
                 --disable-{pam,dbus,avahi,systemd}
@@ -48,12 +40,6 @@ build () {
     chmod 0755 $PKG/var/{cache,spool}   
     chmod -R +w $PKG
 
-    # ssl files
-    install -d $PKG/etc/ssl/{certs,keys}
-    touch $PKG/etc/ssl/certs/cups.crt
-    touch $PKG/etc/ssl/keys/cups.key
-    chmod 0600 $PKG/etc/ssl/{keys/cups.key,certs/cups.crt}
-
     # start script
     install -D -m 755 $SRC/cups $PKG/etc/rc.d/cups
 
diff --git a/cups/cups b/cups/cups
index fb2d89ed5..aee717d56 100644
--- a/cups/cups
+++ b/cups/cups
@@ -3,14 +3,8 @@
 # /etc/rc.d/cups: start/stop/reload CUPS daemon
 #
 
-KEY=/etc/ssl/keys/cups.key
-CRT=/etc/ssl/certs/cups.crt
-
 case $1 in
 start)
-	if [ ! -s $KEY -o ! -s $CRT ]; then 
-		/usr/bin/mksslcert $KEY $CRT
-	fi
 	/usr/sbin/cupsd
 	;;
 stop)
diff --git a/cups/cups-config.patch b/cups/cups-config.patch
deleted file mode 100644
index 275cdb7cf..000000000
--- a/cups/cups-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nru cups-1.6.2.orig/conf/cups-files.conf.in cups-1.6.2/conf/cups-files.conf.in
---- cups-1.6.2.orig/conf/cups-files.conf.in	2013-03-18 18:52:05.834379900 +0100
-+++ cups-1.6.2/conf/cups-files.conf.in	2013-03-18 19:13:54.540806821 +0100
-@@ -74,10 +74,10 @@
- #ServerBin @CUPS_SERVERBIN@
- 
- # SSL/TLS certificate for the scheduler...
--#ServerCertificate @CUPS_SERVERCERT@
-+ServerCertificate /etc/ssl/certs/cups.crt
- 
- # SSL/TLS private key for the scheduler...
--#ServerKey @CUPS_SERVERKEY@
-+ServerKey /etc/ssl/keys/cups.key
- 
- # Location of other configuration files...
- #ServerRoot @CUPS_SERVERROOT@
diff --git a/cups/str4523.patch b/cups/str4523.patch
deleted file mode 100644
index 789ad3003..000000000
--- a/cups/str4523.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 6bedaf463..000000000
--- a/cups/str4531-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 697566819..000000000
--- a/cups/str4531.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 */
-   }
- 
-  /*