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: Mon, 30 Jun 2025 11:00:51 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 30 11:00:50 UTC 2025

Modified Files:
        pkgsrc/net/powerdns: Makefile Makefile.common PLIST distinfo options.mk
        pkgsrc/net/powerdns/patches: patch-pdns_dnsscope.cc patch-pdns_qtype.hh
            patch-pdns_version.cc
Added Files:
        pkgsrc/net/powerdns: backend.mk
        pkgsrc/net/powerdns/patches: patch-pdns_misc.hh
Removed Files:
        pkgsrc/net/powerdns: Makefile.backend
        pkgsrc/net/powerdns/patches: patch-configure
            patch-ext_json11_json11.cpp patch-pdns_iputils.cc
            patch-pdns_lock.hh patch-pdns_uuid-utils.cc

Log Message:
powerdns: Update to 4.9.5.

pkgsrc changes:

 * Rename Makefile.backend to backend.mk
 * Include many options by default, there is no benefit to disabling them
   if they do not require additional dependencies, packages should be useful
   out of the box.

Upstream changes too many to list here, see the following URLs:

  https://docs.powerdns.com/authoritative/changelog/4.7.html
  https://docs.powerdns.com/authoritative/changelog/4.8.html
  https://docs.powerdns.com/authoritative/changelog/4.9.html


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/net/powerdns/Makefile
cvs rdiff -u -r1.8 -r0 pkgsrc/net/powerdns/Makefile.backend
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/powerdns/Makefile.common
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/powerdns/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/net/powerdns/backend.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/powerdns/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/powerdns/options.mk
cvs rdiff -u -r1.12 -r0 pkgsrc/net/powerdns/patches/patch-configure
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/net/powerdns/patches/patch-ext_json11_json11.cpp \
    pkgsrc/net/powerdns/patches/patch-pdns_iputils.cc
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/powerdns/patches/patch-pdns_dnsscope.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/net/powerdns/patches/patch-pdns_lock.hh \
    pkgsrc/net/powerdns/patches/patch-pdns_uuid-utils.cc
cvs rdiff -u -r0 -r1.3 pkgsrc/net/powerdns/patches/patch-pdns_misc.hh
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh \
    pkgsrc/net/powerdns/patches/patch-pdns_version.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/Makefile
diff -u pkgsrc/net/powerdns/Makefile:1.86 pkgsrc/net/powerdns/Makefile:1.87
--- pkgsrc/net/powerdns/Makefile:1.86   Sat Apr 19 07:58:13 2025
+++ pkgsrc/net/powerdns/Makefile        Mon Jun 30 11:00:50 2025
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.86 2025/04/19 07:58:13 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2025/06/30 11:00:50 jperkin Exp $
 
-PKGREVISION= 16
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/pdns/powerdns/}
 COMMENT=       Modern, advanced and high performance nameserver
 
+PDNS_MODULES+= bind pipe remote
+
 .include "options.mk"
 
+CONFIGURE_ARGS+=       --enable-lua-records
+CONFIGURE_ARGS+=       --enable-tools
 CONFIGURE_ARGS+=       --with-dynmodules=no
 CONFIGURE_ARGS+=       --with-modules="${PDNS_MODULES}"
 

Index: pkgsrc/net/powerdns/Makefile.common
diff -u pkgsrc/net/powerdns/Makefile.common:1.39 pkgsrc/net/powerdns/Makefile.common:1.40
--- pkgsrc/net/powerdns/Makefile.common:1.39    Tue Jul 18 18:36:30 2023
+++ pkgsrc/net/powerdns/Makefile.common Mon Jun 30 11:00:50 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.39 2023/07/18 18:36:30 nia Exp $
-# used by net/powerdns/Makefile.backend
+# $NetBSD: Makefile.common,v 1.40 2025/06/30 11:00:50 jperkin Exp $
+# used by net/powerdns/backend.mk
 
-PDNS_VERSION=  4.6.4
+PDNS_VERSION=  4.9.5
 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.17 pkgsrc/net/powerdns/PLIST:1.18
