[Midnightbsd-cvs] mports [23555] trunk/dns/bind910: update bind
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon May 28 19:13:57 EDT 2018
Revision: 23555
http://svnweb.midnightbsd.org/mports/?rev=23555
Author: laffer1
Date: 2018-05-28 19:13:54 -0400 (Mon, 28 May 2018)
Log Message:
-----------
update bind
Modified Paths:
--------------
trunk/dns/bind910/Makefile
trunk/dns/bind910/distinfo
trunk/dns/bind910/files/extrapatch-bind-min-override-ttl
trunk/dns/bind910/files/named.in
trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in
trunk/dns/bind910/files/patch-configure
trunk/dns/bind910/pkg-plist
Added Paths:
-----------
trunk/dns/bind910/files/patch-bin_named_include_named_globals.h
Modified: trunk/dns/bind910/Makefile
===================================================================
--- trunk/dns/bind910/Makefile 2018-05-28 23:11:15 UTC (rev 23554)
+++ trunk/dns/bind910/Makefile 2018-05-28 23:13:54 UTC (rev 23555)
@@ -27,9 +27,10 @@
.endif
LICENSE= iscl
+LICENSE_FILE= ${WRKSRC}/COPYRIGHT
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.10.4-P8
+ISCVERSION= 9.10.7
MAKE_JOBS_UNSAFE= yes
@@ -48,7 +49,8 @@
--disable-symtable \
--with-randomdev=/dev/random \
--with-libxml2=${LOCALBASE} \
- --with-readline=-ledit \
+ --with-readline="-L${LOCALBASE}/lib -ledit" \
+ --with-dlopen=yes \
--sysconfdir=${ETCDIR}
.if defined(BIND_TOOLS_SLAVE)
CONFIGURE_ARGS+= --disable-shared
@@ -126,7 +128,7 @@
.endif # BIND_TOOLS_SLAVE
SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
-SSL_USE= openssl=yes
+SSL_USE= ssl=yes
SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl
NEWSTATS_CONFIGURE_ENABLE= newstats
@@ -236,9 +238,6 @@
PORTDOCS= *
post-patch:
- @${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
- s|readline/history.h|histedit.h|' \
- ${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c
.if defined(BIND_TOOLS_SLAVE)
@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-e 's#isc-config.sh installdirs#installdirs#' \
@@ -270,8 +269,8 @@
${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
- ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ* \
+ ${WRKSRC}/HISTORY ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}
.endif
.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100)
Modified: trunk/dns/bind910/distinfo
===================================================================
--- trunk/dns/bind910/distinfo 2018-05-28 23:11:15 UTC (rev 23554)
+++ trunk/dns/bind910/distinfo 2018-05-28 23:13:54 UTC (rev 23555)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520701956
-SHA256 (bind-9.10.4-P8.tar.gz) = 7dd356ab466ead8124d645f83719e620686998c81ce1d4eb0c52daffca7566eb
-SIZE (bind-9.10.4-P8.tar.gz) = 9323291
+TIMESTAMP = 1527536339
+SHA256 (bind-9.10.7.tar.gz) = e15e70982d966cd4b194ff483f5cc636c0017b054ae2e332ca3f28fe53f11660
+SIZE (bind-9.10.7.tar.gz) = 9171441
Modified: trunk/dns/bind910/files/extrapatch-bind-min-override-ttl
===================================================================
--- trunk/dns/bind910/files/extrapatch-bind-min-override-ttl 2018-05-28 23:11:15 UTC (rev 23554)
+++ trunk/dns/bind910/files/extrapatch-bind-min-override-ttl 2018-05-28 23:13:54 UTC (rev 23555)
@@ -1,17 +1,22 @@
---- bin/named/config.c.orig 2016-04-20 20:11:20 UTC
+--- bin/named/config.c.orig 2018-01-24 21:17:00 UTC
+++ bin/named/config.c
-@@ -151,6 +151,8 @@ options {\n\
+@@ -167,11 +167,13 @@ options {\n\
+ max-ncache-ttl 10800; /* 3 hours */\n\
+ max-recursion-depth 7;\n\
+ max-recursion-queries 75;\n\
++ min-cache-ttl 0; /* no minimal, zero is allowed */\n\
min-roots 2;\n\
- lame-ttl 600;\n\
- max-ncache-ttl 10800; /* 3 hours */\n\
-+ override-cache-ttl 0; /* do not override */\n\
-+ min-cache-ttl 0; /* no minimal, zero is allowed */\n\
- max-cache-ttl 604800; /* 1 week */\n\
- transfer-format many-answers;\n\
- max-cache-size 0;\n\
---- bin/named/server.c.orig 2016-04-20 20:11:20 UTC
+ minimal-responses false;\n\
+ notify-source *;\n\
+ notify-source-v6 *;\n\
+ nsec3-test-zone no;\n\
++ override-cache-ttl 0; /* do not override */\n\
+ provide-ixfr true;\n\
+ query-source address *;\n\
+ query-source-v6 address *;\n\
+--- bin/named/server.c.orig 2018-01-24 21:17:00 UTC
+++ bin/named/server.c
-@@ -2802,6 +2802,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -2854,6 +2854,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@@ -28,9 +33,9 @@
result = ns_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig 2016-04-20 20:11:20 UTC
+--- lib/dns/include/dns/view.h.orig 2018-01-24 21:17:00 UTC
+++ lib/dns/include/dns/view.h
-@@ -150,6 +150,8 @@ struct dns_view {
+@@ -151,6 +151,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t requestsit;
dns_ttl_t maxcachettl;
@@ -39,9 +44,9 @@
dns_ttl_t maxncachettl;
dns_ttl_t prefetch_trigger;
dns_ttl_t prefetch_eligible;
---- lib/dns/resolver.c.orig 2016-04-20 20:11:20 UTC
+--- lib/dns/resolver.c.orig 2018-01-24 21:17:00 UTC
+++ lib/dns/resolver.c
-@@ -5371,6 +5371,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
+@@ -5416,6 +5416,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
@@ -59,11 +64,11 @@
+ /*
* Enforce the configure maximum cache TTL.
*/
- if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig 2016-04-20 20:11:20 UTC
+ if (rdataset->ttl > res->view->maxcachettl) {
+--- lib/isccfg/namedconf.c.orig 2018-01-24 21:17:00 UTC
+++ lib/isccfg/namedconf.c
-@@ -1572,6 +1572,8 @@ view_clauses[] = {
- #endif
+@@ -1600,6 +1600,8 @@ view_clauses[] = {
+ { "lame-ttl", &cfg_type_uint32, 0 },
{ "max-acache-size", &cfg_type_sizenodefault, 0 },
{ "max-cache-size", &cfg_type_sizenodefault, 0 },
+ { "override-cache-ttl", &cfg_type_uint32, 0 },
Modified: trunk/dns/bind910/files/named.in
===================================================================
--- trunk/dns/bind910/files/named.in 2018-05-28 23:11:15 UTC (rev 23554)
+++ trunk/dns/bind910/files/named.in 2018-05-28 23:13:54 UTC (rev 23555)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: head/dns/bind910/files/named.in 395660 2015-08-31 10:06:27Z mat $
+# $FreeBSD: head/dns/bind910/files/named.in 458413 2018-01-08 13:38:47Z mat $
#
# PROVIDE: named
@@ -175,7 +175,8 @@
make_symlinks()
{
checkyesno named_symlink_enable &&
- ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
+ ln -fs "${named_chrootdir}${pidfile}" ${pidfile} &&
+ ln -fs "${named_chrootdir}${sessionkeyfile}" ${sessionkeyfile}
}
named_poststart()
@@ -194,7 +195,7 @@
{
# This is a one line function, but ${named_program} is not defined early
# enough to be there when the reload_cmd variable is defined up there.
- ${_named_program_root}/sbin/rndc ${rndc_flags} reload
+ rndc reload
}
find_pidfile()
@@ -206,6 +207,15 @@
fi
}
+find_sessionkeyfile()
+{
+ if get_pidfile_from_conf session-keyfile ${named_conf}; then
+ sessionkeyfile="${_pidfile_from_conf}"
+ else
+ sessionkeyfile="/var/run/named/session.key"
+ fi
+}
+
named_stop()
{
find_pidfile
@@ -220,7 +230,7 @@
return 1
fi
echo 'Stopping named.'
- if ${_named_program_root}/sbin/rndc ${rndc_flags} stop 2>/dev/null; then
+ if rndc stop; then
wait_for_pids ${rc_pid}
else
echo -n 'rndc failed, trying kill: '
@@ -255,31 +265,46 @@
install -o root -g wheel -m 0644 /dev/null $1
}
+rndc()
+{
+ if [ -z "${rndc_flags}" ]; then
+ if [ -s "${rndc_conf}" ] ; then
+ rndc_flags="-c ${rndc_conf}"
+ elif [ -s "${rndc_key}" ] ; then
+ rndc_flags="-k ${rndc_key}"
+ else
+ rndc_flags=""
+ fi
+ fi
+
+ ${_named_program_root}/sbin/rndc ${rndc_flags} "$@"
+}
+
named_prestart()
{
find_pidfile
+ find_sessionkeyfile
if [ -n "${named_pidfile}" ]; then
warn 'named_pidfile: now determined from the conf file'
fi
+ if [ -n "${named_sessionkeyfile}" ]; then
+ warn 'named_sessionkeyfile: now determined from the conf file'
+ fi
+
piddir=`/usr/bin/dirname ${pidfile}`
if [ ! -d ${piddir} ]; then
install -d -o ${named_uid} -g ${named_uid} ${piddir}
fi
+ sessionkeydir=`/usr/bin/dirname ${sessionkeyfile}`
+ if [ ! -d ${sessionkeydir} ]; then
+ install -d -o ${named_uid} -g ${named_uid} ${sessionkeydir}
+ fi
+
command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}"
- if [ -z "${rndc_flags}" ]; then
- if [ -s ${rndc_conf} ] ; then
- rndc_flags="-c ${rndc_conf}"
- elif [ -s ${rndc_key} ] ; then
- rndc_flags="-k ${rndc_key}"
- else
- rndc_flags=""
- fi
- fi
-
%%NATIVE_PKCS11%% if [ -z "${named_pkcs11_engine}"]; then
%%NATIVE_PKCS11%% err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use"
%%NATIVE_PKCS11%% elif [ ! -f ${named_pkcs11_engine} ]; then
@@ -297,6 +322,15 @@
if [ -n "${named_chrootdir}" ]; then
rc_flags="${rc_flags} -t ${named_chrootdir}"
checkyesno named_chroot_autoupdate && chroot_autoupdate
+
+ case "${altlog_proglist}" in
+ *named*)
+ ;;
+ *)
+ warn 'Using chroot without setting altlog_proglist, logging may not'
+ warn 'work correctly. Run sysrc altlog_proglist+=named'
+ ;;
+ esac
else
named_symlink_enable=NO
fi
Added: trunk/dns/bind910/files/patch-bin_named_include_named_globals.h
===================================================================
--- trunk/dns/bind910/files/patch-bin_named_include_named_globals.h (rev 0)
+++ trunk/dns/bind910/files/patch-bin_named_include_named_globals.h 2018-05-28 23:13:54 UTC (rev 23555)
@@ -0,0 +1,13 @@
+We reference the pid file as being run/named/pid everywere else.
+
+--- bin/named/include/named/globals.h.orig 2018-01-04 05:35:08 UTC
++++ bin/named/include/named/globals.h
+@@ -136,7 +136,7 @@ EXTERN const char * ns_g_defaultsession
+ #if NS_RUN_PID_DIR
+ EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR
+ "/run/named/"
+- "named.pid");
++ "pid");
+ EXTERN const char * lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
+ "/run/lwresd/"
+ "lwresd.pid");
Property changes on: trunk/dns/bind910/files/patch-bin_named_include_named_globals.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in
===================================================================
--- trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in 2018-05-28 23:11:15 UTC (rev 23554)
+++ trunk/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in 2018-05-28 23:13:54 UTC (rev 23555)
@@ -1,6 +1,6 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig 2016-04-20 20:11:20 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig 2017-04-14 03:54:11 UTC
+++ bin/tests/system/dlzexternal/Makefile.in
-@@ -43,7 +43,7 @@ OBJS = ${DLOPENOBJS}
+@@ -39,7 +39,7 @@ OBJS =
@BIND9_MAKE_RULES@
CFLAGS = @CFLAGS@ @SO_CFLAGS@
@@ -7,5 +7,5 @@
-SO_LDFLAGS = @LDFLAGS@ @SO_LDFLAGS@
+SO_LDFLAGS = @SO_LDFLAGS@
- dlopen at EXEEXT@: ${DLOPENOBJS}
- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
+ driver. at SO@: ${SO_OBJS}
+ ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ driver. at O@
Modified: trunk/dns/bind910/files/patch-configure
===================================================================
--- trunk/dns/bind910/files/patch-configure 2018-05-28 23:11:15 UTC (rev 23554)
+++ trunk/dns/bind910/files/patch-configure 2018-05-28 23:13:54 UTC (rev 23555)
@@ -1,6 +1,6 @@
---- configure.orig 2016-04-20 20:11:20 UTC
+--- configure.orig 2018-03-08 20:55:52 UTC
+++ configure
-@@ -14142,27 +14142,9 @@ done
+@@ -14387,27 +14387,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@@ -20,7 +20,7 @@
- # -L/usr/local/lib to LIBS, which can make the
- # -lgssapi_krb5 test succeed with shared libraries even
- # when you are trying to build with KTH in /usr/lib.
-- if test "$use_gssapi" = "/usr"
+- if test "/usr" = "$use_gssapi"
- then
- LIBS="$TRY_LIBS"
- else
@@ -30,7 +30,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
$as_echo_n "checking linking as $TRY_LIBS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14205,47 +14187,7 @@ $as_echo "no" >&6; } ;;
+@@ -14450,47 +14432,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@@ -43,7 +43,7 @@
- # many times as it is the right thing. Something better
- # needs to be done.
- #
-- if test "$use_gssapi" = "/usr" -a \
+- if test "/usr" = "$use_gssapi" -a \
- -f /usr/local/lib/libkrb5.a; then
- FIX_KTH_VS_MIT=yes
- fi
@@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -21602,7 +21544,7 @@ $as_echo "" >&6; }
+@@ -22349,7 +22291,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
Modified: trunk/dns/bind910/pkg-plist
===================================================================
--- trunk/dns/bind910/pkg-plist 2018-05-28 23:11:15 UTC (rev 23554)
+++ trunk/dns/bind910/pkg-plist 2018-05-28 23:13:54 UTC (rev 23555)
@@ -126,6 +126,7 @@
include/isc/crc64.h
include/isc/dir.h
include/isc/entropy.h
+include/isc/errno.h
include/isc/error.h
include/isc/event.h
include/isc/eventclass.h
@@ -147,6 +148,7 @@
include/isc/lex.h
include/isc/lfsr.h
include/isc/lib.h
+include/isc/likely.h
include/isc/list.h
include/isc/log.h
include/isc/magic.h
@@ -245,7 +247,9 @@
include/pk11/internal.h
include/pk11/pk11.h
include/pk11/result.h
+include/pk11/site.h
include/pkcs11/cryptoki.h
+include/pkcs11/eddsa.h
include/pkcs11/pkcs11.h
include/pkcs11/pkcs11f.h
include/pkcs11/pkcs11t.h
@@ -379,7 +383,7 @@
%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
man/man8/rndc-confgen.8.gz
man/man8/rndc.8.gz
-sbin/arpaname
+bin/arpaname
sbin/ddns-confgen
%%PYTHON%%sbin/dnssec-checkds
%%PYTHON%%sbin/dnssec-coverage
@@ -399,7 +403,7 @@
sbin/named-checkzone
sbin/named-compilezone
sbin/named-journalprint
-sbin/named-rrchecker
+bin/named-rrchecker
sbin/nsec3hash
%%NATIVE_PKCS11%%sbin/pkcs11-destroy
%%NATIVE_PKCS11%%sbin/pkcs11-keygen
More information about the Midnightbsd-cvs
mailing list