diff options
| -rw-r--r-- | net/bind97/Makefile | 5 | ||||
| -rw-r--r-- | net/bind97/distinfo | 9 | ||||
| -rw-r--r-- | net/bind97/patches/patch-lib_dns_resolver.c | 34 |
3 files changed, 6 insertions, 42 deletions
diff --git a/net/bind97/Makefile b/net/bind97/Makefile index 9ebbbf31075..ccc40e09f66 100644 --- a/net/bind97/Makefile +++ b/net/bind97/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2012/05/01 02:48:58 taca Exp $ +# $NetBSD: Makefile,v 1.14 2012/05/22 03:33:28 taca Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME: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.7.5 +BIND_VERSION= 9.7.6 .include "../../mk/bsd.prefs.mk" diff --git a/net/bind97/distinfo b/net/bind97/distinfo index 748ae36354a..345e05c1b51 100644 --- a/net/bind97/distinfo +++ b/net/bind97/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.12 2012/05/01 02:48:58 taca Exp $ +$NetBSD: distinfo,v 1.13 2012/05/22 03:33:28 taca Exp $ -SHA1 (bind-9.7.5.tar.gz) = d66705bb898340de88653892a75e0038c3dec86e -RMD160 (bind-9.7.5.tar.gz) = 0186557e4d20b06c45939988b47dbf2cf600ae9b -Size (bind-9.7.5.tar.gz) = 6848848 bytes +SHA1 (bind-9.7.6.tar.gz) = 79dd03a017b0e56eee75e07cb1bef4fbfbe7de36 +RMD160 (bind-9.7.6.tar.gz) = 3b1b8b91d188b48d3531d38c9b90f7f468fb1641 +Size (bind-9.7.6.tar.gz) = 6846451 bytes SHA1 (patch-aa) = 6cec876c8caa7082f97365863f3f88c4f168da48 SHA1 (patch-ab) = 9585a26a376d32f80ac8266eb7967c00b433f14d SHA1 (patch-ac) = ee4ca3d200b3d3f93b8ccfa2c6e51ab005b35a01 SHA1 (patch-ad) = 29fb5c24ff3558f1621e93ea16419e32dbc695b7 SHA1 (patch-ae) = 68b8155daa8f75081b6f8fd70ca23fda60506c64 -SHA1 (patch-lib_dns_resolver.c) = 1c0bc26a159219f65dc59429d395f7796a5165f6 diff --git a/net/bind97/patches/patch-lib_dns_resolver.c b/net/bind97/patches/patch-lib_dns_resolver.c deleted file mode 100644 index 6bae806b32a..00000000000 --- a/net/bind97/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:48:58 taca Exp $ - -Prevent segmentation fault in resolver.c: https://kb.isc.org/article/AA-00664 - ---- lib/dns/resolver.c.orig 2012-03-22 19:14:04.000000000 +0000 -+++ lib/dns/resolver.c -@@ -2157,7 +2157,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; -@@ -2196,17 +2195,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); - |