commit pdns for openSUSE:Factory
Hello community,
here is the log from the commit of package pdns for openSUSE:Factory
checked in at Wed Apr 28 23:08:20 CEST 2010.
--------
--- pdns/pdns.changes 2009-06-09 15:28:56.000000000 +0200
+++ pdns/pdns.changes 2010-04-28 12:30:04.000000000 +0200
@@ -1,0 +2,17 @@
+Wed Apr 28 10:28:51 UTC 2010 - mrueckert@suse.de
+
+- create /var/run/pdns directory in the init script and package it
+ as ghost.
+
+-------------------------------------------------------------------
+Wed Apr 28 00:46:52 UTC 2010 - mrueckert@suse.de
+
+- fix feature guards
+
+-------------------------------------------------------------------
+Tue Apr 27 19:47:13 UTC 2010 - mrueckert@suse.de
+
+- add pdns-2.9.22_missing_includes.patch:
+ add missing includes
+
+-------------------------------------------------------------------
@@ -6,0 +24,23 @@
+Wed Jan 28 17:50:02 CET 2009 - mrueckert@suse.de
+
+- updated to version 2.9.22
+ "This is a huge release, spanning almost 20 months of
+ development. Besides fixing a lot of bugs, of note is the
+ addition of the so called 'Notification Proxy', which allows
+ PowerDNS to function as a master server behind a firewall, plus
+ the huge performance improvement of the internal caches."
+ http://doc.powerdns.com/changelog.html#CHANGELOG-AUTH-2-9-22
+- updated pdns-2.9.21.1-wrong-pgsql.patch
+ new name: pdns-2.9.22_wrong_pgsql.patch
+- updated pdns-2.9.21.1_new_boost_exceptions.patch:
+ most fixes went into 2.9.22. Just the LDAP chunk got lost
+ somehow. Additional the new patch also fixes the odbc backend
+ (we do not build this one, but the patch got also send upstream)
+ new name pdns-2.9.22_new_boost_exceptions.patch
+- dropped patches after upstream included them:
+ pdns-2.9.21.1_gcc43.patch
+ pdns-2.9.21.1_unversioned_modules.patch
+- added pdns-2.9.22_warnings.patch:
+ fix 2 small compiler warnings
+
+-------------------------------------------------------------------
@@ -16,0 +57,5 @@
+
+-------------------------------------------------------------------
+Fri Nov 14 21:05:09 CET 2008 - mrueckert@suse.de
+
+- make conditionals use suse_version instead of sles_version
calling whatdependson for head-i586
Old:
----
pdns-2.9.21.1-wrong-pgsql.patch
pdns-2.9.21.1_gcc43.patch
pdns-2.9.21.1_new_boost_exceptions.patch
pdns-2.9.21.1_unversioned_modules.patch
pdns-2.9.21.2.tar.bz2
pdns-2.9.21.2_fix_default_config.patch
pdns-2.9.21.2_gcc44.patch
New:
----
pdns-2.9.22.tar.bz2
pdns-2.9.22_missing_includes.patch
pdns-2.9.22_new_boost_exceptions.patch
pdns-2.9.22_warnings.patch
pdns-2.9.22_wrong_pgsql.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pdns.spec ++++++
--- /var/tmp/diff_new_pack.wJKrCp/_old 2010-04-28 23:05:49.000000000 +0200
+++ /var/tmp/diff_new_pack.wJKrCp/_new 2010-04-28 23:05:49.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package pdns (Version 2.9.21.2)
+# spec file for package pdns (Version 2.9.22)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,31 +19,30 @@
Name: pdns
-Version: 2.9.21.2
-Release: 2
+Version: 2.9.22
+Release: 1
#
Group: Productivity/Networking/DNS/Servers
-License: GPL v2 or later
+License: GPLv2+
#
%define pkg_name pdns
%define home %{_var}/lib/pdns
%define _localstatedir %{_var}/run/pdns
-%define with_recursor 0
#
-%define with_opendbx 0
-%define with_xdb 0
-%define with_sqlite2 1
-%if 0%{?sles_version} != 9
-%define with_sqlite3 1
+%if 0%{?sles_version} < 11
+%define with_pdns_sqlite2 1
+%endif
+%if 0%{?suse_version} > 1000
+%define with_pdns_sqlite3 1
%endif
#
BuildRequires: boost-devel docbook-toys docbook-utils docbook-xsl-stylesheets gcc-c++ gdbm-devel mysql-devel openldap2-devel postgresql-devel pwdutils
# we add opendbx-backend-sqlite2 as we pull in sqlite2 anyway and we need one installed backend
-%if 0%{?with_sqlite3}
+%if 0%{?with_pdns_sqlite3}
BuildRequires: sqlite-devel >= 3
%endif
#
-%if 0%{?with_sqlite2}
+%if 0%{?with_pdns_sqlite2}
%if 0%{?sles_version} == 9
BuildRequires: sqlite-devel
%else
@@ -51,12 +50,15 @@
%endif
%endif
#
-%if 0%{?with_opendbx}
-BuildRequires: opendbx-backend-sqlite2 opendbx-devel
+%if 0%{?with_pdns_opendbx}
+BuildRequires: opendbx-backend-pgsql opendbx-devel
%endif
-%if 0%{?with_xdb}
+%if 0%{?with_pdns_xdb}
BuildRequires: tdb-devel
%endif
+%if 0%{?with_pdns_recursor}
+BuildRequires: lua-devel pkg-config
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq pwdutils
#
@@ -64,12 +66,10 @@
Source: %{name}-%{version}.tar.bz2
Source1: rcpdns
Source2: README.opendbx
-Patch1: pdns-2.9.21.1_unversioned_modules.patch
-Patch2: pdns-2.9.21.1_gcc43.patch
-Patch3: pdns-2.9.21.1-wrong-pgsql.patch
-Patch4: pdns-2.9.21.1_new_boost_exceptions.patch
-Patch5: pdns-2.9.21.2_fix_default_config.patch
-Patch6: pdns-2.9.21.2_gcc44.patch
+Patch: pdns-2.9.22_new_boost_exceptions.patch
+Patch1: pdns-2.9.22_wrong_pgsql.patch
+Patch2: pdns-2.9.22_warnings.patch
+Patch3: pdns-2.9.22_missing_includes.patch
#
Summary: Modern, advanced and high performance authoritative-only nameserver
@@ -86,7 +86,7 @@
http://www.powerdns.com
%package backend-mysql
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: MySQL backend for pdns
@@ -106,7 +106,7 @@
http://www.powerdns.com
%package backend-postgresql
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: PostgreSQL backend for pdns
@@ -125,10 +125,10 @@
--------
http://www.powerdns.com
-%if 0%{?with_sqlite2}
+%if 0%{?with_pdns_sqlite2}
%package backend-sqlite2
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: SQLite 2 backend for pdns
@@ -148,10 +148,11 @@
http://www.powerdns.com
%endif
-%if 0%{?with_sqlite3}
+
+%if 0%{?with_pdns_sqlite3}
%package backend-sqlite3
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: SQLite 3 backend for pdns
@@ -173,7 +174,7 @@
%endif
%package backend-ldap
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: LDAP backend for pdns
@@ -192,10 +193,10 @@
--------
http://www.powerdns.com
-%if 0%{?with_opendbx}
+%if 0%{?with_pdns_opendbx}
%package backend-opendbx
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: OpenDBX backend for pdns
@@ -215,10 +216,11 @@
http://www.powerdns.com
%endif
-%if 0%{?with_xdb}
+
+%if 0%{?with_pdns_xdb}
%package backend-xdb
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: Samba TDB backend for pdns
@@ -238,10 +240,11 @@
http://www.powerdns.com
%endif
-%if %with_recursor
+
+%if 0%{?with_pdns_recursor}
%package -n pdns-recursor
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/DNS/Servers
Requires: %{name} = %{version}
Summary: Modern, advanced and high performance recursing/non authoritative nameserver
@@ -260,13 +263,12 @@
%prep
%setup
+%patch
%patch1
%patch2
%patch3
-%patch4
-%patch5
-%patch6 -p1
-%if 0%{?with_opendbx}
+#patch4
+%if 0%{?with_pdns_opendbx}
%{__cp} %{S:2} README.opendbx
%endif
%{__cp} modules/geobackend/README README.geobackend
@@ -298,35 +300,44 @@
gmysql \
gpgsql \
ldap \
-%if 0%{?with_sqlite3}
+%if 0%{?with_pdns_sqlite3}
gsqlite3 \
%endif
-%if 0%{?with_sqlite2}
+%if 0%{?with_pdns_sqlite2}
gsqlite \
%endif
-%if 0%{?with_opendbx}
+%if 0%{?with_pdns_opendbx}
opendbx \
%endif
-%if 0%{?with_xdb}
+%if 0%{?with_pdns_xdb}
xdb \
%endif
-%if 0%{?with_db2}
+%if 0%{?with_pdns_db2}
db2 \
%endif
-%if 0%{?with_odbc}
+%if 0%{?with_pdns_odbc}
odbc \
%endif
-%if 0%{?with_oracle}
+%if 0%{?with_pdns_oracle}
goracle \
oracle \
%endif
"\
-%if %with_recursor
+%if 0%{?with_pdns_recursor}
--enable-recursor
%else
--disable-recursor # we have an external package for that.
%endif
%{__make}
+%if 0%{?build_debugging_tools}
+pushd pdns
+for i in $(awk -F= '/EXTRA_PROGRAMS/ {print $2}' Makefile.am ) ; do
+ if ! [ $(echo $i | grep -c 'pdns' 2>&1) ] ; then
+ make $i ;
+ fi
+done
+popd
+%endif
pushd pdns/docs
db2html -o html pdns.sgml
find . -type d -exec chmod 755 {} \;
@@ -336,6 +347,15 @@
%install
%makeinstall
+%if 0%{?build_debugging_tools}
+pushd pdns
+for i in $(awk -F= '/EXTRA_PROGRAMS/ {print $2}' Makefile.am ) ; do
+ if ! [ $(echo $i | grep -c 'pdns' 2>&1) ] ; then
+ install -D -m 0755 $i %{buildroot}%{_sbindir}/$i ;
+ fi
+done
+popd
+%endif
%{__install} -Dd -m 0755 %{buildroot}{%{home},%{_localstatedir}}
%{__mv} %{buildroot}%{_sysconfdir}/%{pkg_name}/pdns.conf{-dist,}
%{__install} -D -m 0755 %{S:1} %{buildroot}/etc/init.d/%{pkg_name}
@@ -379,8 +399,9 @@
%{_libdir}/%{pkg_name}/libpipebackend.so*
%{_libdir}/%{pkg_name}/libgeobackend.so*
%dir %{home}
-%dir %{_localstatedir}
-%if %with_recursor
+%ghost %dir %{_localstatedir}
+
+%if 0%{?with_pdns_recursor}
%files -n pdns-recursor
%defattr (-,root,root,-)
@@ -394,13 +415,15 @@
%files backend-postgresql
%defattr (-,root,root,-)
%{_libdir}/%{pkg_name}/libgpgsqlbackend.so*
-%if 0%{?with_sqlite2}
+
+%if 0%{?with_pdns_sqlite2}
%files backend-sqlite2
%defattr (-,root,root,-)
%{_libdir}/%{pkg_name}/libgsqlitebackend.so*
%endif
-%if 0%{?with_sqlite3}
+
+%if 0%{?with_pdns_sqlite3}
%files backend-sqlite3
%defattr (-,root,root,-)
@@ -410,13 +433,15 @@
%files backend-ldap
%defattr (-,root,root,-)
%{_libdir}/%{pkg_name}/libldapbackend.so*
-%if 0%{?with_opendbx}
+
+%if 0%{?with_pdns_opendbx}
%files backend-opendbx
%defattr (-,root,root,-)
%{_libdir}/%{pkg_name}/libopendbxbackend.so*
%endif
-%if 0%{?with_xdb}
+
+%if 0%{?with_pdns_xdb}
%files backend-xdb
%defattr (-,root,root,-)
++++++ pdns-2.9.21.2.tar.bz2 -> pdns-2.9.22.tar.bz2 ++++++
++++ 23474 lines of diff (skipped)
++++++ pdns-2.9.22_missing_includes.patch ++++++
Index: pdns/rcpgenerator.cc
===================================================================
--- pdns/rcpgenerator.cc.orig
+++ pdns/rcpgenerator.cc
@@ -21,6 +21,7 @@
#include "misc.hh"
#include
participants (1)
-
root@hilbert.suse.de