CVS commit: pkgsrc/net/powerdns-recursor

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Tue Jan  2 12:23:55 UTC 2018

Modified Files:
        pkgsrc/net/powerdns-recursor: Makefile distinfo
        pkgsrc/net/powerdns-recursor/patches: patch-configure
            patch-kqueuemplexer.cc patch-m4_pdns__check__os.m4
Added Files:
        pkgsrc/net/powerdns-recursor/patches: patch-portsmplexer.cc
Removed Files:
        pkgsrc/net/powerdns-recursor: options.mk

Log Message:
Update net/powerdns-recursor to 4.1.0.
Lua support no longer optional.

PowerDNS Recursor 4.1.0
===========================================================

- Improved DNSSEC support
- Improved documentation
- Improved RPZ support
- Improved EDNS Client Subnet support
- Support for Botan 2.x (and removal of support for Botan 1.10)
- SNMP support
- Lua engine has gained access to more parts of the recursor
- CPU affinity can now be specified
- TCP Fast Open support
- New performance metrics

Full changelog:

  https://doc.powerdns.com/recursor/changelog/4.1.html

PowerDNS Recursor 4.0.7
===========================================================

- Insufficient validation of DNSSEC signatures (CVE-2017-15090)
- Cross-Site Scripting in the web interface (CVE-2017-15092)
- Configuration file injection in the API (CVE-2017-15093)
- Memory leak in DNSSEC parsing (CVE-2017-15094)

Bug fixes
- Update rec_control manpage
- Check in the detected OpenSSL/libcrypto for ECDSA
- Make more specific Netmasks < to less specific ones
- Fix validation at the exact RRSIG inception or expiration time
- Lowercase all outgoing qnames when lowercase-outgoing is set
- Fix libatomic detection on ppc64
- Edit configname definition to include the 'config-name' argument

Improvements
- Extract nested exception from Luawrapper
- Use explicit yes for default-enabled settings
- Throw an error when lua-conf-file can't be loaded
- get-remote-ring's "other" report should only have two items.
- PowerDNS sdig does not truncate trailing bits of EDNS Client Subnet
  mask
- Only increase no-packet-error on the first read
- Add support for Botan 2.x
- Add more information to recursor cache dumps
- Fix typo in two log messages
- Add help text on autodetecting systemd support
- Be more resilient with broken auths
- Remove pdns.PASS and pdns.TRUNCATE
- Improve dnsbulktest experience in travis for more robustness
- Create socket-dir from init-script
- b.root renumbering, effective 2017-10-24
- Don't retry security polling too often when it fails


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/powerdns-recursor/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/powerdns-recursor/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/net/powerdns-recursor/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/powerdns-recursor/patches/patch-configure \
    pkgsrc/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/powerdns-recursor/patches/patch-kqueuemplexer.cc
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/powerdns-recursor/Makefile
diff -u pkgsrc/net/powerdns-recursor/Makefile:1.25 pkgsrc/net/powerdns-recursor/Makefile:1.26
--- pkgsrc/net/powerdns-recursor/Makefile:1.25  Sun Sep  3 08:53:13 2017
+++ pkgsrc/net/powerdns-recursor/Makefile       Tue Jan  2 12:23:55 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2017/09/03 08:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/01/02 12:23:55 fhajny Exp $
 #
 
-DISTNAME=              pdns-recursor-4.0.6
+DISTNAME=              pdns-recursor-4.1.0
 CATEGORIES=            net
 MASTER_SITES=          http://downloads.powerdns.com/releases/
 EXTRACT_SUFX=          .tar.bz2
@@ -31,9 +31,8 @@ CONF_FILES+=          ${EGDIR}/recursor.conf-dis
 CXXFLAGS+=     -Wno-c++11-narrowing
 .endif
 
