diff options
| -rw-r--r-- | print/cups/Makefile | 4 | ||||
| -rw-r--r-- | print/cups/distinfo | 10 | ||||
| -rw-r--r-- | print/cups/patches/patch-scheduler_dirsvc.c | 37 |
3 files changed, 10 insertions, 41 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 69be14ca2b8..a6ebbf695b5 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.209 2014/06/07 07:34:05 wiz Exp $ +# $NetBSD: Makefile,v 1.210 2014/07/29 11:38:40 wiz Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -6,7 +6,7 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${DIST_VERS:S/-/./g} -BASE_VERS= 1.7.3 +BASE_VERS= 1.7.4 DIST_VERS= ${BASE_VERS} CATEGORIES= print MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/ diff --git a/print/cups/distinfo b/print/cups/distinfo index 57e0c507325..c96e0a74efd 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.102 2014/06/09 09:27:10 wiz Exp $ +$NetBSD: distinfo,v 1.103 2014/07/29 11:38:40 wiz Exp $ -SHA1 (cups-1.7.3-source.tar.bz2) = 8b967f64224eaa7f8e1241560dcf93a723c4b54a -RMD160 (cups-1.7.3-source.tar.bz2) = ecc5803ffa2b78b04f617ef43819395410dc182b -Size (cups-1.7.3-source.tar.bz2) = 8792641 bytes +SHA1 (cups-1.7.4-source.tar.bz2) = f6eaf9f5b60992e678868719c8ee81841972a9d0 +RMD160 (cups-1.7.4-source.tar.bz2) = 93074532d4051e7a2289c22d38ca8b5b1a86bbee +Size (cups-1.7.4-source.tar.bz2) = 8792324 bytes SHA1 (patch-ac) = a6f3ed84b727fe4735060a804eaf564ef813748b SHA1 (patch-ad) = c7c6b052e6ed5a78f8d3aeceaac9c5b08597df38 SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3 @@ -17,4 +17,4 @@ SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f130 SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448 SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4 -SHA1 (patch-scheduler_dirsvc.c) = 79bcc46c2120a77465fc33b1684d60eeee689f8b +SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69 diff --git a/print/cups/patches/patch-scheduler_dirsvc.c b/print/cups/patches/patch-scheduler_dirsvc.c index 5504f592830..ca245965313 100644 --- a/print/cups/patches/patch-scheduler_dirsvc.c +++ b/print/cups/patches/patch-scheduler_dirsvc.c @@ -1,42 +1,11 @@ -$NetBSD: patch-scheduler_dirsvc.c,v 1.4 2014/06/09 09:27:10 wiz Exp $ +$NetBSD: patch-scheduler_dirsvc.c,v 1.5 2014/07/29 11:38:40 wiz Exp $ -o Fix building without dnssd option. o net/mDNSResponder-258.14 does not define kDNSServiceErr_Timeout, just threat it like kDNSServiceErr_Unknown. ---- scheduler/dirsvc.c.orig 2014-03-05 21:11:32.000000000 +0000 +--- scheduler/dirsvc.c.orig 2014-06-09 18:33:24.000000000 +0000 +++ 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 - } - - -@@ -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 */ -@@ -829,9 +831,6 @@ dnssdErrorString(int error) /* I - Erro +@@ -831,9 +833,6 @@ dnssdErrorString(int error) /* I - Erro case kDNSServiceErr_PollingMode : return ("Service polling mode error."); |