Merge branch 'rawhide' into epel8

This commit is contained in:
Morten Stevens 2023-04-04 17:24:54 +02:00
commit 2b7a1e1fc7
5 changed files with 62 additions and 14 deletions

4
.gitignore vendored
View File

@ -58,3 +58,7 @@ pdns-2.9.22.tar.gz
/pdns-4.6.0.tar.bz2
/pdns-4.6.1.tar.bz2
/pdns-4.6.2.tar.bz2
/pdns-4.7.0.tar.bz2
/pdns-4.7.1.tar.bz2
/pdns-4.7.2.tar.bz2
/pdns-4.7.3.tar.bz2

View File

@ -1,11 +0,0 @@
--- pdns-4.5.0/pdns/common_startup.cc.orig 2021-06-06 17:05:27.000000000 +0200
+++ pdns-4.5.0/pdns/common_startup.cc 2021-07-24 20:52:46.332575172 +0200
@@ -227,7 +227,7 @@ void declareArguments()
::arg().set("default-publish-cds","Default value for PUBLISH-CDS")="";
::arg().set("include-dir","Include *.conf files from this directory");
- ::arg().set("security-poll-suffix", "Zone name from which to query security update notifications") = "secpoll.powerdns.com.";
+ ::arg().set("security-poll-suffix", "Zone name from which to query security update notifications") = "";
::arg().setSwitch("expand-alias", "Expand ALIAS records")="no";
::arg().setSwitch("outgoing-axfr-expand-alias", "Expand ALIAS records during outgoing AXFR")="no";

21
pdns-gcc13.patch Normal file
View File

@ -0,0 +1,21 @@
From d8b4ea24dc5dbe7c53c24bfffba24bcae7f58e02 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 23 Jan 2023 14:54:09 +0100
Subject: [PATCH] lock.hh: include <stdexcept>
---
pdns/lock.hh | 1 +
1 file changed, 1 insertion(+)
diff --git a/pdns/lock.hh b/pdns/lock.hh
index e8bd82988da..a08951a266d 100644
--- a/pdns/lock.hh
+++ b/pdns/lock.hh
@@ -22,6 +22,7 @@
#pragma once
#include <mutex>
#include <shared_mutex>
+#include <stdexcept>
/*
This file provides several features around locks:

View File

@ -2,13 +2,13 @@
%global backends %{nil}
Name: pdns
Version: 4.6.2
Version: 4.7.3
Release: 1%{?dist}
Summary: A modern, advanced and high performance authoritative-only nameserver
License: GPLv2
URL: http://powerdns.com
Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
Patch0: pdns-disable-secpoll.patch
Patch0: pdns-gcc13.patch
ExcludeArch: %{arm} %{ix86}
Requires(pre): shadow-utils
@ -179,6 +179,7 @@ sed -i \
-e 's/# setuid=/setuid=pdns/' \
-e 's/# setgid=/setgid=pdns/' \
-e 's/# launch=/launch=bind/' \
-e 's/# security-poll-suffix=secpoll\.powerdns\.com\./security-poll-suffix=/' \
%{buildroot}%{_sysconfdir}/%{name}/pdns.conf
%{__rm} %{buildroot}/%{_bindir}/stubquery
@ -269,6 +270,7 @@ exit 0
%{_pkgdocdir}/3.4.0_to_4.1.0_schema.mysql.sql
%{_pkgdocdir}/4.1.0_to_4.2.0_schema.mysql.sql
%{_pkgdocdir}/4.2.0_to_4.3.0_schema.mysql.sql
%{_pkgdocdir}/4.3.0_to_4.7.0_schema.mysql.sql
%{_pkgdocdir}/enable-foreign-keys.mysql.sql
%{_libdir}/%{name}/libgmysqlbackend.so
@ -279,6 +281,7 @@ exit 0
%{_pkgdocdir}/3.4.0_to_4.1.0_schema.pgsql.sql
%{_pkgdocdir}/4.1.0_to_4.2.0_schema.pgsql.sql
%{_pkgdocdir}/4.2.0_to_4.3.0_schema.pgsql.sql
%{_pkgdocdir}/4.3.0_to_4.7.0_schema.pgsql.sql
%{_libdir}/%{name}/libgpgsqlbackend.so
%files backend-pipe
@ -303,6 +306,7 @@ exit 0
%{_pkgdocdir}/4.0.0_to_4.2.0_schema.sqlite3.sql
%{_pkgdocdir}/4.2.0_to_4.3.0_schema.sqlite3.sql
%{_pkgdocdir}/4.3.0_to_4.3.1_schema.sqlite3.sql
%{_pkgdocdir}/4.3.1_to_4.7.0_schema.sqlite3.sql
%{_libdir}/%{name}/libgsqlite3backend.so
%files backend-tinydns
@ -317,6 +321,36 @@ exit 0
%{_unitdir}/ixfrdist@.service
%changelog
* Tue Apr 04 2023 Morten Stevens <mstevens@fedoraproject.org> - 4.7.3-1
- Update to 4.7.3
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 4.7.2-5
- Rebuilt for Boost 1.81
* Mon Jan 23 2023 Morten Stevens <mstevens@fedoraproject.org> - 4.7.2-4
- Fix missing include for gcc13
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 08 2022 Richard Shaw <hobbes1069@gmail.com> - 4.7.2-2
- Rebuild for yaml-cpp 0.7.0.
* Tue Nov 01 2022 Morten Stevens <mstevens@fedoraproject.org> - 4.7.2-1
- Update to 4.7.2
* Mon Oct 31 2022 Morten Stevens <mstevens@fedoraproject.org> - 4.7.1-1
- Update to 4.7.1
* Sat Oct 22 2022 Morten Stevens <mstevens@fedoraproject.org> - 4.7.0-1
- Update to 4.7.0
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 4.6.2-2
- Rebuilt for Boost 1.78
* Tue Apr 12 2022 Morten Stevens <mstevens@fedoraproject.org> - 4.6.2-1
- Update to 4.6.2

View File

@ -1 +1 @@
SHA512 (pdns-4.6.2.tar.bz2) = 10e7f4338f99f063ca8d694c148d468e66dd1b9feb2cf8dba04861396addb138b9335908d666e7e2701424d1fdb3c29e40b596098f19b1443643b9e6ab356c0a
SHA512 (pdns-4.7.3.tar.bz2) = 25ca5ef04297efc56f6b88e06177d0db5ed390844225dbc53bff6a9299ba3f711aa27642adca31df0f04e6af7059280690a3793458090cd6b2703cbc4fc9072a