Authoritative semi-static packages

 * Move debian to build-scripts/build-auth-semistatic
 * Add a build script for the semistatic builds
 * Remove pdns.spec

diff --git a/Makefile.am b/Makefile.am
index d36ebdfb22a0618b19da15efc67583bb34be4849..1abdb43089780b324112ba4cd982a2478b6e4655 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ EXTRA_DIST = \
        contrib/powerdns.solaris.init.d \
        contrib/systemd-pdns-recursor.service \
        contrib/systemd-pdns.service \
-       debian \
        pdns.spec \
        pdns/named.conf.parsertest \
        regression-tests/zones/unit.test

diff --git a/pdns.spec b/build-scripts/build-auth-semistatic
old mode 100644 (file)
new mode 100755 (executable)
similarity index 54%
rename from pdns.spec
rename to build-scripts/build-auth-semistatic
index 996b8e9..e7977e5
--- a/pdns.spec
+++ b/build-scripts/build-auth-semistatic
@@ -1,7 +1,48 @@
+#!/bin/sh
+
+if [ "$0" != "./build-scripts/build-auth-semistatic" ]; then
+  echo "Please run me from the root checkout dir"
+  exit 1
+fi
+
+if [ -z "$VERSION" ]; then
+  echo 'Please set $VERSION' >&2
+  exit 1
+fi
+
+if [ -z "$RELEASE" ];then
+  echo 'Please set $RELEASE' >&2
+  exit 1
+fi
+
+if [ -z "$DISTDIR" ]; then
+  DISTDIR=pdns
+fi
+
+set -e
+set -x
+
+rm -rf $DISTDIR/debian/
+cp -r build-scripts/debian-authoritative-semistatic $DISTDIR/debian
+
+cd $DISTDIR
+
+cat > debian/changelog << EOF
+pdns (${VERSION}-${RELEASE}) unstable; urgency=medium
+
+  * Automatic build
+
+ -- PowerDNS.COM AutoBuilder <noreply@powerdns.com>  $(date -R)
+
+EOF
+
+fakeroot debian/rules binary-static
+
+cat > pdns.spec <<EOF
 BuildRoot: /tmp/pdns
 Name: pdns-static
-Version: 3.3
-Release: 1
+Version: $VERSION
+Release: $RELEASE
 Summary: extremely powerful and versatile nameserver
 License: GPLv2
 Distribution: Neutral
@@ -52,6 +93,7 @@ These are the tools
 
 %files -n pdns-tools
 %defattr(-,root,root)
+%{_bindir}/calidns
 %{_bindir}/dnsbulktest
 %{_bindir}/dnsgram
 %{_bindir}/dnsreplay
@@ -59,12 +101,12 @@ These are the tools
 %{_bindir}/dnsscope
 %{_bindir}/dnstcpbench
 %{_bindir}/dnswasher
+%{_bindir}/dumresp
 %{_bindir}/notify
 %{_bindir}/nproxy
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
 %{_mandir}/man1/dnsbulktest.1
-%{_mandir}/man1/dnsdist.1
 %{_mandir}/man1/dnsgram.1
 %{_mandir}/man1/dnsreplay.1
 %{_mandir}/man1/dnsscan.1
@@ -73,3 +115,15 @@ These are the tools
 %{_mandir}/man1/dnswasher.1
 %{_mandir}/man1/nsec3dig.1
 %{_mandir}/man1/saxfr.1