--- pkgsrc/net/powerdns/PLIST:1.17      Thu Sep 29 13:49:50 2022
+++ pkgsrc/net/powerdns/PLIST   Mon Jun 30 11:00:50 2025
@@ -1,48 +1,50 @@
-@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
-${PLIST.tools}bin/dnspcap2calidns
-${PLIST.tools}bin/dnsreplay
-${PLIST.tools}bin/dnsscan
-${PLIST.tools}bin/dnsscope
-${PLIST.tools}bin/dnstcpbench
-${PLIST.tools}bin/dnswasher
-${PLIST.tools}bin/dumresp
-${PLIST.tools}bin/ixplore
-${PLIST.tools}bin/nproxy
-${PLIST.tools}bin/nsec3dig
+@comment $NetBSD: PLIST,v 1.18 2025/06/30 11:00:50 jperkin Exp $
+bin/calidns
+bin/dnsbulktest
+bin/dnsgram
+bin/dnspcap2calidns
+bin/dnspcap2protobuf
+bin/dnsreplay
+bin/dnsscan
+bin/dnsscope
+bin/dnstcpbench
+bin/dnswasher
+bin/dumresp
+bin/ixplore
+bin/nproxy
+bin/nsec3dig
 bin/pdns_control
-${PLIST.tools}bin/pdns_notify
+bin/pdns_notify
 bin/pdnsutil
-${PLIST.tools}bin/saxfr
-${PLIST.tools}bin/sdig
-${PLIST.tools}bin/stubquery
+bin/saxfr
+bin/sdig
+bin/stubquery
 bin/zone2json
 bin/zone2sql
-${PLIST.bind}lib/pdns/libbindbackend.la
+lib/pdns/libbindbackend.la
 ${PLIST.sqlite}lib/pdns/libgsqlite3backend.la
-${PLIST.pipe}lib/pdns/libpipebackend.la
-${PLIST.remote}lib/pdns/libremotebackend.la
-${PLIST.tools}man/man1/calidns.1
+lib/pdns/libpipebackend.la
+lib/pdns/libremotebackend.la
+man/man1/calidns.1
 man/man1/dnsbulktest.1
-${PLIST.tools}man/man1/dnsgram.1
-${PLIST.tools}man/man1/dnspcap2calidns.1
-${PLIST.tools}man/man1/dnsreplay.1
-${PLIST.tools}man/man1/dnsscan.1
-${PLIST.tools}man/man1/dnsscope.1
+man/man1/dnsgram.1
+man/man1/dnspcap2calidns.1
+man/man1/dnspcap2protobuf.1
+man/man1/dnsreplay.1
+man/man1/dnsscan.1
+man/man1/dnsscope.1
 man/man1/dnstcpbench.1
-${PLIST.tools}man/man1/dnswasher.1
-${PLIST.tools}man/man1/dumresp.1
-${PLIST.tools}man/man1/ixplore.1
-${PLIST.tools}man/man1/nproxy.1
-${PLIST.tools}man/man1/nsec3dig.1
+man/man1/dnswasher.1
+man/man1/dumresp.1
+man/man1/ixplore.1
+man/man1/nproxy.1
+man/man1/nsec3dig.1
 man/man1/pdns_control.1
-${PLIST.tools}man/man1/pdns_notify.1
+man/man1/pdns_notify.1
 man/man1/pdns_server.1
 man/man1/pdnsutil.1
-${PLIST.tools}man/man1/saxfr.1
-${PLIST.tools}man/man1/sdig.1
+man/man1/saxfr.1
+man/man1/sdig.1
 man/man1/zone2json.1
 man/man1/zone2sql.1
 sbin/pdns_server
