diff --git a/net/bind911/Makefile b/net/bind911/Makefile index c8a0d56aa0b4..e0a68476e008 100644 --- a/net/bind911/Makefile +++ b/net/bind911/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/04/30 02:51:38 taca Exp $ +# $NetBSD: Makefile,v 1.9 2019/05/20 16:03:55 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.11.6-P1 +BIND_VERSION= 9.11.7 .include "../../mk/bsd.prefs.mk" diff --git a/net/bind911/distinfo b/net/bind911/distinfo index 77a38a69041a..6fc8ed47c35a 100644 --- a/net/bind911/distinfo +++ b/net/bind911/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.7 2019/04/30 02:51:38 taca Exp $ +$NetBSD: distinfo,v 1.8 2019/05/20 16:03:55 taca Exp $ -SHA1 (bind-9.11.6-P1.tar.gz) = 1a142cc9af68f7205bc0ea942458e6a044244422 -RMD160 (bind-9.11.6-P1.tar.gz) = 7024ba26f218015ebd99f54988f78148ae789cf7 -SHA512 (bind-9.11.6-P1.tar.gz) = 419aeeddeab7aef818b9043db7b21a847993444f663dca04e58ee97a0ebee0610cbc5a9422d17a6f0ee5d44598a2cbb5651e3b4e8c56708eaf923dca0a5c4c03 -Size (bind-9.11.6-P1.tar.gz) = 8102241 bytes +SHA1 (bind-9.11.7.tar.gz) = 1c2950cab84d6d41e262f3782875294addaff8be +RMD160 (bind-9.11.7.tar.gz) = af723a4d7a892efa3e5451b8f6d518e778456071 +SHA512 (bind-9.11.7.tar.gz) = eecf731c55b04f56385cda013c9444ee69c1ea23621fa77fece4389fda12fe5fc3fa43aec0d6cc5a2947eb90fb16a6c4d366a30dfc80f5d222e11ae1f059e665 +Size (bind-9.11.7.tar.gz) = 8124611 bytes SHA1 (patch-bin_named_server.c) = 0294d74eb3039049c4672a3de6eb371407bb382d -SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = 49571fc0222c57cac0f2f07875c74ad2afadcb32 +SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = ca2671a5e3216a08a212cf893e070b01705ef9ee SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28 SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0 -SHA1 (patch-configure) = 7f73f26266ebd4556ab160e93dc0738188a70e20 +SHA1 (patch-configure) = 16940ddefa25d393f8df57e52406b2381ba33d83 SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7 SHA1 (patch-lib_dns_rbt.c) = 8af91b6d40b591d28d15f7f98c9b7a82df234381 SHA1 (patch-lib_dns_view.c) = 39e71fe6a407e4f9bee49b1ee25adfa0ba74b338 diff --git a/net/bind911/patches/patch-bin_pkcs11_pkcs11-keygen.c b/net/bind911/patches/patch-bin_pkcs11_pkcs11-keygen.c index fb589fa7cec2..a0234de4db62 100644 --- a/net/bind911/patches/patch-bin_pkcs11_pkcs11-keygen.c +++ b/net/bind911/patches/patch-bin_pkcs11_pkcs11-keygen.c @@ -1,10 +1,10 @@ -$NetBSD: patch-bin_pkcs11_pkcs11-keygen.c,v 1.1 2019/04/30 02:51:38 taca Exp $ +$NetBSD: patch-bin_pkcs11_pkcs11-keygen.c,v 1.2 2019/05/20 16:03:55 taca Exp $ * Honor HAVE_PKCS11_ECDSA. ---- bin/pkcs11/pkcs11-keygen.c.orig 2019-02-27 23:28:15.000000000 +0000 +--- bin/pkcs11/pkcs11-keygen.c.orig 2019-05-10 05:03:58.000000000 +0000 +++ bin/pkcs11/pkcs11-keygen.c -@@ -421,13 +421,23 @@ main(int argc, char *argv[]) { +@@ -428,13 +428,23 @@ main(int argc, char *argv[]) { id_offset = ECC_ID; if (bits == 256) { @@ -26,5 +26,5 @@ + usage(); +#endif } - + #endif break; diff --git a/net/bind911/patches/patch-configure b/net/bind911/patches/patch-configure index 0a086dd6037b..6b97aa024cb2 100644 --- a/net/bind911/patches/patch-configure +++ b/net/bind911/patches/patch-configure @@ -1,12 +1,12 @@ -$NetBSD: patch-configure,v 1.2 2018/10/24 11:27:28 jperkin Exp $ +$NetBSD: patch-configure,v 1.3 2019/05/20 16:03:55 taca Exp $ * Add DragonFly support. * Use proper link options for NetBSD. * Link proper postgresql library. ---- configure.orig 2018-10-06 01:36:17.000000000 +0000 +--- configure.orig 2019-05-10 05:03:58.000000000 +0000 +++ configure -@@ -15415,6 +15415,8 @@ case $host in +@@ -15470,6 +15470,8 @@ case $host in use_threads=false ;; *-freebsd*) use_threads=true ;; @@ -15,7 +15,7 @@ $NetBSD: patch-configure,v 1.2 2018/10/24 11:27:28 jperkin Exp $ *-bsdi[234]*) # Thread signals do not work reliably on some versions of BSD/OS. use_threads=false ;; -@@ -17962,27 +17964,10 @@ case "$use_libjson" in +@@ -18023,27 +18025,10 @@ case "$use_libjson" in libjson_libs="" ;; auto|yes) @@ -47,36 +47,29 @@ $NetBSD: patch-configure,v 1.2 2018/10/24 11:27:28 jperkin Exp $ ;; *) if test -f "${use_libjson}/include/json/json.h" -@@ -23436,7 +23421,7 @@ if test "yes" = "$dlopen"; then - SO_LD="ld" - fi - ;; -- *-freebsd*|*-openbsd*) -+ *-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - LDFLAGS="${LDFLAGS} -Wl,-E" - SO_CFLAGS="-fpic" - if test "yes" = "$use_libtool"; then -@@ -23447,16 +23432,10 @@ if test "yes" = "$dlopen"; then - SO_LD="${CC}" - fi - ;; -- *-netbsd*) -- SO_CFLAGS="-fpic" -- SO_LDFLAGS="-Bshareable -x" -- SO_LD="ld" -- SO_STRIP="sed -e s/-Wl,//g" -- ;; - *-solaris*) -- SO_CFLAGS="-KPIC" -- SO_LDFLAGS="-G -z text" -- SO_LD="ld" -+ SO_CFLAGS="-fPIC" -+ SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text" -+ SO_LD="${CC}" - ;; - *-hp-hpux*) - SO=sl -@@ -23705,8 +23684,8 @@ $as_echo "no" >&6; } +@@ -23798,7 +23783,7 @@ else + + fi + ;; #( +- *-freebsd*|*-openbsd*|*-netbsd*) : ++ *-dragonfly*|*-freebsd*|*-openbsd*|*-netbsd*) : + + LDFLAGS="${LDFLAGS} -Wl,-E" + SO_CFLAGS="-fpic" +@@ -23830,9 +23815,9 @@ fi + ;; #( + *-solaris*) : + +- SO_CFLAGS="-KPIC" +- SO_LDFLAGS="-G -z text" +- SO_LD="ld" ++ SO_CFLAGS="-fPIC" ++ SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text" ++ SO_LD="${CC}" + ;; #( + *) : + +@@ -24082,8 +24067,8 @@ $as_echo "no" >&6; } fi if test -n "-L$use_dlz_postgres_lib -lpq" then