diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile index 20a956703fb7..f7aeaf99c539 100644 --- a/net/powerdns-recursor/Makefile +++ b/net/powerdns-recursor/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2020/01/18 21:50:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.35 2020/03/17 19:07:29 adam Exp $ -DISTNAME= pdns-recursor-4.1.12 +DISTNAME= pdns-recursor-4.3.0 PKGNAME= ${DISTNAME:S/pdns/powerdns/} -PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.powerdns.com/releases/ EXTRACT_SUFX= .tar.bz2 @@ -23,8 +22,6 @@ RCD_SCRIPTS+= pdns_recursor EGDIR= ${PREFIX}/share/examples/pdns-recursor -PTHREAD_AUTO_VARS= yes - INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} CONF_FILES+= ${EGDIR}/recursor.conf-dist \ diff --git a/net/powerdns-recursor/distinfo b/net/powerdns-recursor/distinfo index 7f83e5001768..1387cec4a076 100644 --- a/net/powerdns-recursor/distinfo +++ b/net/powerdns-recursor/distinfo @@ -1,16 +1,12 @@ -$NetBSD: distinfo,v 1.29 2019/04/25 18:44:36 adam Exp $ +$NetBSD: distinfo,v 1.30 2020/03/17 19:07:29 adam Exp $ -SHA1 (pdns-recursor-4.1.12.tar.bz2) = aaecc9ab4ce403be623b9eb6a76841b8b363272e -RMD160 (pdns-recursor-4.1.12.tar.bz2) = 7348ed96bf70193fce1f3cbab53b4e90259a25ec -SHA512 (pdns-recursor-4.1.12.tar.bz2) = d228976937ede7e9f6b3375e573f5b436d9df7ae246e411b13acb095a1a58f12173b663acc364ce0fbdcc61b3d5522e101472a88da8f044e44541564f9915d9e -Size (pdns-recursor-4.1.12.tar.bz2) = 1245110 bytes -SHA1 (patch-configure) = 5c91dcbc43a51bf30af200e234f18eb9b7458e6f +SHA1 (pdns-recursor-4.3.0.tar.bz2) = 8801c9ea575aa3bd88d793c252891d43ac529d31 +RMD160 (pdns-recursor-4.3.0.tar.bz2) = 9da059ca48866b31c577ea6b5a5ffd0cf9a08842 +SHA512 (pdns-recursor-4.3.0.tar.bz2) = 6ba4721f502e1e483d04e8d8cafa35d1cc088c6b3c73120a0cc90ff9c8e8f495a1591e01f0daf30d00f020e3aa06b1cf092ed6b8a0786070c307a6564812c085 +Size (pdns-recursor-4.3.0.tar.bz2) = 1349359 bytes SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68 SHA1 (patch-ext_json11_json11.cpp) = 2de8ea8b51556bd3e3c1a88f681697eff239ab1a -SHA1 (patch-iputils.cc) = af5fa3942b34ac5e83326aa454ce14793130a4ad SHA1 (patch-iputils.hh) = 9de7c58db7468da9fd2a175464becdbe339fac9d -SHA1 (patch-kqueuemplexer.cc) = ff1685111c98c085e74bd64f27dfaae6fbe1e8b3 -SHA1 (patch-m4_pdns__check__os.m4) = 0e23d942944ad752fbbc0029745789ce47744628 SHA1 (patch-portsmplexer.cc) = b4d447d88d9f2a4e9c0dffb40a41a0e5fde7255a SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2 -SHA1 (patch-version.cc) = 117d440f16c9095c03e28b305b85e03ea6e65c8a +SHA1 (patch-version.cc) = 26226a02198edd9d8890a5199ee5a8051334fe41 diff --git a/net/powerdns-recursor/patches/patch-configure b/net/powerdns-recursor/patches/patch-configure deleted file mode 100644 index da96ff930968..000000000000 --- a/net/powerdns-recursor/patches/patch-configure +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-configure,v 1.3 2018/01/02 12:23:55 fhajny Exp $ - -Regen after excluding -latomic test on NetBSD. - ---- configure.orig 2017-12-04 12:51:13.000000000 +0000 -+++ configure -@@ -15944,9 +15944,14 @@ else - fi - - -- case "$host" in -- mips* | powerpc-* ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5 -+ case "$host_os" in -+ netbsd*) -+ : # no -latomic -+ ;; -+ *) -+ case "$host" in -+ mips* | powerpc-* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5 - $as_echo_n "checking whether the linker accepts -latomic... " >&6; } - LDFLAGS="-latomic $LDFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -15968,7 +15973,9 @@ else - - fi - rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ conftest$ac_exeext conftest.$ac_ext -+ ;; -+ esac - ;; - esac - diff --git a/net/powerdns-recursor/patches/patch-iputils.cc b/net/powerdns-recursor/patches/patch-iputils.cc deleted file mode 100644 index d1460a7de0c5..000000000000 --- a/net/powerdns-recursor/patches/patch-iputils.cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-iputils.cc,v 1.1 2019/02/20 12:19:44 adam Exp $ - -Fix buildling. - ---- iputils.cc.orig 2019-02-20 10:50:10.609217278 +0000 -+++ iputils.cc -@@ -146,7 +146,7 @@ bool HarvestTimestamp(struct msghdr* msg - bool HarvestDestinationAddress(const struct msghdr* msgh, ComboAddress* destination) - { - destination->reset(); -- const struct cmsghdr* cmsg; -+ struct cmsghdr* cmsg; - for (cmsg = CMSG_FIRSTHDR(msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(const_cast(msgh), const_cast(cmsg))) { - #if defined(IP_PKTINFO) - if ((cmsg->cmsg_level == IPPROTO_IP) && (cmsg->cmsg_type == IP_PKTINFO)) { diff --git a/net/powerdns-recursor/patches/patch-kqueuemplexer.cc b/net/powerdns-recursor/patches/patch-kqueuemplexer.cc deleted file mode 100644 index ab28b888e075..000000000000 --- a/net/powerdns-recursor/patches/patch-kqueuemplexer.cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-kqueuemplexer.cc,v 1.4 2018/01/02 12:23:55 fhajny Exp $ - -kqueue systems normally have sys/event.h - ---- kqueuemplexer.cc.orig 2017-12-04 12:51:03.000000000 +0000 -+++ kqueuemplexer.cc -@@ -28,9 +28,7 @@ - #include - #include "misc.hh" - #include --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include --#endif - #include - - #include "namespaces.hh" diff --git a/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4 b/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4 deleted file mode 100644 index 83e6208e3ce4..000000000000 --- a/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4 +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-m4_pdns__check__os.m4,v 1.3 2018/01/02 12:23:55 fhajny Exp $ - -Don't insist on -latomic on mips & powerpc if on NetBSD. - ---- m4/pdns_check_os.m4.orig 2017-12-04 12:51:03.000000000 +0000 -+++ m4/pdns_check_os.m4 -@@ -35,14 +35,21 @@ AC_DEFUN([PDNS_CHECK_OS],[ - AM_CONDITIONAL([HAVE_LINUX], [test "x$have_linux" = "xyes"]) - AM_CONDITIONAL([HAVE_SOLARIS], [test "x$have_solaris" = "xyes"]) - -- case "$host" in -- mips* | powerpc-* ) -- AC_MSG_CHECKING([whether the linker accepts -latomic]) -- LDFLAGS="-latomic $LDFLAGS" -- AC_LINK_IFELSE([m4_default([],[AC_LANG_PROGRAM()])], -- [AC_MSG_RESULT([yes])], -- [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])] -- ) -+ case "$host_os" in -+ netbsd*) -+ : # no -latomic -+ ;; -+ *) -+ case "$host" in -+ mips* | powerpc-* ) -+ AC_MSG_CHECKING([whether the linker accepts -latomic]) -+ LDFLAGS="-latomic $LDFLAGS" -+ AC_LINK_IFELSE([m4_default([],[AC_LANG_PROGRAM()])], -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])] -+ ) -+ ;; -+ esac - ;; - esac - diff --git a/net/powerdns-recursor/patches/patch-version.cc b/net/powerdns-recursor/patches/patch-version.cc index 37e3e11b877b..2cec8fd9c6b4 100644 --- a/net/powerdns-recursor/patches/patch-version.cc +++ b/net/powerdns-recursor/patches/patch-version.cc @@ -1,20 +1,15 @@ -$NetBSD: patch-version.cc,v 1.1 2017/07/03 13:02:38 joerg Exp $ +$NetBSD: patch-version.cc,v 1.2 2020/03/17 19:07:29 adam Exp $ -Don't include build time noise. +Do not store configure args, as they contain workdir references. ---- version.cc.orig 2017-07-03 00:20:50.928274609 +0000 +--- version.cc.orig 2020-03-17 17:04:42.000000000 +0000 +++ version.cc -@@ -108,13 +108,6 @@ void showBuildConfiguration() +@@ -145,7 +145,7 @@ void showBuildConfiguration() // Auth only - theL()<