diff options
| -rw-r--r-- | net/bind96/Makefile | 5 | ||||
| -rw-r--r-- | net/bind96/distinfo | 9 | ||||
| -rw-r--r-- | net/bind96/patches/patch-lib_dns_resolver.c | 34 |
3 files changed, 6 insertions, 42 deletions
diff --git a/net/bind96/Makefile b/net/bind96/Makefile index 943cd86a717..c3860ec2593 100644 --- a/net/bind96/Makefile +++ b/net/bind96/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2012/05/01 02:49:26 taca Exp $ +# $NetBSD: Makefile,v 1.25 2012/05/22 03:34:31 taca Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-ESV/.3.1.ESV/:S/-R/./:S/-P/pl/} -PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ @@ -17,7 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no -BIND_VERSION= 9.6-ESV-R6 +BIND_VERSION= 9.6-ESV-R7 .include "../../mk/bsd.prefs.mk" diff --git a/net/bind96/distinfo b/net/bind96/distinfo index 8991e76f77a..eefaffb9aad 100644 --- a/net/bind96/distinfo +++ b/net/bind96/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.16 2012/05/01 02:49:26 taca Exp $ +$NetBSD: distinfo,v 1.17 2012/05/22 03:34:32 taca Exp $ -SHA1 (bind-9.6-ESV-R6.tar.gz) = 8818ba00a7503e757d9d34053b2f16beac0d0f5e -RMD160 (bind-9.6-ESV-R6.tar.gz) = 239d70e1bc1d7e16a42d36938de8aa3ffbab0b64 -Size (bind-9.6-ESV-R6.tar.gz) = 6288288 bytes +SHA1 (bind-9.6-ESV-R7.tar.gz) = d34b271a46fb40ded68ca79e5cc08650fd43f713 +RMD160 (bind-9.6-ESV-R7.tar.gz) = abdca464c1eb1b3b285cbd26ad8b675ae9226133 +Size (bind-9.6-ESV-R7.tar.gz) = 6286390 bytes SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48 SHA1 (patch-ac) = 074649e1514870a3154c623a5f6d1507b72b5b05 SHA1 (patch-ad) = 3fcfac007f7823d48573459e57810f442c5b7d2f SHA1 (patch-ag) = ffc547b444f01f51a12a01cfa884916a9a411a88 SHA1 (patch-am) = a52d847354cd83b2474d5420925925e4614c966f -SHA1 (patch-lib_dns_resolver.c) = e9b7460c15df6b942b9987aeb4d223f48dec712d diff --git a/net/bind96/patches/patch-lib_dns_resolver.c b/net/bind96/patches/patch-lib_dns_resolver.c deleted file mode 100644 index 94fe33c1b0b..00000000000 --- a/net/bind96/patches/patch-lib_dns_resolver.c +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-lib_dns_resolver.c,v 1.1 2012/05/01 02:49:27 taca Exp $ - -Prevent segmentation fault in resolver.c: https://kb.isc.org/article/AA-00664 - ---- lib/dns/resolver.c.orig 2012-03-26 16:14:28.000000000 +0000 -+++ lib/dns/resolver.c -@@ -2156,7 +2156,6 @@ fctx_finddone(isc_task_t *task, isc_even - isc_boolean_t want_try = ISC_FALSE; - isc_boolean_t want_done = ISC_FALSE; - isc_boolean_t bucket_empty = ISC_FALSE; -- isc_boolean_t destroy = ISC_FALSE; - unsigned int bucketnum; - - find = event->ev_sender; -@@ -2195,17 +2194,12 @@ fctx_finddone(isc_task_t *task, isc_even - } - } else if (SHUTTINGDOWN(fctx) && fctx->pending == 0 && - fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) { -- /* -- * Note that we had to wait until we had the lock before -- * looking at fctx->references. -- */ -+ - if (fctx->references == 0) -- destroy = ISC_TRUE; -+ bucket_empty = fctx_destroy(fctx); - } - UNLOCK(&res->buckets[bucketnum].lock); - -- if (destroy) -- bucket_empty = fctx_destroy(fctx); - isc_event_free(&event); - dns_adb_destroyfind(&find); - |