Remove old version; update metadata (remove obsolete USE flags, and improve description for 'isdn'); revision bump with new pdnsd.online init script: add support for dash (bug #349335, thanks to René 'Necoro' Neumann), no longer use IFACE variable (use rc_need instead) and avoid depending on a non-existing init script by default.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

7 files changed, 186 insertions, 155 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index d0ab46d5429c..395b5fbc35e7 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/pdnsd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.99 2010/10/14 16:59:24 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.100 2011/03/27 17:31:42 flameeyes Exp $
+
+*pdnsd-1.2.8-r1 (27 Mar 2011)
+
+  27 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> -pdnsd-1.2.7-r1.ebuild,
+  +pdnsd-1.2.8-r1.ebuild, +files/pdnsd.online.1, -files/pdnsd.rc6,
+  metadata.xml:
+  Remove old version; update metadata (remove obsolete USE flags, and improve
+  description for 'isdn'); revision bump with new pdnsd.online init script: add
+  support for dash (bug #349335, thanks to René 'Necoro' Neumann), no longer
+  use IFACE variable (use rc_need instead) and avoid depending on a
+  non-existing init script by default.
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org> pdnsd-1.2.8.ebuild:
   stable ppc, bug 336282
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 1ccd8a970f1e..326a83ff3f4e 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,11 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pdnsd.conf.test 377 RMD160 fbf25b78728754fa1f9cf5259c43cce9cb22a995 SHA1 bd7fdc0d89873921d5284e8d6713e62a424de704 SHA256 8ef1e68c43cefde86598158d2b624cbdd66d2436d681cabbc6327d34d5886058
 AUX pdnsd.online 733 RMD160 22a0107d1521c4f0934c14f9c617a7e0878da5a3 SHA1 94398b67952142548557394fe64d82dc85fafaff SHA256 48479251841f348848c497cdf7e61134da69001d7c611756368746122fc95b7d
-AUX pdnsd.rc6 850 RMD160 9700c23cbe4a8fb18a6492c04ec4e8d7b8d2c082 SHA1 b7a231bb4c486015895f1efc7fe566c2210fe384 SHA256 4406f536e237fb92547e25373500b16198e6eb1cf6ab6e54e9ed3effa4eaa4ba
+AUX pdnsd.online.1 751 RMD160 b38e1e6d50744dd9bc73fe534a8e16696d0698fc SHA1 8719c93a0ed4e786538a3f77ea9a90c80717d20e SHA256 275402040f80f8044d59d50fcc8db8edcd12597243878d3f126ffc24b028f138
 AUX pdnsd.rc6.1 942 RMD160 eaf58c47f1b6183dea8466ef1a05f9afbefd4404 SHA1 fcc8392195e0ee20a6f180ca4e6c5fbc413580b8 SHA256 9508b0dd6adbbe1bf5afc5af037d5fa9bd2ee0ab9748892fdf4ed6f12739d2fa
 AUX pdnsd.resolvconf-r1 17538 RMD160 a79ab764cd96a7203165771d50b14f4bf3907141 SHA1 3afbba4b8eb5fad1e1268dab85cc1fc04b1258b2 SHA256 40bdcc876ba8bb86069d52f8023fed468974004f47c235c202ca7eac88aa0fe3
-DIST pdnsd-1.2.7-par.tar.gz 459565 RMD160 5bb73572120ed9e27f7294f21e2f9878671aef41 SHA1 8f2a0ec234efd61d81a2e89559a94568c342b36f SHA256 2777d7317509df7c75c90bcfd7f9ceaec9ea2db164bf00eb797fa54e0b476a00
 DIST pdnsd-1.2.8-par.tar.gz 471303 RMD160 227a550ba210c2454b3cc39e8d8d056960d49b9f SHA1 538849975f29c59b1e7f0dd0756435cc6f0f2b30 SHA256 5f3cade09e445f034430863ba65047a4ab2f581b86f3eab0d0981646e7ec244e
-EBUILD pdnsd-1.2.7-r1.ebuild 3401 RMD160 c6ca735d0edfb59f2832d5eb3be30764da02196b SHA1 b907768ebbe7f84c40d3caf64713201872d88031 SHA256 4897cef203a2d4976f6a2a238e6bc556b34da5598cbf763787048cec14577672
+EBUILD pdnsd-1.2.8-r1.ebuild 3784 RMD160 612fa8f6242da8f7f24fd434d2c5c2043f4c7fa1 SHA1 3ad87db44c07e18521d44f0046586cfd82c94e9c SHA256 1b5342e13027083f9ff5073b3c8108c3e35e85af418eafc4a40b36b6b0e847ed
 EBUILD pdnsd-1.2.8.ebuild 3729 RMD160 afdb5d582c44f73d1cec4d5224ba66230b249ea8 SHA1 2c90593c445a17e3183709d59418a9a051fdd543 SHA256 e151c197e484decd0eec85b005d78d08def4070d08b441cfb684bd9471941461
-MISC ChangeLog 14938 RMD160 675c328d826887a05f57102c2fc3711daea10bf7 SHA1 fa62b500e74c27236cc7cb202311303c01e0c63e SHA256 4356d1bfcf8d87d632eff35e3370e138392ee2daef0c6f9827798efe91fb8fd5
-MISC metadata.xml 1000 RMD160 b01c88339529731d4894f36360b96d3870a469b8 SHA1 71a02f653d1539de51b6dabc98b1442c8063c33c SHA256 bf3330827a208c13c60764d8ed54d84ed1b1114c44d71f946c7335c3e72d153c
+MISC ChangeLog 15480 RMD160 b62382cce95e10603b290e9ceccc7a382c0ae697 SHA1 4035c512c246d0bc1cd42d61841849155eb67888 SHA256 5ccc288b78ed4bbb53b541c4c723294ff74e8ea4869c444f3946e13ba1107ab3
+MISC metadata.xml 791 RMD160 b3836aa6dcb1a6a902d6778827a54ae6a6d2d2e2 SHA1 7cfc112ccb691fe60b0f9fd8c4cebcc36bf3539a SHA256 8b45a03b5123fe08058fd1657b80fe479b1025ee0e1663fca7e077363f6be6f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2PdIIACgkQAiZjviIA2XgwAgCg8558r918sAE/OY9v0u9br02C
+/T4An3uC/zte/4GOb37dQB6s5QhirMp+
+=Wmr3
+-----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/pdnsd.online.1 b/net-dns/pdnsd/files/pdnsd.online.1
new file mode 100644
index 000000000000..79e7a41e96fb
--- /dev/null
+++ b/net-dns/pdnsd/files/pdnsd.online.1
@@ -0,0 +1,36 @@
+#!/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.1 2011/03/27 17:31:44 flameeyes Exp $
+
+depend() {
+	need pdnsd
+}
+
+wait_for_socket() {
+	local i pdnsd_socket="/var/cache/pdnsd/pdnsd.status"
+	while [ ! -S "${pdnsd_socket}" -a $i -lt 10 ]; do
+		sleep 1s
+		: $((i++))
+	done
+
+	if [ ! -S "${pdnsd_socket}" ]; then
+    	eerror "${pdnsd_socket} socket is missing."
+    	return 1
+	fi
+
+	return 0
+}
+
+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 b/net-dns/pdnsd/files/pdnsd.rc6
deleted file mode 100644
index 6ae51270141e..000000000000
--- a/net-dns/pdnsd/files/pdnsd.rc6
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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.13 2007/07/13 07:46:00 mrness Exp $
-
-opts="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
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting pdnsd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/pdnsd \
-		-- -s -t -d -p /var/run/pdnsd.pid ${PDNSDCONFIG}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pdnsd"
-	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/metadata.xml b/net-dns/pdnsd/metadata.xml
index df9bbedad964..8fa9717d151c 100644
--- a/net-dns/pdnsd/metadata.xml
+++ b/net-dns/pdnsd/metadata.xml
@@ -12,14 +12,9 @@
     networking).
   </longdescription>
   <use>
-    <flag name='isdn'>Enable ISDN features</flag>
-    <flag name='underscores'>
-      Enable support for domain names containing underscores
-    </flag>
-    <flag name="nptl">
-      Linux-only: override auto-detection of the system threading
-      implementation and force usage of the Native Posix Thread
-      Library.
+    <flag name='isdn'>
+      Linux-only: check status of ippp interfaces with ISDN-specific
+      system calls.
     </flag>
     <flag name='urandom'>
       Linux-only: use /dev/urandom (pseudo-random number generation)
diff --git a/net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild
deleted file mode 100644
index 4655b3384cf3..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild,v 1.3 2009/05/09 13:06:11 mrness Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.phys.uu.nl/~rombouts/pdnsd.html"
-SRC_URI="http://www.phys.uu.nl/~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 nptl underscores urandom"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --with-debug=3"
-	use nptl && myconf="${myconf} --with-thread-lib=NPTL"
-	use urandom && myconf="${myconf} --with-random-device=/dev/urandom"
-
-	econf \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/cache/pdnsd \
-		--with-default-id=pdnsd \
-		$(use_enable ipv6) \
-		$(use_enable isdn) \
-		$(use_enable underscores) \
-		${myconf} \
-		|| die "bad configure"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	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
-
-	dodir /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}"
-
-	# gentoo resolvconf support
-	exeinto /etc/resolvconf/update.d
-	newexe "${FILESDIR}/pdnsd.resolvconf-r1" 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_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.8-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.8-r1.ebuild
new file mode 100644
index 000000000000..e7204784cc45
--- /dev/null
+++ b/net-dns/pdnsd/pdnsd-1.2.8-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/03/27 17:31:42 flameeyes Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Proxy DNS server with permanent caching"
+HOMEPAGE="http://www.phys.uu.nl/~rombouts/pdnsd.html"
+SRC_URI="http://www.phys.uu.nl/~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"
+}