svn commit: r340219 - in stable/12: contrib/unbound contrib/unbound/util libexec/rc libexec/rc/rc.d
Dag-Erling Smørgrav
des at FreeBSD.org
Wed Nov 7 16:22:21 UTC 2018
Author: des
Date: Wed Nov 7 16:22:18 2018
New Revision: 340219
URL: https://svnweb.freebsd.org/changeset/base/340219
Log:
MFH (r339812): add default value for local_unbound_tls
MFH (r339995): run unbound-anchor if root.key is empty (PR 232555)
MFH (r340037): turn off so-reuseport by default
Approved by: re (gjb)
Modified:
stable/12/contrib/unbound/config.h
stable/12/contrib/unbound/config.h.in
stable/12/contrib/unbound/configure
stable/12/contrib/unbound/configure.ac
stable/12/contrib/unbound/util/config_file.c
stable/12/libexec/rc/rc.conf
stable/12/libexec/rc/rc.d/local_unbound
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/contrib/unbound/config.h
==============================================================================
--- stable/12/contrib/unbound/config.h Wed Nov 7 15:04:41 2018 (r340218)
+++ stable/12/contrib/unbound/config.h Wed Nov 7 16:22:18 2018 (r340219)
@@ -664,6 +664,9 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
+/* if REUSEPORT is enabled by default */
+#define REUSEPORT_DEFAULT 0
+
/* default rootkey location */
#define ROOT_ANCHOR_FILE "/var/unbound/root.key"
Modified: stable/12/contrib/unbound/config.h.in
==============================================================================
--- stable/12/contrib/unbound/config.h.in Wed Nov 7 15:04:41 2018 (r340218)
+++ stable/12/contrib/unbound/config.h.in Wed Nov 7 16:22:18 2018 (r340219)
@@ -663,6 +663,9 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
+/* if REUSEPORT is enabled by default */
+#undef REUSEPORT_DEFAULT
+
/* default rootkey location */
#undef ROOT_ANCHOR_FILE
Modified: stable/12/contrib/unbound/configure
==============================================================================
--- stable/12/contrib/unbound/configure Wed Nov 7 15:04:41 2018 (r340218)
+++ stable/12/contrib/unbound/configure Wed Nov 7 16:22:18 2018 (r340219)
@@ -15966,6 +15966,17 @@ fi
done
+# check if we can use SO_REUSEPORT
+if echo "$host" | grep -i -e linux -e dragonfly >/dev/null; then
+
+$as_echo "#define REUSEPORT_DEFAULT 1" >>confdefs.h
+
+else
+
+$as_echo "#define REUSEPORT_DEFAULT 0" >>confdefs.h
+
+fi
+
# set memory allocation checking if requested
# Check whether --enable-alloc-checks was given.
if test "${enable_alloc_checks+set}" = set; then :
Modified: stable/12/contrib/unbound/configure.ac
==============================================================================
--- stable/12/contrib/unbound/configure.ac Wed Nov 7 15:04:41 2018 (r340218)
+++ stable/12/contrib/unbound/configure.ac Wed Nov 7 16:22:18 2018 (r340219)
@@ -461,6 +461,13 @@ ACX_CHECK_NONBLOCKING_BROKEN
ACX_MKDIR_ONE_ARG
AC_CHECK_FUNCS([strptime],[AC_CHECK_STRPTIME_WORKS],[AC_LIBOBJ([strptime])])
+# check if we can use SO_REUSEPORT
+if echo "$host" | grep -i -e linux -e dragonfly >/dev/null; then
+ AC_DEFINE(REUSEPORT_DEFAULT, 1, [if REUSEPORT is enabled by default])
+else
+ AC_DEFINE(REUSEPORT_DEFAULT, 0, [if REUSEPORT is enabled by default])
+fi
+
# set memory allocation checking if requested
AC_ARG_ENABLE(alloc-checks, AC_HELP_STRING([--enable-alloc-checks],
[ enable to memory allocation statistics, for debug purposes ]),
Modified: stable/12/contrib/unbound/util/config_file.c
==============================================================================
--- stable/12/contrib/unbound/util/config_file.c Wed Nov 7 15:04:41 2018 (r340218)
+++ stable/12/contrib/unbound/util/config_file.c Wed Nov 7 16:22:18 2018 (r340219)
@@ -177,7 +177,7 @@ config_create(void)
cfg->if_automatic = 0;
cfg->so_rcvbuf = 0;
cfg->so_sndbuf = 0;
- cfg->so_reuseport = 1;
+ cfg->so_reuseport = REUSEPORT_DEFAULT;
cfg->ip_transparent = 0;
cfg->ip_freebind = 0;
cfg->num_ifs = 0;
Modified: stable/12/libexec/rc/rc.conf
==============================================================================
--- stable/12/libexec/rc/rc.conf Wed Nov 7 15:04:41 2018 (r340218)
+++ stable/12/libexec/rc/rc.conf Wed Nov 7 16:22:18 2018 (r340219)
@@ -283,8 +283,9 @@ hastd_enable="NO" # Run the HAST daemon (YES/NO).
hastd_program="/sbin/hastd" # path to hastd, if you want a different one.
hastd_flags="" # Optional flags to hastd.
ctld_enable="NO" # CAM Target Layer / iSCSI target daemon.
-local_unbound_enable="NO" # local caching resolver
-blacklistd_enable="NO" # Run blacklistd daemon (YES/NO).
+local_unbound_enable="NO" # Local caching resolver
+local_unbound_tls="NO" # Use DNS over TLS
+blacklistd_enable="NO" # Run blacklistd daemon (YES/NO).
blacklistd_flags="" # Optional flags for blacklistd(8).
resolv_enable="YES" # Enable resolv / resolvconf
Modified: stable/12/libexec/rc/rc.d/local_unbound
==============================================================================
--- stable/12/libexec/rc/rc.d/local_unbound Wed Nov 7 15:04:41 2018 (r340218)
+++ stable/12/libexec/rc/rc.d/local_unbound Wed Nov 7 16:22:18 2018 (r340219)
@@ -92,7 +92,7 @@ local_unbound_prestart()
fi
# Retrieve DNSSEC root key
- if [ ! -f ${local_unbound_anchor} ] ; then
+ if [ ! -s ${local_unbound_anchor} ] ; then
run_rc_command anchor
fi
}
More information about the svn-src-stable
mailing list