CVS commit: pkgsrc/net/powerdns

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/powerdns
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Thu, 29 Sep 2022 13:49:50 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Sep 29 13:49:50 UTC 2022

Modified Files:
        pkgsrc/net/powerdns: Makefile Makefile.backend Makefile.common PLIST
            distinfo options.mk
        pkgsrc/net/powerdns/patches: patch-configure
            patch-ext_json11_json11.cpp patch-pdns_iputils.cc
            patch-pdns_qtype.hh

Log Message:
powerdns: Update to 4.6.3.

The changelogs are very long and unwieldly, even trying to use the raw versions
as they're written in RST, so please see the following URLs for the full list
of changes (which are many) since 4.4.1:

  https://doc.powerdns.com/authoritative/changelog/4.6.html
  https://doc.powerdns.com/authoritative/changelog/4.5.html
  https://doc.powerdns.com/authoritative/changelog/4.4.html

While here clean up various pkglint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/net/powerdns/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/powerdns/Makefile.backend
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/powerdns/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/powerdns/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/powerdns/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/powerdns/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/powerdns/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp \
    pkgsrc/net/powerdns/patches/patch-pdns_iputils.cc \
    pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh

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/Makefile
diff -u pkgsrc/net/powerdns/Makefile:1.66 pkgsrc/net/powerdns/Makefile:1.67
--- pkgsrc/net/powerdns/Makefile:1.66   Mon Apr 18 19:11:53 2022
+++ pkgsrc/net/powerdns/Makefile        Thu Sep 29 13:49:50 2022
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.66 2022/04/18 19:11:53 adam Exp $
+# $NetBSD: Makefile,v 1.67 2022/09/29 13:49:50 jperkin Exp $
 
-PKGREVISION= 7
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/pdns/powerdns/}

Index: pkgsrc/net/powerdns/Makefile.backend
diff -u pkgsrc/net/powerdns/Makefile.backend:1.7 pkgsrc/net/powerdns/Makefile.backend:1.8
--- pkgsrc/net/powerdns/Makefile.backend:1.7    Tue Mar 17 19:04:49 2020
+++ pkgsrc/net/powerdns/Makefile.backend        Thu Sep 29 13:49:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.7 2020/03/17 19:04:49 adam Exp $
+# $NetBSD: Makefile.backend,v 1.8 2022/09/29 13:49:50 jperkin Exp $
 # used by net/powerdns-geoip/Makefile
 # used by net/powerdns-ldap/Makefile
 # used by net/powerdns-mysql/Makefile
@@ -19,6 +19,5 @@ CONFIGURE_ARGS+=      --with-modules=""
 BUILD_DIRS=            modules
 
 # These are required by configure, but not used by the modules
-BUILDLINK_DEPMETHOD.boost-headers=     build
 BUILDLINK_DEPMETHOD.boost-libs=                build
 BUILDLINK_DEPMETHOD.openssl=           build

Index: pkgsrc/net/powerdns/Makefile.common
diff -u pkgsrc/net/powerdns/Makefile.common:1.34 pkgsrc/net/powerdns/Makefile.common:1.35
--- pkgsrc/net/powerdns/Makefile.common:1.34    Mon Feb  8 13:31:58 2021
+++ pkgsrc/net/powerdns/Makefile.common Thu Sep 29 13:49:50 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.34 2021/02/08 13:31:58 otis Exp $
+# $NetBSD: Makefile.common,v 1.35 2022/09/29 13:49:50 jperkin Exp $
+# used by net/powerdns/Makefile.backend
 
-PDNS_VERSION=  4.4.1
+PDNS_VERSION=  4.6.3
 DISTNAME=      pdns-${PDNS_VERSION}
 CATEGORIES=    net
 MASTER_SITES=  http://downloads.powerdns.com/releases/

