Update support for resolvconf-gentoo (#134254).

(Portage version: 2.1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 147 deletions

diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index c30cde77765b..bf84c60f7f63 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -17,27 +17,27 @@ AUX pdnsd.rc6 755 RMD160 deb6e6eed3ad8dabcc313b6e78abdd5c574c1c35 SHA1 525b68ce5
 MD5 65809ab9f525565a98ebe800edea45ab files/pdnsd.rc6 755
 RMD160 deb6e6eed3ad8dabcc313b6e78abdd5c574c1c35 files/pdnsd.rc6 755
 SHA256 7f6b8782a8b4fff6b0cb1b8bfebdddf5777a5788aae76044cba499023c73423f files/pdnsd.rc6 755
-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
+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
 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-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-r3.ebuild 4081 RMD160 91d040ce4d35499fcade711273c41b1bff2b22b2 SHA1 87eaa20a679708ff92457077972733abd2c6754a SHA256 9eb36d573ec0cc692de47fd61c8d8889bc5ff290fe56f3bac62d3a5136d5e9ce
+MD5 28c56d5e16b5717d4e34997aa696f189 pdnsd-1.2.4-r3.ebuild 4081
+RMD160 91d040ce4d35499fcade711273c41b1bff2b22b2 pdnsd-1.2.4-r3.ebuild 4081
+SHA256 9eb36d573ec0cc692de47fd61c8d8889bc5ff290fe56f3bac62d3a5136d5e9ce pdnsd-1.2.4-r3.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 9125 RMD160 741a037bf327d67a5cd18783c148bc74c4a13fc0 SHA1 54694af3e21c9c578a9130b95a74b041a4fed790 SHA256 5dbb96d43c95ec1a5251f773e560a99a3547071da2b3890fd0ed7a44d170ea44
-MD5 115598b8450d58418a47ecd89a6a6aab ChangeLog 9125
-RMD160 741a037bf327d67a5cd18783c148bc74c4a13fc0 ChangeLog 9125
-SHA256 5dbb96d43c95ec1a5251f773e560a99a3547071da2b3890fd0ed7a44d170ea44 ChangeLog 9125
+MISC ChangeLog 9328 RMD160 9c01cd06943e4bfc92bb818c8c05634c0984fd7e SHA1 ad3fd144dea00188486523b47f3d08ff4f13c362 SHA256 83af4c95e15123a4c62e9aa9349c8b192b8bd43007f72c9220fc73b7bcd71231
+MD5 678e8e05e74bb62eaabf1663b534b835 ChangeLog 9328
+RMD160 9c01cd06943e4bfc92bb818c8c05634c0984fd7e ChangeLog 9328
+SHA256 83af4c95e15123a4c62e9aa9349c8b192b8bd43007f72c9220fc73b7bcd71231 ChangeLog 9328
 MISC metadata.xml 402 RMD160 2dbd46b28843db4e7c216ec2d38354fe544d3d4b SHA1 8e51bef82c01c04db3c4a130b8bf726195c3acb9 SHA256 d5dba4f72c2ee03f15efe1a6954b8e81dc4d2e2842611cf5db90b9c241433ac6
 MD5 03c559c81ebc357c5f906e8247f1b79b metadata.xml 402
 RMD160 2dbd46b28843db4e7c216ec2d38354fe544d3d4b metadata.xml 402
@@ -48,13 +48,13 @@ SHA256 e7ac61d711062ec862f2bccce3bf7ec943887cfecaf35c1b7e390bf30e4a099d files/di
 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
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEi/3AjG8pv1lIUX4RAiK+AJ0T39PX7en4NpHGTLdHFD6Q7mlOiACghDfA
-cF4in1vVeLXO2EsPNCsVnDw=
-=TxOz
+iD8DBQFEntv2jG8pv1lIUX4RAtm6AKCMEXic/x7gejHcOKGx/jrGSEUIvgCgz9Ad
+AE9aBT/2DS2jTdpfXMIe7Bc=
+=9UT9
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r2 b/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r2
deleted file mode 100644
index a46253777836..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.2.4-r2
+++ /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/pdnsd-1.2.4-r2.ebuild b/net-dns/pdnsd/pdnsd-1.2.4-r2.ebuild
deleted file mode 100644
index b8fdb35dc644..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,126 +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.4-r2.ebuild,v 1.1 2006/06/11 11:24:58 mrness 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"
-}
-
-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)
-		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
-}
-
-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
-
-	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
-}
-
-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"
-}