Fixed pidfile location in init script. Removed old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 23 insertions, 219 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 1027f0f4b09b..ffe26f6197d2 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.120 2014/01/18 19:53:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.121 2014/02/07 14:48:45 polynomial-c Exp $
+
+  07 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -pdnsd-1.2.8-r4.ebuild,
+  -files/pdnsd.online.1, -files/pdnsd.rc6.1, files/pdnsd.rc7:
+  Fixed pidfile location in init script. Removed old.
 
   18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> pdnsd-1.2.9a.ebuild:
   Stable for alpha, wrt bug #487284
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 45de272a8935..1858b7d67a65 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -2,31 +2,27 @@
 Hash: SHA256
 
 AUX pdnsd.conf.test 377 SHA256 8ef1e68c43cefde86598158d2b624cbdd66d2436d681cabbc6327d34d5886058 SHA512 feec55fbdda4afe07e478eff6e2f5d1c62616ef0e90ae2dc7f3a39f2e005634ba917b6849fdd0cafc16d699cbac4575ec0d8acec3614c8dd92506384a91aa6e3 WHIRLPOOL 7cee62ec1905560c416f85ae00b0a8a90b67379016cad1b7431ebfb5705865577e27d6039e10af0483df2f3bce15850263ba89716122cb7568ce4b0ca3584548
-AUX pdnsd.online.1 669 SHA256 b4bc97c47bcda1713c98d4cf8de583d4dbb26ec7b9c064252d15e493977af09b SHA512 22cea420d3054ae8c70e4645e052eb9ab7dc1f8a89ec382cf9a3f75f7f0c4295b14a82aecb35ad9671535d5c2136b6be872cbcc66307e30cec818ebd0c091d24 WHIRLPOOL 87dfc72208837b619631f4674f1cb9c0336b7cfb6b30fa5eabbf4a42a54e5db3c300ad6ba503172154dbb4a57f7be51cd6678c176fa0858a5f2e720aa71a4fe7
 AUX pdnsd.online.2 682 SHA256 eb771771c79a81608355c8f01ae595a35125d379fc6d502274dbc7f81685df8d SHA512 8c218673c22e3cde7fad3ddc49a90e6d7664e6a1c8c983eb7ad668179e4fbd8fa083c579ed87d48cad4a4c762f35b08df7de1fbf46c9b755c76d3a1ad7430924 WHIRLPOOL 47840e7b5701696d956ab47bc73ea7598f6eaf8df05c6569ffd20b51d05542aeb44628b26a58010e0ef57bf5d8f76a652ca168b0bdf311a46a8f9c38fff6e0df
-AUX pdnsd.rc6.1 956 SHA256 75e0327c6f91f36388a9184f640a80a2671142edc54bceb9f3312f2ad8052fcd SHA512 cdc61a6fd8176f76f65b49fedddf7c89213a6ea4eb6f0a876e83facd2bb369dd86613dce25b92ca0008525c52a3a0c31873e4eee3dba6e3804b1554c12572f06 WHIRLPOOL 90ffa1999d1218c09c7c19faebda8ded86ee5577d19e12d8e719d62b373e117a261bcd85cfbd54ba83ed7379dc4b49321720e77a4d43edbdc3d37a901870aced
-AUX pdnsd.rc7 727 SHA256 829e8f4959be9d26184bb6cf6f24424d90e93958100b36976673fb7749547204 SHA512 e0aec37df421f9860b67e65ffcd4cea37b1170fd1826d9995439eab3aaf27fa35b8fc7467eaffa8292eed206ef8eac32903d3120ff3fbec9fe88f2e6042bb008 WHIRLPOOL 6fdefc373c9c788f838dddab8ad2371e18fa6def58e6874671904a0bc4822a5e6a52d8095d60face87902f4120c9f10b2504b2f7bc526ac04c0a6bf2006b0b4f
+AUX pdnsd.rc7 723 SHA256 6fa13defed18c22e5cf612bc4b0468f85d3d61eb21fc0e3b13b9f307a4106c33 SHA512 f6708b2b7c203e643a517638bfbc8d844d642fa3991da022b0778574545613f8bd03203c36db79a954edd1d3692b9a0a9195c1f1b6acfe61f790f12fed8594df WHIRLPOOL be843a7baab708312372ab77f1e9090cbcaf265bd18086462e2f739ae792f565d566e0991fc5796727c2f328c845cf27428f01ac422ab94ab34dc19e090e577f
 AUX pdnsd.resolvconf-r1 17538 SHA256 40bdcc876ba8bb86069d52f8023fed468974004f47c235c202ca7eac88aa0fe3 SHA512 22a92df825d560ec03860c1a9a6000f32e19b33ccda0f6412830ebca13499e6d45161267bb30658aa9ed4b5862bae04e304e25358c30ee6d80a9deea90ba989f WHIRLPOOL c6c08c105be3986d1d0c8b86d2cf9f0a36e2608b207ec3db084f46f55dd6f0764d999179133783ac055c75c14542d049f3240cb11036c162eeb5d820811ca3cb