@@ -50,6 +52,7 @@ ${PLIST.sqlite}share/doc/pdns/3.4.0_to_4
 ${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
+${PLIST.sqlite}share/doc/pdns/4.3.1_to_4.7.0_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

Index: pkgsrc/net/powerdns/distinfo
diff -u pkgsrc/net/powerdns/distinfo:1.50 pkgsrc/net/powerdns/distinfo:1.51
--- pkgsrc/net/powerdns/distinfo:1.50   Fri Oct  4 04:27:20 2024
+++ pkgsrc/net/powerdns/distinfo        Mon Jun 30 11:00:50 2025
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.50 2024/10/04 04:27:20 ryoon Exp $
+$NetBSD: distinfo,v 1.51 2025/06/30 11:00:50 jperkin Exp $
 
-BLAKE2s (pdns-4.6.4.tar.bz2) = 4c29e8ea41013fb06790da5c9c4ac8460b2e27acbd713508bbd80832e9f1bf80
-SHA512 (pdns-4.6.4.tar.bz2) = b05c880e1dad7cf83cb17d74c331206487bea14d7f56bc21a70d65ad2704ce71258ff055f3008fb5af2c8cfc4fbd7d09333c47c046ca306d3fdb307f203230b5
-Size (pdns-4.6.4.tar.bz2) = 1318629 bytes
-SHA1 (patch-configure) = 2635c2e5c22c419850703e3f5e5ed73ed116c339
-SHA1 (patch-ext_json11_json11.cpp) = 3f8f4518ebd807a064e83572385ea5456fc7e81f
-SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf
-SHA1 (patch-pdns_iputils.cc) = 06b58c59034454b2c6788f28d412215ca801c5cf
-SHA1 (patch-pdns_lock.hh) = c4a5c59955b808c7a04700b32a39235dc0888285
-SHA1 (patch-pdns_qtype.hh) = 7bf40a1ace0525c6611967985fe45951eb57957e
-SHA1 (patch-pdns_uuid-utils.cc) = 9c7ada4aa04379d7155c478585c44841d1a4fcf6
-SHA1 (patch-pdns_version.cc) = 25917c329dafa34e657fa31c7a9abd99110bb4b0
+BLAKE2s (pdns-4.9.5.tar.bz2) = 5695108093c45363e9eb3b2adc4ea3f6134a0c535ddd4e6c5510135985861b48
+SHA512 (pdns-4.9.5.tar.bz2) = ac1682b0616391240aa3dc618ea93855899987f2baa46546e6592a55fc0a83da1f1e2c08109d847a560e1a0c3106f7749935d0b152992ce85da715bb842d8dad
+Size (pdns-4.9.5.tar.bz2) = 1380263 bytes
+SHA1 (patch-pdns_dnsscope.cc) = 221b860350acad10e0d2f1a854d7930819a598de
+SHA1 (patch-pdns_misc.hh) = ffc2eea374157e25cae17743db900ff6e3101a66
+SHA1 (patch-pdns_qtype.hh) = 4d086e28e7bacc624cf7db199ac16ebafec88e04
+SHA1 (patch-pdns_version.cc) = 0e089c41260546e9ef9647eeb162becf158873d9

Index: pkgsrc/net/powerdns/options.mk
diff -u pkgsrc/net/powerdns/options.mk:1.10 pkgsrc/net/powerdns/options.mk:1.11
--- pkgsrc/net/powerdns/options.mk:1.10 Thu Sep 29 13:49:50 2022
+++ pkgsrc/net/powerdns/options.mk      Mon Jun 30 11:00:50 2025
@@ -1,57 +1,26 @@
-# $NetBSD: options.mk,v 1.10 2022/09/29 13:49:50 jperkin Exp $
+# $NetBSD: options.mk,v 1.11 2025/06/30 11:00:50 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.powerdns
-PKG_SUPPORTED_OPTIONS= bind botan luarecords pipe remote sqlite tools zeromq
-PKG_SUGGESTED_OPTIONS= bind luarecords pipe
+PKG_SUPPORTED_OPTIONS= botan sqlite zeromq
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           bind pipe remote sqlite tools
-
-.if !empty(PKG_OPTIONS:Mbind)
-PDNS_MODULES+=         bind
-PLIST.bind=            yes
-.endif
+PLIST_VARS+=           sqlite
 
 .if !empty(PKG_OPTIONS:Mbotan)
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../security/botan2/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mluarecords)
-CONFIGURE_ARGS+=       --enable-lua-records
-.else
-CONFIGURE_ARGS+=       --disable-lua-records
-.endif
-
-.if !empty(PKG_OPTIONS:Mpipe)
-PLIST.pipe=            yes
-PDNS_MODULES+=         pipe
-.endif
-
-.if !empty(PKG_OPTIONS:Mremote)
-PLIST.remote=          yes
-PDNS_MODULES+=         remote
-.endif
-
 .if !empty(PKG_OPTIONS:Msqlite)
 PDNS_MODULES+=         gsqlite3
 PLIST.sqlite=          yes
 .include "../../databases/sqlite3/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mtools)
