diff options
-rw-r--r-- | net/bind910/Makefile | 4 | ||||
-rw-r--r-- | net/bind910/distinfo | 16 | ||||
-rw-r--r-- | net/bind910/patches/patch-bin_dig_dighost.c | 32 | ||||
-rw-r--r-- | net/bind910/patches/patch-bin_tests_system_Makefile.in | 10 | ||||
-rw-r--r-- | net/bind910/patches/patch-configure | 26 |
5 files changed, 35 insertions, 53 deletions
diff --git a/net/bind910/Makefile b/net/bind910/Makefile index 759c9be1992..80d3b3d39a8 100644 --- a/net/bind910/Makefile +++ b/net/bind910/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/09/03 00:33:31 taca Exp $ +# $NetBSD: Makefile,v 1.13 2015/12/13 17:35:22 taca Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} @@ -14,7 +14,7 @@ CONFLICTS+= host-[0-9]* MAKE_JOBS_SAFE= no -BIND_VERSION= 9.10.2-P4 +BIND_VERSION= 9.10.3 .include "../../mk/bsd.prefs.mk" diff --git a/net/bind910/distinfo b/net/bind910/distinfo index eb187053702..aa3731453d9 100644 --- a/net/bind910/distinfo +++ b/net/bind910/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.11 2015/11/04 00:34:53 agc Exp $ +$NetBSD: distinfo,v 1.12 2015/12/13 17:35:22 taca Exp $ -SHA1 (bind-9.10.2-P4.tar.gz) = 55b8803c566aa0c9a9e4dbabbad06fb4536a8d5b -RMD160 (bind-9.10.2-P4.tar.gz) = 8b2e0501899a5d654d8a234a7bd939cf06c43948 -SHA512 (bind-9.10.2-P4.tar.gz) = 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c -Size (bind-9.10.2-P4.tar.gz) = 8471531 bytes -SHA1 (patch-bin_dig_dighost.c) = 582fa4c7288e70bcc6ac906e8429cf38e0ad5152 -SHA1 (patch-bin_tests_system_Makefile.in) = 8bb6130981a6ff2ac736cf53a061115782bb65a2 +SHA1 (bind-9.10.3.tar.gz) = 44db4949dc63fc7c4c50d1cd3bb978648ceacdd7 +RMD160 (bind-9.10.3.tar.gz) = 5520c961621846d3ea8aa941353346a2cc0907c8 +SHA512 (bind-9.10.3.tar.gz) = 4dd6b298496cb451d8ccc0c1360f7bcfcd4f3180097c7fe4af33bffb8f8d38808e56bcc008d009deb5c8f1e612a2c6c00154b822df94a709195a3abf63e98f99 +Size (bind-9.10.3.tar.gz) = 8552545 bytes +SHA1 (patch-bin_dig_dighost.c) = 983e23a30d519982cbe88ed2277fcffc9cad616e +SHA1 (patch-bin_tests_system_Makefile.in) = aeb2de1b6c6cfdbae7ffbf38aeebf52e94af9e2f SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2 -SHA1 (patch-configure) = 3ea12f60b26064679e086ef5e637420b95d165be +SHA1 (patch-configure) = 754a510493ae8fae669a9ff79940ccb04bc1e57e SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f SHA1 (patch-lib_dns_rbt.c) = 510dfc72bc7764e548a46e9c48b58b2543490d7a SHA1 (patch-lib_lwres_getaddrinfo.c) = 69e9c8049fedcb93bd219c6053163f21ce3b2535 diff --git a/net/bind910/patches/patch-bin_dig_dighost.c b/net/bind910/patches/patch-bin_dig_dighost.c index d984b3b7ecd..4ac423f5f28 100644 --- a/net/bind910/patches/patch-bin_dig_dighost.c +++ b/net/bind910/patches/patch-bin_dig_dighost.c @@ -1,11 +1,11 @@ -$NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ +$NetBSD: patch-bin_dig_dighost.c,v 1.3 2015/12/13 17:35:22 taca Exp $ * Avoid to use true as variable name. ---- bin/dig/dighost.c.orig 2015-02-18 01:55:55.000000000 +0000 +--- bin/dig/dighost.c.orig 2015-09-09 02:23:40.000000000 +0000 +++ bin/dig/dighost.c -@@ -4678,7 +4678,7 @@ prepare_lookup(dns_name_t *name) - isc_result_t result; +@@ -4821,7 +4821,7 @@ prepare_lookup(dns_name_t *name) + isc_buffer_t *b = NULL; isc_region_t r; dns_rdataset_t *rdataset = NULL; - isc_boolean_t true = ISC_TRUE; @@ -13,7 +13,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ #endif memset(namestr, 0, DNS_NAME_FORMATSIZE); -@@ -4692,7 +4692,7 @@ prepare_lookup(dns_name_t *name) +@@ -4835,7 +4835,7 @@ prepare_lookup(dns_name_t *name) result = advanced_rrsearch(&rdataset, &ns.name, dns_rdatatype_aaaa, @@ -22,7 +22,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result == ISC_R_SUCCESS) { for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; -@@ -4721,7 +4721,7 @@ prepare_lookup(dns_name_t *name) +@@ -4864,7 +4864,7 @@ prepare_lookup(dns_name_t *name) rdataset = NULL; result = advanced_rrsearch(&rdataset, &ns.name, dns_rdatatype_a, @@ -31,7 +31,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result == ISC_R_SUCCESS) { for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; -@@ -4840,11 +4840,11 @@ isc_result_t +@@ -4983,11 +4983,11 @@ isc_result_t initialization(dns_name_t *name) { isc_result_t result; @@ -45,7 +45,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result != ISC_R_SUCCESS) { printf("\n;; NS RRset is missing to continue validation:" " FAILED\n\n"); -@@ -5202,7 +5202,7 @@ sigchase_td(dns_message_t *msg) +@@ -5342,7 +5342,7 @@ sigchase_td(dns_message_t *msg) isc_result_t result; dns_name_t *name = NULL; isc_boolean_t have_answer = ISC_FALSE; @@ -54,7 +54,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (msg->rcode != dns_rcode_noerror && msg->rcode != dns_rcode_nxdomain) { -@@ -5225,7 +5225,7 @@ sigchase_td(dns_message_t *msg) +@@ -5365,7 +5365,7 @@ sigchase_td(dns_message_t *msg) initialization(name); return; } @@ -63,7 +63,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ } else { if (!current_lookup->trace_root_sigchase) { result = dns_message_firstname(msg, -@@ -5346,7 +5346,7 @@ sigchase_td(dns_message_t *msg) +@@ -5484,7 +5484,7 @@ sigchase_td(dns_message_t *msg) dns_rdatatype_rrsig, current_lookup ->rdtype_sigchase, @@ -72,7 +72,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result == ISC_R_FAILURE) { printf("\n;; RRset is missing to continue" " validation SHOULD NOT APPEND:" -@@ -5359,7 +5359,7 @@ sigchase_td(dns_message_t *msg) +@@ -5497,7 +5497,7 @@ sigchase_td(dns_message_t *msg) &chase_authority_name, dns_rdatatype_rrsig, dns_rdatatype_any, @@ -81,7 +81,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result == ISC_R_FAILURE) { printf("\n;; RRSIG is missing to continue" " validation SHOULD NOT APPEND:" -@@ -5435,7 +5435,7 @@ sigchase_td(dns_message_t *msg) +@@ -5573,7 +5573,7 @@ sigchase_td(dns_message_t *msg) &chase_authority_name, dns_rdatatype_rrsig, dns_rdatatype_ds, @@ -90,7 +90,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result != ISC_R_SUCCESS) { printf("\n;; DSset is missing to continue validation:" " FAILED\n\n"); -@@ -5523,7 +5523,7 @@ sigchase_td(dns_message_t *msg) +@@ -5660,7 +5660,7 @@ sigchase_td(dns_message_t *msg) result = advanced_rrsearch(&chase_rdataset, &chase_name, current_lookup->rdtype_sigchase, dns_rdatatype_any , @@ -99,7 +99,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result == ISC_R_FAILURE) { printf("\n;; RRsig of RRset is missing to continue validation" " SHOULD NOT APPEND: FAILED\n\n"); -@@ -5566,7 +5566,7 @@ getneededrr(dns_message_t *msg) +@@ -5703,7 +5703,7 @@ getneededrr(dns_message_t *msg) dns_name_t *name = NULL; dns_rdata_t sigrdata = DNS_RDATA_INIT; dns_rdata_sig_t siginfo; @@ -108,7 +108,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER)) != ISC_R_SUCCESS) { -@@ -5582,7 +5582,7 @@ getneededrr(dns_message_t *msg) +@@ -5719,7 +5719,7 @@ getneededrr(dns_message_t *msg) if (chase_rdataset == NULL) { result = advanced_rrsearch(&chase_rdataset, name, dns_rdatatype_any, @@ -117,7 +117,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2015/02/26 10:15:02 taca Exp $ if (result != ISC_R_SUCCESS) { printf("\n;; No Answers: Validation FAILED\n\n"); return (ISC_R_NOTFOUND); -@@ -5701,7 +5701,7 @@ getneededrr(dns_message_t *msg) +@@ -5838,7 +5838,7 @@ getneededrr(dns_message_t *msg) result = advanced_rrsearch(&chase_sigdsrdataset, &chase_signame, dns_rdatatype_rrsig, diff --git a/net/bind910/patches/patch-bin_tests_system_Makefile.in b/net/bind910/patches/patch-bin_tests_system_Makefile.in index 6d012e308db..1a824e2e432 100644 --- a/net/bind910/patches/patch-bin_tests_system_Makefile.in +++ b/net/bind910/patches/patch-bin_tests_system_Makefile.in @@ -1,15 +1,15 @@ -$NetBSD: patch-bin_tests_system_Makefile.in,v 1.2 2014/10/14 16:23:19 taca Exp $ +$NetBSD: patch-bin_tests_system_Makefile.in,v 1.3 2015/12/13 17:35:22 taca Exp $ Build fix for DragonFly while linking of driver.so. ---- bin/tests/system/Makefile.in.orig 2014-09-16 19:27:15.000000000 +0000 +--- bin/tests/system/Makefile.in.orig 2015-09-09 02:23:40.000000000 +0000 +++ bin/tests/system/Makefile.in -@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ +@@ -19,7 +19,7 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ --SUBDIRS = builtin dlzexternal filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss -+SUBDIRS = builtin filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss +-SUBDIRS = builtin dlzexternal fetchlimit filter-aaaa geoip lwresd rpz rsabigexponent statistics tkey tsiggss ++SUBDIRS = builtin fetchlimit filter-aaaa geoip lwresd rpz rsabigexponent statistics tkey tsiggss TARGETS = @BIND9_MAKE_RULES@ diff --git a/net/bind910/patches/patch-configure b/net/bind910/patches/patch-configure index ebdc9d6486c..fb9fb974cab 100644 --- a/net/bind910/patches/patch-configure +++ b/net/bind910/patches/patch-configure @@ -1,30 +1,12 @@ -$NetBSD: patch-configure,v 1.3 2015/02/26 10:15:02 taca Exp $ +$NetBSD: patch-configure,v 1.4 2015/12/13 17:35:22 taca Exp $ * Add DragonFly support. * Link proper postgresql library. * Avoid using "==" for argument of test(1). ---- configure.orig 2015-02-18 01:55:55.000000000 +0000 +--- configure.orig 2015-09-09 02:23:40.000000000 +0000 +++ configure -@@ -11840,7 +11840,7 @@ fi - test -n "$PYTHON" && break - done - -- if test "X$PYTHON" == "X"; then -+ if test "X$PYTHON" = "X"; then - continue; - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'argparse'" >&5 -@@ -11855,7 +11855,7 @@ $as_echo "not found" >&6; } - unset ac_cv_path_PYTHON - unset PYTHON - done -- if test "X$PYTHON" == "X" -+ if test "X$PYTHON" = "X" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python support" >&5 - $as_echo_n "checking for python support... " >&6; } -@@ -14379,6 +14379,8 @@ case $host in +@@ -14388,6 +14388,8 @@ case $host in use_threads=false ;; *-freebsd*) use_threads=true ;; @@ -33,7 +15,7 @@ $NetBSD: patch-configure,v 1.3 2015/02/26 10:15:02 taca Exp $ *-bsdi[234]*) # Thread signals do not work reliably on some versions of BSD/OS. use_threads=false ;; -@@ -21029,7 +21031,7 @@ $as_echo "no" >&6; } +@@ -21276,7 +21278,7 @@ $as_echo "no" >&6; } fi if test -n "-L$use_dlz_postgres_lib -lpq" then |