Add support for resolvconf-gentoo (#134254).

(Portage version: 2.1)
 (Signed Manifest commit)

3 files changed, 33 insertions, 157 deletions

diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 55a8224f1782..c30cde77765b 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,47 +1,60 @@
-AUX pdnsd-1.2.4-dbg_file.patch 1366 RMD160 d401e3c26684dc3d10fbf2a3bb7610ed0fdba11f SHA1 90f07221dc53953199910d8c632d8b4f66da9fbe SHA256 7c293c95dd45f9fddc2aba48479f0b0f06c8ac9fa15e3c5ed1a582ba8c82d1a0 size 1366
+-----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 size 377
+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
 SHA256 8ef1e68c43cefde86598158d2b624cbdd66d2436d681cabbc6327d34d5886058 files/pdnsd.conf.test 377
-AUX pdnsd.online 452 RMD160 45ecfe4acf625d62a299ee1ba46c6559901e2e66 SHA1 23998f42399430a457f3122ec906b9ef1b701520 SHA256 6fe3f33c7c5554f9577abfc5f7dc9547ba508ab68fe3590d8f1bb9598a865e9a size 452
+AUX pdnsd.online 452 RMD160 45ecfe4acf625d62a299ee1ba46c6559901e2e66 SHA1 23998f42399430a457f3122ec906b9ef1b701520 SHA256 6fe3f33c7c5554f9577abfc5f7dc9547ba508ab68fe3590d8f1bb9598a865e9a
 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 size 755
+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
-DIST pdnsd-1.2.3-par.tar.gz 532232 size 532232
-DIST pdnsd-1.2.4-par.tar.gz 537362 RMD160 19cbb5d03eacdd8153ac3b9675cdbe07b1edfbd4 SHA256 b9172094feee0ebe6b2aec3c1358419cc928469e16c96718d7d0fc639fc17e55 size 537362
-EBUILD pdnsd-1.2.3.ebuild 4280 RMD160 8a515cb5656d92ce9566227f54f3b23dbc704125 SHA1 1ea6bfbe3c9268397618b9106181be5d44b6c8e0 SHA256 ce94e5cfe76ca3dcb9b519890b77db4540f62db16f1905d3f0c9a9d15d95a970 size 4280
-MD5 ff5367e7e1e820b6d58bbf69326d72a1 pdnsd-1.2.3.ebuild 4280
-RMD160 8a515cb5656d92ce9566227f54f3b23dbc704125 pdnsd-1.2.3.ebuild 4280
-SHA256 ce94e5cfe76ca3dcb9b519890b77db4540f62db16f1905d3f0c9a9d15d95a970 pdnsd-1.2.3.ebuild 4280
-EBUILD pdnsd-1.2.4-r1.ebuild 3972 RMD160 b215b639a7f64475fd728d83254e2334ab0922d2 SHA1 403edbe719ff60cdebb17a6c4cf3b0fa04b2db63 SHA256 99fe471dfa2bce006d0adb79c9a65e6be6f21652a6cb24c4113a8a0a2d5075b1 size 3972
+AUX pdnsd.resolvconf 13222 RMD160 3cb4495a72e1e78c3d2d05cd162ae72593e850c5 SHA1 f3bd8ebf785f5d920f695457e090996a3e454136 SHA256 3a7f25f2670a1555255ecd6496191e68bb4a297e32e863e87c32ee5ed5ae5ba1
+MD5 67ddd06cf9ea843b4593cccb88f37c1a files/pdnsd.resolvconf 13222
+RMD160 3cb4495a72e1e78c3d2d05cd162ae72593e850c5 files/pdnsd.resolvconf 13222
+SHA256 3a7f25f2670a1555255ecd6496191e68bb4a297e32e863e87c32ee5ed5ae5ba1 files/pdnsd.resolvconf 13222
+DIST pdnsd-1.2.4-par.tar.gz 537362 RMD160 19cbb5d03eacdd8153ac3b9675cdbe07b1edfbd4 SHA1 60719a178b05214de6d98fff1455e05733cc75cd SHA256 b9172094feee0ebe6b2aec3c1358419cc928469e16c96718d7d0fc639fc17e55
+EBUILD pdnsd-1.2.4-r1.ebuild 3972 RMD160 b215b639a7f64475fd728d83254e2334ab0922d2 SHA1 403edbe719ff60cdebb17a6c4cf3b0fa04b2db63 SHA256 99fe471dfa2bce006d0adb79c9a65e6be6f21652a6cb24c4113a8a0a2d5075b1
 MD5 817f708ee3af586e0957940ecaaea10b pdnsd-1.2.4-r1.ebuild 3972
 RMD160 b215b639a7f64475fd728d83254e2334ab0922d2 pdnsd-1.2.4-r1.ebuild 3972
 SHA256 99fe471dfa2bce006d0adb79c9a65e6be6f21652a6cb24c4113a8a0a2d5075b1 pdnsd-1.2.4-r1.ebuild 3972
-EBUILD pdnsd-1.2.4.ebuild 3889 RMD160 bcbf1f62b83639d17ff29d23e32692f98e16d29b SHA1 8154196537a0a2fef450649076b01e0d3c186c01 SHA256 2ba3fa5ac5fb617132025fa529b818c75dd360ee174ec72758ff35923e7e3dce size 3889
+EBUILD pdnsd-1.2.4-r2.ebuild 4081 RMD160 76c462235d5f24a1b0702c86dff3707a6b3f7bbc SHA1 3679d54262b85495335a11a4bdc3dd9dac3418d1 SHA256 66d2b14055f43eb2d3da202c1a66939ea216e95b5f768e2e549d4cdcd6102f18
+MD5 33f17a3e164ec88b4a764d9277faa5e1 pdnsd-1.2.4-r2.ebuild 4081
+RMD160 76c462235d5f24a1b0702c86dff3707a6b3f7bbc pdnsd-1.2.4-r2.ebuild 4081
+SHA256 66d2b14055f43eb2d3da202c1a66939ea216e95b5f768e2e549d4cdcd6102f18 pdnsd-1.2.4-r2.ebuild 4081
+EBUILD pdnsd-1.2.4.ebuild 3889 RMD160 bcbf1f62b83639d17ff29d23e32692f98e16d29b SHA1 8154196537a0a2fef450649076b01e0d3c186c01 SHA256 2ba3fa5ac5fb617132025fa529b818c75dd360ee174ec72758ff35923e7e3dce
 MD5 0bd9240a8e73728857da354bc687531e pdnsd-1.2.4.ebuild 3889
 RMD160 bcbf1f62b83639d17ff29d23e32692f98e16d29b pdnsd-1.2.4.ebuild 3889
 SHA256 2ba3fa5ac5fb617132025fa529b818c75dd360ee174ec72758ff35923e7e3dce pdnsd-1.2.4.ebuild 3889
-MISC ChangeLog 8878 RMD160 c2bac6c99a1fa231b458040b252b2dfe37c24142 SHA1 1e45a72ef8637b3e6ba0ea20365e627c7ef86e77 SHA256 41a89899338619431a750af55ab6834122d2db0d5e9f40f9733a6d1c292b9196 size 8878
-MD5 165ae3c4d922d1def99fb0f54a8da0cd ChangeLog 8878
-RMD160 c2bac6c99a1fa231b458040b252b2dfe37c24142 ChangeLog 8878
-SHA256 41a89899338619431a750af55ab6834122d2db0d5e9f40f9733a6d1c292b9196 ChangeLog 8878
-MISC metadata.xml 402 RMD160 2dbd46b28843db4e7c216ec2d38354fe544d3d4b SHA1 8e51bef82c01c04db3c4a130b8bf726195c3acb9 SHA256 d5dba4f72c2ee03f15efe1a6954b8e81dc4d2e2842611cf5db90b9c241433ac6 size 402
+MISC ChangeLog 9125 RMD160 741a037bf327d67a5cd18783c148bc74c4a13fc0 SHA1 54694af3e21c9c578a9130b95a74b041a4fed790 SHA256 5dbb96d43c95ec1a5251f773e560a99a3547071da2b3890fd0ed7a44d170ea44
+MD5 115598b8450d58418a47ecd89a6a6aab ChangeLog 9125
+RMD160 741a037bf327d67a5cd18783c148bc74c4a13fc0 ChangeLog 9125
+SHA256 5dbb96d43c95ec1a5251f773e560a99a3547071da2b3890fd0ed7a44d170ea44 ChangeLog 9125
+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 841f98e9e42888ec6d3869f716017c5f files/digest-pdnsd-1.2.3 67
-RMD160 bdea6159ef5232e8d7e436170fb3725912fd8015 files/digest-pdnsd-1.2.3 67
-SHA256 6e8e085938f058223fde4a6ebd7715c9be50ad17b989dabf518f4ee015ae3633 files/digest-pdnsd-1.2.3 67
 MD5 0206348621925721875c0a8e013a80fd files/digest-pdnsd-1.2.4 247
 RMD160 ae7499c8e9585c07bd01061cc11e9863e01cd248 files/digest-pdnsd-1.2.4 247
 SHA256 e7ac61d711062ec862f2bccce3bf7ec943887cfecaf35c1b7e390bf30e4a099d files/digest-pdnsd-1.2.4 247
 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-r2 247
+RMD160 ae7499c8e9585c07bd01061cc11e9863e01cd248 files/digest-pdnsd-1.2.4-r2 247
+SHA256 e7ac61d711062ec862f2bccce3bf7ec943887cfecaf35c1b7e390bf30e4a099d files/digest-pdnsd-1.2.4-r2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEi/3AjG8pv1lIUX4RAiK+AJ0T39PX7en4NpHGTLdHFD6Q7mlOiACghDfA
+cF4in1vVeLXO2EsPNCsVnDw=
+=TxOz
+-----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.3 b/net-dns/pdnsd/files/digest-pdnsd-1.2.3
deleted file mode 100644
index af44654c35c4..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76f8be89e8fd0c8f08ba0d919216e475 pdnsd-1.2.3-par.tar.gz 532232
diff --git a/net-dns/pdnsd/pdnsd-1.2.3.ebuild b/net-dns/pdnsd/pdnsd-1.2.3.ebuild
deleted file mode 100644
index f32f4d6e4b6c..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.3.ebuild,v 1.8 2006/02/07 21:34:41 blubb 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"
-
-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 -1 /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 -1 /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 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"
-}