version bump and old version clean as per bug #72941

5 files changed, 146 insertions, 98 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 7d545c982652..ed5d204c5383 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.36 2004/10/04 09:20:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.37 2004/11/30 20:56:43 dragonheart Exp $
+
+*pdnsd-1.2.1 (01 Dec 2004)
+
+  01 Dec 2004; Daniel Black <dragonheart@gentoo.org> -pdnsd-1.1.9.ebuild,
+  +pdnsd-1.2.1.ebuild:
+  version bump and old version clean as per bug #72941. Thanks to Davin Boling
+  <davin@postmark.net>
 
 *pdnsd-1.1.12_pre3 (04 Oct 2004)
 
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.1.9 b/net-dns/pdnsd/files/digest-pdnsd-1.1.9
deleted file mode 100644
index 6b51deab29b9..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b40367617bbcb41f8c76221fedcd490 pdnsd-1.1.9-par.tar.gz 319386
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.1 b/net-dns/pdnsd/files/digest-pdnsd-1.2.1
new file mode 100644
index 000000000000..2c4a0646c0b1
--- /dev/null
+++ b/net-dns/pdnsd/files/digest-pdnsd-1.2.1
@@ -0,0 +1 @@
+MD5 7be77e25ba8b3de73df32706d956c294 pdnsd-1.2.1-par.tar.gz 350181
diff --git a/net-dns/pdnsd/pdnsd-1.1.9.ebuild b/net-dns/pdnsd/pdnsd-1.1.9.ebuild
deleted file mode 100644
index 507a154bdd61..000000000000
--- a/net-dns/pdnsd/pdnsd-1.1.9.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.9.ebuild,v 1.12 2004/11/08 08:55:06 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-
-MY_P=${PN}-${PV}-par
-
-SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/${MY_P}.tar.gz"
-
-HOMEPAGE="http://home.t-online.de/home/Moestl http://www.phys.uu.nl/%7Erombouts/pdnsd.html"
-
-IUSE="ipv6 debug isdn"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-
-RDEPEND="virtual/libc"
-
-SLOT="0"
-LICENSE="|| ( BSD GPL-2 )"
-
-# Should work on  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
-# REF http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=pdnsd
-# According to release notes 1.1.8b1par7 is effectively 1.1.9 with minor documentation changes
-
-KEYWORDS="x86 ppc sparc s390"
-
-S=${WORKDIR}/${PN}-${PV}
-
-
-# for debugging use
-use debug && RESTRICT="${RESTRICT} nostrip"
-
-src_compile() {
-	cd ${S} || die
-	local myconf
-
-	if use debug; then
-	 	myconf="${myconf} --with-debug=3"
-		CFLAGS="${CFLAGS} -g"
-	fi
-	[ -c /dev/urandom ] && myconf="${myconf} --with-random-device=/dev/urandom"
-
-	econf \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/lib/pdnsd \
-		--infodir=/usr/share/info --mandir=/usr/share/man \
-		`use_enable ipv6` `use_enable isdn` \
-		${myconf} \
-		|| die "bad configure"
-
-	emake all || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	fowners pdnsd:pdnsd /var/lib/pdnsd /var/lib/pdnsd/pdnsd.cache
-
-	sed -i 's/run_as=.*/run_as="pdnsd";/' ${D}/etc/pdnsd/pdnsd.conf.sample
-
-	dodoc AUTHORS COPYING* ChangeLog* NEWS README THANKS TODO README.par
-	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
-	docinto html ; dohtml doc/html/*
-	docinto txt ; dodoc doc/txt/*
-	newdoc doc/pdnsd.conf pdnsd.conf.sample
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pdnsd.rc6 pdnsd
-	newexe ${FILESDIR}/pdnsd.online pdnsd-online
-
-	use ipv6 && \
-		sed -i -e "s:-- -s:-- -6 -s:" ${D}/etc/init.d/pdnsd
-
-	use ipv6 && \
-		ewarn "make sure your servers in /etc/pdnsd/pdnsd.conf are reachable with IPv6"
-
-	keepdir /etc/conf.d
-	local config=${D}/etc/conf.d/pdnsd-online
-	echo "# Enter the interface that connects you to the dns servers" > ${config}
-	echo "# This will correspond to /etc/init.d/net.${IFACE}" >> ${config}
-	echo "IFACE=ppp0" >> ${config}
-
-	einfo "Add pdnsd to your default runlevel."
-	einfo ""
-	einfo "Add pdnsd-online to your online runlevel."
-	einfo "The online interface will be listed in /etc/conf.d/pdnsd-online"
-}
diff --git a/net-dns/pdnsd/pdnsd-1.2.1.ebuild b/net-dns/pdnsd/pdnsd-1.2.1.ebuild
new file mode 100644
index 000000000000..779f1bff3e47
--- /dev/null
+++ b/net-dns/pdnsd/pdnsd-1.2.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.1.ebuild,v 1.1 2004/11/30 20:56:43 dragonheart Exp $
+
+inherit eutils
+
+MY_P=${PN}-${PV}-par
+DESCRIPTION="Proxy DNS server with permanent caching"
+HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://home.t-online.de/home/Moestl"
+SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/releases/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+IUSE="ipv6 debug isdn nptl"
+
+DEPEND="virtual/libc
+	sys-apps/sed
+	sys-apps/gawk
+	sys-devel/libtool
+	sys-devel/gcc
+	sys-devel/automake
+	sys-devel/autoconf"
+RDEPEND="virtual/libc"
+
+pkg_setup() {
+	enewgroup pdnsd
+	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
+src_compile() {
+	cd ${S} || die
+	local myconf
+
+	if useq debug; then
+	 	myconf="${myconf} --with-debug=3"
+		CFLAGS="${CFLAGS} -g"
+	fi
+	useq nptl && myconf="${myconf} --with-thread-lib=NPTL"
+
+	[ -c /dev/urandom ] && myconf="${myconf} --with-random-device=/dev/urandom"
+
+	econf \
+		--sysconfdir=/etc/pdnsd \
+		--with-cachedir=/var/cache/pdnsd \
+		--infodir=/usr/share/info --mandir=/usr/share/man \
+		--with-default-id=pdnsd \
+		`use_enable ipv6` `use_enable isdn` \
+		${myconf} \
+		|| die "bad configure"
+
+	emake all || die "compile problem"
+}
+
+pkg_preinst() {
+	# Duplicated so that binary packages work
+	enewgroup pdnsd
+	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
+
+src_test() {
+	if [ -x /usr/bin/dig ];
+	then
+		mkdir ${T}/pdnsd
+		echo -n -e "pd12\0\0\0\0" > ${T}/pdnsd/pdnsd.cache
+		IPS=$(grep ^nameserver ${ROOT}/etc/resolv.conf | sed -e 's/nameserver \(.*\)/\tip=\1;/g' | xargs)
+		#IPS=$(grep ^nameserver ${ROOT}/etc/resolv.conf |  sed -e 's/nameserver//g' | head -n 1)
+		sed -e "s/\tip=/${IPS}/" -e "s:cache_dir=:cache_dir=${T}/pdnsd:" ${FILESDIR}/pdnsd.conf.test \
+			> ${T}/pdnsd.conf.test
+		src/pdnsd -c ${T}/pdnsd.conf.test -g -s -d -p ${T}/pid || die "couldn't start daemon"
+		find ${T} -ls
+
+		[ -s ${T}/pid ] || die "empty or no pid file created"
+		[ -S ${T}/pdnsd/pdnsd.status ] || die "no socket created"
+		src/pdnsd-ctl/pdnsd-ctl   -c ${T}/pdnsd server all up || die "failed to communicate to daemon"
+		src/pdnsd-ctl/pdnsd-ctl   -c ${T}/pdnsd status || die "failed to communicate to daemon"
+		sleep 3
+
+		dig @127.0.0.1 -p 33455 www.gentoo.org  | fgrep "status: NOERROR" || die "www.gentoo.org lookup failed"
+		kill `cat ${T}/pid` || die "failed to terminate daemon"
+	fi
+}
+
+src_install() {
+
+	emake DESTDIR=${D} install || die
+
+	# Copy cache from prev older versions
+	[ -f ${ROOT}/var/lib/pdnsd/pdnsd.cache ] && \
+		cp ${ROOT}/var/lib/pdnsd/pdnsd.cache ${D}/var/cache/pdnsd/pdnsd.cache
+
+	# Don't clobber existing cache - copy prev cache so unmerging prev version
+	# doesn't remove the cache.
+	[ -f ${ROOT}/var/cache/pdnsd/pdnsd.cache ] && \
+		rm  ${D}/var/cache/pdnsd/pdnsd.cache
+
+	dodoc AUTHORS COPYING* ChangeLog* NEWS README THANKS TODO README.par
+	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
+	docinto html ; dohtml doc/html/*
+	docinto txt ; dodoc doc/txt/*
+	newdoc doc/pdnsd.conf pdnsd.conf.sample
+
+	# Remind users that the cachedir has moved to /var/cache
+	#[ -f ${ROOT}/etc/pdnsd/pdnsd.conf ] && \
+	#	sed -e "s#/var/lib#/var/cache#g" ${ROOT}/etc/pdnsd/pdnsd.conf \
+	#	> ${D}/etc/pdnsd/pdnsd.conf
+
+	newinitd ${FILESDIR}/pdnsd.rc6 pdnsd
+	newinitd ${FILESDIR}/pdnsd.online pdnsd-online
+
+
+	keepdir /etc/conf.d
+	local config=${D}/etc/conf.d/pdnsd-online
+
+	echo -e "# Enter the interface that connects you to the dns servers" >> ${config}
+	echo "# This will correspond to /etc/init.d/net.${IFACE}" >> ${config}
+	echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >>  ${config}
+	echo "IFACE=ppp0" >> ${config}
+
+	config=${D}/etc/conf.d/pdnsd
+	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" > ${config}
+	echo "# Command line options" >> ${config}
+	use ipv6 && echo PDNSDCONFIG="-a" >> ${config} \
+		|| echo PDNSDCONFIG="" >> ${config}
+
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Add pdnsd to your default runlevel - rc-update add pdnsd default"
+	einfo ""
+	einfo "Add pdnsd-online to your online runlevel."
+	einfo "The online interface will be listed in /etc/conf.d/pdnsd-online"
+	einfo ""
+	einfo "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
+}