-DIST pdnsd-1.2.8-par.tar.gz 471303 SHA256 5f3cade09e445f034430863ba65047a4ab2f581b86f3eab0d0981646e7ec244e SHA512 cf3157abbd4a5a1102b802fdb64c8847861dec7dbdf782e41171ee11ed9aaa28c35b68dbd45d548867d9c90ee680022eaf0ce4e5df041ad0c86fba73e2fbaa76 WHIRLPOOL 808b494cda735b7a174d3633dc4ddfa039f9c3796eee5d084c5939278d9d15252646682d82344e86a0d1be2eba849e37ba6d00617e1c355cb62e156e7e03a68c
 DIST pdnsd-1.2.9a-par.tar.gz 516061 SHA256 bb5835d0caa8c4b31679d6fd6a1a090b71bdf70950db3b1d0cea9cf9cb7e2a7b SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81 WHIRLPOOL 9f1f94d6aece1d5cdffe4799e532b1f88217e8d0fef83d097fd03a24a958ad551154efa1f1b719a31315be5e225f33cc7da5c40e3f13a0acba6686e0f6376573
-EBUILD pdnsd-1.2.8-r4.ebuild 3781 SHA256 e50c16041bb0dea093d24f38a53dda4f2534ec97ec0e451251f46842f1ae3127 SHA512 1c4f8da51b009f0c5989ddb1a558ee14823c7f4dbb16611c75ff3e0711e8603aa00378c4a0b81e418d75c9d2e7bc22d85dddda31af78629a4b624f26101828ea WHIRLPOOL 46442b9a2a49a2c317a6ac7378c365ae49cd36a354064a7d684c9ab554cea0bd1cf3676f5cea665dc6cfb9099df4404b2033dc642d80d2b0dec5f117bd91565f
 EBUILD pdnsd-1.2.9a.ebuild 3677 SHA256 b111b88061084cfbbc144d4d4340b542181792e95353eb6850af469c0e75137c SHA512 15faf2f5cda3d4eb690f8b9f3cf767741b33854bea5e61dc5f513906e962fcdf10917570b15d93a2cf3b1dc90d93d703b0d62ce1278e77b2e1c8fad2d1c100f5 WHIRLPOOL 837549ba0069d9cc49822f8faa8237e98df5cc692ffb0342aaa07e12e1fceb0478610da7f5922c093da47f571350d9ca03b027982cbd83ab0fcefff0d353593b
