net/bind911: update to 9.11.34 9.11.34 This maintenance release of BIND 9.11 contains no significant changes, although some minor updates have been made (for example, to fix build issues on Solaris 11).diff -r1.47 -r1.48 pkgsrc/net/bind911/Makefile
(taca)
@@ -1,31 +1,30 @@ | @@ -1,31 +1,30 @@ | |||
1 | # $NetBSD: Makefile,v 1.47 2021/06/23 20:33:14 nia Exp $ | 1 | # $NetBSD: Makefile,v 1.48 2021/07/22 22:50:40 taca Exp $ | |
2 | 2 | |||
3 | DISTNAME= bind-${BIND_VERSION} | 3 | DISTNAME= bind-${BIND_VERSION} | |
4 | PKGNAME= ${DISTNAME:S/-P/pl/} | 4 | PKGNAME= ${DISTNAME:S/-P/pl/} | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= net | 5 | CATEGORIES= net | |
7 | MASTER_SITES= https://downloads.isc.org/isc/bind9/${BIND_VERSION}/ | 6 | MASTER_SITES= https://downloads.isc.org/isc/bind9/${BIND_VERSION}/ | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://www.isc.org/software/bind/ | 9 | HOMEPAGE= https://www.isc.org/software/bind/ | |
11 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.11 | 10 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.11 | |
12 | LICENSE= mpl-2.0 | 11 | LICENSE= mpl-2.0 | |
13 | 12 | |||
14 | CONFLICTS+= host-[0-9]* | 13 | CONFLICTS+= host-[0-9]* | |
15 | 14 | |||
16 | MAKE_JOBS_SAFE= no | 15 | MAKE_JOBS_SAFE= no | |
17 | 16 | |||
18 | BIND_VERSION= 9.11.33 | 17 | BIND_VERSION= 9.11.34 | |
19 | 18 | |||
20 | .include "../../mk/bsd.prefs.mk" | 19 | .include "../../mk/bsd.prefs.mk" | |
21 | 20 | |||
22 | BUILD_DEFS+= BIND_DIR VARBASE | 21 | BUILD_DEFS+= BIND_DIR VARBASE | |
23 | 22 | |||
24 | .include "options.mk" | 23 | .include "options.mk" | |
25 | 24 | |||
26 | USE_TOOLS+= pax perl pkg-config tar | 25 | USE_TOOLS+= pax perl pkg-config tar | |
27 | USE_LIBTOOL= yes | 26 | USE_LIBTOOL= yes | |
28 | GNU_CONFIGURE= yes | 27 | GNU_CONFIGURE= yes | |
29 | MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} | 28 | MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX} | |
30 | 29 | |||
31 | CONFIGURE_ARGS+= --with-libtool | 30 | CONFIGURE_ARGS+= --with-libtool |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: distinfo,v 1.32 2021/06/17 12:14:45 otis Exp $ | 1 | $NetBSD: distinfo,v 1.33 2021/07/22 22:50:40 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (bind-9.11.33.tar.gz) = 4baec56aad75f7243f92ba6d5031720270dacf3d | 3 | SHA1 (bind-9.11.34.tar.gz) = 88e16adfc9fc8cadfe9b85fc6e86e44da14e7f4e | |
4 | RMD160 (bind-9.11.33.tar.gz) = 405a4764ea64a769a17a0330a7874af764bf6bd4 | 4 | RMD160 (bind-9.11.34.tar.gz) = 59b7a901217fe8fd44103380be68a5ad2a9f5bb7 | |
5 | SHA512 (bind-9.11.33.tar.gz) = aa695803034a4f2f26c0fca5684323d6717b1943e671df20aafa152389369a1b9dc4de273fdcdd5dbcb100dc49bbe3e500f47afacbc18b70fa91bbbeb3060636 | 5 | SHA512 (bind-9.11.34.tar.gz) = bf7e21e4bd1137fafc7da2ea1db9a4ab28b40c961925f237208e2794d8056c3a655c67bf6b5bc6ac4092616b266ddea2683ca08ced15ef119a2defaf69aebb64 | |
6 | Size (bind-9.11.33.tar.gz) = 8305191 bytes | 6 | Size (bind-9.11.34.tar.gz) = 8307113 bytes | |
7 | SHA1 (patch-bin_named_Makefile.in) = 3e5b98e3e0bdb701be679d3580d6d2d7609d655b | 7 | SHA1 (patch-bin_named_Makefile.in) = 3e5b98e3e0bdb701be679d3580d6d2d7609d655b | |
8 | SHA1 (patch-bin_named_server.c) = 0294d74eb3039049c4672a3de6eb371407bb382d | 8 | SHA1 (patch-bin_named_server.c) = 0294d74eb3039049c4672a3de6eb371407bb382d | |
9 | SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = ca2671a5e3216a08a212cf893e070b01705ef9ee | 9 | SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = ca2671a5e3216a08a212cf893e070b01705ef9ee | |
10 | SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0 | 10 | SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0 | |
11 | SHA1 (patch-configure) = 90a15a138931a27bc5b25cac47ca6c277d4bf43f | 11 | SHA1 (patch-configure) = 25883b81834df9c0377578f89e1e1cbd8f25b1cb | |
12 | SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7 | 12 | SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7 | |
13 | SHA1 (patch-lib_dns_rbt.c) = 8af91b6d40b591d28d15f7f98c9b7a82df234381 | 13 | SHA1 (patch-lib_dns_rbt.c) = 8af91b6d40b591d28d15f7f98c9b7a82df234381 | |
14 | SHA1 (patch-lib_dns_view.c) = 39e71fe6a407e4f9bee49b1ee25adfa0ba74b338 | 14 | SHA1 (patch-lib_dns_view.c) = 39e71fe6a407e4f9bee49b1ee25adfa0ba74b338 | |
15 | SHA1 (patch-lib_isc_unix_socket.c) = a36e24f530c4a462b782ad7cce784fd4648dded3 | 15 | SHA1 (patch-lib_isc_unix_socket.c) = a36e24f530c4a462b782ad7cce784fd4648dded3 | |
16 | SHA1 (patch-lib_lwres_getaddrinfo.c) = 1956a857c1b158dbe95c46d90ab406e0030e321e | 16 | SHA1 (patch-lib_lwres_getaddrinfo.c) = 1956a857c1b158dbe95c46d90ab406e0030e321e | |
17 | SHA1 (patch-lib_lwres_getnameinfo.c) = 67cece0c9b7077dc48fcae15bcab426e8e82a506 | 17 | SHA1 (patch-lib_lwres_getnameinfo.c) = 67cece0c9b7077dc48fcae15bcab426e8e82a506 |
@@ -1,31 +1,32 @@ | @@ -1,31 +1,32 @@ | |||
1 | $NetBSD: patch-configure,v 1.4 2019/06/20 02:13:58 taca Exp $ | 1 | $NetBSD: patch-configure,v 1.5 2021/07/22 22:50:40 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 | * Do not use "==" for test(1). | |||
6 | 7 | |||
7 | --- configure.orig 2019-06-04 16:01:00.000000000 +0000 | 8 | --- configure.orig 2021-07-09 08:55:20.000000000 +0000 | |
8 | +++ configure | 9 | +++ configure | |
9 | @@ -15481,6 +15481,8 @@ case $host in | 10 | @@ -16057,6 +16057,8 @@ case $host in | |
10 | use_threads=false ;; | 11 | use_threads=false ;; | |
11 | *-freebsd*) | 12 | *-freebsd*) | |
12 | use_threads=true ;; | 13 | use_threads=true ;; | |
13 | +*-dragonfly*) | 14 | +*-dragonfly*) | |
14 | + use_threads=false ;; | 15 | + use_threads=false ;; | |
15 | *-bsdi[234]*) | 16 | *-bsdi[234]*) | |
16 | # Thread signals do not work reliably on some versions of BSD/OS. | 17 | # Thread signals do not work reliably on some versions of BSD/OS. | |
17 | use_threads=false ;; | 18 | use_threads=false ;; | |
18 | @@ -18034,27 +18036,10 @@ case "$use_libjson" in | 19 | @@ -18720,27 +18722,10 @@ case "$use_libjson" in | |
19 | libjson_libs="" | 20 | libjson_libs="" | |
20 | ;; | 21 | ;; | |
21 | auto|yes) | 22 | auto|yes) | |
22 | - for d in /usr /usr/local /opt/local | 23 | - for d in /usr /usr/local /opt/local | |
23 | - do | 24 | - do | |
24 | - if test -f "${d}/include/json/json.h" | 25 | - if test -f "${d}/include/json/json.h" | |
25 | - then | 26 | - then | |
26 | - if test ${d} != /usr | 27 | - if test ${d} != /usr | |
27 | - then | 28 | - then | |
28 | - libjson_cflags="-I ${d}/include" | 29 | - libjson_cflags="-I ${d}/include" | |
29 | - LIBS="$LIBS -L${d}/lib" | 30 | - LIBS="$LIBS -L${d}/lib" | |
30 | - fi | 31 | - fi | |
31 | - have_libjson="yes" | 32 | - have_libjson="yes" | |
@@ -37,46 +38,55 @@ $NetBSD: patch-configure,v 1.4 2019/06/2 | @@ -37,46 +38,55 @@ $NetBSD: patch-configure,v 1.4 2019/06/2 | |||
37 | - LIBS="$LIBS -L${d}/lib" | 38 | - LIBS="$LIBS -L${d}/lib" | |
38 | - fi | 39 | - fi | |
39 | - have_libjson="yes" | 40 | - have_libjson="yes" | |
40 | - have_libjson_c="yes" | 41 | - have_libjson_c="yes" | |
41 | - fi | 42 | - fi | |
42 | - done | 43 | - done | |
43 | + libjson_cflags="`pkg-config --cflags json-c`" | 44 | + libjson_cflags="`pkg-config --cflags json-c`" | |
44 | + LIBS="`pkg-config --libs json-c`" | 45 | + LIBS="`pkg-config --libs json-c`" | |
45 | + have_libjson="yes" | 46 | + have_libjson="yes" | |
46 | + have_libjson_c="yes" | 47 | + have_libjson_c="yes" | |
47 | ;; | 48 | ;; | |
48 | *) | 49 | *) | |
49 | if test -f "${use_libjson}/include/json/json.h" | 50 | if test -f "${use_libjson}/include/json/json.h" | |
50 | @@ -23809,7 +23794,7 @@ else | 51 | @@ -24492,7 +24477,7 @@ else | |
51 | 52 | |||
52 | fi | 53 | fi | |
53 | ;; #( | 54 | ;; #( | |
54 | - *-freebsd*|*-openbsd*|*-netbsd*) : | 55 | - *-freebsd*|*-openbsd*|*-netbsd*) : | |
55 | + *-dragonfly*|*-freebsd*|*-openbsd*|*-netbsd*) : | 56 | + *-dragonfly*|*-freebsd*|*-openbsd*|*-netbsd*) : | |
56 | 57 | |||
57 | LDFLAGS="${LDFLAGS} -Wl,-E" | 58 | LDFLAGS="${LDFLAGS} -Wl,-E" | |
58 | SO_CFLAGS="-fpic" | 59 | SO_CFLAGS="-fpic" | |
59 | @@ -23841,9 +23826,9 @@ fi | 60 | @@ -24524,9 +24509,9 @@ fi | |
60 | ;; #( | 61 | ;; #( | |
61 | *-solaris*) : | 62 | *-solaris*) : | |
62 | 63 | |||
63 | - SO_CFLAGS="-KPIC" | 64 | - SO_CFLAGS="-KPIC" | |
64 | - SO_LDFLAGS="-G -z text" | 65 | - SO_LDFLAGS="-G -z text" | |
65 | - SO_LD="ld" | 66 | - SO_LD="ld" | |
66 | + SO_CFLAGS="-fPIC" | 67 | + SO_CFLAGS="-fPIC" | |
67 | + SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text" | 68 | + SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text" | |
68 | + SO_LD="${CC}" | 69 | + SO_LD="${CC}" | |
69 | ;; #( | 70 | ;; #( | |
70 | ia64-hp-hpux*) : | 71 | ia64-hp-hpux*) : | |
71 | 72 | |||
72 | @@ -24099,8 +24084,8 @@ $as_echo "no" >&6; } | 73 | @@ -24786,8 +24771,8 @@ $as_echo "no" >&6; } | |
73 | fi | 74 | fi | |
74 | if test -n "-L$use_dlz_postgres_lib -lpq" | 75 | if test -n "-L$use_dlz_postgres_lib -lpq" | |
75 | then | 76 | then | |
76 | - DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq" | 77 | - DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq" | |
77 | - DLZ_DRIVER_POSTGRES_LIBS="-L$use_dlz_postgres_lib -lpq" | 78 | - DLZ_DRIVER_POSTGRES_LIBS="-L$use_dlz_postgres_lib -lpq" | |
78 | + DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq" | 79 | + DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq" | |
79 | + DLZ_DRIVER_POSTGRES_LIBS="-L${PREFIX}/lib -lpq" | 80 | + DLZ_DRIVER_POSTGRES_LIBS="-L${PREFIX}/lib -lpq" | |
80 | fi | 81 | fi | |
81 | 82 | |||
82 | 83 | |||
84 | @@ -28111,7 +28096,7 @@ report() { | |||
85 | echo " localstatedir: $localstatedir" | |||
86 | echo "-------------------------------------------------------------------------------" | |||
87 | echo "Compiler: $CC" | |||
88 | - if test "yes" == "$GCC"; then | |||
89 | + if test "yes" = "$GCC"; then | |||
90 | $CC --version 2>&1 | sed 's/^/ /' | |||
91 | else | |||
92 | case "$host_os" in |