-.include "options.mk"
-
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/powerdns-recursor/distinfo
diff -u pkgsrc/net/powerdns-recursor/distinfo:1.21 pkgsrc/net/powerdns-recursor/distinfo:1.22
--- pkgsrc/net/powerdns-recursor/distinfo:1.21  Wed Aug  2 20:15:42 2017
+++ pkgsrc/net/powerdns-recursor/distinfo       Tue Jan  2 12:23:55 2018
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.21 2017/08/02 20:15:42 fhajny Exp $
+$NetBSD: distinfo,v 1.22 2018/01/02 12:23:55 fhajny Exp $
 
-SHA1 (pdns-recursor-4.0.6.tar.bz2) = 70c27e604841f833000416e9f06835ee92fd3616
-RMD160 (pdns-recursor-4.0.6.tar.bz2) = 93aeaaa2b26834f0a2cbea7421b6fe01a82d048e
-SHA512 (pdns-recursor-4.0.6.tar.bz2) = 2203fd96469deded1da677344485da221eec036b1ad9fb418a89cd4477d73f2a6fcf984a39b574561df6946f440ddf1982de20cd39d7204da9c27e74216d1159
-Size (pdns-recursor-4.0.6.tar.bz2) = 1105423 bytes
-SHA1 (patch-configure) = aba2ac9f8e28dc16e9f94b2d91ff0d81be07b287
+SHA1 (pdns-recursor-4.1.0.tar.bz2) = b7a5ed70f55c9269b65b2403d1d56a2ee43d0c28
+RMD160 (pdns-recursor-4.1.0.tar.bz2) = a8b8c0f7e46cf2841ae25f6ac406bf555260c583
+SHA512 (pdns-recursor-4.1.0.tar.bz2) = 1e4d70f3794005c3f45b2ec0ab580c3697e7de3096f3378b9b9d1cd53f10f95e577522ca9f634eb235b166f007e8a2bfa99f312ddf19f266ad4bb0965167fd7c
+Size (pdns-recursor-4.1.0.tar.bz2) = 1222751 bytes
+SHA1 (patch-configure) = 5c91dcbc43a51bf30af200e234f18eb9b7458e6f
 SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68
 SHA1 (patch-ext_json11_json11.cpp) = 2de8ea8b51556bd3e3c1a88f681697eff239ab1a
 SHA1 (patch-iputils.hh) = 9de7c58db7468da9fd2a175464becdbe339fac9d
-SHA1 (patch-kqueuemplexer.cc) = 87b3b6670393ee60fc96cf91c5acf575adfd06c0
-SHA1 (patch-m4_pdns__check__os.m4) = fd84d61d71ec6eed7c9570a2d62c49646a0a4f4a
+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

Index: pkgsrc/net/powerdns-recursor/patches/patch-configure
diff -u pkgsrc/net/powerdns-recursor/patches/patch-configure:1.2 pkgsrc/net/powerdns-recursor/patches/patch-configure:1.3
--- pkgsrc/net/powerdns-recursor/patches/patch-configure:1.2    Wed Aug  2 20:15:42 2017
+++ pkgsrc/net/powerdns-recursor/patches/patch-configure        Tue Jan  2 12:23:55 2018
@@ -1,23 +1,35 @@
-$NetBSD: patch-configure,v 1.2 2017/08/02 20:15:42 fhajny Exp $
+$NetBSD: patch-configure,v 1.3 2018/01/02 12:23:55 fhajny Exp $
 
-Regenerate for PDNS_CHECK_OS fix.
+Regen after excluding -latomic test on NetBSD.
 
---- configure.orig     2017-07-04 15:43:19.000000000 +0000
+--- configure.orig     2017-12-04 12:51:13.000000000 +0000
 +++ configure
-@@ -15921,13 +15921,12 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___latomic" >&5
- $as_echo "$ax_cv_check_ldflags___latomic" >&6; }
- if test "x$ax_cv_check_ldflags___latomic" = xyes; then :
--   :
-+  LDFLAGS="-latomic $LDFLAGS"
-+      as_fn_error $? "Unable to link against libatomic, cannot continue" "$LINENO" 5
- else
--   as_fn_error $? "Unable to link against libatomic, cannot continue" "$LINENO" 5
--
-+  :
+@@ -15944,9 +15944,14 @@ else
  fi
  
