CVS commit: pkgsrc/net/bind914

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Jun 20 02:16:53 UTC 2019

Modified Files:
        pkgsrc/net/bind914: Makefile distinfo
        pkgsrc/net/bind914/patches: patch-config.h.in patch-configure
            patch-lib_isc_rwlock.c

Log Message:
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]


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/bind914/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/bind914/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind914/patches/patch-config.h.in \
    pkgsrc/net/bind914/patches/patch-configure \
    pkgsrc/net/bind914/patches/patch-lib_isc_rwlock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/bind914/Makefile
diff -u pkgsrc/net/bind914/Makefile:1.5 pkgsrc/net/bind914/Makefile:1.6
--- pkgsrc/net/bind914/Makefile:1.5     Fri Jun 14 16:14:05 2019
+++ pkgsrc/net/bind914/Makefile Thu Jun 20 02:16:53 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/06/14 16:14:05 taca Exp $
+# $NetBSD: Makefile,v 1.6 2019/06/20 02:16:53 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}/
 
@@ -15,7 +14,7 @@ CONFLICTS+=   host-[0-9]*
 
 MAKE_JOBS_SAFE=        no
 
-BIND_VERSION=  9.14.2
+BIND_VERSION=  9.14.3
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/net/bind914/distinfo
diff -u pkgsrc/net/bind914/distinfo:1.4 pkgsrc/net/bind914/distinfo:1.5
--- pkgsrc/net/bind914/distinfo:1.4     Fri Jun 14 16:14:05 2019
+++ pkgsrc/net/bind914/distinfo Thu Jun 20 02:16:53 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2019/06/14 16:14:05 taca Exp $
+$NetBSD: distinfo,v 1.5 2019/06/20 02:16:53 taca Exp $
 
-SHA1 (bind-9.14.2.tar.gz) = b46c8713804cb8de43ded17cfb852d2db8e184d9
-RMD160 (bind-9.14.2.tar.gz) = 74d9d8d29515aa7d57e9d986d6e4b0f8af6b7962
-SHA512 (bind-9.14.2.tar.gz) = f538e6b894e19084b3a25df85e4997b244878bbd3a080b9c77fda72e1b526d79006e9f140f22d5b6b33e81b94897b8f7b5ec4dd56800b4c13ba48b91422a2286
-Size (bind-9.14.2.tar.gz) = 6263879 bytes
+SHA1 (bind-9.14.3.tar.gz) = aac68ca0242419de24663dca935b63ba54189d9e
+RMD160 (bind-9.14.3.tar.gz) = dc7bd989fd5cf20db954078af5a54e6f1bc558a9
+SHA512 (bind-9.14.3.tar.gz) = 46974be2adea512c58b82184566ea5e8a9faf67aeb78ea33356861f0a7edce37eac05c21e8fbbc7f7db4e87404fe71ed59d9eac46e6e4758d95139a21891f437
+Size (bind-9.14.3.tar.gz) = 6258311 bytes
 SHA1 (patch-bin_named_Makefile.in) = 12e071c61e0f326d0fd7613c6b8884ad0da35214
 SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0
 SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
