Boost.System is headers only since 1.69 and stub library removed in 1.89

Change to new boost.m4 from upstream project

_service

@@ -1,6 +1,6 @@
 <services>
 <service name="cargo_vendor" mode="manual">
-  <param name="src">pdns-recursor-5.1.1/settings/rust/</param>
+  <param name="src">pdns-recursor-5.2.5/settings/rust/</param>
   <param name="compression">zst</param>
   <param name="update">true</param>
 </service>

boost-m4-39.patch

@@ -0,0 +1,90 @@
+diff -purN a/m4/boost.m4 b/m4/boost.m4
+--- a/m4/boost.m4	2025-07-28 11:49:44.000000000 +0200
++++ b/m4/boost.m4	2025-10-26 15:44:41.781334662 +0100
+@@ -22,7 +22,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ m4_define([_BOOST_SERIAL], [m4_translit([
+-# serial 38
++# serial 39
+ ], [#
+ ], [])])
+ 
+@@ -226,7 +226,7 @@ AC_LANG_POP([C++])dnl
+   AC_CACHE_CHECK([for Boost's header version],
+     [boost_cv_lib_version],
+     [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
+-     _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
++     _BOOST_SED_CPP([[/^.*boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
+                     [#include <boost/version.hpp>
+ boost-lib-version = BOOST_LIB_VERSION],
+     [boost_cv_lib_version=`cat conftest.i`])])
+@@ -1332,11 +1332,16 @@ BOOST_DEFUN([String_Algo],
+ # --------------------------------
+ # Look for Boost.System.  For the documentation of PREFERRED-RT-OPT, see the
+ # documentation of BOOST_FIND_LIB above.  This library was introduced in Boost
+-# 1.35.0.
++# 1.35.0 and is header only since 1.70.
+ BOOST_DEFUN([System],
+-[BOOST_FIND_LIB([system], [$1],
++[
++if test $boost_major_version -ge 170; then
++  BOOST_FIND_HEADER([boost/system/error_code.hpp])
++else
++  BOOST_FIND_LIB([system], [$1],
+                 [boost/system/error_code.hpp],
+                 [boost::system::error_code e; e.clear();], [], [], [$2])
++fi
+ ])# BOOST_SYSTEM
+ 
+ 
+@@ -1615,10 +1620,6 @@ if test x$boost_cv_inc_path != xno; then
+   # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
+   # the same defines as GCC's).
+   for i in \
+-    "defined __clang__ && __clang_major__ == 18 && __clang_minor__ == 1 @ clang181" \
+-    "defined __clang__ && __clang_major__ == 17 && __clang_minor__ == 0 @ clang170" \
+-    "defined __clang__ && __clang_major__ == 16 && __clang_minor__ == 0 @ clang160" \
+-    "defined __clang__ && __clang_major__ == 15 && __clang_minor__ == 0 @ clang150" \
+     "defined __clang__ && __clang_major__ == 14 && __clang_minor__ == 0 @ clang140" \
+     "defined __clang__ && __clang_major__ == 13 && __clang_minor__ == 0 @ clang130" \
+     "defined __clang__ && __clang_major__ == 12 && __clang_minor__ == 0 @ clang120" \
+@@ -1634,38 +1635,16 @@ if test x$boost_cv_inc_path != xno; then
+     "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 9 @ clang39" \
+     "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 8 @ clang38" \
+     "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 7 @ clang37" \
+-    _BOOST_mingw_test(13, 2) \
+-    _BOOST_gcc_test(13, 2) \
+-    _BOOST_mingw_test(13, 1) \
+-    _BOOST_gcc_test(13, 1) \
+-    _BOOST_mingw_test(12, 3) \
+-    _BOOST_gcc_test(12, 3) \
+-    _BOOST_mingw_test(12, 2) \
+-    _BOOST_gcc_test(12, 2) \
+-    _BOOST_mingw_test(12, 1) \
+-    _BOOST_gcc_test(12, 1) \
+-    _BOOST_mingw_test(11, 4) \
+-    _BOOST_gcc_test(11, 4) \
+-    _BOOST_mingw_test(11, 3) \
+-    _BOOST_gcc_test(11, 3) \
+     _BOOST_mingw_test(11, 2) \
+     _BOOST_gcc_test(11, 2) \
+     _BOOST_mingw_test(11, 1) \
+     _BOOST_gcc_test(11, 1) \
+-    _BOOST_mingw_test(10, 5) \
+-    _BOOST_gcc_test(10, 5) \
+-    _BOOST_mingw_test(10, 4) \
+-    _BOOST_gcc_test(10, 4) \
+     _BOOST_mingw_test(10, 3) \
+     _BOOST_gcc_test(10, 3) \
+     _BOOST_mingw_test(10, 2) \
+     _BOOST_gcc_test(10, 2) \
+     _BOOST_mingw_test(10, 1) \
+     _BOOST_gcc_test(10, 1) \
+-    _BOOST_mingw_test(9, 5) \
+-    _BOOST_gcc_test(9, 5) \
+-    _BOOST_mingw_test(9, 4) \
+-    _BOOST_gcc_test(9, 4) \
+     _BOOST_mingw_test(9, 3) \
+     _BOOST_gcc_test(9, 3) \
+     _BOOST_mingw_test(9, 2) \

pdns-recursor-5.1.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b7ab793ace822294a3f38092fe72ee64748ff0cbb8a5283dc77f40780605ae9
-size 1709091

pdns-recursor-5.2.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8a657a7abd6e9d237cdd26753f7dcf5ccd5b8c48ac8120b08d2b8d57a1d856a
+size 1726625

pdns-recursor.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Sun Oct 26 14:54:39 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- Boost.System is headers only since 1.69 and stub library removed in
+  1.89. Change to new boost.m4 from upstream project.
+  + Add boost-m4-39.patch
+
+-------------------------------------------------------------------
+Thu Aug 14 01:49:02 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- update to 5.2.5 (CVE-2025-30192 boo#246841)
+  https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2025-04.html
+  https://doc.powerdns.com/recursor/changelog/5.1.html#change-5.1.4
+  https://doc.powerdns.com/recursor/changelog/5.1.html#change-5.1.6
+  https://doc.powerdns.com/recursor/changelog/5.1.html#change-5.1.7
+  https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.0
+  https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.1
+  https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.2
+  https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.3
+  https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.4
+  https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.5
+- reenable snmp support ( we had the BR but not the configure flag)
+- add missing BR for fstrm and libcurl
+- enable NOD support (new BR libboost_filesystem-devel)
+- enable luajit where possible
+
+-------------------------------------------------------------------
+Sat Mar 22 22:54:01 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 5.1.3:
+  * Implement rfc6303 special zones (mostly v6 reverse mappings)
+  * Distinguish OS imposed limits from app imposed limits,
+    specifically on chains.
+
+-------------------------------------------------------------------
+Tue Nov  5 01:41:30 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- update to 5.1.2 (boo#1231292 CVE-2024-25590)
+  https://doc.powerdns.com/recursor/changelog/5.1.html#change-5.1.2
+- drop powerdns-5_1_1-2_fix-build-with-boost-1_86_0.patch included
+  in update
+
 -------------------------------------------------------------------
 Sun Sep 29 19:46:28 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 

pdns-recursor.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package pdns-recursor
 #
-# Copyright (c) 2024 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,8 +25,18 @@
 %bcond_without systemd_separetedlibs
 %endif
 
+%ifarch ppc64le
+%bcond_with     pdns_luajit
+%else
+%if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1599
+%bcond_without  pdns_luajit
+%else
+%bcond_with     pdns_luajit
+%endif
+%endif
+
 Name:           pdns-recursor
-Version:        5.1.1
+Version:        5.2.5
 Release:        0
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -45,23 +55,29 @@ BuildRequires:  gcc-c++
 
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_context-devel
-BuildRequires:  libboost_system-devel
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  (libboost_system-devel if boost-devel < 1.89)
 BuildRequires:  libboost_thread-devel
-%else
-BuildRequires:  boost-devel >= 1.66
 %endif
+BuildRequires:  boost-devel >= 1.66
 
 BuildRequires:  libsodium-devel
-BuildRequires:  lua-devel
+%if %{with pdns_luajit}
+BuildRequires:  pkgconfig(luajit)
+%else
+BuildRequires:  pkgconfig(lua)
+%endif
 BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python3
+BuildRequires:  pkgconfig(libfstrm)
 %if 0%{?suse_version}
 PreReq:         shadow
 %else
 PreReq:         shadow-utils
 %endif
+BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(systemd)
 %if %{with systemd_separetedlibs}
 BuildRequires:  pkgconfig(libsystemd)
@@ -80,7 +96,8 @@ Provides:       bundled(yahttp)
 URL:            https://www.powerdns.com/
 Source:         https://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Source10:       https://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2.sig
-Source11:       https://powerdns.com/powerdns-keyblock.asc#/pdns-recursor.keyring
+# on https://docs.powerdns.com/recursor/security.html but 404 right now, emailed them
+Source11:       %{name}.keyring
 Source1:        pdns-recursor.init
 Source2:        recursor.conf
 Source3:        vendor.tar.zst
@@ -88,7 +105,8 @@ Source3:        vendor.tar.zst
 Source99:       series
 Patch1:         boost_context.patch
 Patch2:         cargo_build_fix.patch
-Patch3:         powerdns-5_1_1-2_fix-build-with-boost-1_86_0.patch
+# PATCH-FIX-OPENSUSE - use version 58 of boost.m4
+Patch3:         boost-m4-39.patch
 #
 Summary:        Modern, advanced and high performance recursing/non authoritative nameserver
 License:        GPL-2.0-or-later
@@ -120,6 +138,8 @@ ln effective_tld_names.dat effective_tld_list.dat
   --sysconfdir=%{_sysconfdir}/pdns/  \
   --enable-dns-over-tls              \
   --with-lua                         \
+  --enable-nod                       \
+  --with-net-snmp                    \
   --with-socketdir=%{_rundir}        \
   --with-service-user=pdns           \
   --with-service-group=pdns

powerdns-5_1_1-2_fix-build-with-boost-1_86_0.patch

@@ -1,31 +0,0 @@
-From 2c64bff84abde12139cb3b6bf779cf566daeaddc Mon Sep 17 00:00:00 2001
-From: Michael Cho <michael@michaelcho.dev>
-Date: Thu, 15 Aug 2024 22:49:17 -0400
-Subject: [PATCH] Fix build with boost 1.86.0
-
-Boost 1.86.0 changes seem to no longer indirectly include header which
-causes build to fail with:
-```
-uuid-utils.cc:38:58:
-error: 'random' is not a class, namespace, or enumeration
-```
-
-boost/random/mersenne_twister.hpp has been available since Boost 1.21.2
-
-(cherry picked from commit eed56000b1d68ac083b8e8bea4ff0ea30a1579c4)
----
- pdns/uuid-utils.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: pdns-recursor-5.1.1/uuid-utils.cc
-===================================================================
---- pdns-recursor-5.1.1.orig/uuid-utils.cc
-+++ pdns-recursor-5.1.1/uuid-utils.cc
-@@ -30,6 +30,7 @@
- #endif /* BOOST_PENDING_INTEGER_LOG2_HPP */
- #endif /* BOOST_VERSION */
- 
-+#include <boost/random/mersenne_twister.hpp>
- #include <boost/uuid/uuid_generators.hpp>
- 
- // The default of:

series

@@ -1,3 +1,2 @@
 boost_context.patch
 cargo_build_fix.patch
-powerdns-5_1_1-2_fix-build-with-boost-1_86_0.patch

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32066896f0d17d58331dc29902a5ccfeaf7c979614c3e47a014eea9ad02e62a0
-size 6869041
+oid sha256:510ec4c178c3c276f98e1f5d231cfdfaa43775a8e1359f1e91e529b2b438026a
+size 6998747