diff -ruN powerdns~recursor/Makefile powerdns-recursor/Makefile --- powerdns~recursor/Makefile 2020-03-07 03:16:13.881494000 -0500 +++ powerdns-recursor/Makefile 2020-03-07 03:16:14.158978000 -0500 @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= recursor -DISTVERSION= 4.2.1 +DISTVERSION= 4.3.0 CATEGORIES= dns MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- @@ -32,22 +32,19 @@ --with-protobuf \ --without-net-snmp +USERS= pdns_recursor +GROUPS= pdns + SUB_FILES= pkg-message -OPTIONS_DEFINE= LUAJIT SETUID -OPTIONS_DEFAULT= SETUID +OPTIONS_DEFINE= LUAJIT LUAJIT_DESC= Use LuaJIT instead of Lua -SETUID_DESC= Run as pdns_recursor user LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit-openresty LUAJIT_USES_OFF= lua LUAJIT_CONFIGURE_ON= --with-lua=luajit -SETUID_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-setuid -SETUID_VARS= GROUPS=pdns \ - USERS=pdns_recursor - .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl @@ -56,5 +53,8 @@ LIB_DEPENDS+= libdecaf.so:security/libdecaf \ libsodium.so:security/libsodium .endif + +post-install: + @${MKDIR} ${STAGEDIR}/var/run/pdns-recursor .include diff -ruN powerdns~recursor/distinfo powerdns-recursor/distinfo --- powerdns~recursor/distinfo 2020-03-07 03:16:13.881586000 -0500 +++ powerdns-recursor/distinfo 2020-03-07 03:16:14.159134000 -0500 @@ -1,3 +1,3 @@ -TIMESTAMP = 1575887223 -SHA256 (pdns-recursor-4.2.1.tar.bz2) = 8d8c3235cc5281f0fc51946129f22758778f4c50bfda095d5856feb4c756891f -SIZE (pdns-recursor-4.2.1.tar.bz2) = 1318022 +TIMESTAMP = 1583454090 +SHA256 (pdns-recursor-4.3.0.tar.bz2) = 2bc130f287dfdb32e03d0b38a4ac24baf1117f96eca9b407611c847fa08a628f +SIZE (pdns-recursor-4.3.0.tar.bz2) = 1349359 diff -ruN powerdns~recursor/files/extrapatch-setuid powerdns-recursor/files/extrapatch-setuid --- powerdns~recursor/files/extrapatch-setuid 2020-03-07 03:16:13.881726000 -0500 +++ powerdns-recursor/files/extrapatch-setuid 1969-12-31 19:00:00.000000000 -0500 @@ -1,13 +0,0 @@ ---- pdns_recursor.cc.orig 2017-12-11 13:13:52.274237000 +0100 -+++ pdns_recursor.cc 2017-12-11 13:18:42.339569000 +0100 -@@ -3325,8 +3325,8 @@ - ::arg().set("log-timestamp","Print timestamps in log lines, useful to disable when running with a tool that timestamps stdout already")="yes"; - ::arg().set("log-common-errors","If we should log rather common errors")="no"; - ::arg().set("chroot","switch to chroot jail")=""; -- ::arg().set("setgid","If set, change group id to this gid for more security")=""; -- ::arg().set("setuid","If set, change user id to this uid for more security")=""; -+ ::arg().set("setgid","If set, change group id to this gid for more security")="pdns"; -+ ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor"; - ::arg().set("network-timeout", "Wait this number of milliseconds for network i/o")="1500"; - ::arg().set("threads", "Launch this number of threads")="2"; - ::arg().set("processes", "Launch this number of processes (EXPERIMENTAL, DO NOT CHANGE)")="1"; // if we un-experimental this, need to fix openssl rand seeding for multiple PIDs! diff -ruN powerdns~recursor/files/patch-configure powerdns-recursor/files/patch-configure --- powerdns~recursor/files/patch-configure 2020-03-07 03:16:13.881821000 -0500 +++ powerdns-recursor/files/patch-configure 2020-03-07 03:16:14.159308000 -0500 @@ -1,6 +1,6 @@ ---- configure.orig 2019-05-17 10:25:29 UTC -+++ configure -@@ -19350,8 +19350,10 @@ fi +--- configure.orig 2020-03-02 07:50:20.000000000 -0500 ++++ configure 2020-03-02 07:50:20.000000000 -0500 +@@ -21139,8 +21139,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/crypto.h in $ssldir" >&5 $as_echo_n "checking for openssl/crypto.h in $ssldir... " >&6; } if test -f "$ssldir/include/openssl/crypto.h"; then diff -ruN powerdns~recursor/files/patch-dns_random.cc powerdns-recursor/files/patch-dns_random.cc --- powerdns~recursor/files/patch-dns_random.cc 1969-12-31 19:00:00.000000000 -0500 +++ powerdns-recursor/files/patch-dns_random.cc 2020-03-07 03:16:13.881135000 -0500 @@ -0,0 +1,12 @@ +--- dns_random.cc.orig 2018-11-29 12:53:42 UTC ++++ dns_random.cc +@@ -40,7 +40,9 @@ + #include + #endif + #if defined(HAVE_GETRANDOM) ++extern "C" { + #include ++} + #endif + + static enum DNS_RNG { diff -ruN powerdns~recursor/files/patch-dnsname.hh powerdns-recursor/files/patch-dnsname.hh --- powerdns~recursor/files/patch-dnsname.hh 2020-03-07 03:16:13.881908000 -0500 +++ powerdns-recursor/files/patch-dnsname.hh 2020-03-07 03:16:14.159465000 -0500 @@ -1,6 +1,6 @@ ---- dnsname.hh.orig 2019-01-31 19:43:44 UTC -+++ dnsname.hh -@@ -30,7 +30,7 @@ +--- dnsname.hh.orig 2020-03-02 07:49:54.000000000 -0500 ++++ dnsname.hh 2020-03-02 07:49:54.000000000 -0500 +@@ -33,7 +33,7 @@ #include // it crashes on OSX and doesn't compile on OpenBSD @@ -9,7 +9,7 @@ #include #endif -@@ -135,7 +135,7 @@ class DNSName (public) +@@ -138,7 +138,7 @@ inline bool canonCompare(const DNSName& rhs) const; bool slowCanonCompare(const DNSName& rhs) const; diff -ruN powerdns~recursor/files/patch-pdns_dns__random.cc powerdns-recursor/files/patch-pdns_dns__random.cc --- powerdns~recursor/files/patch-pdns_dns__random.cc 2020-03-07 03:16:13.881970000 -0500 +++ powerdns-recursor/files/patch-pdns_dns__random.cc 1969-12-31 19:00:00.000000000 -0500 @@ -1,12 +0,0 @@ ---- dns_random.cc.orig 2018-11-29 12:53:42 UTC -+++ dns_random.cc -@@ -40,7 +40,9 @@ - #include - #endif - #if defined(HAVE_GETRANDOM) -+extern "C" { - #include -+} - #endif - - static enum DNS_RNG { diff -ruN powerdns~recursor/files/patch-pdns_recursor.cc powerdns-recursor/files/patch-pdns_recursor.cc --- powerdns~recursor/files/patch-pdns_recursor.cc 1969-12-31 19:00:00.000000000 -0500 +++ powerdns-recursor/files/patch-pdns_recursor.cc 2020-03-07 03:16:13.881281000 -0500 @@ -0,0 +1,17 @@ +--- pdns_recursor.cc.orig 2020-03-02 07:49:54.000000000 -0500 ++++ pdns_recursor.cc 2020-03-02 07:49:54.000000000 -0500 +@@ -4639,12 +4639,12 @@ + #define SYSTEMD_SETID_MSG ". When running inside systemd, use the User and Group settings in the unit-file!" + SYSTEMD_SETID_MSG + #endif +- )=""; ++ )="pdns"; + ::arg().set("setuid","If set, change user id to this uid for more security" + #ifdef HAVE_SYSTEMD + SYSTEMD_SETID_MSG + #endif +- )=""; ++ )="pdns_recursor"; + ::arg().set("network-timeout", "Wait this number of milliseconds for network i/o")="1500"; + ::arg().set("threads", "Launch this number of threads")="2"; + ::arg().set("distributor-threads", "Launch this number of distributor threads, distributing queries to other threads")="0"; diff -ruN powerdns~recursor/files/pdns-recursor.in powerdns-recursor/files/pdns-recursor.in --- powerdns~recursor/files/pdns-recursor.in 2020-03-07 03:16:13.882068000 -0500 +++ powerdns-recursor/files/pdns-recursor.in 2020-03-07 03:16:14.159631000 -0500 @@ -4,8 +4,8 @@ # # PROVIDE: pdns_recursor -# REQUIRE: SERVERS cleanvar -# BEFORE: DAEMON +# REQUIRE: NETWORKING +# BEFORE: SERVERS # KEYWORD: shutdown # @@ -22,16 +22,15 @@ name=pdns_recursor rcvar=pdns_recursor_enable -command=%%PREFIX%%/sbin/pdns_recursor -command_args="--daemon=yes" +load_rc_config ${name} -# set defaults - pdns_recursor_enable=${pdns_recursor_enable:-"NO"} pdns_recursor_conf=${pdns_recursor_conf:-"%%PREFIX%%/etc/pdns/recursor.conf"} +required_files=${pdns_recursor_conf} -load_rc_config ${name} +pidfile=/var/run/pdns-recursor/${name}.pid -required_files=${pdns_recursor_conf} +command=%%PREFIX%%/sbin/${name} +command_args="--daemon" run_rc_command "$1" diff -ruN powerdns~recursor/files/pkg-message.in powerdns-recursor/files/pkg-message.in --- powerdns~recursor/files/pkg-message.in 2020-03-07 03:16:13.882160000 -0500 +++ powerdns-recursor/files/pkg-message.in 2020-03-07 03:16:14.159799000 -0500 @@ -1,8 +1,9 @@ [ { type: install message: <