Index: head/dns/dnsdist/Makefile =================================================================== --- head/dns/dnsdist/Makefile (revision 551266) +++ head/dns/dnsdist/Makefile (revision 551267) @@ -1,95 +1,94 @@ # Created by: Carlos J Puga Medina # $FreeBSD$ PORTNAME= dnsdist -DISTVERSION= 1.5.0 -PORTREVISION= 1 +DISTVERSION= 1.5.1 CATEGORIES= dns net MASTER_SITES= https://downloads.powerdns.com/releases/ MAINTAINER= tremere@cainites.net COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer LICENSE= GPLv2 UNLICENSE LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ libh2o-evloop.so:www/h2o \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 \ libsodium.so:security/libsodium USES= bison:alias compiler:c++14-lang cpe gmake libedit libtool \ localbase pkgconfig tar:bz2 USE_RC_SUBR= dnsdist GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ --enable-dns-over-https \ --enable-dns-over-tls \ --enable-dnscrypt \ --sysconfdir=${ETCDIR} \ --with-libsodium \ --with-re2 INSTALL_TARGET= install-strip USERS= _dnsdist GROUPS= _dnsdist OPTIONS_DEFINE= DNSTAP SNMP OPTIONS_DEFAULT= CDB GNUTLS LMDB LUA OPENSSL OPTIONS_GROUP= KSVOPT OPTIONS_GROUP_KSVOPT= CDB LMDB OPTIONS_MULTI= TLS OPTIONS_MULTI_TLS= GNUTLS OPENSSL OPTIONS_SINGLE= EXTLUA OPTIONS_SINGLE_EXTLUA= LUA LUAJIT LUAJITOR CDB_DESC= CDB backend DNSTAP_DESC= dnstap support (see dnstap.info) KSVOPT_DESC= Key Value Stores LMDB_DESC= LMDB backend LUAJITOR_DESC= Use lang/luajit-openresty LUAJIT_DESC= Use lang/luajit LUA_DESC= Use lang/lua CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb CDB_CONFIGURE_ON= CDB_CFLAGS="-I${LOCALBASE}/include" \ CDB_LIBS="-L${LOCALBASE}/lib -lcdb" DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm DNSTAP_CONFIGURE_ENABLE= fstrm GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb LMDB_CONFIGURE_ON= --with-lmdb=${LOCALBASE} LMDB_CONFIGURE_OFF= --without-lmdb LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUAJITOR_CONFIGURE_ON= --with-lua=luajit LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_CONFIGURE_ON= --with-lua=luajit LUA_USES= lua LUA_CONFIGURE_ON= --with-lua=lua-${LUA_VER} OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= LIBSSL_CFLAGS=-I${OPENSSLINC} \ LIBSSL_LIBS="-L${OPENSSLLIB} -lssl" OPENSSL_CONFIGURE_WITH= libssl SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_WITH= net-snmp post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample ${STAGEDIR}${ETCDIR} .include Index: head/dns/dnsdist/distinfo =================================================================== --- head/dns/dnsdist/distinfo (revision 551266) +++ head/dns/dnsdist/distinfo (revision 551267) @@ -1,3 +1,3 @@ -TIMESTAMP = 1596123185 -SHA256 (dnsdist-1.5.0.tar.bz2) = 2c07c4ef0c497f5223909ff181fe3ba7c6016962a2855cffe26b7f3609f27b58 -SIZE (dnsdist-1.5.0.tar.bz2) = 1067645 +TIMESTAMP = 1601542484 +SHA256 (dnsdist-1.5.1.tar.bz2) = cae759729a87703f4d09b0ed4227cb224aaaa252fa92f2432fd7116f560afbf1 +SIZE (dnsdist-1.5.1.tar.bz2) = 1068061 Index: head/dns/dnsdist/files/patch-dnsdist-console.cc =================================================================== --- head/dns/dnsdist/files/patch-dnsdist-console.cc (revision 551266) +++ head/dns/dnsdist/files/patch-dnsdist-console.cc (nonexistent) @@ -1,14 +0,0 @@ -Backport of: - https://github.com/PowerDNS/pdns/commit/e7c6996eb650d17372548899408160bb2d712511 - ---- dnsdist-console.cc.orig 2020-08-28 19:39:07 UTC -+++ dnsdist-console.cc -@@ -526,7 +526,7 @@ const std::vector g_consoleKeywords{ - { "setMaxTCPQueriesPerConnection", true, "n", "set the maximum number of queries in an incoming TCP connection. 0 means unlimited" }, - { "setMaxTCPQueuedConnections", true, "n", "set the maximum number of TCP connections queued (waiting to be picked up by a client thread)" }, - { "setMaxUDPOutstanding", true, "n", "set the maximum number of outstanding UDP queries to a given backend server. This can only be set at configuration time and defaults to 65535" }, -- { "SetNegativeAndSOAAction", "true", "nxd, zone, ttl, mname, rname, serial, refresh, retry, expire, minimum [, options]", "Turn a query into a NXDomain or NoData answer and sets a SOA record in the additional section" }, -+ { "SetNegativeAndSOAAction", true, "nxd, zone, ttl, mname, rname, serial, refresh, retry, expire, minimum [, options]", "Turn a query into a NXDomain or NoData answer and sets a SOA record in the additional section" }, - { "setPayloadSizeOnSelfGeneratedAnswers", true, "payloadSize", "set the UDP payload size advertised via EDNS on self-generated responses" }, - { "setPoolServerPolicy", true, "policy, pool", "set the server selection policy for this pool to that policy" }, - { "setPoolServerPolicyLua", true, "name, func, pool", "set the server selection policy for this pool to one named 'name' and provided by 'function'" }, Property changes on: head/dns/dnsdist/files/patch-dnsdist-console.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/dnsdist/files/dnsdist.in =================================================================== --- head/dns/dnsdist/files/dnsdist.in (revision 551266) +++ head/dns/dnsdist/files/dnsdist.in (revision 551267) @@ -1,97 +1,98 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: dnsdist -# REQUIRE: DAEMON NETWORKING +# REQUIRE: FILESYSTEMS defaultroute netwait resolv +# BEFORE: NETWORKING # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable dnsdist: # # dnsdist_enable="YES" # # Multiple profiles are supported with # # dnsdist_profiles="name1 name2" # dnsdist_name1_enable="YES" # dnsdist_name1_config="/path/to/config1" # dnsdist_name2_enable="YES" # dnsdist_name2_config="/path/to/config2" # # This script does't validate uid/gid per profile (yet) # It still uses the default or definition of # dnsdist_priv_user and/or dnsdist_priv_group # . /etc/rc.subr desc="dnsdist is a powerful, scriptable DNS loadbalancer" name=dnsdist rcvar=dnsdist_enable load_rc_config ${name} : ${dnsdist_enable:=NO} : ${dnsdist_config:=%%ETCDIR%%/dnsdist.conf} : ${dnsdist_priv_user:=_dnsdist} : ${dnsdist_priv_group:=_dnsdist} pidfile="/var/run/${name}.pid" required_files=${dnsdist_config} actual_command="%%PREFIX%%/sbin/${name} -C ${dnsdist_config} -u ${dnsdist_priv_user} -g ${dnsdist_priv_group} --supervised" command=/usr/sbin/daemon command_args="-c -f -r -P ${pidfile} -- ${actual_command}" if [ -n "$2" ]; then profile="$2" if [ "x${dnsdist_profiles}" != "x" ]; then eval dnsdist_config="\${dnsdist_${profile}_config:-%%ETCDIR%%/dnsdist-${profile}.conf}" if [ "x${dnsdist_config}" = "x" ]; then echo "You must define a configuration file (dnsdist_${profile}_config)" >&2 exit 1 fi eval dnsdist_enable="\${dnsdist_${profile}_enable:-${dnsdist_enable}}" pidfile="/var/run/${name}-${profile}.pid" required_files="${dnsdist_config}" actual_command="%%PREFIX%%/sbin/${name} -C ${dnsdist_config} -u ${dnsdist_priv_user} -g ${dnsdist_priv_group} --supervised" command_args="-c -f -r -P ${pidfile} -- ${actual_command}" else echo "$0: extra argument ignored" >&2 fi else if [ "x${dnsdist_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${dnsdist_profiles}; do eval _enable="\${dnsdist_${profile}_enable}" case "x${_enable:-${dnsdist_enable}}" in x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) continue ;; x[Yy][Ee][Ss]) ;; *) if test -z "$_enable"; then _var=dnsdist_enable else _var=dnsdist_"${profile}"_enable fi echo "Bad value" \ "'${_enable:-${dnsdist_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." >&2 continue ;; esac echo "===> dnsdist profile: ${profile}" >&2 %%PREFIX%%/etc/rc.d/dnsdist $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" fi done exit 0 fi fi run_rc_command "$1"