Hello community, here is the log from the commit of package pdns for openSUSE:Factory checked in at 2012-05-07 22:48:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-09-23 12:21:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pdns.new/pdns.changes 2012-05-07 22:48:44.000000000 +0200 @@ -1,0 +2,48 @@ +Wed Apr 18 15:53:30 UTC 2012 - mrueck...@suse.de + +- use %{_sysconfdir}/init.d/ instead of %{_initddir} to fix build + on older distros + +------------------------------------------------------------------- +Wed Apr 18 14:49:26 UTC 2012 - mrueck...@suse.de + +- update to 3.0.1 + This is 3.0 + the fix for CVE-2012-0206 + Warning: + Version 3.0 of the PowerDNS Authoritative Server is a major + upgrade. Please refer to Section 1, “From PowerDNS Authoritative + Server 2.9.x to 3.0” 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-0-1 +- build all binaries with as PIE (bnc#743152) + +------------------------------------------------------------------- +Tue Mar 6 09:58:47 UTC 2012 - mhruse...@suse.cz + +- fixed lua dependency (fixed build on Factory) + +------------------------------------------------------------------- +Mon Feb 13 10:51:51 UTC 2012 - co...@suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Sun Nov 20 06:28:03 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon Oct 3 11:32:14 CEST 2011 - mhruse...@suse.cz + +- fixed build on factory + +------------------------------------------------------------------- +Thu Aug 18 07:23:22 CEST 2011 - mhruse...@suse.cz + +- update to 3.0 + * main feature is DNSSEC support + * for full changelog see + http://doc.powerdns.com/changelog.html#changelog-auth-3-0 + +------------------------------------------------------------------- Old: ---- 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 New: ---- pdns-3.0.1.tar.gz pdns-3.0.rc1_polarssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdns.spec ++++++ --- /var/tmp/diff_new_pack.OGbWru/_old 2012-05-07 22:48:45.000000000 +0200 +++ /var/tmp/diff_new_pack.OGbWru/_new 2012-05-07 22:48:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pdns (Version 2.9.22) +# spec file for package pdns # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,28 +15,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: pdns -Version: 2.9.22 -Release: 1 +Version: 3.0.1 +Release: 0 # -Group: Productivity/Networking/DNS/Servers -License: GPLv2+ # %define pkg_name pdns +%define pkg_version 3.0.1 %define home %{_var}/lib/pdns %define _localstatedir %{_var}/run/pdns # %if 0%{?sles_version} < 11 %define with_pdns_sqlite2 1 -%endif -%if 0%{?suse_version} > 1000 +%else %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 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: Botan-devel +BuildRequires: boost-devel +BuildRequires: docbook-toys +BuildRequires: docbook-utils +BuildRequires: docbook-xsl-stylesheets +BuildRequires: gcc-c++ +BuildRequires: gdbm-devel +BuildRequires: libtool +%if 0%{?suse_version} > 1210 +BuildRequires: lua51-devel +%else +BuildRequires: lua-devel +%endif +BuildRequires: mysql-devel +BuildRequires: openldap2-devel +BuildRequires: pkg-config +BuildRequires: postgresql-devel +BuildRequires: pwdutils # we add opendbx-backend-sqlite2 as we pull in sqlite2 anyway and we need one installed backend %if 0%{?with_pdns_sqlite3} BuildRequires: sqlite-devel >= 3 @@ -51,27 +66,26 @@ %endif # %if 0%{?with_pdns_opendbx} -BuildRequires: opendbx-backend-pgsql opendbx-devel +BuildRequires: opendbx-backend-pgsql +BuildRequires: opendbx-devel %endif %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 +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: pwdutils # Url: http://www.powerdns.com/ -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{pkg_version}.tar.gz Source1: rcpdns Source2: README.opendbx -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 +# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch5: pdns-3.0.rc1_polarssl.patch # Summary: Modern, advanced and high performance authoritative-only nameserver +License: GPL-2.0+ +Group: Productivity/Networking/DNS/Servers %description The PowerDNS Nameserver is a modern, advanced and high performance @@ -79,17 +93,11 @@ to all relevant DNS standards documents. Furthermore, PowerDNS interfaces with almost any database. - - -Authors: --------- - http://www.powerdns.com - %package backend-mysql -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers Requires: %{name} = %{version} +# Summary: MySQL backend for pdns +Group: Productivity/Networking/DNS/Servers %description backend-mysql The PowerDNS Nameserver is a modern, advanced and high performance @@ -99,17 +107,11 @@ This package holds the MySQL backend for pdns. - - -Authors: --------- - http://www.powerdns.com - %package backend-postgresql -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers 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 @@ -119,19 +121,13 @@ This package holds the PostgreSQL backend for pdns. - - -Authors: --------- - http://www.powerdns.com - %if 0%{?with_pdns_sqlite2} %package backend-sqlite2 -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers 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 @@ -141,21 +137,15 @@ This package holds the SQLite 2 backend for pdns. - - -Authors: --------- - http://www.powerdns.com - %endif %if 0%{?with_pdns_sqlite3} %package backend-sqlite3 -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers 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 @@ -165,19 +155,13 @@ This package holds the SQLite 3 backend for pdns. - - -Authors: --------- - http://www.powerdns.com - %endif %package backend-ldap -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers Requires: %{name} = %{version} +# Summary: LDAP backend for pdns +Group: Productivity/Networking/DNS/Servers %description backend-ldap The PowerDNS Nameserver is a modern, advanced and high performance @@ -187,19 +171,13 @@ This package holds the LDAP backend for pdns. - - -Authors: --------- - http://www.powerdns.com - %if 0%{?with_pdns_opendbx} %package backend-opendbx -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers 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 @@ -209,21 +187,15 @@ This package holds the OpenDBX backend for pdns. - - -Authors: --------- - http://www.powerdns.com - %endif %if 0%{?with_pdns_xdb} %package backend-xdb -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers 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 @@ -233,45 +205,29 @@ This package holds the Samba TDB backend for pdns. - - -Authors: --------- - http://www.powerdns.com - %endif %if 0%{?with_pdns_recursor} %package -n pdns-recursor -License: GPLv2+ -Group: Productivity/Networking/DNS/Servers 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. - - -Authors: --------- - http://www.powerdns.com - %endif %prep -%setup -%patch -%patch1 -%patch2 -%patch3 -#patch4 +%setup -n %{name}-%{pkg_version} +%patch5 %if 0%{?with_pdns_opendbx} -%{__cp} %{S:2} README.opendbx +cp %{S:2} README.opendbx %endif -%{__cp} modules/geobackend/README README.geobackend +cp modules/geobackend/README README.geobackend # module-dir=/usr/local/lib perl -p -i.back -e 's|module-dir=.*|module-dir=%{_libdir}/%{pkg_name}|g' pdns/pdns.conf-dist diff -urN pdns/pdns.conf-dist{.back,} ||: @@ -279,9 +235,10 @@ %build touch NEWS AUTHORS COPYING -autoreconf -fiv -export CFLAGS="%{optflags} -DLDAP_DEPRECATED -g " +#autoreconf -fiv +export CFLAGS="%{optflags} -DLDAP_DEPRECATED -g -fpic -DPIC" export CXXFLAGS="$CFLAGS" +export LIBS="-pie" # "mysql" backend is legacy crap. dont build it! %configure \ --disable-static \ @@ -328,7 +285,10 @@ %else --disable-recursor # we have an external package for that. %endif -%{__make} +pushd pdns/ext/polarssl/library + make OFLAGS="%{optflags}" all +popd +make %if 0%{?build_debugging_tools} pushd pdns for i in $(awk -F= '/EXTRA_PROGRAMS/ {print $2}' Makefile.am ) ; do @@ -338,12 +298,13 @@ done popd %endif -pushd pdns/docs - db2html -o html pdns.sgml - find . -type d -exec chmod 755 {} \; - find . -type f -exec chmod 644 {} \; - %{__ln_s} book1.html html/index.html -popd + +# pushd pdns/docs +# db2html -o html pdns.sgml +# find . -type d -exec chmod 755 {} \; +# find . -type f -exec chmod 644 {} \; +# ln -s book1.html html/index.html +# popd %install %makeinstall @@ -356,14 +317,14 @@ 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} -%{__ln_s} -f ../../etc/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name} -%{__rm} -rfv %{buildroot}%{_libdir}/pdns/*.la +install -Dd -m 0755 %{buildroot}{%{home},%{_var}} +mv %{buildroot}%{_sysconfdir}/%{pkg_name}/pdns.conf{-dist,} +install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name} +ln -s -f ../..%{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name} +rm -rfv %{buildroot}%{_libdir}/pdns/*.la %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %pre /usr/sbin/groupadd -r pdns &>/dev/null || : @@ -382,13 +343,15 @@ %files %defattr (-,root,root,-) %doc ChangeLog HACKING INSTALL README* TODO -%doc pdns/docs/html -%config(noreplace) /etc/init.d/%{pkg_name} +#doc pdns/docs/html +%{_sysconfdir}/init.d/%{pkg_name} %dir %attr(750,root,pdns) %{_sysconfdir}/%{pkg_name} %config(noreplace) %attr(640,root,pdns) %{_sysconfdir}/%{pkg_name}/%{pkg_name}.conf %{_bindir}/pdns_control %{_bindir}/zone2ldap %{_bindir}/zone2sql +%{_bindir}/dnsreplay +%{_bindir}/pdnssec %{_sbindir}/rcpdns %{_sbindir}/pdns_server %{_mandir}/man8/pdns_control.8.gz @@ -398,8 +361,7 @@ %{_libdir}/%{pkg_name}/libpdnsbackend.so* %{_libdir}/%{pkg_name}/libpipebackend.so* %{_libdir}/%{pkg_name}/libgeobackend.so* -%dir %{home} -%ghost %dir %{_localstatedir} +%dir %attr(750,root,pdns) %{home} %if 0%{?with_pdns_recursor} ++++++ pdns-3.0.rc1_polarssl.patch ++++++ Index: pdns/ext/polarssl/library/Makefile =================================================================== --- pdns/ext/polarssl/library/Makefile.orig +++ pdns/ext/polarssl/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 OFLAGS = -O @@ -11,7 +11,7 @@ OFLAGS = -O # CFLAGS += -D_BSD_EXTENSION # To compile as a shared library: -# CFLAGS += -fPIC +CFLAGS += -fPIC 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 -.SILENT: +#.SILENT: all: static @@ -36,21 +36,21 @@ static: libpolarssl.a shared: libpolarssl.$(DLEXT) libpolarssl.a: $(OBJS) - echo " AR $@" +# echo " AR $@" ar r $@ $(OBJS) - echo " RL $@" +# echo " RL $@" ranlib $@ libpolarssl.so: libpolarssl.a - echo " LD $@" +# echo " LD $@" $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) libpolarssl.dylib: libpolarssl.a - echo " LD $@" +# echo " LD $@" $(CC) -dynamiclib -o $@ $(OBJS) .c.o: - echo " CC $<" +# echo " CC $<" $(CC) $(CFLAGS) $(OFLAGS) -c $< clean: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org