-MISC ChangeLog 18330 SHA256 30d453282fa6eec282ba8418519898164f69e319508abff70e214029c86ebe74 SHA512 03cd581b7fbe792edbee3d2eb21556d126c590a1db513b7a793db89aa9c54bcad10bce2ef3b0cbc5221ae8771be81d35a09fc34e1763d46ccc8701d3c0367143 WHIRLPOOL 3c09c2de01c7194bc9620044304a647879db439d9914e967d5a0f151e64bdde4c4027dd816ebcf2c10cb3ae75594a93966c3c6906908832bb218741d0d6e7045
+MISC ChangeLog 18534 SHA256 32a04a9130234c4da25a0d8be2d26612c518d19e65553772d8e741d1081c7f99 SHA512 0e4e0c2f2baf669e0489d91eba2a0399980bbc0f3cf30e8d772f80869e95cf2f0ea65cc636c7385d7041152cdbd969796153d3511da166d9b1edbb805f71bd73 WHIRLPOOL f61a35b1bdbb9156135877de1193f62eca5a569cae2bfb728bd67c8b59e38ee27c05e7e0cd958dbd45829d40a19384cb022179450ae86e820b080c43e3e4a2f7
 MISC metadata.xml 832 SHA256 3c197153f23083829e0a999a45a347df60829a03fd0bb3124e65943fcd00cbe8 SHA512 e8fc00a1d55acab6c01bc6fea75cb4271a8e1286666fdc639bb1cf9c7412ca0a8a92a97320e66ee821a2716d45378a977542265229f6c27fdf7e4bff286b5466 WHIRLPOOL 7c63c4f9292833e373011f578cba0a292b577c2492d57b17239b77a03438ea7251b65137a346baa74912dad10b7d5e9f60ce75a4ceea9b5daa5ed6251bbec396
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2tvQAAoJELp701BxlEWfhSAP/0Y3dVzIVc13sXea6lmKvfJe
-WRfsWm6+tValrj5Llx4kWxtlyVG+9uEgH6lXxAZGV/8bOIhNgqRtB3DZGqSnLVTy
-ATC/beqSaq8MV7+ZBXROLFeFga2sorqt71huaR0epsYfqvQiwyfWT6KxtEqj7s0F
-tkH6on9HS7X2gRoDluWVLK4uCo1fwkPDC/ZvVelftTaLlFcdul2/6dBySRRKCYpN
-UrS2ZcbDUTKfJHShE+/nKDk8Wrre7JjhYD/TTwis00OBNkaS0vb/ru/COMFPQoY0
-bQWq+q+8Y2DiCPTO18p4Yx2NAPOZGL5HJmgWgYYBtPXOReuTyDHiwTHL5nzMEweQ
-3hytSYxxM8MN/0Nax02GkXFyAJ/i7AWG6SxKgujEMjpecm1N2gk7b5SxIHMpbXOR
-5eSe7mayDf+PGDE1fISBqdT81DitWsDtHvEAzcOjkiK/zCx8PvDfxl+xs9DOCJCk
-meVSz1/8cdpT7nTYgzORGyZ/mHtHoumrn7QuNmpRco7YUYcUF+Ix/I5KGDnxgQ0w
-lF/rk6wji7BGN063AC78CnBUu0dlU8GHhlcT2uR+mfniIvcD8vp9ZxZTFrC1ouMb
-tCYPmwcyBuEztZfrIsduCc16J5hlBY5V9XU0+Oq78SH0exeSc31by+Fy1ossqLTZ
-+NG9zuYGgBxq6+vwIqmo
-=mlP/
+iQIcBAEBCAAGBQJS9PJPAAoJEPiazRVxLXTFKSYP/20Tvh9EIXB9UARiPo0zImMX
++oYNfQ1TlGhniv7jjAeaT5sYRLBl7+4uPr4mCuLiZgb2P8DNk12RYko23KoaxpKW
+Yd5eAINa6LLJ57Xv519FmdgQoXh2oIRykTUvmy513JTtUUnP+bkiwZVLl12BNZsp
+TN1e/RCNbGgCKbyX2p+C9wl0OM+jk1/sGNO2GKhjEIygyezSTWt0NikUbUHsZzZL
+S4aDwG0rrWooDQeRvZb9/utjbSJHmPN7pS6oTzxfqd+7tcno6Yv6O92dk/4V6x5e
++bj8t5tJZkESbjS3zqh2TdmzOkF/RzNxVpxaOyGDajV7KjvO6Vi+26UzQA0T+kUe
+pLCwwXo/fvCRSSBGH51NrQi41mO+AkRk7xVnYLjAcbbvliDXLoW8SAsOdFXm3oSG
+CwZKKgv3MjkkrXQQoU3XgE+leLK3ss/05pRvC/VciIyoyzgniBJZfkPV5AMIhoHb
+CC7DHmE+dRlJ1HZGZ1pHKF0Uja5eIZE2QNNRIC1XA3ePUXbH/rbDpDA/A2itmgHT
+dziOLLka3luOq/klcHHP3ELmLgQ5S91aSZgOMvAgMdIx61OaJ8q/y7JBym2koPLZ
+GISGPhkoCJvx51nPBqNfav2YwjKv6eu62Q15dOjAP8+aiNkmrx7Q+LXJg5emEjKo
+upohkuHpom80ZiKeI2Yd
+=PkZ3
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/pdnsd.online.1 b/net-dns/pdnsd/files/pdnsd.online.1
deleted file mode 100644
index 393ebf589ebd..000000000000
--- a/net-dns/pdnsd/files/pdnsd.online.1
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online.1,v 1.2 2011/03/28 14:00:21 polynomial-c Exp $
-
-depend() {
-	need pdnsd
-}
-
-wait_for_socket() {
-	local i=0 pdnsd_socket="/var/cache/pdnsd/pdnsd.status"
-	while [ $i -lt 10 ]; do
-		[ -S "${pdnsd_socket}" ] && return 0
-		i=$(($i+1))
-		sleep 1s
-	done
-
-    	return 1
-}
-
-start() {
-	wait_for_socket || return 1
-	ebegin "Starting pdnsd-online"
-	/usr/sbin/pdnsd-ctl -q server all up
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pdnsd-online"
-	/usr/sbin/pdnsd-ctl -q server all down
-	eend $?
-}
diff --git a/net-dns/pdnsd/files/pdnsd.rc6.1 b/net-dns/pdnsd/files/pdnsd.rc6.1
deleted file mode 100644
index b9dda2688391..000000000000
--- a/net-dns/pdnsd/files/pdnsd.rc6.1
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6.1,v 1.2 2011/12/31 21:22:49 idl0r Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -e /etc/pdnsd/pdnsd.conf ] ; then
-		eerror "You need an /etc/pdnsd/pdnsd.conf file first."
-		eerror "There is a sample in /etc/pdnsd/pdnsd.conf.sample"
-		return 1
-	fi
-
-	if [ ! -d /var/cache/pdnsd ] ; then
-		mkdir /var/cache/pdnsd
-		chown pdnsd:pdnsd /var/cache/pdnsd
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting pdnsd"
-	start-stop-daemon --start --exec /usr/sbin/pdnsd \
-		-- -s -t -d -p /var/run/pdnsd.pid ${PDNSDCONFIG}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pdnsd"
-	start-stop-daemon --stop --pidfile /var/run/pdnsd.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading pdnsd.conf"
-	/usr/sbin/pdnsd-ctl config
-	eend $?
-}
diff --git a/net-dns/pdnsd/files/pdnsd.rc7 b/net-dns/pdnsd/files/pdnsd.rc7
index f6c91add617c..d41cc0f98024 100644
--- a/net-dns/pdnsd/files/pdnsd.rc7
+++ b/net-dns/pdnsd/files/pdnsd.rc7
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc7,v 1.3 2013/10/08 06:06:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc7,v 1.4 2014/02/07 14:48:46 polynomial-c Exp $
 
