commit 4074a522eea7fc4237ce03cc5bd0c64bd507fef2 Author: Juergen Daubert <jue@jue.li> Date: Sun Aug 17 11:24:33 2014 +0200 [notify] cups: update to 1.7.5 Update includes security fixes, see - http://www.cups.org/str.php?L4450 - http://www.cups.org/str.php?L4455 (cherry picked from commit 52a3976c5d4317043771f79628a0381282f4bea9) diff --git a/cups/.md5sum b/cups/.md5sum index cbaff77..082990e 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,4 +1,3 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -d498c3020acda0904ab0c13b6389a1ec cups-1.7.3-source.tar.bz2 +5d893edc2957005f78e2b2423fdace2e cups-1.7.5-source.tar.bz2 fd78a2c51a2e206ea85d21d2dc9dde69 cups-config.patch -e579b616ea59ab462cff1b1361d4d741 cups-dnssd.patch diff --git a/cups/Pkgfile b/cups/Pkgfile index f2604bd..b8cb0ec 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,17 +4,15 @@ # Depends on: acl tcp_wrappers libusb openssl zlib name=cups -version=1.7.3 +version=1.7.5 release=1 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2 - cups-config.patch cups - cups-dnssd.patch) + cups-config.patch cups) build () { cd $name-$version patch -p1 -i $SRC/cups-config.patch - patch -p1 -i $SRC/cups-dnssd.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/cups/cups-dnssd.patch b/cups/cups-dnssd.patch deleted file mode 100644 index a120f20..0000000 --- a/cups/cups-dnssd.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 8441e27ce4008828cbdd25bdd6249c0019853b92 -Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> -Date: Fri May 9 20:57:11 2014 +0000 - - CUPS did not compile when Avahi or mDNSResponder was not present (STR #4402) - - - - git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11871 a1ca3aef-8c08-0410-bb20-df032aa958be - -diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c -index 495bf1b..4e417b0 100644 ---- a/scheduler/dirsvc.c -+++ b/scheduler/dirsvc.c -@@ -237,11 +237,13 @@ cupsdStartBrowsing(void) - if (BrowseLocalProtocols & BROWSE_SMB) - update_smb(1); - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * Register the individual printers - */ - - dnssdRegisterAllPrinters(0); -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ - } - - -@@ -255,6 +257,7 @@ cupsdStopBrowsing(void) - if (!Browsing || !BrowseLocalProtocols) - return; - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * De-register the individual printers - */ -@@ -265,7 +268,6 @@ cupsdStopBrowsing(void) - * Shut down browsing sockets... - */ - --#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster) - dnssdStop(); - #endif /* HAVE_DNSSD || HAVE_AVAHI */