diff options
| -rw-r--r-- | print/cups/distinfo | 4 | ||||
| -rw-r--r-- | print/cups/patches/patch-scheduler_dirsvc.c | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index 90a7e0adce1..57e0c507325 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.101 2014/06/07 11:54:54 wiz Exp $ +$NetBSD: distinfo,v 1.102 2014/06/09 09:27:10 wiz Exp $ SHA1 (cups-1.7.3-source.tar.bz2) = 8b967f64224eaa7f8e1241560dcf93a723c4b54a RMD160 (cups-1.7.3-source.tar.bz2) = ecc5803ffa2b78b04f617ef43819395410dc182b @@ -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) = a4967c2c5841a8b51c24becd5a0f796daa3c5be2 +SHA1 (patch-scheduler_dirsvc.c) = 79bcc46c2120a77465fc33b1684d60eeee689f8b diff --git a/print/cups/patches/patch-scheduler_dirsvc.c b/print/cups/patches/patch-scheduler_dirsvc.c index e9d1b2a39ba..5504f592830 100644 --- a/print/cups/patches/patch-scheduler_dirsvc.c +++ b/print/cups/patches/patch-scheduler_dirsvc.c @@ -1,6 +1,10 @@ -$NetBSD: patch-scheduler_dirsvc.c,v 1.3 2014/06/07 11:54:54 wiz Exp $ +$NetBSD: patch-scheduler_dirsvc.c,v 1.4 2014/06/09 09:27:10 wiz Exp $ ---- scheduler/dirsvc.c.orig 2014-03-05 21:11:32.000000000 +0000 +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 @@ -237,11 +237,13 @@ cupsdStartBrowsing(void) if (BrowseLocalProtocols & BROWSE_SMB) @@ -32,3 +36,13 @@ $NetBSD: patch-scheduler_dirsvc.c,v 1.3 2014/06/07 11:54:54 wiz Exp $ if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster) dnssdStop(); #endif /* HAVE_DNSSD || HAVE_AVAHI */ +@@ -829,9 +831,6 @@ dnssdErrorString(int error) /* I - Erro + + case kDNSServiceErr_PollingMode : + return ("Service polling mode error."); +- +- case kDNSServiceErr_Timeout : +- return ("Service timeout."); + } + + # else /* HAVE_AVAHI */ |