From 3c6c69ffa279000d0b2fd7eaae3ba41d535b31f0 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Dec 17 2013 19:19:59 +0000 Subject: Update to 3.3.1 --- diff --git a/.gitignore b/.gitignore index 8ee0ca6..dc18fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,12 @@ pdns-2.9.22.tar.gz -/pdns-2.9.22.5.tar.gz -/pdns-2.9.22.6.tar.gz +/pdns-3.0-pre.20110327.2103.tar.gz +/pdns-3.0-rc2.tar.gz +/pdns-3.0-rc3.tar.gz +/pdns-3.0.tar.gz +/pdns-3.0.1.tar.gz +/pdns-3.1.tar.gz +/pdns-3.2.tar.gz +/pdns-3.3-rc1.tar.gz +/pdns-3.3-rc2.tar.gz +/pdns-3.3.tar.gz +/pdns-3.3.1.tar.gz diff --git a/pdns-default-config.patch b/pdns-default-config.patch index c26fe2c..e6d2075 100644 --- a/pdns-default-config.patch +++ b/pdns-default-config.patch @@ -1,9 +1,9 @@ ---- pdns-3.1/pdns/pdns.conf-dist.orig 2012-05-04 12:13:23.000000000 +0200 -+++ pdns-3.1/pdns/pdns.conf-dist 2012-10-18 23:07:42.614876259 +0200 +--- pdns-3.3-rc2/pdns/pdns.conf-dist.orig 2013-06-14 11:51:22.000000000 +0200 ++++ pdns-3.3-rc2/pdns/pdns.conf-dist 2013-06-28 13:45:37.307992960 +0200 @@ -1,3 +1,6 @@ +setuid=pdns +setgid=pdns +launch=bind # Autogenerated configuration file template ################################# - # allow-axfr-ips Allow zonetransfers only to these subnets + # add-superfluous-nsec3-for-old-bind Add superfluous NSEC3 record to positive wildcard response diff --git a/pdns-fixinit.patch b/pdns-fixinit.patch index 10ce827..c721fd1 100644 --- a/pdns-fixinit.patch +++ b/pdns-fixinit.patch @@ -1,15 +1,15 @@ ---- pdns-3.1/pdns/pdns.in.orig 2012-05-04 12:13:23.000000000 +0200 -+++ pdns-3.1/pdns/pdns.in 2012-10-26 17:25:09.000000000 +0200 +--- pdns-3.3/pdns/pdns.in.orig 2013-06-10 09:02:40.000000000 +0200 ++++ pdns-3.3/pdns/pdns.in 2013-07-08 22:36:59.277997994 +0200 @@ -8,7 +8,7 @@ # Required-Stop: $remote_fs $network $syslog - # Should-Start: $all - # Should-Stop: $all + # Should-Start: + # Should-Stop: -# Default-Start: 2 3 4 5 +# Default-Start: # Default-Stop: 0 1 6 - # Short-Description: Start/stop PowerDNS authoritative server - # Description: Start/stop PowerDNS authoritative server -@@ -62,6 +62,7 @@ case "$1" in + # Short-Description: PowerDNS authoritative server + # Description: PowerDNS authoritative server +@@ -63,6 +63,7 @@ case "$1" in if test "$NOTRUNNING" = "0" then doPC quit @@ -17,7 +17,7 @@ echo $ret else echo "not running" -@@ -72,6 +73,7 @@ case "$1" in +@@ -73,6 +74,7 @@ case "$1" in force-stop) echo -n "Stopping PowerDNS authoritative nameserver: " killall -v -9 pdns_server @@ -25,13 +25,15 @@ echo "killed" ;; -@@ -83,11 +85,22 @@ case "$1" in +@@ -84,6 +86,7 @@ case "$1" in else if $pdns_server --daemon --guardian=yes then + touch /var/lock/subsys/pdns echo "started" - fi + else + echo "starting failed" +@@ -92,6 +95,16 @@ case "$1" in fi ;; @@ -48,7 +50,7 @@ force-reload | restart) echo -n "Restarting PowerDNS authoritative nameserver: " if test "$NOTRUNNING" = "1" -@@ -190,7 +203,7 @@ case "$1" in +@@ -194,7 +207,7 @@ case "$1" in *) diff --git a/pdns.spec b/pdns.spec index 2490cbc..3a186f3 100644 --- a/pdns.spec +++ b/pdns.spec @@ -1,11 +1,11 @@ %global backends %{nil} -Summary: A modern, advanced and high performance authoritative-only nameserver Name: pdns -Version: 3.1 -Release: 2%{?dist} -License: GPLv2 +Version: 3.3.1 +Release: 1%{?dist} +Summary: A modern, advanced and high performance authoritative-only nameserver Group: System Environment/Daemons +License: GPLv2 URL: http://powerdns.com Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz Patch0: pdns-default-config.patch @@ -16,11 +16,11 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: chrpath BuildRequires: boost-devel BuildRequires: lua-devel BuildRequires: cryptopp-devel +BuildRequires: bison +BuildRequires: polarssl-devel Provides: powerdns = %{version}-%{release} %description @@ -29,83 +29,114 @@ authoritative-only nameserver. It is written from scratch and conforms to all relevant DNS standards documents. Furthermore, PowerDNS interfaces with almost any database. -%package backend-mysql -Summary: MySQL backend for %{name} -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: mysql-devel +%package tools +Summary: Extra tools for %{name} +Group: System Environment/Daemons + +%description tools +This package contains the extra tools for %{name} + +%package backend-mysql +Summary: MySQL backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: mysql-devel %global backends %{backends} gmysql -%package backend-postgresql -Summary: PostgreSQL backend for %{name} -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: postgresql-devel -%global backends %{backends} gpgsql +%description backend-mysql +This package contains the gmysql backend for %{name} -%package backend-pipe -Summary: Pipe backend for %{name} -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -%global backends %{backends} pipe +%package backend-postgresql +Summary: PostgreSQL backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: postgresql-devel +%global backends %{backends} gpgsql -%package backend-geo -Summary: Geo backend for %{name} -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -%global backends %{backends} geo +%description backend-postgresql +This package contains the gpgsql backend for %{name} -%package backend-ldap -Summary: LDAP backend for %{name} -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: openldap-devel -%global backends %{backends} ldap +%package backend-pipe +Summary: Pipe backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%global backends %{backends} pipe -%package backend-sqlite -Summary: SQLite backend for %{name} -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: sqlite-devel -%global backends %{backends} gsqlite3 +%description backend-pipe +This package contains the pipe backend for %{name} -%description backend-mysql -This package contains the gmysql backend for %{name} +%package backend-remote +Summary: Remote backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: libcurl-devel +%global backends %{backends} remote -%description backend-postgresql -This package contains the gpgsql backend for %{name} +%description backend-remote +This package contains the remote backend for %{name} -%description backend-pipe -This package contains the pipe backend for %{name} +%package backend-geo +Summary: Geo backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%global backends %{backends} geo -%description backend-geo +%description backend-geo This package contains the geo backend for %{name} It allows different answers to DNS queries coming from different IP address ranges or based on the geographic location -%description backend-ldap +%package backend-ldap +Summary: LDAP backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: openldap-devel +%global backends %{backends} ldap + +%description backend-ldap This package contains the ldap backend for %{name} -%description backend-sqlite -This package contains the SQLite backend for %{name} +%package backend-lua +Summary: LUA backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%global backends %{backends} lua + +%description backend-lua +This package contains the lua backend for %{name} + +%package backend-sqlite +Summary: SQLite backend for %{name} +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: sqlite-devel +%global backends %{backends} gsqlite3 +%description backend-sqlite +This package contains the SQLite backend for %{name} %prep %setup -q %patch0 -p1 -b .default-config-patch %patch1 -p1 -b .fixinit +# No inclusion of pre-built binaries or libraries +rm -rf pdns/ext/polarssl-* + %build -export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}" +export CPPFLAGS="-DLDAP_DEPRECATED" %configure \ --sysconfdir=%{_sysconfdir}/%{name} \ --libdir=%{_libdir}/%{name} \ --disable-static \ --with-modules='' \ + --with-system-polarssl \ --with-lua \ --with-dynmodules='%{backends}' \ - --enable-cryptopp + --enable-cryptopp \ + --enable-tools \ + --enable-remotebackend-http sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -121,13 +152,6 @@ make install DESTDIR=%{buildroot} chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf -# strip the static rpath from the binaries -chrpath --delete %{buildroot}%{_bindir}/pdns_control -chrpath --delete %{buildroot}%{_bindir}/zone2ldap -chrpath --delete %{buildroot}%{_bindir}/zone2sql -chrpath --delete %{buildroot}%{_sbindir}/pdns_server -chrpath --delete %{buildroot}%{_libdir}/%{name}/*.so - %pre getent group pdns >/dev/null || groupadd -r pdns getent passwd pdns >/dev/null || \ @@ -149,53 +173,83 @@ if [ $1 -ge 1 ]; then /sbin/service pdns condrestart >/dev/null 2>&1 || : fi -%clean -%{__rm} -rf %{buildroot} - %files -%defattr(-,root,root,-) %doc COPYING README -%{_bindir}/dnsreplay %{_bindir}/pdns_control %{_bindir}/pdnssec %{_bindir}/zone2ldap %{_bindir}/zone2sql +%{_bindir}/zone2json %{_sbindir}/pdns_server %{_mandir}/man8/pdns_control.8.gz %{_mandir}/man8/pdns_server.8.gz %{_mandir}/man8/zone2sql.8.gz +%{_mandir}/man8/zone2ldap.8.gz +%{_mandir}/man8/pdnssec.8.gz %{_initrddir}/pdns %dir %{_libdir}/%{name}/ %dir %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/%{name}/pdns.conf +%files tools +%{_bindir}/dnsbulktest +%{_bindir}/dnsreplay +%{_bindir}/dnsscan +%{_bindir}/dnsscope +%{_bindir}/dnstcpbench +%{_bindir}/dnswasher +%{_bindir}/nproxy +%{_bindir}/nsec3dig +%{_mandir}/man8/dnsreplay.8.gz +%{_mandir}/man8/dnsscope.8.gz +%{_mandir}/man8/dnswasher.8.gz +%{_mandir}/man1/dnstcpbench.1.gz + %files backend-mysql -%defattr(-,root,root,-) +%doc pdns/dnssec.schema.mysql.sql +%doc pdns/no-dnssec.schema.mysql.sql %{_libdir}/%{name}/libgmysqlbackend.so %files backend-postgresql -%defattr(-,root,root,-) +%doc pdns/dnssec.schema.pgsql.sql +%doc pdns/no-dnssec.schema.pgsql.sql %{_libdir}/%{name}/libgpgsqlbackend.so %files backend-pipe -%defattr(-,root,root,-) %{_libdir}/%{name}/libpipebackend.so +%files backend-remote +%{_libdir}/%{name}/libremotebackend.so + %files backend-geo -%defattr(-,root,root,-) %doc modules/geobackend/README %{_libdir}/%{name}/libgeobackend.so %files backend-ldap -%defattr(-,root,root,-) %{_libdir}/%{name}/libldapbackend.so +%files backend-lua +%{_libdir}/%{name}/libluabackend.so + %files backend-sqlite -%defattr(-,root,root,-) +%doc pdns/dnssec.schema.sqlite3.sql +%doc pdns/no-dnssec.schema.sqlite3.sql +%doc pdns/bind-dnssec.schema.sqlite3.sql %{_libdir}/%{name}/libgsqlite3backend.so - %changelog +* Tue Dec 17 2013 Morten Stevens - 3.3.1-1 +- Update to latest upstream release 3.3.1 +- Some more DNSSEC improvements +- Several bugs fixed since 3.1 +- Add extra tools package for pdns +- Add Remote backend +- Add LUA backend +- Enable remotebackend-http +- Add extra tools package for pdns +- Add polarssl-devel as build dependency +- Fix bogus date in changelog + * Sun Oct 28 2012 Morten Stevens - 3.1-2 - Spec improvements @@ -267,29 +321,39 @@ fi * Tue Sep 11 2007 Ruben Kerkhof 2.9.21-2 - Fix license tag - Add README for geo backend to docs + * Tue Apr 24 2007 Ruben Kerkhof 2.9.21-1 - Upstream released 2.9.21 - Enabled new SQLite backend -* Thu Apr 10 2007 2.9.20-9 + +* Tue Apr 10 2007 2.9.20-9 - Add Requires for chkconfig, service and useradd (#235582) + * Mon Jan 1 2007 2.9.20-8 - Add the pdns user and group to the config file - Don't restart pdns on an upgrade - Minor cleanups in scriptlets + * Mon Jan 1 2007 2.9.20-7 - Fixed typo in scriptlet + * Mon Jan 1 2007 2.9.20-6 - Check if user pdns exists before adding it + * Sat Dec 30 2006 2.9.20-5 - Strip rpath from the backends as well + * Fri Dec 29 2006 2.9.20-4 - Disable rpath + * Thu Dec 28 2006 2.9.20-3 - More fixes as per review #219973 + * Wed Dec 27 2006 2.9.20-2 - A few changes for FE review (bz #219973): - Renamed package to pdns, since that's how upstream calls it - Removed calls to ldconfig - Subpackages now require %%{version}-%%{release} + * Sat Dec 16 2006 2.9.20-1 - Initial import diff --git a/sources b/sources index e5b69e7..5a73878 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7dedae65403b31a795b2d53a512947fd pdns-3.1.tar.gz +074e2ff211fd12ecad25b5c1cc190dd4 pdns-3.3.1.tar.gz