@@ -15,9 +15,9 @@ SHA1 (patch-bin_tests_system_metadata_te
 SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34
 SHA1 (patch-bin_tools_arpaname.c) = 2bf3ccf81a0f89ced34f5e32419dee314601e0c0
 SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3
-SHA1 (patch-config.h.in) = 82b1d79646872a08b2029e74f1fdcbfac7d83d42
+SHA1 (patch-config.h.in) = 0720dd6303293b32c1e5f0357fa3cd02f00068e4
 SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5
-SHA1 (patch-configure) = e4105ed668aa7c5bd83dd82e8639524453162d13
+SHA1 (patch-configure) = 2fc0d22ee8cc2cf2e1f48ff87ca8d69a7cc6db81
 SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
 SHA1 (patch-lib_dns_byaddr.c) = 75668b9bf31cd0175eab3dd74f99f4edf410fcce
 SHA1 (patch-lib_dns_dnsrps.c) = bddd1e3ec6efada581ee8865ee429d283fb7a957
@@ -34,7 +34,7 @@ SHA1 (patch-lib_dns_spnego.c) = 28672126
 SHA1 (patch-lib_dns_validator.c) = 7d7471efe5109f5b2d6f9e99fe15fa314fdd217d
 SHA1 (patch-lib_dns_view.c) = 25095827adbc75dc629b0f435dbd711b599c86c9
 SHA1 (patch-lib_isc_backtrace.c) = 5fa1dd0f18ae757233d9cc21e36a5f6a84990db1
-SHA1 (patch-lib_isc_rwlock.c) = 7eb832915528d00e616b6c7503ec346143946876
+SHA1 (patch-lib_isc_rwlock.c) = f3276efe56b7060cd61323e8cc71cd25d157b21b
 SHA1 (patch-lib_isc_stats.c) = 0dde2b7cbde80f608e52bf8136b3af227b65ba4b
 SHA1 (patch-lib_isc_unix_socket.c) = 4f7be1616bac7263069292f909896373f0e6fab8
 SHA1 (patch-lib_isc_unix_time.c) = 04312e043601688aa2b0a09dad1bcb51d9273e9d

Index: pkgsrc/net/bind914/patches/patch-config.h.in
diff -u pkgsrc/net/bind914/patches/patch-config.h.in:1.1 pkgsrc/net/bind914/patches/patch-config.h.in:1.2
--- pkgsrc/net/bind914/patches/patch-config.h.in:1.1    Tue Apr 30 03:34:34 2019
+++ pkgsrc/net/bind914/patches/patch-config.h.in        Thu Jun 20 02:16:53 2019
@@ -1,12 +1,12 @@
-$NetBSD: patch-config.h.in,v 1.1 2019/04/30 03:34:34 taca Exp $
+$NetBSD: patch-config.h.in,v 1.2 2019/06/20 02:16:53 taca Exp $
 
 * Add support for blacklistd.
 
---- config.h.in.orig   2019-04-06 20:09:59.000000000 +0000
+--- config.h.in.orig   2019-06-04 15:20:04.000000000 +0000
 +++ config.h.in
-@@ -45,6 +45,9 @@
- /* Define to 1 if you have the `arc4random_uniform' function. */
- #undef HAVE_ARC4RANDOM_UNIFORM
+@@ -48,6 +48,9 @@
+ /* define if the ARM yield instruction is available */
+ #undef HAVE_ARM_YIELD
  
 +/* Define to 1 if blacklist is supported. */
 +#undef HAVE_BLACKLIST
Index: pkgsrc/net/bind914/patches/patch-configure
diff -u pkgsrc/net/bind914/patches/patch-configure:1.1 pkgsrc/net/bind914/patches/patch-configure:1.2
--- pkgsrc/net/bind914/patches/patch-configure:1.1      Tue Apr 30 03:34:34 2019
+++ pkgsrc/net/bind914/patches/patch-configure  Thu Jun 20 02:16:53 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2019/04/30 03:34:34 taca Exp $
+$NetBSD: patch-configure,v 1.2 2019/06/20 02:16:53 taca Exp $
 
 * Add DragonFly support.
 * Use proper link options for NetBSD.
 * Link proper postgresql library.
 * Add support for blacklistd.
 
---- configure.orig     2019-04-06 20:09:59.000000000 +0000
+--- configure.orig     2019-06-04 15:20:04.000000000 +0000
 +++ configure
 @@ -725,6 +725,9 @@ purify_path
  MKDEPPROG
@@ -17,7 +17,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
  ZLIB
  JSONSTATS
  XMLSTATS
-@@ -879,6 +882,7 @@ with_pic
+@@ -882,6 +885,7 @@ with_pic
  enable_fast_install
  with_aix_soname
  with_gnu_ld
@@ -25,7 +25,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
  with_sysroot
  enable_libtool_lock
  enable_libbind
-@@ -1672,6 +1676,7 @@ Optional Packages:
+@@ -1675,6 +1679,7 @@ Optional Packages:
    --with-dlz-stub=ARG     Build with stub DLZ driver [yes|no]. (Required to
                            use stub driver with DLZ)
    --with-make-clean       run "make clean" at end of configure [yes|no]
@@ -33,7 +33,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
  
  Some influential environment variables:
    CC          C compiler command
-@@ -3818,7 +3823,7 @@ fi
+@@ -3821,7 +3826,7 @@ fi
  
  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
@@ -42,7 +42,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-@@ -16679,27 +16684,10 @@ case "$use_libjson" in
+@@ -16709,27 +16714,10 @@ case "$use_libjson" in
                libjson_libs=""
                ;;
        auto|yes)
@@ -74,7 +74,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
                ;;
        *)
                if test -f "${use_libjson}/include/json/json.h"