--    LDFLAGS="-latomic $LDFLAGS"
+ 
+-  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
  
Index: pkgsrc/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4
diff -u pkgsrc/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4:1.2 pkgsrc/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4:1.3
--- pkgsrc/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4:1.2        Wed Aug  2 20:15:42 2017
+++ pkgsrc/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4    Tue Jan  2 12:23:55 2018
@@ -1,20 +1,36 @@
-$NetBSD: patch-m4_pdns__check__os.m4,v 1.2 2017/08/02 20:15:42 fhajny Exp $
+$NetBSD: patch-m4_pdns__check__os.m4,v 1.3 2018/01/02 12:23:55 fhajny Exp $
 
-Third argument is a instruction list.
+Don't insist on -latomic on mips & powerpc if on NetBSD.
 
---- m4/pdns_check_os.m4.orig   2017-07-04 15:43:07.000000000 +0000
+--- m4/pdns_check_os.m4.orig   2017-12-04 12:51:03.000000000 +0000
 +++ m4/pdns_check_os.m4
-@@ -37,11 +37,8 @@ AC_DEFUN([PDNS_CHECK_OS],[
+@@ -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* )
--    AX_CHECK_LINK_FLAG([-latomic],
--      [ : ],
--      [ AC_MSG_ERROR([Unable to link against libatomic, cannot continue]) ]
--    )
+-  case "$host" in
+-  mips* | powerpc-* )
+-    AC_MSG_CHECKING([whether the linker accepts -latomic])
 -    LDFLAGS="-latomic $LDFLAGS"
-+    AX_CHECK_LINK_FLAG([-latomic],[LDFLAGS="-latomic $LDFLAGS"]
-+      [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])])
+-    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
  

Index: pkgsrc/net/powerdns-recursor/patches/patch-kqueuemplexer.cc
diff -u pkgsrc/net/powerdns-recursor/patches/patch-kqueuemplexer.cc:1.3 pkgsrc/net/powerdns-recursor/patches/patch-kqueuemplexer.cc:1.4
--- pkgsrc/net/powerdns-recursor/patches/patch-kqueuemplexer.cc:1.3     Thu Mar  9 13:43:49 2017
+++ pkgsrc/net/powerdns-recursor/patches/patch-kqueuemplexer.cc Tue Jan  2 12:23:55 2018
@@ -1,12 +1,12 @@
-$NetBSD: patch-kqueuemplexer.cc,v 1.3 2017/03/09 13:43:49 fhajny Exp $
+$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-01-13 08:55:55.000000000 +0000
+--- kqueuemplexer.cc.orig      2017-12-04 12:51:03.000000000 +0000
 +++ kqueuemplexer.cc
-@@ -29,9 +29,7 @@
+@@ -28,9 +28,7 @@
+ #include <unistd.h>
  #include "misc.hh"
- #include "syncres.hh"
  #include <sys/types.h>
 -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  #include <sys/event.h>

Added files:

Index: pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc
diff -u /dev/null pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc:1.1
--- /dev/null   Tue Jan  2 12:23:55 2018
+++ pkgsrc/net/powerdns-recursor/patches/patch-portsmplexer.cc  Tue Jan  2 12:23:55 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-portsmplexer.cc,v 1.1 2018/01/02 12:23:55 fhajny Exp $
+
+Work around invalid cast to binary operator.
+
+--- portsmplexer.cc.orig       2017-12-04 12:51:03.000000000 +0000
++++ portsmplexer.cc
+@@ -85,8 +85,8 @@ int PortsFDMultiplexer::run(struct timev
+   }
+   
+   struct timespec timeoutspec;
+-  timeoutspec.tv_sec = time / 1000;
+-  timeoutspec.tv_nsec = (time % 1000) * 1000000;
++  timeoutspec.tv_sec = (intptr_t)time / 1000;
++  timeoutspec.tv_nsec = ((intptr_t)time % 1000) * 1000000;
+   unsigned int numevents=1;
+   int ret= port_getn(d_portfd, d_pevents.get(), min(PORT_MAX_LIST, s_maxevents), &numevents, &timeoutspec);
+