Hello community, here is the log from the commit of package pdns for openSUSE:Factory checked in at 2012-05-23 08:53:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdns (Old) and /work/SRC/openSUSE:Factory/.pdns.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pdns", Maintainer is "nadvor...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pdns/pdns.changes 2012-05-07 22:48:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pdns.new/pdns.changes 2012-05-23 09:07:29.000000000 +0200 @@ -1,0 +2,28 @@ +Mon May 21 13:35:36 UTC 2012 - mrueck...@suse.de + +- set license to GPLv2 Only (bnc#762986) + +------------------------------------------------------------------- +Fri May 4 13:56:17 UTC 2012 - mrueck...@suse.de + +- update to 3.1 + + Warning: + Version 3.1 of the PowerDNS Authoritative Server is a + major upgrade if you are coming from 2.9.x. There are also some + important changes if you are coming from 3.0. Please refer to + Section 1, “From PowerDNS Authoritative Server 2.9.x to 3.0” and + Section 2, “From PowerDNS Authoritative Server 3.0 to 3.1” for + important information on correct and stable operation, as well as + notes on performance and memory use. + + For the details see: + http://rtfm.powerdns.com/changelog.html#changelog-auth-3-1 +- added pdns-3.1_lib_lua.patch: + instead of using an hardcoded -llua5.1 use the LUA_LIBS variable. +- refreshed pdns-3.0.rc1_polarssl.patch +- added 2 new subpackages: + pdns-backend-mydns + pdns-backend-lua (new dependency 5.2 > lua >= 5.1) + +------------------------------------------------------------------- Old: ---- pdns-3.0.1.tar.gz New: ---- pdns-3.1.tar.gz pdns-3.1_lib_lua.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdns.spec ++++++ --- /var/tmp/diff_new_pack.9zhhMw/_old 2012-05-23 09:07:37.000000000 +0200 +++ /var/tmp/diff_new_pack.9zhhMw/_new 2012-05-23 09:07:37.000000000 +0200 @@ -18,12 +18,13 @@ Name: pdns -Version: 3.0.1 +Version: 3.1.0 Release: 0 # # %define pkg_name pdns -%define pkg_version 3.0.1 +%define pkg_version 3.1 +%define polarssl_version 1.1.2 %define home %{_var}/lib/pdns %define _localstatedir %{_var}/run/pdns # @@ -32,6 +33,10 @@ %else %define with_pdns_sqlite3 1 %endif +%define with_pdns_lua 1 +%define with_pdns_mongo 0 +%define with_pdns_mydns 1 +%define with_pdns_tinydns 0 # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Botan-devel @@ -42,11 +47,19 @@ BuildRequires: gcc-c++ BuildRequires: gdbm-devel BuildRequires: libtool -%if 0%{?suse_version} > 1210 +%if 0%{?with_pdns_lua} +%if 0%{?suse_version} < 1030 || 0%{?suse_version} > 1210 BuildRequires: lua51-devel %else BuildRequires: lua-devel %endif +%endif +%if 0%{?with_pdns_tinydns} +# FIXME: Could not find libcdb/tinycdb +%endif +%if 0%{?with_pdns_mongo} +# FIXME: needs mongo devel package +%endif BuildRequires: mysql-devel BuildRequires: openldap2-devel BuildRequires: pkg-config @@ -81,12 +94,12 @@ Source1: rcpdns Source2: README.opendbx # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch5: pdns-3.0.rc1_polarssl.patch +Patch: pdns-3.0.rc1_polarssl.patch +Patch1: pdns-3.1_lib_lua.patch # Summary: Modern, advanced and high performance authoritative-only nameserver -License: GPL-2.0+ +License: GPL-2.0 Group: Productivity/Networking/DNS/Servers - %description The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -98,7 +111,6 @@ # Summary: MySQL backend for pdns Group: Productivity/Networking/DNS/Servers - %description backend-mysql The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -107,12 +119,27 @@ This package holds the MySQL backend for pdns. +%if 0%{?with_pdns_mydns} +%package backend-mydns +Requires: %{name} = %{version} +# +Summary: MyDNS backend for pdns +Group: Productivity/Networking/DNS/Servers +%description backend-mydns +The PowerDNS Nameserver is a modern, advanced and high performance +authoritative-only nameserver. It is written from scratch and conforms +to all relevant DNS standards documents. Furthermore, PowerDNS +interfaces with almost any database. + +This package holds the MyDNS backend for pdns. + +%endif + %package backend-postgresql Requires: %{name} = %{version} # Summary: PostgreSQL backend for pdns Group: Productivity/Networking/DNS/Servers - %description backend-postgresql The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -122,13 +149,11 @@ This package holds the PostgreSQL backend for pdns. %if 0%{?with_pdns_sqlite2} - %package backend-sqlite2 Requires: %{name} = %{version} # Summary: SQLite 2 backend for pdns Group: Productivity/Networking/DNS/Servers - %description backend-sqlite2 The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -140,13 +165,11 @@ %endif %if 0%{?with_pdns_sqlite3} - %package backend-sqlite3 Requires: %{name} = %{version} # Summary: SQLite 3 backend for pdns Group: Productivity/Networking/DNS/Servers - %description backend-sqlite3 The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -162,7 +185,6 @@ # Summary: LDAP backend for pdns Group: Productivity/Networking/DNS/Servers - %description backend-ldap The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -172,13 +194,11 @@ This package holds the LDAP backend for pdns. %if 0%{?with_pdns_opendbx} - %package backend-opendbx Requires: %{name} = %{version} # Summary: OpenDBX backend for pdns Group: Productivity/Networking/DNS/Servers - %description backend-opendbx The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -189,14 +209,29 @@ %endif -%if 0%{?with_pdns_xdb} +%if 0%{?with_pdns_lua} +%package backend-lua +Requires: %{name} = %{version} +# +Summary: Lua backend for pdns +Group: Productivity/Networking/DNS/Servers +%description backend-lua +The PowerDNS Nameserver is a modern, advanced and high performance +authoritative-only nameserver. It is written from scratch and conforms +to all relevant DNS standards documents. Furthermore, PowerDNS +interfaces with almost any database. + +This package holds the Lua backend for pdns. + +%endif + +%if 0%{?with_pdns_xdb} %package backend-xdb Requires: %{name} = %{version} # Summary: Samba TDB backend for pdns Group: Productivity/Networking/DNS/Servers - %description backend-xdb The PowerDNS Nameserver is a modern, advanced and high performance authoritative-only nameserver. It is written from scratch and conforms @@ -208,13 +243,11 @@ %endif %if 0%{?with_pdns_recursor} - %package -n pdns-recursor Requires: %{name} = %{version} # Summary: Modern, advanced and high performance recursing/non authoritative nameserver Group: Productivity/Networking/DNS/Servers - %description -n pdns-recursor PowerDNS Recursor is a non authoritative/recursing DNS server. Use this package if you need a dns cache for your network. @@ -223,7 +256,8 @@ %prep %setup -n %{name}-%{pkg_version} -%patch5 +%patch +%patch1 %if 0%{?with_pdns_opendbx} cp %{S:2} README.opendbx %endif @@ -250,13 +284,27 @@ --with-pgsql-lib=%{_libdir} \ --with-mysql-lib=%{_libdir} \ --with-modules="" \ +%if 0%{?with_pdns_lua} + --with-lua \ +%endif --with-dynmodules="\ - pdns \ pipe \ geo \ gmysql \ gpgsql \ ldap \ +%if 0%{?with_pdns_lua} + lua \ +%endif +%if 0%{?with_pdns_mongo} + mongodb \ +%endif +%if 0%{?with_pdns_mydns} + mydns \ +%endif +%if 0%{?with_pdns_tinydns} + tinydns \ +%endif %if 0%{?with_pdns_sqlite3} gsqlite3 \ %endif @@ -285,8 +333,8 @@ %else --disable-recursor # we have an external package for that. %endif -pushd pdns/ext/polarssl/library - make OFLAGS="%{optflags}" all +pushd pdns/ext/polarssl-%{polarssl_version}/library + make OFLAGS="%{optflags}" static shared popd make %if 0%{?build_debugging_tools} @@ -342,7 +390,7 @@ %files %defattr (-,root,root,-) -%doc ChangeLog HACKING INSTALL README* TODO +%doc ChangeLog HACKING README* TODO #doc pdns/docs/html %{_sysconfdir}/init.d/%{pkg_name} %dir %attr(750,root,pdns) %{_sysconfdir}/%{pkg_name} @@ -358,13 +406,11 @@ %{_mandir}/man8/pdns_server.8.gz %{_mandir}/man8/zone2sql.8.gz %dir %{_libdir}/%{pkg_name} -%{_libdir}/%{pkg_name}/libpdnsbackend.so* %{_libdir}/%{pkg_name}/libpipebackend.so* %{_libdir}/%{pkg_name}/libgeobackend.so* %dir %attr(750,root,pdns) %{home} %if 0%{?with_pdns_recursor} - %files -n pdns-recursor %defattr (-,root,root,-) %{_sbindir}/pdns_recursor @@ -374,19 +420,29 @@ %defattr (-,root,root,-) %{_libdir}/%{pkg_name}/libgmysqlbackend.so* +%if 0%{?with_pdns_mydns} +%files backend-mydns +%defattr (-,root,root,-) +%{_libdir}/%{pkg_name}/libmydnsbackend.so* +%endif + +%if 0%{?with_pdns_lua} +%files backend-lua +%defattr (-,root,root,-) +%{_libdir}/%{pkg_name}/libluabackend.so* +%endif + %files backend-postgresql %defattr (-,root,root,-) %{_libdir}/%{pkg_name}/libgpgsqlbackend.so* %if 0%{?with_pdns_sqlite2} - %files backend-sqlite2 %defattr (-,root,root,-) %{_libdir}/%{pkg_name}/libgsqlitebackend.so* %endif %if 0%{?with_pdns_sqlite3} - %files backend-sqlite3 %defattr (-,root,root,-) %{_libdir}/%{pkg_name}/libgsqlite3backend.so* @@ -397,14 +453,12 @@ %{_libdir}/%{pkg_name}/libldapbackend.so* %if 0%{?with_pdns_opendbx} - %files backend-opendbx %defattr (-,root,root,-) %{_libdir}/%{pkg_name}/libopendbxbackend.so* %endif %if 0%{?with_pdns_xdb} - %files backend-xdb %defattr (-,root,root,-) %{_bindir}/xdb-fill ++++++ pdns-3.0.rc1_polarssl.patch ++++++ --- /var/tmp/diff_new_pack.9zhhMw/_old 2012-05-23 09:07:37.000000000 +0200 +++ /var/tmp/diff_new_pack.9zhhMw/_new 2012-05-23 09:07:37.000000000 +0200 @@ -1,13 +1,13 @@ -Index: pdns/ext/polarssl/library/Makefile +Index: pdns/ext/polarssl-1.1.2/library/Makefile =================================================================== ---- pdns/ext/polarssl/library/Makefile.orig -+++ pdns/ext/polarssl/library/Makefile +--- pdns/ext/polarssl-1.1.2/library/Makefile.orig ++++ pdns/ext/polarssl-1.1.2/library/Makefile @@ -1,6 +1,6 @@ # Also see "include/polarssl/config.h" - -+CC = gcc - CFLAGS = -I../include -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement ++CC=gcc + CFLAGS += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement OFLAGS = -O @@ -11,7 +11,7 @@ OFLAGS = -O @@ -15,39 +15,44 @@ # To compile as a shared library: -# CFLAGS += -fPIC -+CFLAGS += -fPIC ++CFLAGS += -fPIC -DPIC - DLEXT=so - # OSX shared library extension: -@@ -27,7 +27,7 @@ OBJS= aes.o arc4.o base64.o \ - timing.o x509parse.o xtea.o \ - camellia.o + SONAME=libpolarssl.so.0 + +@@ -37,7 +37,7 @@ OBJS= aes.o arc4.o asn1parse.o \ + x509parse.o xtea.o + -.SILENT: +#.SILENT: all: static -@@ -36,21 +36,21 @@ static: libpolarssl.a +@@ -46,27 +46,26 @@ static: libpolarssl.a shared: libpolarssl.$(DLEXT) libpolarssl.a: $(OBJS) - echo " AR $@" +# echo " AR $@" - ar r $@ $(OBJS) + $(AR) r $@ $(OBJS) - echo " RL $@" +# echo " RL $@" - ranlib $@ + $(AR) s $@ libpolarssl.so: libpolarssl.a - echo " LD $@" +# echo " LD $@" - $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) + $(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS) libpolarssl.dylib: libpolarssl.a - echo " LD $@" +# echo " LD $@" - $(CC) -dynamiclib -o $@ $(OBJS) + $(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS) + + libpolarssl.dll: libpolarssl.a +- echo " LD $@" ++# echo " LD $@" + $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32 .c.o: - echo " CC $<" @@ -55,3 +60,5 @@ $(CC) $(CFLAGS) $(OFLAGS) -c $< clean: + rm -f *.o libpolarssl.* +- ++++++ pdns-3.0.1.tar.gz -> pdns-3.1.tar.gz ++++++ ++++ 74711 lines of diff (skipped) ++++++ pdns-3.1_lib_lua.patch ++++++ Index: modules/luabackend/Makefile.am =================================================================== --- modules/luabackend/Makefile.am.orig +++ modules/luabackend/Makefile.am @@ -9,5 +9,5 @@ lib_LTLIBRARIES = libluabackend.la libluabackend_la_SOURCES=luabackend.cc luabackend.hh minimal.cc reload.cc lua_functions.cc master.cc private.cc slave.cc supermaster.cc dnssec.cc \ lua_functions.hh -libluabackend_la_LDFLAGS=-module -avoid-version -llua5.1 +libluabackend_la_LDFLAGS=-module -avoid-version $(LUA_LIBS) #-lluajit-5.1 Index: modules/luabackend/Makefile.in =================================================================== --- modules/luabackend/Makefile.in.orig +++ modules/luabackend/Makefile.in @@ -265,7 +265,7 @@ lib_LTLIBRARIES = libluabackend.la libluabackend_la_SOURCES = luabackend.cc luabackend.hh minimal.cc reload.cc lua_functions.cc master.cc private.cc slave.cc supermaster.cc dnssec.cc \ lua_functions.hh -libluabackend_la_LDFLAGS = -module -avoid-version -llua5.1 +libluabackend_la_LDFLAGS = -module -avoid-version $(LUA_LIBS) all: all-am .SUFFIXES: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
