From: Bert Hubert Date: Thu, 14 Jul 2005 22:00:08 +0000 (+0000) Subject: release fixes - drop xdbbackend from the static builds, fix up pdns_recursor for... X-Git-Tag: pdns-2.9.18~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df38dbe8b0421d626def9f7558318d4eeb4260f2;p=thirdparty%2Fpdns.git release fixes - drop xdbbackend from the static builds, fix up pdns_recursor for static compilation, fix debian rename git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@447 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- diff --git a/build-scripts/rpm-build-instruction b/build-scripts/rpm-build-instruction index 7b0c9b6925..a9186dc94e 100755 --- a/build-scripts/rpm-build-instruction +++ b/build-scripts/rpm-build-instruction @@ -1,5 +1,5 @@ #!/bin/sh -./configure --with-modules="mysql gmysql gpgsql gsqlite pipe pdns xdb geo" \ +./configure --with-modules="mysql gmysql gpgsql gsqlite pipe pdns geo" \ --with-pgsql-lib=/opt/postgresql/lib/ \ --with-pgsql-includes=/opt/postgresql/include/ \ --with-dynmodules="" \ diff --git a/debian-pdns/changelog b/debian-pdns/changelog index 21292be95d..52b91896de 100644 --- a/debian-pdns/changelog +++ b/debian-pdns/changelog @@ -1,3 +1,9 @@ +pdns (2.9.18-1) unstable; urgency=medium + + * fill in the blanks + + -- bert hubert Thu, 14 Jun 2005 23:23:33 +0100 + pdns (2.9.17-1) unstable; urgency=medium * fill in the blanks diff --git a/debian-pdns/rules b/debian-pdns/rules index 7b1b5cde1c..7ae1c8c00c 100755 --- a/debian-pdns/rules +++ b/debian-pdns/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f -tmpdir := $(shell pwd)/debian/tmp -be_tmpdir := $(shell pwd)/debian/tmp-backend +tmpdir := $(shell pwd)/debian-pdns/tmp +be_tmpdir := $(shell pwd)/debian-pdns/tmp-backend backends := ldap mysql pipe xdb gmysql gpgsql gsqlite debs := ldap mysql pipe xdb pgsql sqlite @@ -21,37 +21,37 @@ binary-doc: "$(tmpdir)"/usr/share/doc/pdns-doc install -p -m 644 -o root -g root ChangeLog \ "$(tmpdir)"/usr/share/doc/pdns-doc/changelog - install -p -m 644 -o root -g root debian/changelog \ + install -p -m 644 -o root -g root debian-pdns/changelog \ "$(tmpdir)"/usr/share/doc/pdns-doc/changelog.Debian gzip -9 "$(tmpdir)"/usr/share/doc/pdns-doc/* - install -p -m 644 -o root -g root debian/copyright \ + install -p -m 644 -o root -g root debian-pdns/copyright \ "$(tmpdir)"/usr/share/doc/pdns-doc/ install -d -m 755 -o root -g root "$(tmpdir)"/usr/share/doc-base - install -p -m 644 -o root -g root debian/doc-base \ + install -p -m 644 -o root -g root debian-pdns/doc-base \ "$(tmpdir)"/usr/share/doc-base/pdns install -d -m 755 -o root -g root "$(tmpdir)"/DEBIAN - install -p -m 755 -o root -g root debian/pdns-doc.prerm \ + install -p -m 755 -o root -g root debian-pdns/pdns-doc.prerm \ "$(tmpdir)"/DEBIAN/prerm - install -p -m 755 -o root -g root debian/pdns-doc.postinst \ + install -p -m 755 -o root -g root debian-pdns/pdns-doc.postinst \ "$(tmpdir)"/DEBIAN/postinst - dpkg-gencontrol -isp -ppdns-doc -P"$(tmpdir)" + dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -ppdns-doc -P"$(tmpdir)" dpkg --build "$(tmpdir)" .. build-static stamp-build-static: ./configure \ - --with-pgsql-lib=/opt/postgresql/lib/ \ - --with-pgsql-includes=/opt/postgresql/include/ \ --prefix=/usr \ --libexecdir='$${prefix}/lib' \ --libdir='$${prefix}/lib/powerdns' \ + --with-pgsql-lib=/opt/postgresql/lib/ \ + --with-pgsql-includes=/opt/postgresql/include/ \ --sysconfdir=/etc/powerdns \ --infodir='$${datadir}/info' \ --mandir='$${datadir}/man' \ - --with-modules="mysql gmysql gpgsql pipe pdns xdb gsqlite geo" \ + --with-modules="mysql gmysql gpgsql pipe pdns gsqlite geo" \ --with-dynmodules="" \ --enable-static-binaries --enable-recursor make @@ -74,7 +74,7 @@ build stamp-build: configure binary-main-prepare: - rm -f debian/substvars + rm -f debian-pdns/substvars rm -rf "$(tmpdir)" "$(tmpdir)"-* install -d -m 755 -o root -g root "$(tmpdir)" make DESTDIR="$(tmpdir)" install @@ -100,33 +100,33 @@ binary-main-prepare: "$(tmpdir)"/usr/share/doc/pdns install -p -m 644 -o root -g root ChangeLog \ "$(tmpdir)"/usr/share/doc/pdns/changelog - install -p -m 644 -o root -g root debian/changelog \ + install -p -m 644 -o root -g root debian-pdns/changelog \ "$(tmpdir)"/usr/share/doc/pdns/changelog.Debian gzip -9 "$(tmpdir)"/usr/share/doc/pdns/c* - install -p -m 644 -o root -g root debian/copyright \ + install -p -m 644 -o root -g root debian-pdns/copyright \ "$(tmpdir)"/usr/share/doc/pdns/ install -d -m 755 -o root -g root "$(tmpdir)"/DEBIAN - install -p -m 755 -o root -g root debian/pdns.prerm \ + install -p -m 755 -o root -g root debian-pdns/pdns.prerm \ "$(tmpdir)"/DEBIAN/prerm - install -p -m 755 -o root -g root debian/pdns.postrm \ + install -p -m 755 -o root -g root debian-pdns/pdns.postrm \ "$(tmpdir)"/DEBIAN/postrm - install -p -m 755 -o root -g root debian/pdns.postinst \ + install -p -m 755 -o root -g root debian-pdns/pdns.postinst \ "$(tmpdir)"/DEBIAN/postinst - install -p -m 644 -o root -g root debian/pdns.conffiles \ + install -p -m 644 -o root -g root debian-pdns/pdns.conffiles \ "$(tmpdir)"/DEBIAN/conffiles binary-main: stamp-build binary-main-prepare - dpkg-shlibdeps "$(tmpdir)"/usr/bin/zone2sql \ + dpkg-shlibdeps -Tdebian-pdns/substvars "$(tmpdir)"/usr/bin/zone2sql \ "$(tmpdir)"/usr/sbin/pdns_server \ "$(tmpdir)"/usr/bin/pdns_control - dpkg-gencontrol -isp -ppdns -P"$(tmpdir)" + dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -ppdns -P"$(tmpdir)" dpkg --build "$(tmpdir)" .. binary-static: stamp-build-static binary-main-prepare - dpkg-gencontrol -isp -ppdns-static -P"$(tmpdir)" + dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -ppdns-static -P"$(tmpdir)" dpkg --build "$(tmpdir)" .. @@ -142,7 +142,7 @@ binary-backend: stamp-build chmod 644 "$(tmpdir)"/usr/lib/powerdns/* set -e ; for be in $(debs) ; do \ - rm -f debian/substvars ; \ + rm -f debian-pdns/substvars ; \ rm -rf "$(be_tmpdir)" ; \ pkg=pdns-backend-$$be ; \ \ @@ -155,8 +155,8 @@ binary-backend: stamp-build ln -s pdns "$(be_tmpdir)"/usr/share/doc/$$pkg ; \ \ install -d -m 755 -o root -g root "$(be_tmpdir)"/DEBIAN ; \ - dpkg-shlibdeps "$(be_tmpdir)"/usr/lib/powerdns/*.so ; \ - dpkg-gencontrol -isp -p$$pkg -P"$(be_tmpdir)" ; \ + dpkg-shlibdeps -Tdebian-pdns/substvars "$(be_tmpdir)"/usr/lib/powerdns/*.so ; \ + dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -p$$pkg -P"$(be_tmpdir)" ; \ dpkg --build "$(be_tmpdir)" .. ; \ done @@ -168,7 +168,7 @@ binary-arch: binary-main binary-backend clean: -make distclean -make -C pdns/docs clean - rm -f debian/files debian/substvars stamp-build stamp-build-static + rm -f debian-pdns/files debian-pdns/substvars stamp-build stamp-build-static rm -rf "$(tmpdir)" "$(be_tmpdir)" .PHONY: clean build binary binary-arch binary-indep diff --git a/pdns.spec b/pdns.spec index 9a3f9ab070..335e759ff3 100644 --- a/pdns.spec +++ b/pdns.spec @@ -1,6 +1,6 @@ Buildroot: /tmp/pdns Name: pdns-static -Version: 2.9.17 +Version: 2.9.18 Release: 1 Summary: extremely powerful and versatile nameserver Copyright: see /usr/doc/pdns/copyright @@ -27,7 +27,6 @@ backend'. "/usr/sbin/pdns_recursor" "/usr/bin/pdns_control" "/usr/bin/zone2sql" -"/usr/bin/xdb-fill" %dir "/etc/powerdns/" %config(noreplace) "/etc/powerdns/pdns.conf" %config "/etc/init.d/pdns" diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 676b1ad93f..e240d179a6 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -66,7 +66,7 @@ extern "C" { int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr){ return 0; } int pthread_mutex_lock(pthread_mutex_t *mutex){ return 0; } int pthread_mutex_unlock(pthread_mutex_t *mutex) { return 0; } - + int pthread_mutex_destroy(pthread_mutex_t *mutex) { return 0; } } #endif // __FreeBSD__ #endif // WIN32