Index: pkgsrc/net/powerdns/PLIST
diff -u pkgsrc/net/powerdns/PLIST:1.16 pkgsrc/net/powerdns/PLIST:1.17
--- pkgsrc/net/powerdns/PLIST:1.16      Thu Sep 24 19:09:53 2020
+++ pkgsrc/net/powerdns/PLIST   Thu Sep 29 13:49:50 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/09/24 19:09:53 otis Exp $
+@comment $NetBSD: PLIST,v 1.17 2022/09/29 13:49:50 jperkin Exp $
 ${PLIST.tools}bin/calidns
 ${PLIST.tools}bin/dnsbulktest
 ${PLIST.tools}bin/dnsgram
@@ -23,7 +23,6 @@ bin/zone2sql
 ${PLIST.bind}lib/pdns/libbindbackend.la
 ${PLIST.sqlite}lib/pdns/libgsqlite3backend.la
 ${PLIST.pipe}lib/pdns/libpipebackend.la
-${PLIST.random}lib/pdns/librandombackend.la
 ${PLIST.remote}lib/pdns/libremotebackend.la
 ${PLIST.tools}man/man1/calidns.1
 man/man1/dnsbulktest.1
@@ -47,12 +46,12 @@ ${PLIST.tools}man/man1/sdig.1
 man/man1/zone2json.1
 man/man1/zone2sql.1
 sbin/pdns_server
-share/doc/pdns/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql
-share/doc/pdns/bind-dnssec.schema.sqlite3.sql
-${PLIST.sqlite}share/doc/pdns/4.3.0_to_4.3.1_schema.sqlite3.sql
-${PLIST.sqlite}share/doc/pdns/4.2.0_to_4.3.0_schema.sqlite3.sql
 ${PLIST.sqlite}share/doc/pdns/3.4.0_to_4.0.0_schema.sqlite3.sql
 ${PLIST.sqlite}share/doc/pdns/4.0.0_to_4.2.0_schema.sqlite3.sql
+${PLIST.sqlite}share/doc/pdns/4.2.0_to_4.3.0_schema.sqlite3.sql
+${PLIST.sqlite}share/doc/pdns/4.3.0_to_4.3.1_schema.sqlite3.sql
+share/doc/pdns/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql
+share/doc/pdns/bind-dnssec.schema.sqlite3.sql
 ${PLIST.sqlite}share/doc/pdns/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 ${PLIST.sqlite}share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
 ${PLIST.sqlite}share/doc/pdns/schema.sqlite3.sql

Index: pkgsrc/net/powerdns/distinfo
diff -u pkgsrc/net/powerdns/distinfo:1.46 pkgsrc/net/powerdns/distinfo:1.47
--- pkgsrc/net/powerdns/distinfo:1.46   Tue Oct 26 11:06:31 2021
+++ pkgsrc/net/powerdns/distinfo        Thu Sep 29 13:49:50 2022
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.46 2021/10/26 11:06:31 nia Exp $
+$NetBSD: distinfo,v 1.47 2022/09/29 13:49:50 jperkin Exp $
 
-BLAKE2s (pdns-4.4.1.tar.bz2) = 27ea63c252535fef1c0810f6fe4f717c56f1d3d434ba01860d580e6fef8764f8
-SHA512 (pdns-4.4.1.tar.bz2) = a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
-Size (pdns-4.4.1.tar.bz2) = 1276990 bytes
-SHA1 (patch-configure) = 691b4f804f9e72eb18ec895a7b0e685789c78034
-SHA1 (patch-ext_json11_json11.cpp) = a8ffe67156a836841aef8a6bba134a82283f381e
+BLAKE2s (pdns-4.6.3.tar.bz2) = 3eaac487fc3f1ea86da62427b62498a38c96eb4be26fbd913fc22fab6b816dcb
+SHA512 (pdns-4.6.3.tar.bz2) = ea44a0c929e36bf9002d8db7bf1e06ec372a08b31b60c74bbc3ea5600073fb745151f33798a0a4bd151ce17ad7efb07be30f7ddcf620d5bdaab6de4f37f4296f
+Size (pdns-4.6.3.tar.bz2) = 1302651 bytes
+SHA1 (patch-configure) = 2635c2e5c22c419850703e3f5e5ed73ed116c339
+SHA1 (patch-ext_json11_json11.cpp) = 3f8f4518ebd807a064e83572385ea5456fc7e81f
 SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf
-SHA1 (patch-pdns_iputils.cc) = fbd3bb210216bb98c3cd73b702b6dea486c51dec
-SHA1 (patch-pdns_qtype.hh) = 0f8bca4c0cafea9a5257a08077fa42b4c52127f5
+SHA1 (patch-pdns_iputils.cc) = 06b58c59034454b2c6788f28d412215ca801c5cf
+SHA1 (patch-pdns_qtype.hh) = 7bf40a1ace0525c6611967985fe45951eb57957e
 SHA1 (patch-pdns_version.cc) = 25917c329dafa34e657fa31c7a9abd99110bb4b0

Index: pkgsrc/net/powerdns/options.mk
diff -u pkgsrc/net/powerdns/options.mk:1.9 pkgsrc/net/powerdns/options.mk:1.10
--- pkgsrc/net/powerdns/options.mk:1.9  Fri Apr  1 08:07:28 2022
+++ pkgsrc/net/powerdns/options.mk      Thu Sep 29 13:49:50 2022
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2022/04/01 08:07:28 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2022/09/29 13:49:50 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.powerdns
-PKG_SUPPORTED_OPTIONS= bind botan luarecords pipe random remote sqlite tools zeromq
-PKG_SUGGESTED_OPTIONS= bind luarecords pipe random
+PKG_SUPPORTED_OPTIONS= bind botan luarecords pipe remote sqlite tools zeromq
+PKG_SUGGESTED_OPTIONS= bind luarecords pipe
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           bind luarecords pipe random remote sqlite tools
+PLIST_VARS+=           bind pipe remote sqlite tools
 
 .if !empty(PKG_OPTIONS:Mbind)
 PDNS_MODULES+=         bind
@@ -29,11 +29,6 @@ PLIST.pipe=          yes
 PDNS_MODULES+=         pipe
 .endif
 
-.if !empty(PKG_OPTIONS:Mrandom)
-PLIST.random=          yes
-PDNS_MODULES+=         random
-.endif
-
 .if !empty(PKG_OPTIONS:Mremote)
 PLIST.remote=          yes
 PDNS_MODULES+=         remote
@@ -51,11 +46,11 @@ PLIST.tools=                yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mzeromq)
-.  if empty(PKG_OPTIONS:Mremote)
-PKG_FAIL_REASON+=      "The 'zeromq' option requires the 'remote' option enabled."
-.  else
+.  if !empty(PKG_OPTIONS:Mremote)
 CONFIGURE_ARGS+=       --enable-remotebackend-zeromq=yes
 .include "../../net/zeromq/buildlink3.mk"
+.  else
+PKG_FAIL_REASON+=      "The 'zeromq' option requires the 'remote' option enabled."
 .  endif
 .else
 CONFIGURE_ARGS+=       --enable-remotebackend-zeromq=no

Index: pkgsrc/net/powerdns/patches/patch-configure
diff -u pkgsrc/net/powerdns/patches/patch-configure:1.11 pkgsrc/net/powerdns/patches/patch-configure:1.12
--- pkgsrc/net/powerdns/patches/patch-configure:1.11    Mon Dec 21 00:26:51 2020
+++ pkgsrc/net/powerdns/patches/patch-configure Thu Sep 29 13:49:50 2022
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure,v 1.11 2020/12/21 00:26:51 otis Exp $
+$NetBSD: patch-configure,v 1.12 2022/09/29 13:49:50 jperkin Exp $
+
+Shell portability.
 
 --- configure.orig     2020-12-17 14:49:10.000000000 +0000
 +++ configure

Index: pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp
diff -u pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp:1.1 pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp:1.2
--- pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp:1.1 Fri Mar 24 15:14:14 2017
+++ pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp     Thu Sep 29 13:49:50 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-ext_json11_json11.cpp,v 1.1 2017/03/24 15:14:14 joerg Exp $
+$NetBSD: patch-ext_json11_json11.cpp,v 1.2 2022/09/29 13:49:50 jperkin Exp $
 
 Clang rejects ordering relations for nullptr, so introduce a template
 indirection.
 