-CONFIGURE_ARGS+=       --enable-tools
-PLIST.tools=           yes
-.endif
-
 .if !empty(PKG_OPTIONS:Mzeromq)
-.  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
 .endif

Index: pkgsrc/net/powerdns/patches/patch-pdns_dnsscope.cc
diff -u pkgsrc/net/powerdns/patches/patch-pdns_dnsscope.cc:1.3 pkgsrc/net/powerdns/patches/patch-pdns_dnsscope.cc:1.4
--- pkgsrc/net/powerdns/patches/patch-pdns_dnsscope.cc:1.3      Thu Mar  9 13:32:54 2017
+++ pkgsrc/net/powerdns/patches/patch-pdns_dnsscope.cc  Mon Jun 30 11:00:50 2025
@@ -1,15 +1,19 @@
-$NetBSD: patch-pdns_dnsscope.cc,v 1.3 2017/03/09 13:32:54 fhajny Exp $
+$NetBSD: patch-pdns_dnsscope.cc,v 1.4 2025/06/30 11:00:50 jperkin Exp $
 
-IP_OFFMASK not defined on SunOS.
+Support IP_OFFMASK on illumos.
 
---- pdns/dnsscope.cc.orig      2017-01-17 08:43:49.000000000 +0000
+--- pdns/dnsscope.cc.orig      2025-06-20 13:58:07.364067810 +0000
 +++ pdns/dnsscope.cc
-@@ -43,6 +43,10 @@
+@@ -45,6 +45,14 @@
  #include "dnsrecords.hh"
  #include "statnode.hh"
  
-+#ifndef IP_OFFMASK
-+# define        IP_OFFMASK      0x1fff
++/*
++ * illumos defines this in netinet/ip_compat.h but that introduces many more
++ * complications so just define exactly what we need.
++ */
++#if defined(__illumos__) && !defined(IP_OFFMASK)
++#define IP_OFFMASK 0x1fff
 +#endif
 +
  namespace po = boost::program_options;

Index: pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh
diff -u pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh:1.2 pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh:1.3
--- pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh:1.2 Thu Sep 29 13:49:50 2022
+++ pkgsrc/net/powerdns/patches/patch-pdns_qtype.hh     Mon Jun 30 11:00:50 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-pdns_qtype.hh,v 1.2 2022/09/29 13:49:50 jperkin Exp $
+$NetBSD: patch-pdns_qtype.hh,v 1.3 2025/06/30 11:00:50 jperkin Exp $
 
 Avoid symbol pollution on SunOS.
 
---- pdns/qtype.hh.orig 2022-07-11 13:54:25.000000000 +0000
+--- pdns/qtype.hh.orig 2025-06-20 14:11:31.859917271 +0000
 +++ pdns/qtype.hh
-@@ -22,6 +22,10 @@
- #pragma once
+@@ -26,6 +26,10 @@
+ 
  #include "namespaces.hh"
  
 +#if defined(__sun) && defined(DS)