-@@ -16805,6 +16793,139 @@ $as_echo "#define HAVE_JSON_C 1" >>confd
+@@ -16835,6 +16823,139 @@ $as_echo "#define HAVE_JSON_C 1" >>confd
        JSONSTATS=1
  fi
  
@@ -214,7 +214,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
  
  #
  # was --with-zlib specified?
-@@ -20234,7 +20355,7 @@ else
+@@ -20264,7 +20385,7 @@ else
  
  fi
                ;; #(
@@ -223,7 +223,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
  
                 LDFLAGS="${LDFLAGS} -Wl,-E"
                 SO_CFLAGS="-fpic"
-@@ -20266,9 +20387,9 @@ fi
+@@ -20296,9 +20417,9 @@ fi
                ;; #(
    *-solaris*) :
  
@@ -234,9 +234,9 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
 +               SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text"
 +               SO_LD="${CC}"
                ;; #(
-   *) :
+   ia64-hp-hpux*) :
  
-@@ -20691,8 +20812,8 @@ $as_echo "no" >&6; }
+@@ -20727,8 +20848,8 @@ $as_echo "no" >&6; }
        fi
        if test -n "-L$use_dlz_postgres_lib -lpq"
        then
@@ -247,7 +247,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
        fi
  
  
-@@ -23892,6 +24013,7 @@ report() {
+@@ -23928,6 +24049,7 @@ report() {
        test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
        test "X$XMLSTATS" = "X" || echo "    XML statistics (--with-libxml2)"
        test "X$JSONSTATS" = "X" || echo "    JSON statistics (--with-libjson)"
@@ -255,7 +255,7 @@ $NetBSD: patch-configure,v 1.1 2019/04/3
        test "X$ZLIB" = "X" || echo "    HTTP zlib compression (--with-zlib)"
        test "X$NZD_TOOLS" = "X" || echo "    LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
        test "no" = "$with_libidn2" || echo "    IDN support (--with-libidn2)"
-@@ -23970,6 +24092,7 @@ report() {
+@@ -24006,6 +24128,7 @@ report() {
      test "X$PYTHON" = "X" && echo "    Python tools (--with-python)"
      test "X$XMLSTATS" = "X" && echo "    XML statistics (--with-libxml2)"
      test "X$JSONSTATS" = "X" && echo "    JSON statistics (--with-libjson)"
Index: pkgsrc/net/bind914/patches/patch-lib_isc_rwlock.c
diff -u pkgsrc/net/bind914/patches/patch-lib_isc_rwlock.c:1.1 pkgsrc/net/bind914/patches/patch-lib_isc_rwlock.c:1.2
--- pkgsrc/net/bind914/patches/patch-lib_isc_rwlock.c:1.1       Tue Apr 30 03:34:34 2019
+++ pkgsrc/net/bind914/patches/patch-lib_isc_rwlock.c   Thu Jun 20 02:16:53 2019
@@ -1,21 +1,16 @@
-$NetBSD: patch-lib_isc_rwlock.c,v 1.1 2019/04/30 03:34:34 taca Exp $
+$NetBSD: patch-lib_isc_rwlock.c,v 1.2 2019/06/20 02:16:53 taca Exp $
 
 * Platform change from NetBSD base.
 
---- lib/isc/rwlock.c.orig      2019-04-06 20:09:59.000000000 +0000
+--- lib/isc/rwlock.c.orig      2019-06-04 15:20:04.000000000 +0000
 +++ lib/isc/rwlock.c
-@@ -54,11 +54,12 @@
- # define isc_rwlock_pause() __asm__ __volatile__ ("rep; nop")
- #elif defined(__ia64__)
- # define isc_rwlock_pause() __asm__ __volatile__ ("hint @pause")
--#elif defined(__arm__)
-+#elif defined(__arm__) && defined(_ARM_ARCH_6)
+@@ -58,7 +58,8 @@
  # define isc_rwlock_pause() __asm__ __volatile__ ("yield")
  #elif defined(sun) && (defined(__sparc) || defined(__sparc__))
  # define isc_rwlock_pause() smt_pause()
 -#elif defined(__sparc) || defined(__sparc__)
 +/* Disable pause, only works on v9 */
-+#elif (defined(__sparc) || defined(__sparc__)) && defined(notdef)
++#elif defined(__sparc) || defined(__sparc__) && defined(notdef)
  # define isc_rwlock_pause() __asm__ __volatile__ ("pause")
  #elif defined(__ppc__) || defined(_ARCH_PPC)  ||                      \
        defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)