+
+EOF
+
+BUILDROOT=$(pwd)/rpm-buildroot/
+fakeroot /bin/sh -c "rm -rf $BUILDROOT ; DESTDIR=$BUILDROOT make install-strip"
+fakeroot rm -f $BUILDROOT/usr/lib/pdns/*.a $BUILDROOT/usr/lib/pdns/*.la $BUILDROOT/usr/lib/*.a $BUILDROOT/usr/lib/*.la
+fakeroot mkdir -p $BUILDROOT/etc/init.d
+fakeroot cp pdns/pdns.init $BUILDROOT/etc/init.d/pdns || fakeroot cp pdns/pdns $BUILDROOT/etc/init.d/pdns
+fakeroot mkdir -p $BUILDROOT/etc/powerdns
+fakeroot mv $BUILDROOT/etc/powerdns/pdns.conf-dist $BUILDROOT/etc/powerdns/pdns.conf
+fakeroot rm -f $BUILDROOT/usr/bin/zone2ldap $BUILDROOT/usr/man/man1/zone2ldap.1 $BUILDROOT/usr/man/man1/zone2ldap.1 $BUILDROOT/usr/share/man/man1/zone2ldap.1 $BUILDROOT/usr/share/man/man1/zone2ldap.1
+fakeroot rpmbuild -bb pdns.spec --buildroot $BUILDROOT

diff --git a/debian/.gitignore b/build-scripts/debian-authoritative-semistatic/.gitignore
similarity index 100%
rename from debian/.gitignore
rename to build-scripts/debian-authoritative-semistatic/.gitignore

diff --git a/debian/control b/build-scripts/debian-authoritative-semistatic/control
similarity index 100%
rename from debian/control
rename to build-scripts/debian-authoritative-semistatic/control

diff --git a/debian/copyright b/build-scripts/debian-authoritative-semistatic/copyright
similarity index 100%
rename from debian/copyright
rename to build-scripts/debian-authoritative-semistatic/copyright

diff --git a/debian/doc-base b/build-scripts/debian-authoritative-semistatic/doc-base
similarity index 100%
rename from debian/doc-base
rename to build-scripts/debian-authoritative-semistatic/doc-base

diff --git a/debian/pdns.conffiles b/build-scripts/debian-authoritative-semistatic/pdns.conffiles
similarity index 100%
rename from debian/pdns.conffiles
rename to build-scripts/debian-authoritative-semistatic/pdns.conffiles

diff --git a/debian/pdns.postinst b/build-scripts/debian-authoritative-semistatic/pdns.postinst
similarity index 100%
rename from debian/pdns.postinst
rename to build-scripts/debian-authoritative-semistatic/pdns.postinst

diff --git a/debian/pdns.postrm b/build-scripts/debian-authoritative-semistatic/pdns.postrm
similarity index 100%
rename from debian/pdns.postrm
rename to build-scripts/debian-authoritative-semistatic/pdns.postrm

diff --git a/debian/pdns.prerm b/build-scripts/debian-authoritative-semistatic/pdns.prerm
similarity index 100%
rename from debian/pdns.prerm
rename to build-scripts/debian-authoritative-semistatic/pdns.prerm

diff --git a/debian/rules b/build-scripts/debian-authoritative-semistatic/rules
similarity index 98%
rename from debian/rules
rename to build-scripts/debian-authoritative-semistatic/rules
index 27d0d166eb05426ce726860224666a0adb4d2ed6..21b07874fd9c0330accc1f2bd11b2a855a92e0fb 100755 (executable)
--- a/debian/rules
+++ b/build-scripts/debian-authoritative-semistatic/rules
@@ -85,7 +85,7 @@ binary-main-prepare:
 
        #FIXME: shell loops hide errors
        for prog in dnsbulktest dnsgram dnsreplay dnsscan dnsscope dnstcpbench dnswasher \
-               dnsdist notify nproxy nsec3dig saxfr ; do \
+               notify nproxy nsec3dig saxfr ; do \
                mv "$(tmpdir)"/usr/bin/$$prog "$(tools_tmpdir)"/usr/bin ; \
                [ -e "$(tmpdir)"/usr/share/man/man8/"$$prog".8 ] && \
                        mv "$(tmpdir)"/usr/share/man/man8/"$$prog".8 "$(tools_tmpdir)"/usr/share/man/man8/ ; \

diff --git a/debian/shlibs.local b/build-scripts/debian-authoritative-semistatic/shlibs.local
similarity index 100%
rename from debian/shlibs.local
rename to build-scripts/debian-authoritative-semistatic/shlibs.local

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 0b4692d..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,331 +0,0 @@
-pdns (3.3-rc1-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- peter van dijk <peter.van.dijk@netherlabs.nl>  Mon, 27 May 2013 16:00:00 +0200
-
-pdns (3.2-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- peter van dijk <peter.van.dijk@netherlabs.nl>  Tue, 15 Jan 2013 15:00:00 +0100
-
-pdns (3.2-rc4-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- peter van dijk <peter.van.dijk@netherlabs.nl>  Wed, 9 Jan 2013 21:00:00 +0100
-
-pdns (3.2-rc3-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- peter van dijk <peter.van.dijk@netherlabs.nl>  Sat, 22 Dec 2012 21:00:00 +0100
-
-pdns (3.2-rc2-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- peter van dijk <peter.van.dijk@netherlabs.nl>  Wed, 19 Dec 2012 12:00:00 +0100
-
-pdns (3.2-rc1-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Thu, 8 Nov 2012 09:23:33 +0100
-
-pdns (3.2-pre-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Thu, 7 Oct 2012 09:23:33 +0100
-
-pdns (3.1-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Thu, 3 May 2012 09:23:33 +0100
-
-pdns (3.1-rc3-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Thu, 28 Apr 2012 09:23:33 +0100
-
-pdns (3.1-rc2-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Thu, 5 Apr 2012 09:23:33 +0100
-
-pdns (3.1-rc1-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Wed, 21 Mar 2012 09:23:33 +0100
-
-pdns (3.1-pre-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Wed, 28 Sep 2011 09:23:33 +0100
-
-pdns (3.0-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Tue, 19 Jul 2011 09:23:33 +0100
-
-pdns (3.0-rc3-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Fri, 15 Jul 2011 09:23:33 +0100
-
-pdns (3.0-rc2-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 16 Apr 2011 23:23:33 +0100
-
-pdns (3.0-rc1-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 3 Apr 2011 23:23:33 +0100
-
-pdns (3.0.pre-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 9 Jan 2011 23:23:33 +0100
-
-pdns (2.9.22-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sat, 25 Jan 2009 23:23:33 +0100
-
-pdns (2.9.22-rc4-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sat, 26 Dec 2008 23:23:33 +0100
-
-pdns (2.9.22-rc3-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sat, 6 Dec 2008 23:23:33 +0100
-
-pdns (2.9.22-rc2-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 29 Nov 2008 23:23:33 +0100
-
-pdns (2.9.22-rc1-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 16 Nov 2008 23:23:33 +0100
-
-pdns (2.9.22-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 3 Aug 2008 23:23:33 +0100
-
-pdns (2.9.21-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sat, 21 Apr 2006 23:23:33 +0100
-
-pdns (2.9.20-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sat, 14 Jan 2006 23:23:33 +0100
-
-pdns (2.9.19-2) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 29 Oct 2005 23:23:33 +0100
-
-pdns (2.9.19-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Sun, 11 Sep 2005 23:23:33 +0100
-
-pdns (2.9.18-2) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Wed, 20 Jul 2005 23:23:33 +0100
-
-pdns (2.9.18-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- bert hubert <bert.hubert@netherlabs.nl>  Thu, 14 Jun 2005 23:23:33 +0100
-
-pdns (2.9.17-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- Wichert Akkerman <wichert@wiggy.net>  Sat, 13 Sep 2004 23:23:33 +0100
-
-pdns (2.9.16-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- Wichert Akkerman <wichert@wiggy.net>  Sat, 17 Jan 2004 23:23:33 +0100
-
-pdns (2.9.15-1) unstable; urgency=medium
-
-  * fill in the blanks
-
- -- Wichert Akkerman <wichert@wiggy.net>  Sat, 17 Jan 2004 23:23:33 +0100
-
-pdns (2.9.14-1) unstable; urgency=medium
-
-  * New upstream version. Postgres support rewritten to use the C interface
-    instead of the deprectaed libpqpp
-
- -- Wichert Akkerman <wichert@wiggy.net>  Fri, 16 Jan 2004 23:23:33 +0100
-
-pdns (2.9.13-3) unstable; urgency=medium
-
-  * Fix pdns postinst so pdns is properly restart on upgrade
-
- -- Wichert Akkerman <wichert@wiggy.net>  Sat, 10 Jan 2004 17:21:18 +0100
-
-pdns (2.9.13-2) unstable; urgency=critical
-
-  * Fix a bug in calculation of early timestamps: 1<<31-1 is not the
-    same as (1<<31)-1. This made all pdns servers consume all possible
-    CPU when UNIX time went through 2^30 two hours ago.
-
- -- Wichert Akkerman <wichert@wiggy.net>  Sat, 10 Jan 2004 16:53:09 +0100
-
-pdns (2.9.13-1) unstable; urgency=low
-
-  * New upstream release
-  * Stop using my debian.org email address
-  * Change init scripts to conform to Debian policy 
-
- -- Wichert Akkerman <wichert@wiggy.net>  Thu, 25 Dec 2003 13:33:40 +0100
-
-pdns (2.9.12-1) unstable; urgency=low
-
-  * New upstream release
-  * Fix dependency generation. Closes: Bug#210256
-  * Check if pdns is installed in init script. Closes: Bug#217402
-  * Create a SQLite backend package
-  * Add versioned dpkg-dev Build-Depends so ${dpkg:Version} works properly
-
- -- Wichert Akkerman <wakkerma@debian.org>  Mon, 27 Oct 2003 18:52:53 +0100
-
-pdns (2.9.11-2) unstable; urgency=low
-
-  * Remove automake build-depends and bootstrap rule from debian/rules.
-    This makes pdns a bit more portable across Debian releases.
-    Closes: Bug#205990
-  * Try to remove the /etc/powerdns directory on purge. Closes: Bug#209051
-  * Use libmysqlclient-dev instead of libmysqlclient10-dev
-
- -- Wichert Akkerman <wakkerma@debian.org>  Tue,  9 Sep 2003 14:59:46 +0200
-
-pdns (2.9.11-1) unstable; urgency=low
-
-  * New upstream release
-  * Do not include zone2ldap in pdns package. Closes: Bug#198613
-  * The gdbm-dev seems to have changed its name, update Build-Depends
-    accordingly. Closes: Bug#199595
-
- -- Wichert Akkerman <wakkerma@debian.org>  Mon, 14 Jul 2003 13:52:47 +0200
-
-pdns (2.9.8-1) unstable; urgency=low
-
-  * New upstream release. Closes: Bug#187781
-
- -- Wichert Akkerman <wakkerma@debian.org>  Mon,  5 May 2003 13:43:16 +0200
-
-pdns (2.9.7-1) unstable; urgency=low
-
-  * New upstream release. Closes: Bug#185730
-
- -- Wichert Akkerman <wakkerma@debian.org>  Fri, 21 Mar 2003 12:53:00 +0100
-
-pdns (2.9.6-2) unstable; urgency=low
-
-  * Enable the recursing nameserver
-  * Change order of things in clean target so debian/files is properly
-    removed. Closes: Bug#181994
-
- -- Wichert Akkerman <wakkerma@debian.org>  Sun, 23 Feb 2003 12:34:57 +0100
-
-pdns (2.9.6-1) unstable; urgency=low
-
-  * New upstream release, adding a new LDAP backend
-
- -- Wichert Akkerman <wakkerma@debian.org>  Sun, 16 Feb 2003 14:49:08 +0100
-
-
-pdns (2.9.5-1) unstable; urgency=low
-
-  * fill in the blanks
-
- -- Wichert Akkerman <wakkerma@debian.org>  Mon,  3 Feb 2003 20:16:16 +0100
-
-pdns (2.9.4-1) unstable; urgency=low
-
-  * fill in the blanks
-
- -- Wichert Akkerman <wakkerma@debian.org>  Sat, 21 Dec 2002 20:16:16 +0100
-
-pdns (2.9.3a-1) unstable; urgency=low
-
-  * New upstream release; fixes a problem in zone2sql
-
- -- Wichert Akkerman <wakkerma@debian.org>  Sat, 21 Dec 2002 20:16:16 +0100
-
-pdns (2.9.3-1) unstable; urgency=low
-
-  * New upstream release. Yes, the packaging changes yet again to
-    reflect changes made upstream. The packaging of SQL backends should
-    be more sane now and we don't expect to change them again.
-
- -- Wichert Akkerman <wakkerma@debian.org>  Sat, 21 Dec 2002 18:18:40 +0100
-
-pdns (2.9.2-3) unstable; urgency=low
-
-  * Compile pgmysql and xdb backend with -fPIC. Real fix is to swithc
-    to using libtool for all backends, which will happen in the next
-    upstream release.
-
- -- Wichert Akkerman <wakkerma@debian.org>  Mon, 16 Dec 2002 13:43:52 +0100
-
-pdns (2.9.2-2) unstable; urgency=low
-
-  * Add Build-Depends on libgdbmg1-dev, which is needed by the pipe backend
- 
- -- Wichert Akkerman <wakkerma@debian.org>  Mon, 16 Dec 2002 11:18:11 +0100
-
-pdns (2.9.2-1) unstable; urgency=low
-
-  * New upstream release
-  * bind backend fully merged in the main pdns package now
-  * Add new pipe, pgmysql and xdb backends
-
- -- Wichert Akkerman <wakkerma@debian.org>  Fri, 13 Dec 2002 16:39:29 +0100
-
-pdns (2.9-1) unstable; urgency=low
-
-  * Initial packaging
-
- -- Wichert Akkerman <wakkerma@debian.org>  Sun,  1 Dec 2002 15:04:52 +0100
-