head 1.3; access; symbols pkgsrc-2020Q2:1.2.0.10 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.6 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.8 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.4 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.2 pkgsrc-2019Q2-base:1.2; locks; strict; comment @# @; 1.3 date 2020.09.01.14.14.54; author taca; state dead; branches; next 1.2; commitid YrZfQkvep8ToSlmC; 1.2 date 2019.06.20.02.16.53; author taca; state Exp; branches; next 1.1; commitid m4ugr0ZRtPs71SrB; 1.1 date 2019.04.30.03.34.34; author taca; state Exp; branches; next ; commitid JaGLh0gr7iQ05klB; desc @@ 1.3 log @net/bind914: remove package Remove bind914 package since it is EOL, May, 2020. @ text @$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-06-04 15:20:04.000000000 +0000 +++ configure @@@@ -725,6 +725,9 @@@@ purify_path MKDEPPROG MKDEPCFLAGS MKDEPCC +BLACKLIST +BLACKLISTLINKOBJS +BLACKLISTLINKSRCS ZLIB JSONSTATS XMLSTATS @@@@ -882,6 +885,7 @@@@ with_pic enable_fast_install with_aix_soname with_gnu_ld +with_blacklist with_sysroot enable_libtool_lock enable_libbind @@@@ -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] + --with-blacklist Build with blacklist Some influential environment variables: CC C compiler command @@@@ -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 \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h blacklist.h 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 @@@@ -16709,27 +16714,10 @@@@ case "$use_libjson" in libjson_libs="" ;; auto|yes) - for d in /usr /usr/local /opt/local - do - if test -f "${d}/include/json/json.h" - then - if test ${d} != /usr - then - libjson_cflags="-I ${d}/include" - LIBS="$LIBS -L${d}/lib" - fi - have_libjson="yes" - elif test -f "${d}/include/json-c/json.h" - then - if test ${d} != /usr - then - libjson_cflags="-I ${d}/include" - LIBS="$LIBS -L${d}/lib" - fi - have_libjson="yes" - have_libjson_c="yes" - fi - done + libjson_cflags="`pkg-config --cflags json-c`" + LIBS="`pkg-config --libs json-c`" + have_libjson="yes" + have_libjson_c="yes" ;; *) if test -f "${use_libjson}/include/json/json.h" @@@@ -16835,6 +16823,139 @@@@ $as_echo "#define HAVE_JSON_C 1" >>confd JSONSTATS=1 fi +# +# was --with-blacklist specified? +# +BLACKLISTLINKOBJS= +BLACKLISTLINKSRCS= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for blacklist library" >&5 +$as_echo_n "checking for blacklist library... " >&6; } + +# Check whether --with-blacklist was given. +if test "${with_blacklist+set}" = set; then : + withval=$with_blacklist; with_blacklist="$withval" +else + with_blacklist="auto" +fi + + +have_blacklist="" +case "$with_blacklist" in + no) + blacklist_libs="" + ;; + auto|yes) + for d in /usr /usr/local /opt/local + do + if test -f "${d}/include/blacklist.h" + then + if test ${d} != /usr + then + blacklist_cflags="-I ${d}/include" + LIBS="$LIBS -L${d}/lib" + fi + have_blacklist="yes" + fi + done + ;; + *) + if test -f "${with_blacklist}/include/blacklist.h" + then + blacklist_cflags="-I${with_blacklist}/include" + LIBS="$LIBS -L${with_blacklist}/lib" + have_blacklist="yes" + else + as_fn_error $? "$with_blacklist/include/blacklist.h not found." "$LINENO" 5 + fi + ;; +esac + +if test "X${have_blacklist}" != "X" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing blacklist" >&5 +$as_echo_n "checking for library containing blacklist... " >&6; } +if ${ac_cv_search_blacklist+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char blacklist_open(void); +int +main () +{ +return blacklist_open(); + ; + return 0; +} +_ACEOF +for ac_lib in '' blacklist; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_blacklist=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_blacklist+:} false; then : + break +fi +done +if ${ac_cv_search_blacklist+:} false; then : + +else + ac_cv_search_blacklist=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_blacklist" >&5 +$as_echo "$ac_cv_search_blacklist" >&6; } +ac_res=$ac_cv_search_blacklist +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + as_fn_error $? "found blacklist include but not library." "$LINENO" 5 + have_blacklist="" +fi + +elif test "X$with_blacklist" = Xyes +then + as_fn_error $? "include/blacklist.h not found." "$LINENO" 5 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + +BLACKLIST= +if test "X${have_blacklist}" != "X" +then + CFLAGS="$CFLAGS $blacklist_cflags" + +$as_echo "#define HAVE_BLACKLIST 1" >>confdefs.h + + BLACKLIST=1 +fi +if test "X${blacklist_libs}" != "X" +then + BLACKLISTLINKSRCS='${BLACKLISTLINKSRCS}' + BLACKLISTLINKOBJS='${BLACKLISTLINKOBJS}' +fi # # was --with-zlib specified? @@@@ -20264,7 +20385,7 @@@@ else fi ;; #( - *-freebsd*|*-openbsd*|*-netbsd*) : + *-dragonfly*|*-freebsd*|*-openbsd*|*-netbsd*) : LDFLAGS="${LDFLAGS} -Wl,-E" SO_CFLAGS="-fpic" @@@@ -20296,9 +20417,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}" ;; #( ia64-hp-hpux*) : @@@@ -20727,8 +20848,8 @@@@ $as_echo "no" >&6; } fi if test -n "-L$use_dlz_postgres_lib -lpq" then - DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq" - DLZ_DRIVER_POSTGRES_LIBS="-L$use_dlz_postgres_lib -lpq" + DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq" + DLZ_DRIVER_POSTGRES_LIBS="-L${PREFIX}/lib -lpq" fi @@@@ -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)" + test "X$BLACKLIST" = "X" || echo " blacklist support (--with-blacklist)" 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)" @@@@ -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)" + test "X$BLACKLIST" = "X" && echo " blacklist support (--with-blacklist)" 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)" @ 1.2 log @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] @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2019/04/30 03:34:34 taca Exp $ @ 1.1 log @net/bind914: add version 9.14.1 Add bind914 version 9.14.1 package (BIND 9.14.1). pkgsrc chagnes: * Add blacklist support from NetBSD base system. * Note about required directories. BIND, the Berkeley Internet Name Daemon. This package contains the BIND 9.14 release. * A new "plugin" mechanism has been added to allow query functionality to be extended using dynamically loadable libraries. The "filter-aaaa" feature has been removed from named and is now implemented as a plugin. * QNAME minimization, as described in RFC 7816, is now supported. * Socket and task code has been refactored to improve performance on most modern machines. * "Root key sentinel" support, enabling validating resolvers to indicate via a special query which trust anchors are configured for the root zone. * Secondary zones can now be configured as "mirror" zones; their contents are transferred in as with traditional slave zones, but are subject to DNSSEC validation and are not treated as authoritative data when answering. This makes it easier to configure a local copy of the root zone as described in RFC 7706. * The "validate-except" option allows configuration of domains below which DNSSEC validation should not be performed. * The default value of "dnssec-validation" is now "auto". * IDNA2008 is now supported when linking with libidn2. * "named -V" now outputs the default paths for files used by named and other tools. @ text @d1 1 a1 1 $NetBSD$ d8 1 a8 1 --- configure.orig 2019-04-06 20:09:59.000000000 +0000 d20 1 a20 1 @@@@ -879,6 +882,7 @@@@ with_pic d28 1 a28 1 @@@@ -1672,6 +1676,7 @@@@ Optional Packages: d36 1 a36 1 @@@@ -3818,7 +3823,7 @@@@ fi d45 1 a45 1 @@@@ -16679,27 +16684,10 @@@@ case "$use_libjson" in d77 1 a77 1 @@@@ -16805,6 +16793,139 @@@@ $as_echo "#define HAVE_JSON_C 1" >>confd d217 1 a217 1 @@@@ -20234,7 +20355,7 @@@@ else d226 1 a226 1 @@@@ -20266,9 +20387,9 @@@@ fi d237 1 a237 1 *) : d239 1 a239 1 @@@@ -20691,8 +20812,8 @@@@ $as_echo "no" >&6; } d250 1 a250 1 @@@@ -23892,6 +24013,7 @@@@ report() { d258 1 a258 1 @@@@ -23970,6 +24092,7 @@@@ report() { @