diff --git a/.cvsignore b/.cvsignore index 4ee962b..9edda5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pdns-2.9.20.tar.gz +pdns-2.9.21.tar.gz diff --git a/pdns-avoid-version.patch b/pdns-avoid-version.patch index 30ffd7e..548de0d 100644 --- a/pdns-avoid-version.patch +++ b/pdns-avoid-version.patch @@ -1,6 +1,6 @@ ---- pdns-2.9.20/modules/ldapbackend/Makefile.in.avoid-version 2006-12-18 00:11:42.000000000 +0100 -+++ pdns-2.9.20/modules/ldapbackend/Makefile.in 2006-12-18 00:13:17.000000000 +0100 -@@ -205,7 +205,7 @@ +--- pdns-2.9.21/modules/ldapbackend/Makefile.in.avoid-version 2007-04-24 09:02:39.000000000 +0200 ++++ pdns-2.9.21/modules/ldapbackend/Makefile.in 2007-04-24 09:04:35.000000000 +0200 +@@ -214,7 +214,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh \ powerldap.hh powerldap.cc utils.hh @@ -9,9 +9,9 @@ libldapbackend_la_LIBADD = -lldap all: all-am ---- pdns-2.9.20/modules/pipebackend/Makefile.in.avoid-version 2006-12-18 00:07:21.000000000 +0100 -+++ pdns-2.9.20/modules/pipebackend/Makefile.in 2006-12-18 00:07:36.000000000 +0100 -@@ -209,7 +209,7 @@ +--- pdns-2.9.21/modules/pipebackend/Makefile.in.avoid-version 2007-04-24 09:04:56.000000000 +0200 ++++ pdns-2.9.21/modules/pipebackend/Makefile.in 2007-04-24 09:05:12.000000000 +0200 +@@ -217,7 +217,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS backend.pl lib_LTLIBRARIES = libpipebackend.la libpipebackend_la_SOURCES = pipebackend.cc pipebackend.hh coprocess.cc coprocess.hh @@ -20,9 +20,9 @@ all: all-am .SUFFIXES: ---- pdns-2.9.20/modules/gpgsqlbackend/Makefile.in.avoid-version 2006-12-18 00:08:23.000000000 +0100 -+++ pdns-2.9.20/modules/gpgsqlbackend/Makefile.in 2006-12-18 00:13:51.000000000 +0100 -@@ -208,7 +208,7 @@ +--- pdns-2.9.21/modules/gpgsqlbackend/Makefile.in.avoid-version 2007-04-24 09:00:43.000000000 +0200 ++++ pdns-2.9.21/modules/gpgsqlbackend/Makefile.in 2007-04-24 09:01:19.000000000 +0200 +@@ -217,7 +217,7 @@ spgsql.hh spgsql.cc libgpgsqlbackend_la_LDFLAGS = @PGSQL_lib@ -Wl,-Bstatic -lpq \ @@ -31,9 +31,9 @@ libgpgsqlbackend_la_LIBADD = -lssl -lcrypt -lcrypto all: all-am ---- pdns-2.9.20/modules/gmysqlbackend/Makefile.in.avoid-version 2006-12-18 00:07:52.000000000 +0100 -+++ pdns-2.9.20/modules/gmysqlbackend/Makefile.in 2006-12-18 00:08:15.000000000 +0100 -@@ -207,7 +207,7 @@ +--- pdns-2.9.21/modules/gmysqlbackend/Makefile.in.avoid-version 2007-04-24 09:00:14.000000000 +0200 ++++ pdns-2.9.21/modules/gmysqlbackend/Makefile.in 2007-04-24 09:00:34.000000000 +0200 +@@ -216,7 +216,7 @@ libgmysqlbackend_la_SOURCES = gmysqlbackend.cc gmysqlbackend.hh \ smysql.hh smysql.cc @@ -42,9 +42,20 @@ all: all-am .SUFFIXES: ---- pdns-2.9.20/modules/geobackend/Makefile.in.avoid-version 2006-03-15 19:33:21.000000000 +0100 -+++ pdns-2.9.20/modules/geobackend/Makefile.in 2006-12-17 23:58:33.000000000 +0100 -@@ -204,7 +204,7 @@ +--- pdns-2.9.21/modules/gsqlite3backend/Makefile.in.avoid-version 2007-04-24 09:02:09.000000000 +0200 ++++ pdns-2.9.21/modules/gsqlite3backend/Makefile.in 2007-04-24 09:02:24.000000000 +0200 +@@ -216,7 +216,7 @@ + libgsqlite3backend_la_SOURCES = gsqlite3backend.cc gsqlite3backend.hh \ + ssqlite3.hh ssqlite3.cc + +-libgsqlite3backend_la_LDFLAGS = -module -lsqlite3 ++libgsqlite3backend_la_LDFLAGS = -module -lsqlite3 -avoid-version + all: all-am + + .SUFFIXES: +--- pdns-2.9.21/modules/geobackend/Makefile.in.avoid-version 2007-04-24 08:58:20.000000000 +0200 ++++ pdns-2.9.21/modules/geobackend/Makefile.in 2007-04-24 08:59:44.000000000 +0200 +@@ -213,7 +213,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS lib_LTLIBRARIES = libgeobackend.la libgeobackend_la_SOURCES = geobackend.cc geobackend.hh ippreftree.cc ippreftree.hh diff --git a/pdns.spec b/pdns.spec index f649620..48c862b 100644 --- a/pdns.spec +++ b/pdns.spec @@ -1,7 +1,7 @@ Summary: A modern, advanced and high performance authoritative-only nameserver Name: pdns -Version: 2.9.20 -Release: 9%{?dist} +Version: 2.9.21 +Release: 1%{?dist} Group: System Environment/Daemons License: GPL @@ -51,6 +51,12 @@ Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} BuildRequires: openldap-devel +%package backend-sqlite +Summary: SQLite backend for %{name} +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} +BuildRequires: sqlite-devel + %description backend-mysql This package contains the gmysql backend for %{name} @@ -68,6 +74,9 @@ IP address ranges or based on the geographic location %description backend-ldap This package contains the ldap backend for %{name} +%description backend-sqlite +This package contains the SQLite backend for %{name} + %prep %setup -q @@ -82,11 +91,10 @@ export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}" --libdir=%{_libdir}/%{name} \ --disable-static \ --with-modules='' \ - --with-dynmodules='pipe gmysql gpgsql geo ldap' \ - --with-mysql-includes=%{_includedir}/mysql \ + --with-dynmodules='pipe gmysql gpgsql geo ldap gsqlite3' \ --with-mysql-lib=%{_libdir}/mysql \ - --with-pgsql-includes=%{_includedir} \ - --with-pgsql-lib=%{_libdir} + --with-pgsql-lib=%{_libdir} \ + --with-sqlite3-lib=%{_libdir} make %{?_smp_mflags} @@ -166,8 +174,16 @@ fi %doc pdns/COPYING %{_libdir}/%{name}/libldapbackend.so +%files backend-sqlite +%defattr(-,root,root,-) +%doc pdns/COPYING +%{_libdir}/%{name}/libgsqlite3backend.so + %changelog +* 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 - Add Requires for chkconfig, service and useradd (#235582) * Mon Jan 1 2007 2.9.20-8 diff --git a/sources b/sources index 0cea3c0..6cc52a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33b20ef1b767f93297101f2aa09e99ed pdns-2.9.20.tar.gz +a0d650dd1489ed46b36dfcc1d73653af pdns-2.9.21.tar.gz