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

(Portage version: 2.1.2.7)

9 files changed, 19 insertions, 306 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/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