pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/bind916
Module Name: pkgsrc
Committed By: taca
Date: Thu Nov 26 13:21:51 UTC 2020
Modified Files:
pkgsrc/net/bind916: Makefile PLIST distinfo
pkgsrc/net/bind916/patches: patch-config.guess patch-config.sub
patch-configure patch-lib_dns_rbt.c
Removed Files:
pkgsrc/net/bind916/patches: patch-bin_tests_system_kasp_tests.sh
patch-bin_tests_system_metadata_tests.sh
patch-bin_tests_system_rpz_tests.sh
Log Message:
net/bind916: update to 9.16.9
--- 9.16.9 released ---
5533. [func] Add the "stale-refresh-time" option, a time window that
starts after a failed lookup, during which a stale RRset
is served directly from cache before a new attempt to
refresh it is made. [GL #2066]
5530. [bug] dnstap did not capture responses to forwarded UPDATE
requests. [GL #2252]
5527. [bug] A NULL pointer dereference occurred when creating an NTA
recheck query failed. [GL #2244]
5525. [bug] Change 5503 inadvertently broke cross-compilation by
replacing a call to AC_LINK_IFELSE() with a call to
AC_RUN_IFELSE() in configure.ac. This has been fixed,
making cross-compilation possible again. [GL #2237]
5523. [bug] The initial lookup in a zone transitioning to/from a
signed state could fail if the DNSKEY RRset was not
found. [GL #2236]
5522. [bug] Fixed a race/NULL dereference in TCPDNS send. [GL #2227]
5520. [bug] Fixed a number of shutdown races, reference counting
errors, and spurious log messages that could occur
in the network manager. [GL #2221]
5518. [bug] Stub zones now work correctly with primary servers using
"minimal-responses yes". [GL #1736]
5517. [bug] Do not treat UV_EOF as a TCP4RecvErr or a TCP6RecvErr.
[GL #2208]
--- 9.16.8 released ---
5516. [func] The default EDNS buffer size has been changed from 4096
to 1232 bytes. [GL #2183]
5515. [func] Add 'rndc dnssec -rollover' command to trigger a manual
rollover for a specific key. [GL #1749]
5514. [bug] Fix KASP expected key size for Ed25519 and Ed448.
[GL #2171]
5513. [doc] The ARM section describing the "rrset-order" statement
was rewritten to make it unambiguous and up-to-date with
the source code. [GL #2139]
5512. [bug] "rrset-order" rules using "order none" were causing
named to crash despite named-checkconf treating them as
valid. [GL #2139]
5511. [bug] 'dig -u +yaml' failed to display timestamps to the
microsecond. [GL #2190]
5510. [bug] Implement the attach/detach semantics for dns_message_t
to fix a data race in accessing an already-destroyed
fctx->rmessage. [GL #2124]
5509. [bug] filter-aaaa: named crashed upon shutdown if it was in
the process of recursing for A RRsets. [GL #1040]
5508. [func] Added new parameter "-expired" for "rndc dumpdb" that
also prints expired RRsets (awaiting cleanup) to the
dump file. [GL #1870]
5507. [bug] Named could compute incorrect SIG(0) responses.
[GL #2109]
5506. [bug] Properly handle failed sysconf() calls, so we don't
report invalid memory size. [GL #2166]
5505. [bug] Updating contents of a mixed-case RPZ could cause some
rules to be ignored. [GL #2169]
5503. [bug] Cleaned up reference counting of network manager
handles, now using isc_nmhandle_attach() and _detach()
instead of _ref() and _unref(). [GL #2122]
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/bind916/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind916/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/bind916/distinfo
cvs rdiff -u -r1.2 -r0 \
pkgsrc/net/bind916/patches/patch-bin_tests_system_kasp_tests.sh
cvs rdiff -u -r1.1 -r0 \
pkgsrc/net/bind916/patches/patch-bin_tests_system_metadata_tests.sh \
pkgsrc/net/bind916/patches/patch-bin_tests_system_rpz_tests.sh
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind916/patches/patch-config.guess \
pkgsrc/net/bind916/patches/patch-config.sub \
pkgsrc/net/bind916/patches/patch-lib_dns_rbt.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/bind916/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/bind916/Makefile
diff -u pkgsrc/net/bind916/Makefile:1.5 pkgsrc/net/bind916/Makefile:1.6
--- pkgsrc/net/bind916/Makefile:1.5 Thu Nov 5 09:08:50 2020
+++ pkgsrc/net/bind916/Makefile Thu Nov 26 13:21:51 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2020/11/05 09:08:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/26 13:21:51 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}/
EXTRACT_SUFX= .tar.xz
@@ -16,7 +15,7 @@ CONFLICTS+= host-[0-9]*
MAKE_JOBS_SAFE= no
-BIND_VERSION= 9.16.7
+BIND_VERSION= 9.16.9
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/net/bind916/PLIST
diff -u pkgsrc/net/bind916/PLIST:1.2 pkgsrc/net/bind916/PLIST:1.3
--- pkgsrc/net/bind916/PLIST:1.2 Sun Aug 9 17:06:32 2020
+++ pkgsrc/net/bind916/PLIST Thu Nov 26 13:21:51 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/08/09 17:06:32 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/11/26 13:21:51 taca Exp $
bin/arpaname
bin/delv
bin/dig
@@ -136,6 +136,7 @@ include/isc/base64.h
include/isc/bind9.h
include/isc/buffer.h
include/isc/bufferlist.h
+include/isc/cmocka.h
include/isc/commandline.h
include/isc/condition.h
include/isc/counter.h
Index: pkgsrc/net/bind916/distinfo
diff -u pkgsrc/net/bind916/distinfo:1.6 pkgsrc/net/bind916/distinfo:1.7
--- pkgsrc/net/bind916/distinfo:1.6 Sat Nov 7 14:28:31 2020
+++ pkgsrc/net/bind916/distinfo Thu Nov 26 13:21:51 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2020/11/07 14:28:31 taca Exp $
+$NetBSD: distinfo,v 1.7 2020/11/26 13:21:51 taca Exp $
-SHA1 (bind-9.16.7.tar.xz) = 633667fac05ad1f87d89bddc504b3e1c3fe0549a
-RMD160 (bind-9.16.7.tar.xz) = 55a5a7cb173ff0bb2214f073c90c2e281daedbd1
-SHA512 (bind-9.16.7.tar.xz) = 176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768
-Size (bind-9.16.7.tar.xz) = 3241476 bytes
+SHA1 (bind-9.16.9.tar.xz) = feeaa9493c6ed735d4ee9c16e694e2dcd179acab
+RMD160 (bind-9.16.9.tar.xz) = 8df1a370ae12387a3db00d686dd9d122cafeec61
+SHA512 (bind-9.16.9.tar.xz) = d5b7694c51d3756aa273efd19d08889d28dd0e80d4ee29660cd06de0fdbc16a77f4f0d2dd9faef527eea1e496ec3292d158a556a84d5aa3f42dbddbb9c890aac
+Size (bind-9.16.9.tar.xz) = 3260964 bytes
SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
@@ -11,16 +11,13 @@ SHA1 (patch-bin_named_main.c) = 408c3f6a
SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
SHA1 (patch-bin_nsupdate_nsupdate.c) = 4ccd0e503a972cf16905e999bcc574f8ee0dd85d
SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
-SHA1 (patch-bin_tests_system_kasp_tests.sh) = 80b096debade569ca28305f8afee4ffdd1c0a908
-SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
-SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34
SHA1 (patch-bin_tools_arpaname.c) = 868da4454d06dc823680cf06a764fa40b8474708
SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3
-SHA1 (patch-config.guess) = b3edcb0b841ed7251f313af22ca21b5259ab0d04
+SHA1 (patch-config.guess) = f44c6344a297e7c623dcbf75b308eb35f797a537
SHA1 (patch-config.h.in) = b03a56721762a96439237f7e1fcaa4275c52be49
-SHA1 (patch-config.sub) = 021f252966d9499f76fcbc6e0dd84eb9d5babf5e
+SHA1 (patch-config.sub) = 7389c0f2500f2afe96d43979a2d3e0b9f8dff073
SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5
-SHA1 (patch-configure) = 8c48da70e8b93f19ce468ac8c10b289a660e3f49
+SHA1 (patch-configure) = 8b00a2808ff9ba43e0fab71e1d6f5cdc8c62cff5
SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
SHA1 (patch-contrib_dlz_modules_wildcard_dlz__wildcard__dynamic.c) = 37ba5f06f4970abaae6d98c4305f6372537a313f
SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3
@@ -29,7 +26,7 @@ SHA1 (patch-lib_dns_gssapi__link.c) = ac
SHA1 (patch-lib_dns_include_dns_zone.h) = 8abf4c18935629624e68a14361dbeaf00a440c90
SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3
SHA1 (patch-lib_dns_peer.c) = 16cc26fd4e792a23caef6e091f94f974041179e7
-SHA1 (patch-lib_dns_rbt.c) = b52d5b965461a39192d4eab598bc82e54254ab80
+SHA1 (patch-lib_dns_rbt.c) = a9ef153a0548eb432567f1e3347c27ce5775a041
SHA1 (patch-lib_dns_rbtdb.c) = bb3f829cbed23bce624462766aa6d039a0153afe
SHA1 (patch-lib_dns_request.c) = 82560e819cba0259883da8d47618ffabead22c55
SHA1 (patch-lib_dns_sdb.c) = ed447ec7a134e620765b25ee36124a19dfd9fab0
Index: pkgsrc/net/bind916/patches/patch-config.guess
diff -u pkgsrc/net/bind916/patches/patch-config.guess:1.1 pkgsrc/net/bind916/patches/patch-config.guess:1.2
--- pkgsrc/net/bind916/patches/patch-config.guess:1.1 Sun Aug 9 15:20:22 2020
+++ pkgsrc/net/bind916/patches/patch-config.guess Thu Nov 26 13:21:51 2020
@@ -1,54 +1,38 @@
-$NetBSD: patch-config.guess,v 1.1 2020/08/09 15:20:22 taca Exp $
+$NetBSD: patch-config.guess,v 1.2 2020/11/26 13:21:51 taca Exp $
* Take from NetBSD base.
---- config.guess.orig 2020-05-06 09:59:35.000000000 +0000
+--- config.guess.orig 2020-10-13 08:41:40.000000000 +0000
+++ config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
--# Copyright 1992-2013 Free Software Foundation, Inc.
+-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
--timestamp='2013-11-29'
+-timestamp='2015-01-01'
+timestamp='2017-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -24,12 +24,12 @@ timestamp='2013-11-29'
- # program. This Exception is an additional permission under section 7
- # of the GNU General Public License, version 3 ("GPLv3").
- #
--# Originally written by Per Bothner.
-+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+@@ -27,7 +27,7 @@ timestamp='2015-01-01'
+ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
--# Please send patches with a ChangeLog entry to config-patches%gnu.org@localhost.
-+# Please send patches to <config-patches%gnu.org@localhost>.
-
+ # Please send patches to <config-patches%gnu.org@localhost>.
- me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
--Copyright 1992-2013 Free Software Foundation, Inc.
+-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
- LIBC=gnu
- #endif
- EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
- ;;
- esac
-
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
@@ -222,19 +206,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
case "`/bin/arch`" in
sun3)
echo m68k-sun-sunos${UNAME_RELEASE}
-@@ -579,8 +603,9 @@ EOF
- else
- IBM_ARCH=powerpc
- fi
-- if [ -x /usr/bin/oslevel ] ; then
-- IBM_REV=`/usr/bin/oslevel`
-+ if [ -x /usr/bin/lslpp ] ; then
-+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
-@@ -617,13 +642,13 @@ EOF
+@@ -618,13 +642,13 @@ EOF
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
@@ -253,7 +225,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
esac ;;
esac
fi
-@@ -662,11 +687,11 @@ EOF
+@@ -663,11 +687,11 @@ EOF
exit (0);
}
EOF
@@ -267,7 +239,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
then
eval $set_cc_for_build
-@@ -679,12 +704,12 @@ EOF
+@@ -680,12 +704,12 @@ EOF
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
# => hppa64-hp-hpux11.23
@@ -283,7 +255,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-@@ -789,14 +814,14 @@ EOF
+@@ -790,14 +814,14 @@ EOF
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
@@ -302,16 +274,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-@@ -826,7 +851,7 @@ EOF
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
-- i*:MSYS*:*)
-+ *:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
-@@ -878,7 +903,7 @@ EOF
+@@ -879,7 +903,7 @@ EOF
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
@@ -320,7 +283,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
-@@ -901,7 +926,7 @@ EOF
+@@ -902,7 +926,7 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
@@ -329,7 +292,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
-@@ -932,6 +957,9 @@ EOF
+@@ -933,6 +957,9 @@ EOF
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
@@ -339,7 +302,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
-@@ -944,6 +972,9 @@ EOF
+@@ -945,6 +972,9 @@ EOF
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -349,23 +312,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
-@@ -969,10 +1000,13 @@ EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- ;;
-- or1k:Linux:*:*)
-+ mips64el:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
-- or32:Linux:*:*)
-+ openrisc*:Linux:*:*)
-+ echo or1k-unknown-linux-${LIBC}
-+ exit ;;
-+ or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- padre:Linux:*:*)
-@@ -1001,6 +1035,9 @@ EOF
+@@ -1002,6 +1032,9 @@ EOF
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
@@ -375,7 +322,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
-@@ -1020,7 +1057,7 @@ EOF
+@@ -1021,7 +1054,7 @@ EOF
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
@@ -384,7 +331,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-@@ -1099,7 +1136,7 @@ EOF
+@@ -1100,7 +1133,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
@@ -393,7 +340,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
-@@ -1248,6 +1285,9 @@ EOF
+@@ -1249,6 +1282,9 @@ EOF
SX-8R:SUPER-UX:*:*)
echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
@@ -403,7 +350,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
-@@ -1261,9 +1301,9 @@ EOF
+@@ -1262,9 +1298,9 @@ EOF
UNAME_PROCESSOR=powerpc
fi
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
@@ -415,7 +362,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
-@@ -1285,7 +1325,7 @@ EOF
+@@ -1286,7 +1322,7 @@ EOF
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -424,7 +371,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
-@@ -1316,7 +1356,7 @@ EOF
+@@ -1317,7 +1353,7 @@ EOF
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
@@ -433,7 +380,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
-@@ -1358,7 +1398,7 @@ EOF
+@@ -1359,7 +1395,7 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
@@ -442,163 +389,7 @@ $NetBSD: patch-config.guess,v 1.1 2020/0
exit ;;
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
-@@ -1369,171 +1409,25 @@ EOF
- x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
- exit ;;
--esac
--
--eval $set_cc_for_build
--cat >$dummy.c <<EOF
--#ifdef _SEQUENT_
--# include <sys/types.h>
--# include <sys/utsname.h>
--#endif
--main ()
--{
--#if defined (sony)
--#if defined (MIPSEB)
-- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
-- I don't know.... */
-- printf ("mips-sony-bsd\n"); exit (0);
--#else
--#include <sys/param.h>
-- printf ("m68k-sony-newsos%s\n",
--#ifdef NEWSOS4
-- "4"
--#else
-- ""
--#endif
-- ); exit (0);
--#endif
--#endif
--
--#if defined (__arm) && defined (__acorn) && defined (__unix)
-- printf ("arm-acorn-riscix\n"); exit (0);
--#endif
--
--#if defined (hp300) && !defined (hpux)
-- printf ("m68k-hp-bsd\n"); exit (0);
--#endif
--
--#if defined (NeXT)
--#if !defined (__ARCHITECTURE__)
--#define __ARCHITECTURE__ "m68k"
--#endif
-- int version;
-- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-- if (version < 4)
-- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-- else
-- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-- exit (0);
--#endif
--
--#if defined (MULTIMAX) || defined (n16)
--#if defined (UMAXV)
-- printf ("ns32k-encore-sysv\n"); exit (0);
--#else
--#if defined (CMU)
-- printf ("ns32k-encore-mach\n"); exit (0);
--#else
-- printf ("ns32k-encore-bsd\n"); exit (0);
--#endif
--#endif
--#endif
--
--#if defined (__386BSD__)
-- printf ("i386-pc-bsd\n"); exit (0);
--#endif
--
--#if defined (sequent)
--#if defined (i386)
-- printf ("i386-sequent-dynix\n"); exit (0);
--#endif
--#if defined (ns32000)
-- printf ("ns32k-sequent-dynix\n"); exit (0);
--#endif
--#endif
--
--#if defined (_SEQUENT_)
-- struct utsname un;
--
-- uname(&un);
--
-- if (strncmp(un.version, "V2", 2) == 0) {
-- printf ("i386-sequent-ptx2\n"); exit (0);
-- }
-- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-- printf ("i386-sequent-ptx1\n"); exit (0);
-- }
-- printf ("i386-sequent-ptx\n"); exit (0);
--
--#endif
--
--#if defined (vax)
--# if !defined (ultrix)
--# include <sys/param.h>
--# if defined (BSD)
--# if BSD == 43
-- printf ("vax-dec-bsd4.3\n"); exit (0);
--# else
--# if BSD == 199006
-- printf ("vax-dec-bsd4.3reno\n"); exit (0);
--# else
-- printf ("vax-dec-bsd\n"); exit (0);
--# endif
--# endif
--# else
-- printf ("vax-dec-bsd\n"); exit (0);
--# endif
--# else
-- printf ("vax-dec-ultrix\n"); exit (0);
--# endif
--#endif
--
--#if defined (alliant) && defined (i860)
-- printf ("i860-alliant-bsd\n"); exit (0);
--#endif
--
-- exit (1);
--}
--EOF
--
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-- { echo "$SYSTEM_NAME"; exit; }
--
--# Apollos put the system type in the environment.
--
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
--
--# Convex versions that predate uname can use getsysinfo(1)
--
--if [ -x /usr/convex/getsysinfo ]
--then
-- case `getsysinfo -f cpu_type` in
-- c1*)
-- echo c1-convex-bsd
-- exit ;;
-- c2*)
-- if getsysinfo -f scalar_acc
-- then echo c32-convex-bsd
-- else echo c2-convex-bsd
-- fi
-- exit ;;
-- c34*)
-- echo c34-convex-bsd
-- exit ;;
-- c38*)
-- echo c38-convex-bsd
-+ amd64:Isilon\ OneFS:*:*)
-+ echo x86_64-unknown-onefs
- exit ;;
-- c4*)
-- echo c4-convex-bsd
-- exit ;;
-- esac
--fi
-+esac
-
+@@ -1375,18 +1411,17 @@ esac
cat >&2 <<EOF
$0: unable to guess system type
Index: pkgsrc/net/bind916/patches/patch-config.sub
diff -u pkgsrc/net/bind916/patches/patch-config.sub:1.1 pkgsrc/net/bind916/patches/patch-config.sub:1.2
--- pkgsrc/net/bind916/patches/patch-config.sub:1.1 Sun Aug 9 15:20:22 2020
+++ pkgsrc/net/bind916/patches/patch-config.sub Thu Nov 26 13:21:51 2020
@@ -1,30 +1,21 @@
-$NetBSD: patch-config.sub,v 1.1 2020/08/09 15:20:22 taca Exp $
+$NetBSD: patch-config.sub,v 1.2 2020/11/26 13:21:51 taca Exp $
* Take from NetBSD base.
---- config.sub.orig 2020-05-06 09:59:35.000000000 +0000
+--- config.sub.orig 2020-10-13 08:41:40.000000000 +0000
+++ config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
--# Copyright 1992-2013 Free Software Foundation, Inc.
+-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
--timestamp='2013-10-01'
+-timestamp='2015-01-01'
+timestamp='2017-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -25,7 +25,7 @@ timestamp='2013-10-01'
- # of the GNU General Public License, version 3 ("GPLv3").
-
-
--# Please send patches with a ChangeLog entry to config-patches%gnu.org@localhost.
-+# Please send patches to <config-patches%gnu.org@localhost>.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
-@@ -33,7 +33,7 @@ timestamp='2013-10-01'
+@@ -33,7 +33,7 @@ timestamp='2015-01-01'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
@@ -33,7 +24,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
-@@ -53,8 +53,7 @@ timestamp='2013-10-01'
+@@ -53,8 +53,7 @@ timestamp='2015-01-01'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
@@ -47,7 +38,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
version="\
GNU config.sub ($timestamp)
--Copyright 1992-2013 Free Software Foundation, Inc.
+-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -63,7 +54,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -255,12 +254,13 @@ case $basic_machine in
+@@ -255,11 +254,12 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
@@ -73,35 +64,17 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
- | epiphany \
-- | fido | fr30 | frv \
+ | e2k | epiphany \
-+ | fido | fr30 | frv | ft32 \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
- | i370 | i860 | i960 | ia64 \
-@@ -283,8 +283,10 @@ case $basic_machine in
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
-+ | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
-@@ -296,14 +298,15 @@ case $basic_machine in
- | nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
-- | open8 \
-- | or1k | or32 \
-+ | open8 | or1k | or1knd | or32 \
+@@ -301,11 +301,12 @@ case $basic_machine in
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
-+ | riscv32 | riscv64 \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -109,25 +82,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -311,6 +314,7 @@ case $basic_machine in
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-+ | visium \
- | we32k \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
-@@ -325,6 +329,9 @@ case $basic_machine in
- c6x)
- basic_machine=tic6x-unknown
- ;;
-+ leon|leon[3-9])
-+ basic_machine=sparc-$basic_machine
-+ ;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
-@@ -370,12 +377,13 @@ case $basic_machine in
+@@ -376,12 +377,13 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
@@ -142,26 +97,11 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-@@ -402,8 +410,10 @@ case $basic_machine in
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa32r6-* | mipsisa32r6el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
-+ | mipsisa64r6-* | mipsisa64r6el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
-@@ -415,16 +425,19 @@ case $basic_machine in
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
-+ | or1k*-* \
+@@ -427,13 +429,15 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-+ | pru-* \
++ | orion-* \
| pyramid-* \
+ | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -174,15 +114,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
-@@ -432,6 +445,7 @@ case $basic_machine in
- | ubicom32-* \
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- | vax-* \
-+ | visium-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
-@@ -508,6 +522,9 @@ case $basic_machine in
+@@ -518,6 +522,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
@@ -192,7 +124,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
aux)
basic_machine=m68k-apple
os=-aux
-@@ -628,6 +645,14 @@ case $basic_machine in
+@@ -638,6 +645,14 @@ case $basic_machine in
basic_machine=m68k-bull
os=-sysv3
;;
@@ -207,28 +139,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
-@@ -769,6 +794,9 @@ case $basic_machine in
- basic_machine=m68k-isi
- os=-sysv
- ;;
-+ leon-*|leon[3-9]-*)
-+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-+ ;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
-@@ -824,6 +852,10 @@ case $basic_machine in
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
-+ moxiebox)
-+ basic_machine=moxie-unknown
-+ os=-moxiebox
-+ ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
-@@ -1000,7 +1032,7 @@ case $basic_machine in
+@@ -1017,7 +1032,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -237,7 +148,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
-@@ -1010,7 +1042,7 @@ case $basic_machine in
+@@ -1027,7 +1042,7 @@ case $basic_machine in
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -246,7 +157,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
-@@ -1356,27 +1388,28 @@ case $os in
+@@ -1373,18 +1388,18 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -267,21 +178,19 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
-- | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+@@ -1393,7 +1408,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1508,6 +1541,8 @@ case $os in
+@@ -1525,6 +1541,8 @@ case $os in
;;
-nacl*)
;;
@@ -290,17 +199,7 @@ $NetBSD: patch-config.sub,v 1.1 2020/08/
-none)
;;
*)
-@@ -1594,9 +1629,6 @@ case $basic_machine in
- mips*-*)
- os=-elf
- ;;
-- or1k-*)
-- os=-elf
-- ;;
- or32-*)
- os=-coff
- ;;
-@@ -1606,6 +1638,9 @@ case $basic_machine in
+@@ -1620,6 +1638,9 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
Index: pkgsrc/net/bind916/patches/patch-lib_dns_rbt.c
diff -u pkgsrc/net/bind916/patches/patch-lib_dns_rbt.c:1.1 pkgsrc/net/bind916/patches/patch-lib_dns_rbt.c:1.2
--- pkgsrc/net/bind916/patches/patch-lib_dns_rbt.c:1.1 Sun Aug 9 15:20:22 2020
+++ pkgsrc/net/bind916/patches/patch-lib_dns_rbt.c Thu Nov 26 13:21:51 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_dns_rbt.c,v 1.1 2020/08/09 15:20:22 taca Exp $
+$NetBSD: patch-lib_dns_rbt.c,v 1.2 2020/11/26 13:21:51 taca Exp $
* Take from NetBSD base.
* Disable inline on powerpc.
---- lib/dns/rbt.c.orig 2020-05-06 09:59:35.000000000 +0000
+--- lib/dns/rbt.c.orig 2020-11-16 14:44:37.000000000 +0000
+++ lib/dns/rbt.c
-@@ -301,12 +301,13 @@ Name(dns_rbtnode_t *node) {
+@@ -319,12 +319,13 @@ Name(dns_rbtnode_t *node) {
}
static void
@@ -20,7 +20,7 @@ $NetBSD: patch-lib_dns_rbt.c,v 1.1 2020/
fprintf(stderr, "%s: ", desc);
do {
-@@ -324,6 +325,10 @@ hexdump(const char *desc, unsigned char
+@@ -342,6 +343,10 @@ hexdump(const char *desc, unsigned char
}
#endif /* DEBUG */
@@ -31,32 +31,7 @@ $NetBSD: patch-lib_dns_rbt.c,v 1.1 2020/
/*
* Upper node is the parent of the root of the passed node's
* subtree. The passed node must not be NULL.
-@@ -545,6 +550,9 @@ serialize_node(FILE *file, dns_rbtnode_t
- off_t file_position;
- unsigned char *node_data = NULL;
- size_t datasize;
-+#ifdef DEBUG
-+ dns_name_t nodename;
-+#endif
-
- INSIST(node != NULL);
-
-@@ -597,10 +605,12 @@ serialize_node(FILE *file, dns_rbtnode_t
- CHECK(isc_stdio_write(node_data, 1, datasize, file, NULL));
-
- #ifdef DEBUG
-+ dns_name_init(&nodename, NULL);
-+ NODENAME(node, &nodename);
- fprintf(stderr, "serialize ");
-- dns_name_print(name, stderr);
-+ dns_name_print(&nodename, stderr);
- fprintf(stderr, "\n");
-- hexdump("node header", (unsigned char *)&temp_node,
-+ hexdump("node header", &temp_node,
- sizeof(dns_rbtnode_t));
- hexdump("node data", node_data, datasize);
- #endif /* ifdef DEBUG */
-@@ -721,7 +731,7 @@ dns_rbt_serialize_tree(FILE *file, dns_r
+@@ -748,7 +753,7 @@ dns_rbt_serialize_tree(FILE *file, dns_r
isc_crc64_final(&crc);
#ifdef DEBUG
@@ -65,7 +40,7 @@ $NetBSD: patch-lib_dns_rbt.c,v 1.1 2020/
#endif /* ifdef DEBUG */
/* Serialize header */
-@@ -742,7 +752,7 @@ cleanup:
+@@ -769,7 +774,7 @@ cleanup:
result = ISC_R_INVALIDFILE; \
goto cleanup; \
} \
@@ -74,7 +49,7 @@ $NetBSD: patch-lib_dns_rbt.c,v 1.1 2020/
static isc_result_t
treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n,
-@@ -852,7 +862,7 @@ treefix(dns_rbt_t *rbt, void *base, size
+@@ -879,7 +884,7 @@ treefix(dns_rbt_t *rbt, void *base, size
fprintf(stderr, "deserialize ");
dns_name_print(&nodename, stderr);
fprintf(stderr, "\n");
@@ -83,7 +58,7 @@ $NetBSD: patch-lib_dns_rbt.c,v 1.1 2020/
hexdump("node data", node_data, datasize);
#endif /* ifdef DEBUG */
isc_crc64_update(crc, (const uint8_t *)&header, sizeof(dns_rbtnode_t));
-@@ -928,7 +938,7 @@ dns_rbt_deserialize_tree(void *base_addr
+@@ -955,7 +960,7 @@ dns_rbt_deserialize_tree(void *base_addr
isc_crc64_final(&crc);
#ifdef DEBUG
Index: pkgsrc/net/bind916/patches/patch-configure
diff -u pkgsrc/net/bind916/patches/patch-configure:1.3 pkgsrc/net/bind916/patches/patch-configure:1.4
--- pkgsrc/net/bind916/patches/patch-configure:1.3 Sat Sep 19 13:09:27 2020
+++ pkgsrc/net/bind916/patches/patch-configure Thu Nov 26 13:21:51 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.3 2020/09/19 13:09:27 taca Exp $
+$NetBSD: patch-configure,v 1.4 2020/11/26 13:21:51 taca Exp $
* Add DragonFly support.
* Use proper link options for NetBSD.
* Link proper postgresql library.
* Take from NetBSD base, adding support for blacklistd.
---- configure.orig 2020-09-04 10:44:49.000000000 +0000
+--- configure.orig 2020-10-13 08:41:40.000000000 +0000
+++ configure
@@ -637,6 +637,10 @@ BUILD_LDFLAGS
BUILD_CPPFLAGS
@@ -18,7 +18,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
DLZ_DRIVER_MYSQL_LIBS
DLZ_DRIVER_MYSQL_INCLUDES
DLZ_SYSTEM_TEST
-@@ -732,6 +736,8 @@ JSON_C_LIBS
+@@ -730,6 +734,8 @@ JSON_C_LIBS
JSON_C_CFLAGS
LIBXML2_LIBS
LIBXML2_CFLAGS
@@ -27,7 +27,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
NZD_MANS
NZDTARGETS
NZDSRCS
-@@ -1721,6 +1727,8 @@ Optional Packages:
+@@ -1719,6 +1725,8 @@ 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]
@@ -36,7 +36,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
Some influential environment variables:
CC C compiler command
-@@ -3919,7 +3927,7 @@ fi
+@@ -3917,7 +3925,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 \
@@ -45,273 +45,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
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
-@@ -18454,7 +18462,265 @@ esac
-
-
-
-+#
-+# 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)
-+ ;;
-+ 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
-+ BLACKLISTLINKSRCS='${BLACKLISTLINKSRCS}'
-+ BLACKLISTLINKOBJS='${BLACKLISTLINKOBJS}'
-+fi
-+
-+#
-+# was --with-blocklist specified?
-+#
-+BLOCKLISTLINKOBJS=
-+BLOCKLISTLINKSRCS=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for blocklist library" >&5
-+$as_echo_n "checking for blocklist library... " >&6; }
-+
-+# Check whether --with-blocklist was given.
-+if test "${with_blocklist+set}" = set; then :
-+ withval=$with_blocklist; with_blocklist="$withval"
-+else
-+ with_blocklist="auto"
-+fi
-+
-+
-+have_blocklist=""
-+case "$with_blocklist" in
-+ no)
-+ ;;
-+ auto|yes)
-+ for d in /usr /usr/local /opt/local
-+ do
-+ if test -f "${d}/include/blocklist.h"
-+ then
-+ if test ${d} != /usr
-+ then
-+ blocklist_cflags="-I ${d}/include"
-+ LIBS="$LIBS -L${d}/lib"
-+ fi
-+ have_blocklist="yes"
-+ fi
-+ done
-+ ;;
-+ *)
-+ if test -f "${with_blocklist}/include/blocklist.h"
-+ then
-+ blocklist_cflags="-I${with_blocklist}/include"
-+ LIBS="$LIBS -L${with_blocklist}/lib"
-+ have_blocklist="yes"
-+ else
-+ as_fn_error $? "$with_blocklist/include/blocklist.h not found." "$LINENO" 5
-+ fi
-+ ;;
-+esac
-+
-+if test "X${have_blocklist}" != "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 blocklist" >&5
-+$as_echo_n "checking for library containing blocklist... " >&6; }
-+if ${ac_cv_search_blocklist+:} 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 blocklist_open(void);
-+int
-+main ()
-+{
-+return blocklist_open();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+for ac_lib in '' blocklist; 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_blocklist=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if ${ac_cv_search_blocklist+:} false; then :
-+ break
-+fi
-+done
-+if ${ac_cv_search_blocklist+:} false; then :
-+
-+else
-+ ac_cv_search_blocklist=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_blocklist" >&5
-+$as_echo "$ac_cv_search_blocklist" >&6; }
-+ac_res=$ac_cv_search_blocklist
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+else
-+ as_fn_error $? "found blocklist include but not library." "$LINENO" 5
-+ have_blocklist=""
-+fi
-+
-+elif test "X$with_blocklist" = Xyes
-+then
-+ as_fn_error $? "include/blocklist.h not found." "$LINENO" 5
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+BLOCKLIST=
-+if test "X${have_blocklist}" != "X"
-+then
-+ CFLAGS="$CFLAGS $blocklist_cflags"
-+
-+$as_echo "#define HAVE_BLOCKLIST 1" >>confdefs.h
-
-+ BLOCKLIST=1
-+ BLOCKLISTLINKSRCS='${BLOCKLISTLINKSRCS}'
-+ BLOCKLISTLINKOBJS='${BLOCKLISTLINKOBJS}'
-+fi
- # Check whether --with-zlib was given.
- if test "${with_zlib+set}" = set; then :
- withval=$with_zlib;
-@@ -22586,7 +22852,7 @@ else
+@@ -22499,7 +22507,7 @@ else
fi
;; #(
@@ -320,7 +54,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
LDFLAGS="${LDFLAGS} -Wl,-E"
SO_CFLAGS="-fpic"
-@@ -22618,9 +22884,9 @@ fi
+@@ -22531,9 +22539,9 @@ fi
;; #(
*-solaris*) :
@@ -333,7 +67,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
;; #(
ia64-hp-hpux*) :
-@@ -23049,8 +23315,8 @@ $as_echo "no" >&6; }
+@@ -22974,8 +22982,8 @@ $as_echo "no" >&6; }
fi
if test -n "-L$use_dlz_postgres_lib -lpq"
then
@@ -344,7 +78,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
fi
-@@ -26255,6 +26523,8 @@ report() {
+@@ -26182,6 +26190,8 @@ report() {
test "X$PYTHON" = "X" || echo " Python tools (--with-python)"
test "X$LIBXML2_LIBS" = "X" || echo " XML statistics (--with-libxml2)"
test "X$JSON_C_LIBS" = "X" || echo " JSON statistics (--with-json-c): $JSON_C_CFLAGS $JSON_C_LIBS"
@@ -353,7 +87,7 @@ $NetBSD: patch-configure,v 1.3 2020/09/1
test "X$ZLIB_LIBS" = "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)"
-@@ -26333,6 +26603,8 @@ report() {
+@@ -26260,6 +26270,8 @@ report() {
test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
test "X$LIBXML2_LIBS" = "X" && echo " XML statistics (--with-libxml2)"
test "X$JSON_C_LIBS" = "X" && echo " JSON statistics (--with-json-c)"
Home |
Main Index |
Thread Index |
Old Index