---- ext/json11/json11.cpp.orig 2017-03-24 11:51:24.440658307 +0000
+--- ext/json11/json11.cpp.orig 2020-09-29 15:26:41.000000000 +0000
 +++ ext/json11/json11.cpp
-@@ -132,6 +133,13 @@ void Json::dump(string &out) const {
+@@ -146,6 +146,13 @@ void Json::dump(string &out) const {
   * Value wrappers
   */
  
@@ -19,7 +19,7 @@ indirection.
  template <Json::Type tag, typename T>
  class Value : public JsonValue {
  protected:
-@@ -150,7 +158,7 @@ protected:
+@@ -164,7 +171,7 @@ protected:
          return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
      }
      bool less(const JsonValue * other) const override {
Index: pkgsrc/net/powerdns/patches/patch-pdns_iputils.cc
diff -u pkgsrc/net/powerdns/patches/patch-pdns_iputils.cc:1.1 pkgsrc/net/powerdns/patches/patch-pdns_iputils.cc:1.2
--- pkgsrc/net/powerdns/patches/patch-pdns_iputils.cc:1.1       Sun Apr  1 20:28:21 2018
+++ pkgsrc/net/powerdns/patches/patch-pdns_iputils.cc   Thu Sep 29 13:49:50 2022
@@ -1,9 +1,11 @@
-$NetBSD: patch-pdns_iputils.cc,v 1.1 2018/04/01 20:28:21 joerg Exp $
+$NetBSD: patch-pdns_iputils.cc,v 1.2 2022/09/29 13:49:50 jperkin Exp $
 
---- pdns/iputils.cc.orig       2018-04-01 17:24:16.523211468 +0000
+Fix build on NetBSD?
+
+--- pdns/iputils.cc.orig       2022-07-11 13:54:25.000000000 +0000
 +++ pdns/iputils.cc
-@@ -150,14 +150,14 @@ bool HarvestDestinationAddress(const str
-   for (cmsg = CMSG_FIRSTHDR(msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(const_cast<struct msghdr*>(msgh), const_cast<struct cmsghdr*>(cmsg))) {
+@@ -228,14 +228,14 @@ bool HarvestDestinationAddress(const str
+   for (cmsg = CMSG_FIRSTHDR(msgh); cmsg != nullptr; cmsg = CMSG_NXTHDR(const_cast<struct msghdr*>(msgh), const_cast<struct cmsghdr*>(cmsg))) {
  #if defined(IP_PKTINFO)
       if ((cmsg->cmsg_level == IPPROTO_IP) && (cmsg->cmsg_type == IP_PKTINFO)) {
 -        struct in_pktinfo *i = (struct in_pktinfo *) CMSG_DATA(cmsg);
@@ -19,7 +21,7 @@ $NetBSD: patch-pdns_iputils.cc,v 1.1 201
        destination->sin4.sin_addr = *i;
        destination->sin4.sin_family = AF_INET;      
        return true;
-@@ -165,7 +165,7 @@ bool HarvestDestinationAddress(const str
+@@ -243,7 +243,7 @@ bool HarvestDestinationAddress(const str
  #endif
  
      if ((cmsg->cmsg_level == IPPROTO_IPV6) && (cmsg->cmsg_type == IPV6_PKTINFO)) {
Index: pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh
diff -u pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh:1.1 pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh:1.2
--- pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh:1.1 Thu Mar  9 13:32:54 2017
+++ pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh     Thu Sep 29 13:49:50 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-pdns_qtype.hh,v 1.1 2017/03/09 13:32:54 fhajny Exp $
+$NetBSD: patch-pdns_qtype.hh,v 1.2 2022/09/29 13:49:50 jperkin Exp $
 
 Avoid symbol pollution on SunOS.
 
---- pdns/qtype.hh.orig 2017-01-17 08:43:49.000000000 +0000
+--- pdns/qtype.hh.orig 2022-07-11 13:54:25.000000000 +0000
 +++ pdns/qtype.hh
-@@ -26,6 +26,10 @@
- #include <vector>
+@@ -22,6 +22,10 @@
+ #pragma once
  #include "namespaces.hh"
  
 +#if defined(__sun) && defined(DS)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index