Add reload option to pdnsd init script (#184871).

Package-Manager: portage-2.1.2.7

10 files changed, 38 insertions, 344 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index c6ddce6e1c05..c7754799dd02 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.71 2007/05/06 09:18:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.72 2007/07/13 07:46:00 mrness Exp $
+
+*pdnsd-1.2.5-r1 (13 Jul 2007)
+
+  13 Jul 2007; Alin Năstac <mrness@gentoo.org>
+  -files/pdnsd-1.2.4-dbg_file.patch, files/pdnsd.rc6,
+  -pdnsd-1.2.4-r1.ebuild, -pdnsd-1.2.4-r3.ebuild, -pdnsd-1.2.5.ebuild,
+  +pdnsd-1.2.5-r1.ebuild:
+  Add reload option to pdnsd init script (#184871).
 
   06 May 2007; Marius Mauch <genone@gentoo.org> pdnsd-1.2.4-r1.ebuild,
   pdnsd-1.2.4-r3.ebuild, pdnsd-1.2.5.ebuild:
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 2b68c035310e..357095ed20c5 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pdnsd-1.2.4-dbg_file.patch 1366 RMD160 d401e3c26684dc3d10fbf2a3bb7610ed0fdba11f SHA1 90f07221dc53953199910d8c632d8b4f66da9fbe SHA256 7c293c95dd45f9fddc2aba48479f0b0f06c8ac9fa15e3c5ed1a582ba8c82d1a0
-MD5 8a12be746cefcb7e1114a74a02b8d0f2 files/pdnsd-1.2.4-dbg_file.patch 1366
-RMD160 d401e3c26684dc3d10fbf2a3bb7610ed0fdba11f files/pdnsd-1.2.4-dbg_file.patch 1366
-SHA256 7c293c95dd45f9fddc2aba48479f0b0f06c8ac9fa15e3c5ed1a582ba8c82d1a0 files/pdnsd-1.2.4-dbg_file.patch 1366
 AUX pdnsd.conf.test 377 RMD160 fbf25b78728754fa1f9cf5259c43cce9cb22a995 SHA1 bd7fdc0d89873921d5284e8d6713e62a424de704 SHA256 8ef1e68c43cefde86598158d2b624cbdd66d2436d681cabbc6327d34d5886058
 MD5 2a7e9d9f54bd31a3675c491d0b6ee187 files/pdnsd.conf.test 377
 RMD160 fbf25b78728754fa1f9cf5259c43cce9cb22a995 files/pdnsd.conf.test 377
@@ -13,49 +9,34 @@ AUX pdnsd.online 452 RMD160 45ecfe4acf625d62a299ee1ba46c6559901e2e66 SHA1 23998f
 MD5 27071ebe71d4f810d57d7cfbd4099788 files/pdnsd.online 452
 RMD160 45ecfe4acf625d62a299ee1ba46c6559901e2e66 files/pdnsd.online 452
 SHA256 6fe3f33c7c5554f9577abfc5f7dc9547ba508ab68fe3590d8f1bb9598a865e9a files/pdnsd.online 452
-AUX pdnsd.rc6 755 RMD160 deb6e6eed3ad8dabcc313b6e78abdd5c574c1c35 SHA1 525b68ce58e597281e0d9694b4f01ce568772ddc SHA256 7f6b8782a8b4fff6b0cb1b8bfebdddf5777a5788aae76044cba499023c73423f
-MD5 65809ab9f525565a98ebe800edea45ab files/pdnsd.rc6 755
-RMD160 deb6e6eed3ad8dabcc313b6e78abdd5c574c1c35 files/pdnsd.rc6 755
-SHA256 7f6b8782a8b4fff6b0cb1b8bfebdddf5777a5788aae76044cba499023c73423f files/pdnsd.rc6 755
+AUX pdnsd.rc6 850 RMD160 9700c23cbe4a8fb18a6492c04ec4e8d7b8d2c082 SHA1 b7a231bb4c486015895f1efc7fe566c2210fe384 SHA256 4406f536e237fb92547e25373500b16198e6eb1cf6ab6e54e9ed3effa4eaa4ba
+MD5 518981abe3776190a1f0a27b914f706d files/pdnsd.rc6 850
+RMD160 9700c23cbe4a8fb18a6492c04ec4e8d7b8d2c082 files/pdnsd.rc6 850
+SHA256 4406f536e237fb92547e25373500b16198e6eb1cf6ab6e54e9ed3effa4eaa4ba files/pdnsd.rc6 850
 AUX pdnsd.resolvconf 17365 RMD160 ea64795ebe6db99bbb304c86f2f2718ae3f9b034 SHA1 1485d59bbfdefa9faf3209b9bea2de30b204e813 SHA256 065679543e9cf3e20622265e3d009c5b68c213136c7632d257af0096b49fbbed
 MD5 4bd3416d81dcdc84389c69ada9854cdc files/pdnsd.resolvconf 17365
 RMD160 ea64795ebe6db99bbb304c86f2f2718ae3f9b034 files/pdnsd.resolvconf 17365
 SHA256 065679543e9cf3e20622265e3d009c5b68c213136c7632d257af0096b49fbbed files/pdnsd.resolvconf 17365
-DIST pdnsd-1.2.4-par.tar.gz 537362 RMD160 19cbb5d03eacdd8153ac3b9675cdbe07b1edfbd4 SHA1 60719a178b05214de6d98fff1455e05733cc75cd SHA256 b9172094feee0ebe6b2aec3c1358419cc928469e16c96718d7d0fc639fc17e55
 DIST pdnsd-1.2.5-par.tar.gz 537586 RMD160 c1444a746e3a8d1552608d0356cb14ed03d86fc1 SHA1 835a399a5ef3ea24f626c36b8eef0816985847b1 SHA256 679b308373cf89983bd21432090aad11bb3109ea2e58532f2e2ac0cb3b97462f
-EBUILD pdnsd-1.2.4-r1.ebuild 3921 RMD160 6fba03095e786e539188fbee948cfc6bb17a3f42 SHA1 cb4487a1f6033908e32148f87ff2778804237a55 SHA256 de559eb46857aac34a233af5f7b118a4761e5ac691660489f2f1dc2de65712dd
-MD5 6a43e063b35472ec1df2266364e0692c pdnsd-1.2.4-r1.ebuild 3921
-RMD160 6fba03095e786e539188fbee948cfc6bb17a3f42 pdnsd-1.2.4-r1.ebuild 3921
-SHA256 de559eb46857aac34a233af5f7b118a4761e5ac691660489f2f1dc2de65712dd pdnsd-1.2.4-r1.ebuild 3921
-EBUILD pdnsd-1.2.4-r3.ebuild 4031 RMD160 97a1dc8ab73d2863855799eecdb13a22faeea36a SHA1 ae79d2e4005860f71da3b97eafae087c124e6d23 SHA256 9852c63b677e6588d792db2d3c7ad8e4b51b3eae8a7163b277b886b37215931b
-MD5 2a50e030ea5fd1c8299f7abd73f3d986 pdnsd-1.2.4-r3.ebuild 4031
-RMD160 97a1dc8ab73d2863855799eecdb13a22faeea36a pdnsd-1.2.4-r3.ebuild 4031
-SHA256 9852c63b677e6588d792db2d3c7ad8e4b51b3eae8a7163b277b886b37215931b pdnsd-1.2.4-r3.ebuild 4031
-EBUILD pdnsd-1.2.5.ebuild 3938 RMD160 9d5ef49cd5dfc53fb4fb2bf61884b7eedebbe20f SHA1 0df63d4413a9e5f7b820e8d6c1a075ba01a3120a SHA256 eead255669643e19910ca112c9c70efe047d4a0673928f80d4b2ec7535888af7
-MD5 5d7df108bd543d3cbba2b881cc6f9310 pdnsd-1.2.5.ebuild 3938
-RMD160 9d5ef49cd5dfc53fb4fb2bf61884b7eedebbe20f pdnsd-1.2.5.ebuild 3938
-SHA256 eead255669643e19910ca112c9c70efe047d4a0673928f80d4b2ec7535888af7 pdnsd-1.2.5.ebuild 3938
-MISC ChangeLog 10555 RMD160 54ac4130734b7ead9b42ea16d3fba40f724a7b94 SHA1 2df21bbe127c93c13355ca94dc8004ce16ba3976 SHA256 69cf2adaa7d406ca404d953accceebea9115bfaed8a31818b1f8cfbbe1b22ab7
-MD5 06a509236ce563ce4aaaf01bec480250 ChangeLog 10555
-RMD160 54ac4130734b7ead9b42ea16d3fba40f724a7b94 ChangeLog 10555
-SHA256 69cf2adaa7d406ca404d953accceebea9115bfaed8a31818b1f8cfbbe1b22ab7 ChangeLog 10555
+EBUILD pdnsd-1.2.5-r1.ebuild 3941 RMD160 aaca73f0aace710e335b300c916f3bbfe120f172 SHA1 0660cdb0007813956ab27d5b136df15ad46a4ae5 SHA256 669bfe6f6370c4c48723934b3f38fdb5a73a16bfadf3cefc4357b0bdf5021f27
+MD5 4892709228f24516aad4678894bd3066 pdnsd-1.2.5-r1.ebuild 3941
+RMD160 aaca73f0aace710e335b300c916f3bbfe120f172 pdnsd-1.2.5-r1.ebuild 3941
+SHA256 669bfe6f6370c4c48723934b3f38fdb5a73a16bfadf3cefc4357b0bdf5021f27 pdnsd-1.2.5-r1.ebuild 3941
+MISC ChangeLog 10838 RMD160 c4cec610cf99a963ee5258aad8b37dcf707f65e7 SHA1 320df15c711f5dcb43ff70e4bb4f08a2a71fedd9 SHA256 ee20fe77de2cfb19811c2423d3b20a19c4eac6721a272f177a390b4c6b1abe60
+MD5 f9b05b63844aede609a8bbe2602cbbdc ChangeLog 10838
+RMD160 c4cec610cf99a963ee5258aad8b37dcf707f65e7 ChangeLog 10838
+SHA256 ee20fe77de2cfb19811c2423d3b20a19c4eac6721a272f177a390b4c6b1abe60 ChangeLog 10838
 MISC metadata.xml 402 RMD160 2dbd46b28843db4e7c216ec2d38354fe544d3d4b SHA1 8e51bef82c01c04db3c4a130b8bf726195c3acb9 SHA256 d5dba4f72c2ee03f15efe1a6954b8e81dc4d2e2842611cf5db90b9c241433ac6
 MD5 03c559c81ebc357c5f906e8247f1b79b metadata.xml 402
 RMD160 2dbd46b28843db4e7c216ec2d38354fe544d3d4b metadata.xml 402
 SHA256 d5dba4f72c2ee03f15efe1a6954b8e81dc4d2e2842611cf5db90b9c241433ac6 metadata.xml 402
-MD5 0206348621925721875c0a8e013a80fd files/digest-pdnsd-1.2.4-r1 247
-RMD160 ae7499c8e9585c07bd01061cc11e9863e01cd248 files/digest-pdnsd-1.2.4-r1 247
-SHA256 e7ac61d711062ec862f2bccce3bf7ec943887cfecaf35c1b7e390bf30e4a099d files/digest-pdnsd-1.2.4-r1 247
-MD5 0206348621925721875c0a8e013a80fd files/digest-pdnsd-1.2.4-r3 247
-RMD160 ae7499c8e9585c07bd01061cc11e9863e01cd248 files/digest-pdnsd-1.2.4-r3 247
-SHA256 e7ac61d711062ec862f2bccce3bf7ec943887cfecaf35c1b7e390bf30e4a099d files/digest-pdnsd-1.2.4-r3 247
-MD5 b217380df87dd99ecbcd955f049a7def files/digest-pdnsd-1.2.5 247
-RMD160 40c815ec61ca878b83d95c8a9a4b58b57a312085 files/digest-pdnsd-1.2.5 247
-SHA256 cadd2f658fe98f1e8a7194a51fec307aff7d8412d0d6feb03c550228f5bc053f files/digest-pdnsd-1.2.5 247
+MD5 b217380df87dd99ecbcd955f049a7def files/digest-pdnsd-1.2.5-r1 247
+RMD160 40c815ec61ca878b83d95c8a9a4b58b57a312085 files/digest-pdnsd-1.2.5-r1 247
+SHA256 cadd2f658fe98f1e8a7194a51fec307aff7d8412d0d6feb03c550228f5bc053f files/digest-pdnsd-1.2.5-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGPZyi6J2i8a8J4okRAmj3AKC37EDSBIzjio7bYquNOrDVObBzmQCgrhn/
-iNbsM0q2YNW3TCm5Q7B7Bns=
-=orLi
+iD8DBQFGly3CVSA5X31g7/gRAqd6AJ0TlD/N/73lOUnCeIRSYRup9BjUbgCdFBcs
+IJUHrBievfWuqsJfDBIyHXY=
+=FfQG
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r1 b/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r1
deleted file mode 100644
index a46253777836..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aafb9d65d713b4bc2c6c4ba822e0bd3c pdnsd-1.2.4-par.tar.gz 537362
-RMD160 19cbb5d03eacdd8153ac3b9675cdbe07b1edfbd4 pdnsd-1.2.4-par.tar.gz 537362
-SHA256 b9172094feee0ebe6b2aec3c1358419cc928469e16c96718d7d0fc639fc17e55 pdnsd-1.2.4-par.tar.gz 537362
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r3 b/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r3
deleted file mode 100644
index a46253777836..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aafb9d65d713b4bc2c6c4ba822e0bd3c pdnsd-1.2.4-par.tar.gz 537362
-RMD160 19cbb5d03eacdd8153ac3b9675cdbe07b1edfbd4 pdnsd-1.2.4-par.tar.gz 537362
-SHA256 b9172094feee0ebe6b2aec3c1358419cc928469e16c96718d7d0fc639fc17e55 pdnsd-1.2.4-par.tar.gz 537362
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.5 b/net-dns/pdnsd/files/digest-pdnsd-1.2.5-r1
index fd17b3df87a7..fd17b3df87a7 100644
--- a/net-dns/pdnsd/files/digest-pdnsd-1.2.5
+++ b/net-dns/pdnsd/files/digest-pdnsd-1.2.5-r1
diff --git a/net-dns/pdnsd/files/pdnsd-1.2.4-dbg_file.patch b/net-dns/pdnsd/files/pdnsd-1.2.4-dbg_file.patch
deleted file mode 100644
index b7a39689c75a..000000000000
--- a/net-dns/pdnsd/files/pdnsd-1.2.4-dbg_file.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nru pdnsd-1.2.4.orig/src/main.c pdnsd-1.2.4/src/main.c
---- pdnsd-1.2.4.orig/src/main.c	2005-11-12 22:03:42.000000000 +0200
-+++ pdnsd-1.2.4/src/main.c	2006-04-27 09:38:38.000000000 +0300
-@@ -63,7 +63,7 @@
- pthread_t main_thrid,servstat_thrid,statsock_thrid,tcps_thrid,udps_thrid;
- uid_t init_uid;
- #if DEBUG>0
--FILE *dbg_file;
-+FILE *dbg_file=NULL;
- #endif
- volatile int tcp_socket=-1;
- volatile int udp_socket=-1;
-@@ -451,6 +451,19 @@
- 		}
- 	}
- 
-+#if DEBUG>0
-+	if (global.daemon) {
-+		if (debug_p) {
-+		  char dbgdir[strlen(global.cache_dir)+sizeof("/pdnsd.debug")];
-+		  stpcpy(stpcpy(dbgdir,global.cache_dir),"/pdnsd.debug");
-+		  if (!(dbg_file=fopen(dbgdir,"w")))
-+		    debug_p=0;
-+		}
-+	} else {
-+		dbg_file=stdout;
-+	}
-+#endif
-+
- 	if (global.daemon && global.pidfile) {
- 		if (unlink(global.pidfile)!=0 && errno!=ENOENT) {
- 			log_error("Error: could not unlink pid file %s: %s",global.pidfile, strerror(errno));
-@@ -550,18 +563,6 @@
- 		dup2(fd,1);
- 		dup2(fd,2);
- 		close(fd);
--#if DEBUG>0
--		if (debug_p) {
--		  char dbgdir[strlen(global.cache_dir)+sizeof("/pdnsd.debug")];
--		  stpcpy(stpcpy(dbgdir,global.cache_dir),"/pdnsd.debug");
--		  if (!(dbg_file=fopen(dbgdir,"w")))
--		    debug_p=0;
--		}
--#endif
--	} else {
--#if DEBUG>0
--		dbg_file=stdout;
--#endif
- 	}
- 	log_info(0,"pdnsd-%s starting.\n",VERSION);
- 	DEBUG_MSG("Debug messages activated\n");
diff --git a/net-dns/pdnsd/files/pdnsd.rc6 b/net-dns/pdnsd/files/pdnsd.rc6
index bef9ba0f7a72..6ae51270141e 100644
--- a/net-dns/pdnsd/files/pdnsd.rc6
+++ b/net-dns/pdnsd/files/pdnsd.rc6
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6,v 1.12 2004/07/14 23:26:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6,v 1.13 2007/07/13 07:46:00 mrness Exp $
+
+opts="reload"
 
 depend() {
 	need net
@@ -29,3 +31,9 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile /var/run/pdnsd.pid
 	eend $?
 }
+
+reload() {
+	ebegin "Reloading pdnsd.conf"
+	/usr/sbin/pdnsd-ctl config
+	eend $?
+}
diff --git a/net-dns/pdnsd/pdnsd-1.2.4-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.4-r1.ebuild
deleted file mode 100644
index 2961f4a31e2e..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.4-r1.ebuild,v 1.7 2007/05/06 09:18:17 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://www.phys.uu.nl/~rombouts/pdnsd.html"
-SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/releases/${P}-par.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc s390 sparc x86"
-IUSE="ipv6 debug isdn nptl"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-dbg_file.patch"
-}
-
-src_compile() {
-	local myconf=""
-
-	if use debug; then
-	 	myconf="${myconf} --with-debug=3"
-		CFLAGS="${CFLAGS} -g"
-	fi
-	use 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"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS 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
-
-	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}"
-}
-
-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 /etc/resolv.conf | sed -e 's/nameserver \(.*\)/\tip=\1;/g' | xargs)
-		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"
-		sleep 3
-
-		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 start the daemon"
-		src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" status || die "failed to communicate with the daemon"
-		sleep 3
-
-		dig @127.0.0.1 -p 33455 www.gentoo.org  | fgrep "status: NOERROR" || die "www.gentoo.org lookup failed"
-		kill $(<"${T}/pid") || die "failed to terminate daemon"
-	fi
-}
-
-pkg_preinst() {
-	# Duplicated so that binary packages work
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-
-	# Copy cache from older versions
-	[ -f "${ROOT}/var/lib/pdnsd/pdnsd.cache" ] && \
-		cp "${ROOT}/var/lib/pdnsd/pdnsd.cache" "${D}/var/cache/pdnsd/pdnsd.cache"
-
-	# Preserve the cache from previous version
-	[ -f "${ROOT}/var/cache/pdnsd/pdnsd.cache" ] && \
-		cp "${ROOT}/var/cache/pdnsd/pdnsd.cache" "${D}/var/cache/pdnsd/pdnsd.cache"
-}
-
-pkg_postinst() {
-	elog
-	elog "Add pdnsd to your default runlevel - rc-update add pdnsd default"
-	elog ""
-	elog "Add pdnsd-online to your online runlevel."
-	elog "The online interface will be listed in /etc/conf.d/pdnsd-online"
-	elog ""
-	elog "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
-}
diff --git a/net-dns/pdnsd/pdnsd-1.2.4-r3.ebuild b/net-dns/pdnsd/pdnsd-1.2.4-r3.ebuild
deleted file mode 100644
index 7dc3f361d249..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.4-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.4-r3.ebuild,v 1.7 2007/05/06 09:18:17 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://www.phys.uu.nl/~rombouts/pdnsd.html"
-SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/releases/${P}-par.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ppc s390 sparc x86"
-IUSE="ipv6 debug isdn nptl"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-dbg_file.patch"
-}
-
-src_compile() {
-	local myconf=""
-
-	if use debug; then
-	 	myconf="${myconf} --with-debug=3"
-		CFLAGS="${CFLAGS} -g"
-	fi
-	use 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"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS 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
-
-	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}"
-
-	#resolvconf-gentoo support
-	exeinto /etc/resolvconf/update.d
-	newexe "${FILESDIR}/pdnsd.resolvconf" 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 /etc/resolv.conf | sed -e 's/nameserver \(.*\)/\tip=\1;/g' | xargs)
-		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"
-		sleep 3
-
-		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 start the daemon"
-		src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" status || die "failed to communicate with the daemon"
-		sleep 3
-
-		dig @127.0.0.1 -p 33455 www.gentoo.org  | fgrep "status: NOERROR" || die "www.gentoo.org lookup failed"
-		kill $(<"${T}/pid") || die "failed to terminate daemon"
-	fi
-}
-
-pkg_preinst() {
-	# Duplicated so that binary packages work
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-
-	# Copy cache from older versions
-	[ -f "${ROOT}/var/lib/pdnsd/pdnsd.cache" ] && \
-		cp "${ROOT}/var/lib/pdnsd/pdnsd.cache" "${D}/var/cache/pdnsd/pdnsd.cache"
-
-	# Preserve the cache from previous version
-	[ -f "${ROOT}/var/cache/pdnsd/pdnsd.cache" ] && \
-		cp "${ROOT}/var/cache/pdnsd/pdnsd.cache" "${D}/var/cache/pdnsd/pdnsd.cache"
-}
-
-pkg_postinst() {
-	elog
-	elog "Add pdnsd to your default runlevel - rc-update add pdnsd default"
-	elog ""
-	elog "Add pdnsd-online to your online runlevel."
-	elog "The online interface will be listed in /etc/conf.d/pdnsd-online"
-	elog ""
-	elog "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
-}
diff --git a/net-dns/pdnsd/pdnsd-1.2.5.ebuild b/net-dns/pdnsd/pdnsd-1.2.5-r1.ebuild
index b6f863659a54..9932eca1dbce 100644
--- a/net-dns/pdnsd/pdnsd-1.2.5.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.5.ebuild,v 1.9 2007/05/06 09:18:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.5-r1.ebuild,v 1.1 2007/07/13 07:46:00 mrness Exp $
 
 inherit eutils