Thu Jun 20 02:16:53 2019 UTC ()
net/bind914: update to 9.14.3

Update bind914 to 9.14.3 (BIND 9.14.3).

	--- 9.14.3 released ---

5244.	[security]	Fixed a race condition in dns_dispatch_getnext()
			that could cause an assertion failure if a
			significant number of incoming packets were
			rejected. (CVE-2019-6471) [GL #942]

5243.	[bug]		Fix a possible race between dispatcher and socket
			code in a high-load cold-cache resolver scenario.
			[GL #943]

5242.	[bug]		In relaxed qname minimizatiom mode, fall back to
			normal resolution when encountering a lame
			delegation, and use _.domain/A queries rather
			than domain/NS. [GL #1055]

5241.	[bug]		Fix Ed448 private and public key ASN.1 prefix blobs.
			[GL #225]

5240.	[bug]		Remove key id calculation for RSAMD5. [GL #996]

5238.	[bug]		Fix a possible deadlock in TCP code. [GL #1046]

5237.	[bug]		Recurse to find the root server list with 'dig +trace'.
			[GL #1028]

5234.	[port]		arm: just use the compiler's default support for
			yield. [GL #981]


(taca)
diff -r1.5 -r1.6 pkgsrc/net/bind914/Makefile
diff -r1.4 -r1.5 pkgsrc/net/bind914/distinfo
diff -r1.1 -r1.2 pkgsrc/net/bind914/patches/patch-config.h.in
diff -r1.1 -r1.2 pkgsrc/net/bind914/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/net/bind914/patches/patch-lib_isc_rwlock.c
cvs diff -r1.5 -r1.6 pkgsrc/net/bind914/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/bind914/Attic/Makefile 2019/06/14 16:14:05 1.5
+++ pkgsrc/net/bind914/Attic/Makefile 2019/06/20 02:16:53 1.6
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.5 2019/06/14 16:14:05 taca Exp $ 1# $NetBSD: Makefile,v 1.6 2019/06/20 02:16:53 taca Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
5PKGREVISION= 1 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ 6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.isc.org/software/bind/ 9HOMEPAGE= http://www.isc.org/software/bind/
11COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14 10COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14
12LICENSE= mpl-2.0 11LICENSE= mpl-2.0
13 12
14CONFLICTS+= host-[0-9]* 13CONFLICTS+= host-[0-9]*
15 14
16MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
17 16
18BIND_VERSION= 9.14.2 17BIND_VERSION= 9.14.3
19 18
20.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
21 20
22BUILD_DEFS+= BIND_DIR VARBASE 21BUILD_DEFS+= BIND_DIR VARBASE
23 22
24.include "options.mk" 23.include "options.mk"
25 24
26USE_TOOLS+= pax perl 25USE_TOOLS+= pax perl
27USE_LIBTOOL= yes 26USE_LIBTOOL= yes
28GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
29 28
30CONFIGURE_ARGS+= --with-libtool 29CONFIGURE_ARGS+= --with-libtool
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
cvs diff -r1.4 -r1.5 pkgsrc/net/bind914/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind914/Attic/distinfo 2019/06/14 16:14:05 1.4
+++ pkgsrc/net/bind914/Attic/distinfo 2019/06/20 02:16:53 1.5
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: distinfo,v 1.4 2019/06/14 16:14:05 taca Exp $ 1$NetBSD: distinfo,v 1.5 2019/06/20 02:16:53 taca Exp $
2 2
3SHA1 (bind-9.14.2.tar.gz) = b46c8713804cb8de43ded17cfb852d2db8e184d9 3SHA1 (bind-9.14.3.tar.gz) = aac68ca0242419de24663dca935b63ba54189d9e
4RMD160 (bind-9.14.2.tar.gz) = 74d9d8d29515aa7d57e9d986d6e4b0f8af6b7962 4RMD160 (bind-9.14.3.tar.gz) = dc7bd989fd5cf20db954078af5a54e6f1bc558a9
5SHA512 (bind-9.14.2.tar.gz) = f538e6b894e19084b3a25df85e4997b244878bbd3a080b9c77fda72e1b526d79006e9f140f22d5b6b33e81b94897b8f7b5ec4dd56800b4c13ba48b91422a2286 5SHA512 (bind-9.14.3.tar.gz) = 46974be2adea512c58b82184566ea5e8a9faf67aeb78ea33356861f0a7edce37eac05c21e8fbbc7f7db4e87404fe71ed59d9eac46e6e4758d95139a21891f437
6Size (bind-9.14.2.tar.gz) = 6263879 bytes 6Size (bind-9.14.3.tar.gz) = 6258311 bytes
7SHA1 (patch-bin_named_Makefile.in) = 12e071c61e0f326d0fd7613c6b8884ad0da35214 7SHA1 (patch-bin_named_Makefile.in) = 12e071c61e0f326d0fd7613c6b8884ad0da35214
8SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0 8SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0
9SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b 9SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
10SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833 10SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833
11SHA1 (patch-bin_named_server.c) = 558088a1e1128e7a69394d66bfff03a5b3b62ee8 11SHA1 (patch-bin_named_server.c) = 558088a1e1128e7a69394d66bfff03a5b3b62ee8
12SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072 12SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072
13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e 13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
14SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28 14SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
15SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34 15SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34
16SHA1 (patch-bin_tools_arpaname.c) = 2bf3ccf81a0f89ced34f5e32419dee314601e0c0 16SHA1 (patch-bin_tools_arpaname.c) = 2bf3ccf81a0f89ced34f5e32419dee314601e0c0
17SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3 17SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3
18SHA1 (patch-config.h.in) = 82b1d79646872a08b2029e74f1fdcbfac7d83d42 18SHA1 (patch-config.h.in) = 0720dd6303293b32c1e5f0357fa3cd02f00068e4
19SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5 19SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5
20SHA1 (patch-configure) = e4105ed668aa7c5bd83dd82e8639524453162d13 20SHA1 (patch-configure) = 2fc0d22ee8cc2cf2e1f48ff87ca8d69a7cc6db81
21SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7 21SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
22SHA1 (patch-lib_dns_byaddr.c) = 75668b9bf31cd0175eab3dd74f99f4edf410fcce 22SHA1 (patch-lib_dns_byaddr.c) = 75668b9bf31cd0175eab3dd74f99f4edf410fcce
23SHA1 (patch-lib_dns_dnsrps.c) = bddd1e3ec6efada581ee8865ee429d283fb7a957 23SHA1 (patch-lib_dns_dnsrps.c) = bddd1e3ec6efada581ee8865ee429d283fb7a957
24SHA1 (patch-lib_dns_gssapi__link.c) = d3ab9b8421f64f6bfbd3b94620e816f3e23f0d49 24SHA1 (patch-lib_dns_gssapi__link.c) = d3ab9b8421f64f6bfbd3b94620e816f3e23f0d49
25SHA1 (patch-lib_dns_keytable.c) = 4369b07b75201d2f7384f05d8a3140a809d303ae 25SHA1 (patch-lib_dns_keytable.c) = 4369b07b75201d2f7384f05d8a3140a809d303ae
26SHA1 (patch-lib_dns_lookup.c) = 8e8e78e20a8e78692772d488e842df230e121203 26SHA1 (patch-lib_dns_lookup.c) = 8e8e78e20a8e78692772d488e842df230e121203
27SHA1 (patch-lib_dns_message.c) = 0be413cf8b56ce21bcceb451191cacf9d044fa06 27SHA1 (patch-lib_dns_message.c) = 0be413cf8b56ce21bcceb451191cacf9d044fa06
28SHA1 (patch-lib_dns_rbt.c) = 5b20fe8adf2fdf5b28822d0b5229845494c9639f 28SHA1 (patch-lib_dns_rbt.c) = 5b20fe8adf2fdf5b28822d0b5229845494c9639f
29SHA1 (patch-lib_dns_rbtdb.c) = 389a83f425050733cb90652ffcb515d7a53d76f2 29SHA1 (patch-lib_dns_rbtdb.c) = 389a83f425050733cb90652ffcb515d7a53d76f2
30SHA1 (patch-lib_dns_request.c) = 211e349ddda1e5a2bbafab7ddab48cca4b553822 30SHA1 (patch-lib_dns_request.c) = 211e349ddda1e5a2bbafab7ddab48cca4b553822
31SHA1 (patch-lib_dns_sdb.c) = 0e5ab9fadcdd20adeb6d5d3234b69087ab7439c8 31SHA1 (patch-lib_dns_sdb.c) = 0e5ab9fadcdd20adeb6d5d3234b69087ab7439c8
32SHA1 (patch-lib_dns_sdlz.c) = 84cc9539cb8fab3581feec2184be2dbebfc6fd67 32SHA1 (patch-lib_dns_sdlz.c) = 84cc9539cb8fab3581feec2184be2dbebfc6fd67
33SHA1 (patch-lib_dns_spnego.c) = 2867212608ebdb949c65d1d6a3db21742c1128f6 33SHA1 (patch-lib_dns_spnego.c) = 2867212608ebdb949c65d1d6a3db21742c1128f6
34SHA1 (patch-lib_dns_validator.c) = 7d7471efe5109f5b2d6f9e99fe15fa314fdd217d 34SHA1 (patch-lib_dns_validator.c) = 7d7471efe5109f5b2d6f9e99fe15fa314fdd217d
35SHA1 (patch-lib_dns_view.c) = 25095827adbc75dc629b0f435dbd711b599c86c9 35SHA1 (patch-lib_dns_view.c) = 25095827adbc75dc629b0f435dbd711b599c86c9
36SHA1 (patch-lib_isc_backtrace.c) = 5fa1dd0f18ae757233d9cc21e36a5f6a84990db1 36SHA1 (patch-lib_isc_backtrace.c) = 5fa1dd0f18ae757233d9cc21e36a5f6a84990db1
37SHA1 (patch-lib_isc_rwlock.c) = 7eb832915528d00e616b6c7503ec346143946876 37SHA1 (patch-lib_isc_rwlock.c) = f3276efe56b7060cd61323e8cc71cd25d157b21b
38SHA1 (patch-lib_isc_stats.c) = 0dde2b7cbde80f608e52bf8136b3af227b65ba4b 38SHA1 (patch-lib_isc_stats.c) = 0dde2b7cbde80f608e52bf8136b3af227b65ba4b
39SHA1 (patch-lib_isc_unix_socket.c) = 4f7be1616bac7263069292f909896373f0e6fab8 39SHA1 (patch-lib_isc_unix_socket.c) = 4f7be1616bac7263069292f909896373f0e6fab8
40SHA1 (patch-lib_isc_unix_time.c) = 04312e043601688aa2b0a09dad1bcb51d9273e9d 40SHA1 (patch-lib_isc_unix_time.c) = 04312e043601688aa2b0a09dad1bcb51d9273e9d
cvs diff -r1.1 -r1.2 pkgsrc/net/bind914/patches/Attic/patch-config.h.in (expand / switch to unified diff)

--- pkgsrc/net/bind914/patches/Attic/patch-config.h.in 2019/04/30 03:34:34 1.1
+++ pkgsrc/net/bind914/patches/Attic/patch-config.h.in 2019/06/20 02:16:53 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-config.h.in,v 1.1 2019/04/30 03:34:34 taca Exp $ 1$NetBSD: patch-config.h.in,v 1.2 2019/06/20 02:16:53 taca Exp $
2 2
3* Add support for blacklistd. 3* Add support for blacklistd.
4 4
5--- config.h.in.orig 2019-04-06 20:09:59.000000000 +0000 5--- config.h.in.orig 2019-06-04 15:20:04.000000000 +0000
6+++ config.h.in 6+++ config.h.in
7@@ -45,6 +45,9 @@ 7@@ -48,6 +48,9 @@
8 /* Define to 1 if you have the `arc4random_uniform' function. */ 8 /* define if the ARM yield instruction is available */
9 #undef HAVE_ARC4RANDOM_UNIFORM 9 #undef HAVE_ARM_YIELD
10  10
11+/* Define to 1 if blacklist is supported. */ 11+/* Define to 1 if blacklist is supported. */
12+#undef HAVE_BLACKLIST 12+#undef HAVE_BLACKLIST
13+ 13+
14 /* Define to 1 if the compiler supports __builtin_clz. */ 14 /* Define to 1 if the compiler supports __builtin_clz. */
15 #undef HAVE_BUILTIN_CLZ 15 #undef HAVE_BUILTIN_CLZ
16  16
cvs diff -r1.1 -r1.2 pkgsrc/net/bind914/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/net/bind914/patches/Attic/patch-configure 2019/04/30 03:34:34 1.1
+++ pkgsrc/net/bind914/patches/Attic/patch-configure 2019/06/20 02:16:53 1.2
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1$NetBSD: patch-configure,v 1.1 2019/04/30 03:34:34 taca Exp $ 1$NetBSD: patch-configure,v 1.2 2019/06/20 02:16:53 taca Exp $
2 2
3* Add DragonFly support. 3* Add DragonFly support.
4* Use proper link options for NetBSD. 4* Use proper link options for NetBSD.
5* Link proper postgresql library. 5* Link proper postgresql library.
6* Add support for blacklistd. 6* Add support for blacklistd.
7 7
8--- configure.orig 2019-04-06 20:09:59.000000000 +0000 8--- configure.orig 2019-06-04 15:20:04.000000000 +0000
9+++ configure 9+++ configure
10@@ -725,6 +725,9 @@ purify_path 10@@ -725,6 +725,9 @@ purify_path
11 MKDEPPROG 11 MKDEPPROG
12 MKDEPCFLAGS 12 MKDEPCFLAGS
13 MKDEPCC 13 MKDEPCC
14+BLACKLIST 14+BLACKLIST
15+BLACKLISTLINKOBJS 15+BLACKLISTLINKOBJS
16+BLACKLISTLINKSRCS 16+BLACKLISTLINKSRCS
17 ZLIB 17 ZLIB
18 JSONSTATS 18 JSONSTATS
19 XMLSTATS 19 XMLSTATS
20@@ -879,6 +882,7 @@ with_pic 20@@ -882,6 +885,7 @@ with_pic
21 enable_fast_install 21 enable_fast_install
22 with_aix_soname 22 with_aix_soname
23 with_gnu_ld 23 with_gnu_ld
24+with_blacklist 24+with_blacklist
25 with_sysroot 25 with_sysroot
26 enable_libtool_lock 26 enable_libtool_lock
27 enable_libbind 27 enable_libbind
28@@ -1672,6 +1676,7 @@ Optional Packages: 28@@ -1675,6 +1679,7 @@ Optional Packages:
29 --with-dlz-stub=ARG Build with stub DLZ driver [yes|no]. (Required to 29 --with-dlz-stub=ARG Build with stub DLZ driver [yes|no]. (Required to
30 use stub driver with DLZ) 30 use stub driver with DLZ)
31 --with-make-clean run "make clean" at end of configure [yes|no] 31 --with-make-clean run "make clean" at end of configure [yes|no]
32+ --with-blacklist Build with blacklist 32+ --with-blacklist Build with blacklist
33  33
34 Some influential environment variables: 34 Some influential environment variables:
35 CC C compiler command 35 CC C compiler command
36@@ -3818,7 +3823,7 @@ fi 36@@ -3821,7 +3826,7 @@ fi
37  37
38 # On IRIX 5.3, sys/types and inttypes.h are conflicting. 38 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
39 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ 39 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
40- inttypes.h stdint.h unistd.h 40- inttypes.h stdint.h unistd.h
41+ inttypes.h stdint.h unistd.h blacklist.h 41+ inttypes.h stdint.h unistd.h blacklist.h
42 do : 42 do :
43 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 43 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
44 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 44 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
45@@ -16679,27 +16684,10 @@ case "$use_libjson" in 45@@ -16709,27 +16714,10 @@ case "$use_libjson" in
46 libjson_libs="" 46 libjson_libs=""
47 ;; 47 ;;
48 auto|yes) 48 auto|yes)
49- for d in /usr /usr/local /opt/local 49- for d in /usr /usr/local /opt/local
50- do 50- do
51- if test -f "${d}/include/json/json.h" 51- if test -f "${d}/include/json/json.h"
52- then 52- then
53- if test ${d} != /usr 53- if test ${d} != /usr
54- then 54- then
55- libjson_cflags="-I ${d}/include" 55- libjson_cflags="-I ${d}/include"
56- LIBS="$LIBS -L${d}/lib" 56- LIBS="$LIBS -L${d}/lib"
57- fi 57- fi
58- have_libjson="yes" 58- have_libjson="yes"
@@ -64,27 +64,27 @@ $NetBSD: patch-configure,v 1.1 2019/04/3 @@ -64,27 +64,27 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
64- LIBS="$LIBS -L${d}/lib" 64- LIBS="$LIBS -L${d}/lib"
65- fi 65- fi
66- have_libjson="yes" 66- have_libjson="yes"
67- have_libjson_c="yes" 67- have_libjson_c="yes"
68- fi 68- fi
69- done 69- done
70+ libjson_cflags="`pkg-config --cflags json-c`" 70+ libjson_cflags="`pkg-config --cflags json-c`"
71+ LIBS="`pkg-config --libs json-c`" 71+ LIBS="`pkg-config --libs json-c`"
72+ have_libjson="yes" 72+ have_libjson="yes"
73+ have_libjson_c="yes" 73+ have_libjson_c="yes"
74 ;; 74 ;;
75 *) 75 *)
76 if test -f "${use_libjson}/include/json/json.h" 76 if test -f "${use_libjson}/include/json/json.h"
77@@ -16805,6 +16793,139 @@ $as_echo "#define HAVE_JSON_C 1" >>confd 77@@ -16835,6 +16823,139 @@ $as_echo "#define HAVE_JSON_C 1" >>confd
78 JSONSTATS=1 78 JSONSTATS=1
79 fi 79 fi
80  80
81+# 81+#
82+# was --with-blacklist specified? 82+# was --with-blacklist specified?
83+# 83+#
84+BLACKLISTLINKOBJS= 84+BLACKLISTLINKOBJS=
85+BLACKLISTLINKSRCS= 85+BLACKLISTLINKSRCS=
86+ 86+
87+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for blacklist library" >&5 87+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for blacklist library" >&5
88+$as_echo_n "checking for blacklist library... " >&6; } 88+$as_echo_n "checking for blacklist library... " >&6; }
89+ 89+
90+# Check whether --with-blacklist was given. 90+# Check whether --with-blacklist was given.
@@ -204,62 +204,62 @@ $NetBSD: patch-configure,v 1.1 2019/04/3 @@ -204,62 +204,62 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
204+ 204+
205+$as_echo "#define HAVE_BLACKLIST 1" >>confdefs.h 205+$as_echo "#define HAVE_BLACKLIST 1" >>confdefs.h
206+ 206+
207+ BLACKLIST=1 207+ BLACKLIST=1
208+fi 208+fi
209+if test "X${blacklist_libs}" != "X" 209+if test "X${blacklist_libs}" != "X"
210+then 210+then
211+ BLACKLISTLINKSRCS='${BLACKLISTLINKSRCS}' 211+ BLACKLISTLINKSRCS='${BLACKLISTLINKSRCS}'
212+ BLACKLISTLINKOBJS='${BLACKLISTLINKOBJS}' 212+ BLACKLISTLINKOBJS='${BLACKLISTLINKOBJS}'
213+fi 213+fi
214  214
215 # 215 #
216 # was --with-zlib specified? 216 # was --with-zlib specified?
217@@ -20234,7 +20355,7 @@ else 217@@ -20264,7 +20385,7 @@ else
218  218
219 fi 219 fi
220 ;; #( 220 ;; #(
221- *-freebsd*|*-openbsd*|*-netbsd*) : 221- *-freebsd*|*-openbsd*|*-netbsd*) :
222+ *-dragonfly*|*-freebsd*|*-openbsd*|*-netbsd*) : 222+ *-dragonfly*|*-freebsd*|*-openbsd*|*-netbsd*) :
223  223
224 LDFLAGS="${LDFLAGS} -Wl,-E" 224 LDFLAGS="${LDFLAGS} -Wl,-E"
225 SO_CFLAGS="-fpic" 225 SO_CFLAGS="-fpic"
226@@ -20266,9 +20387,9 @@ fi 226@@ -20296,9 +20417,9 @@ fi
227 ;; #( 227 ;; #(
228 *-solaris*) : 228 *-solaris*) :
229  229
230- SO_CFLAGS="-KPIC" 230- SO_CFLAGS="-KPIC"
231- SO_LDFLAGS="-G -z text" 231- SO_LDFLAGS="-G -z text"
232- SO_LD="ld" 232- SO_LD="ld"
233+ SO_CFLAGS="-fPIC" 233+ SO_CFLAGS="-fPIC"
234+ SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text" 234+ SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text"
235+ SO_LD="${CC}" 235+ SO_LD="${CC}"
236 ;; #( 236 ;; #(
237 *) : 237 ia64-hp-hpux*) :
238  238
239@@ -20691,8 +20812,8 @@ $as_echo "no" >&6; } 239@@ -20727,8 +20848,8 @@ $as_echo "no" >&6; }
240 fi 240 fi
241 if test -n "-L$use_dlz_postgres_lib -lpq" 241 if test -n "-L$use_dlz_postgres_lib -lpq"
242 then 242 then
243- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq" 243- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq"
244- DLZ_DRIVER_POSTGRES_LIBS="-L$use_dlz_postgres_lib -lpq" 244- DLZ_DRIVER_POSTGRES_LIBS="-L$use_dlz_postgres_lib -lpq"
245+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq" 245+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq"
246+ DLZ_DRIVER_POSTGRES_LIBS="-L${PREFIX}/lib -lpq" 246+ DLZ_DRIVER_POSTGRES_LIBS="-L${PREFIX}/lib -lpq"
247 fi 247 fi
248  248
249  249
250@@ -23892,6 +24013,7 @@ report() { 250@@ -23928,6 +24049,7 @@ report() {
251 test "X$PYTHON" = "X" || echo " Python tools (--with-python)" 251 test "X$PYTHON" = "X" || echo " Python tools (--with-python)"
252 test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)" 252 test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)"
253 test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)" 253 test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)"
254+ test "X$BLACKLIST" = "X" || echo " blacklist support (--with-blacklist)" 254+ test "X$BLACKLIST" = "X" || echo " blacklist support (--with-blacklist)"
255 test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)" 255 test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)"
256 test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)" 256 test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
257 test "no" = "$with_libidn2" || echo " IDN support (--with-libidn2)" 257 test "no" = "$with_libidn2" || echo " IDN support (--with-libidn2)"
258@@ -23970,6 +24092,7 @@ report() { 258@@ -24006,6 +24128,7 @@ report() {
259 test "X$PYTHON" = "X" && echo " Python tools (--with-python)" 259 test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
260 test "X$XMLSTATS" = "X" && echo " XML statistics (--with-libxml2)" 260 test "X$XMLSTATS" = "X" && echo " XML statistics (--with-libxml2)"
261 test "X$JSONSTATS" = "X" && echo " JSON statistics (--with-libjson)" 261 test "X$JSONSTATS" = "X" && echo " JSON statistics (--with-libjson)"
262+ test "X$BLACKLIST" = "X" && echo " blacklist support (--with-blacklist)" 262+ test "X$BLACKLIST" = "X" && echo " blacklist support (--with-blacklist)"
263 test "X$ZLIB" = "X" && echo " HTTP zlib compression (--with-zlib)" 263 test "X$ZLIB" = "X" && echo " HTTP zlib compression (--with-zlib)"
264 test "X$NZD_TOOLS" = "X" && echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)" 264 test "X$NZD_TOOLS" = "X" && echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
265 test "no" = "$with_libidn2" && echo " IDN support (--with-libidn2)" 265 test "no" = "$with_libidn2" && echo " IDN support (--with-libidn2)"
cvs diff -r1.1 -r1.2 pkgsrc/net/bind914/patches/Attic/patch-lib_isc_rwlock.c (expand / switch to unified diff)

--- pkgsrc/net/bind914/patches/Attic/patch-lib_isc_rwlock.c 2019/04/30 03:34:34 1.1
+++ pkgsrc/net/bind914/patches/Attic/patch-lib_isc_rwlock.c 2019/06/20 02:16:53 1.2
@@ -1,21 +1,16 @@ @@ -1,21 +1,16 @@
1$NetBSD: patch-lib_isc_rwlock.c,v 1.1 2019/04/30 03:34:34 taca Exp $ 1$NetBSD: patch-lib_isc_rwlock.c,v 1.2 2019/06/20 02:16:53 taca Exp $
2 2
3* Platform change from NetBSD base. 3* Platform change from NetBSD base.
4 4
5--- lib/isc/rwlock.c.orig 2019-04-06 20:09:59.000000000 +0000 5--- lib/isc/rwlock.c.orig 2019-06-04 15:20:04.000000000 +0000
6+++ lib/isc/rwlock.c 6+++ lib/isc/rwlock.c
7@@ -54,11 +54,12 @@ 7@@ -58,7 +58,8 @@
8 # define isc_rwlock_pause() __asm__ __volatile__ ("rep; nop") 
9 #elif defined(__ia64__) 
10 # define isc_rwlock_pause() __asm__ __volatile__ ("hint @pause") 
11-#elif defined(__arm__) 
12+#elif defined(__arm__) && defined(_ARM_ARCH_6) 
13 # define isc_rwlock_pause() __asm__ __volatile__ ("yield") 8 # define isc_rwlock_pause() __asm__ __volatile__ ("yield")
14 #elif defined(sun) && (defined(__sparc) || defined(__sparc__)) 9 #elif defined(sun) && (defined(__sparc) || defined(__sparc__))
15 # define isc_rwlock_pause() smt_pause() 10 # define isc_rwlock_pause() smt_pause()
16-#elif defined(__sparc) || defined(__sparc__) 11-#elif defined(__sparc) || defined(__sparc__)
17+/* Disable pause, only works on v9 */ 12+/* Disable pause, only works on v9 */
18+#elif (defined(__sparc) || defined(__sparc__)) && defined(notdef) 13+#elif defined(__sparc) || defined(__sparc__) && defined(notdef)
19 # define isc_rwlock_pause() __asm__ __volatile__ ("pause") 14 # define isc_rwlock_pause() __asm__ __volatile__ ("pause")
20 #elif defined(__ppc__) || defined(_ARCH_PPC) || \ 15 #elif defined(__ppc__) || defined(_ARCH_PPC) || \
21 defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER) 16 defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)