-pidfile="/var/run/pdnsd.pid"
+pidfile="/run/pdnsd.pid"
 command="/usr/sbin/pdnsd"
 command_args="-s -t -d -p ${pidfile} ${PDNSDCONFIG}"
 extra_started_commands="reload"
diff --git a/net-dns/pdnsd/pdnsd-1.2.8-r4.ebuild b/net-dns/pdnsd/pdnsd-1.2.8-r4.ebuild
deleted file mode 100644
index 7b26df40887f..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.8-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.8-r4.ebuild,v 1.4 2012/12/19 01:14:36 polynomial-c Exp $
-
-EAPI="2"
-
-inherit user
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://members.home.nl/p.a.rombouts/pdnsd/"
-SRC_URI="http://members.home.nl/p.a.rombouts/pdnsd/releases/${P}-par.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sparc x86"
-IUSE="debug ipv6 isdn +urandom test"
-
-RDEPEND="sys-apps/openrc"
-DEPEND="test? ( net-dns/bind-tools )"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --with-debug=3"
-	use urandom && myconf="${myconf} --with-random-device=/dev/urandom"
-
-	econf \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/cache/pdnsd \
-		--with-default-id=pdnsd \
-		$(use_enable ipv6) $(use_enable ipv6 ipv6-startup) \
-		$(use_enable isdn) \
-		${myconf} \
-		|| die "bad configure"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO README.par || die
-	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl} || die
-	docinto html ; dohtml doc/html/* || die
-	docinto txt ; dodoc doc/txt/* || die
-	newdoc doc/pdnsd.conf pdnsd.conf.sample || die
-
-	newinitd "${FILESDIR}/pdnsd.rc6.1" pdnsd || die
-	newinitd "${FILESDIR}/pdnsd.online.1" pdnsd-online || die
-
-	mkdir "${T}"/confd
-
-	cat - > "${T}"/confd/pdnsd-online <<EOF
-# Make sure to change the rc_need variable to the service for the
-# interface that connects you to the dns servers.
-#
-# For instance if you use a PPP connection on ppp0 to connect, set
-#   rc_need="net.ppp0"
-
-rc_need="net.lo"
-EOF
-
-	# Don't try to do the smart thing and add the --help output here:
-	# it will cause the file to be etc-updated if the help text
-	# changes and fails when cross-compiling.
-	cat - > "${T}"/confd/pdnsd <<EOF
-# Command line options, check pdnsd --help for a list of valid
-# parameters. Note that most of the options that can be given at
-# command-line are also available as configuration parameters in
-# /etc/pdnsd/pdnsd.conf
-PDNSDCONFIG=""
-EOF
-
-	doconfd "${T}"/confd/* || die
-
-	# gentoo resolvconf support
-	exeinto /etc/resolvconf/update.d
-	newexe "${FILESDIR}/pdnsd.resolvconf-r1" pdnsd
-}
-
-src_test() {
-	fail_kill() {
-		kill -9 $(<"${T}"/pid)
-		die "$1"
-	}
-
-	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" ] || fail_kill "no socket created"
-	src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" server all up || fail_kill "failed to start the daemon"
-	src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" status || fail_kill "failed to communicate with the daemon"
-	sleep 3
-
-	dig @127.0.0.1 -p 33455 localhost > "${T}"/dig.output 2>&1
-	cat "${T}"/dig.output
-	fgrep -q "status: NOERROR" "${T}"/dig.output || fail_kill "www.gentoo.org lookup failed"
-
-	kill $(<"${T}/pid") || fail_kill "failed to terminate daemon"
-}
-
-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"
-}