Index: pkgsrc/net/powerdns/patches/patch-pdns_version.cc
diff -u pkgsrc/net/powerdns/patches/patch-pdns_version.cc:1.2 pkgsrc/net/powerdns/patches/patch-pdns_version.cc:1.3
--- pkgsrc/net/powerdns/patches/patch-pdns_version.cc:1.2       Tue Mar 17 19:04:49 2020
+++ pkgsrc/net/powerdns/patches/patch-pdns_version.cc   Mon Jun 30 11:00:50 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-pdns_version.cc,v 1.2 2020/03/17 19:04:49 adam Exp $
+$NetBSD: patch-pdns_version.cc,v 1.3 2025/06/30 11:00:50 jperkin Exp $
 
 Do not store configure args, as they contain workdir references.
 
---- pdns/version.cc.orig       2020-02-29 22:23:50.000000000 +0000
+--- pdns/version.cc.orig       2025-05-07 09:29:28.000000000 +0000
 +++ pdns/version.cc
-@@ -145,7 +145,7 @@ void showBuildConfiguration()
-   // Auth only
-   g_log<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl;
+@@ -160,7 +160,7 @@ void showBuildConfiguration()
+   const auto& modules = BackendMakers().getModules();
+   g_log << Logger::Warning << "Loaded modules: " << boost::join(modules, " ") << endl;
  #endif
 -#ifdef PDNS_CONFIG_ARGS
 +#if 0

Added files:

Index: pkgsrc/net/powerdns/backend.mk
diff -u /dev/null pkgsrc/net/powerdns/backend.mk:1.1
--- /dev/null   Mon Jun 30 11:00:51 2025
+++ pkgsrc/net/powerdns/backend.mk      Mon Jun 30 11:00:50 2025
@@ -0,0 +1,23 @@
+# $NetBSD: backend.mk,v 1.1 2025/06/30 11:00:50 jperkin Exp $
+# used by net/powerdns-geoip/Makefile
+# used by net/powerdns-ldap/Makefile
+# used by net/powerdns-mysql/Makefile
+# used by net/powerdns-odbc/Makefile
+# used by net/powerdns-pgsql/Makefile
+
+.include "../../net/powerdns/Makefile.common"
+
+DEPENDS+=              powerdns>=${PDNS_VERSION}:../../net/powerdns
+
+DISTINFO_FILE=         ${.CURDIR}/../../net/powerdns/distinfo
+PATCHDIR=              ${.CURDIR}/../../net/powerdns/patches
+
+CONFIGURE_ARGS+=       --disable-lua-records
+CONFIGURE_ARGS+=       --disable-pdns_server
+CONFIGURE_ARGS+=       --with-modules=""
+
+BUILD_DIRS=            modules
+
+# These are required by configure, but not used by the modules
+BUILDLINK_DEPMETHOD.boost-libs=                build
+BUILDLINK_DEPMETHOD.openssl=           build

Index: pkgsrc/net/powerdns/patches/patch-pdns_misc.hh
diff -u /dev/null pkgsrc/net/powerdns/patches/patch-pdns_misc.hh:1.3
--- /dev/null   Mon Jun 30 11:00:51 2025
+++ pkgsrc/net/powerdns/patches/patch-pdns_misc.hh      Mon Jun 30 11:00:50 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-pdns_misc.hh,v 1.3 2025/06/30 11:00:50 jperkin Exp $
+
+Checking for CLOCK_THREAD_CPUTIME_ID is sufficient, not all systems
+define _POSIX_THREAD_CPUTIME.
+
+--- pdns/misc.hh.orig  2025-06-20 13:40:32.920712323 +0000
++++ pdns/misc.hh
+@@ -187,7 +187,7 @@ string bitFlip(const string &str);
+ void dropPrivs(int uid, int gid);
+ void cleanSlashes(string &str);
+ 
+-#if defined(_POSIX_THREAD_CPUTIME) && defined(CLOCK_THREAD_CPUTIME_ID)
++#if defined(CLOCK_THREAD_CPUTIME_ID)
+ /** CPUTime measurements */
+ class CPUTime
+ {

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