version bump with a few dependancy/documentation fixes to version 1.1.10

7 files changed, 154 insertions, 18 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 9c7d7abe33d0..9b26fc4e233a 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.27 2004/05/24 05:54:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.28 2004/06/05 12:48:44 dragonheart Exp $
+
+*pdnsd-1.1.11 (05 Jun 2004)
+
+  05 Jun 2004; Daniel Black <dragonheart@gentoo.org> files/pdnsd.online,
+  files/pdnsd.rc6, pdnsd-1.1.10.ebuild, +pdnsd-1.1.11.ebuild:
+  version bump with a few dependancy/documentation fixes to version 1.1.10
 
   06 May 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.10.ebuild:
   Added ~s390 keyword
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 09a73777874e..7eccbffbfbaf 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,10 +1,6 @@
-MD5 0bdfceb7651dd05eee9104195e6d121d ChangeLog 3980
-MD5 cd82be4729ad0da13f8e5e396dd29840 metadata.xml 437
-MD5 5d15448b2e069509dc577c36fcddf202 pdnsd-1.1.10.ebuild 3271
-MD5 a415c002ad5217367da41f607bf6cad6 pdnsd-1.1.7a.ebuild 990
-MD5 47d05c098986aaa7216e397954641bbf pdnsd-1.1.9.ebuild 2669
-MD5 104a9136d4e55e47186ebcc1511b9f93 files/digest-pdnsd-1.1.10 68
-MD5 729266103aee86613f32b6e39c03172f files/digest-pdnsd-1.1.7a 65
-MD5 2f4f436df1064eb21409e1ef613be068 files/digest-pdnsd-1.1.9 67
+MD5 2a4f0d95e3017e4ed4110a9c693aa8f1 pdnsd-1.1.10.ebuild 3496
+MD5 2a4f0d95e3017e4ed4110a9c693aa8f1 pdnsd-1.1.11.ebuild 3496
 MD5 d5e1cbb93d8bb06254e9daac8df76d8d files/pdnsd.online 459
 MD5 a42f0239bb9aee4cad5d2e79dc1ada63 files/pdnsd.rc6 762
+MD5 104a9136d4e55e47186ebcc1511b9f93 files/digest-pdnsd-1.1.10 68
+MD5 1baae3c9299a34f6e8bebe43ca5b8883 files/digest-pdnsd-1.1.11 68
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.1.11 b/net-dns/pdnsd/files/digest-pdnsd-1.1.11
new file mode 100644
index 000000000000..f61704d51b6a
--- /dev/null
+++ b/net-dns/pdnsd/files/digest-pdnsd-1.1.11
@@ -0,0 +1 @@
+MD5 be79162852e3efa2d7cb78c83371fcf2 pdnsd-1.1.11-par.tar.gz 304803
diff --git a/net-dns/pdnsd/files/pdnsd.online b/net-dns/pdnsd/files/pdnsd.online
index f3c1c3986178..2f2bbe7e3c7a 100644
--- a/net-dns/pdnsd/files/pdnsd.online
+++ b/net-dns/pdnsd/files/pdnsd.online
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online,v 1.2 2004/03/04 19:19:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online,v 1.3 2004/06/05 12:48:44 dragonheart Exp $
 
 depend() {
 	need pdnsd net.${IFACE}
diff --git a/net-dns/pdnsd/files/pdnsd.rc6 b/net-dns/pdnsd/files/pdnsd.rc6
index 7d55a1865915..fec0b1cba21b 100644
--- a/net-dns/pdnsd/files/pdnsd.rc6
+++ b/net-dns/pdnsd/files/pdnsd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6,v 1.10 2004/03/04 19:17:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6,v 1.11 2004/06/05 12:48:44 dragonheart Exp $
 
 depend() {
 	need net
diff --git a/net-dns/pdnsd/pdnsd-1.1.10.ebuild b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
index 52d927a86cb5..16af2c1af637 100644
--- a/net-dns/pdnsd/pdnsd-1.1.10.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.9 2004/05/25 16:05:46 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.10 2004/06/05 12:48:44 dragonheart Exp $
 
 inherit eutils
 
@@ -16,7 +16,11 @@ IUSE="ipv6 debug isdn"
 
 DEPEND="virtual/glibc
 	sys-apps/sed
-	sys-apps/gawk"
+	sys-apps/gawk
+	sys-devel/libtool
+	sys-devel/gcc
+	sys-devel/automake
+	sys-devel/autoconf"
 
 RDEPEND="virtual/glibc"
 
@@ -56,9 +60,12 @@ src_compile() {
 	emake all || die "compile problem"
 }
 
-src_install() {
+src_preinst() {
 	enewgroup pdnsd
 	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
+src_install() {
 
 	emake DESTDIR=${D} install || die
 
@@ -78,9 +85,9 @@ src_install() {
 	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
+	#[ -f ${ROOT}/etc/pdnsd/pdnsd.conf ] && \
+	#	sed -e "s#/var/lib#/var/cache#g" ${ROOT}/etc/pdnsd/pdnsd.conf \
+	#	> ${D}/etc/pdnsd/pdnsd.conf
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pdnsd.rc6 pdnsd
@@ -95,13 +102,17 @@ src_install() {
 	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" > ${config}
 	echo -e "\n\n# 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}
 	echo "# Command line options" >> ${config}
 	use ipv6 && echo PDNSDCONFIG="-6" >> ${config} \
 		|| echo PDNSDCONFIG="" >> ${config}
 
+}
 
-	einfo "Add pdnsd to your default runlevel."
+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"
diff --git a/net-dns/pdnsd/pdnsd-1.1.11.ebuild b/net-dns/pdnsd/pdnsd-1.1.11.ebuild
new file mode 100644
index 000000000000..d804209842e0
--- /dev/null
+++ b/net-dns/pdnsd/pdnsd-1.1.11.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.11.ebuild,v 1.1 2004/06/05 12:48:44 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="Proxy DNS server with permanent caching"
+
+MY_P=${PN}-${PV}-par
+
+SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/${MY_P}.tar.gz"
+
+HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://home.t-online.de/home/Moestl"
+
+IUSE="ipv6 debug isdn"
+
+DEPEND="virtual/glibc
+	sys-apps/sed
+	sys-apps/gawk
+	sys-devel/libtool
+	sys-devel/gcc
+	sys-devel/automake
+	sys-devel/autoconf"
+
+RDEPEND="virtual/glibc"
+
+SLOT="0"
+LICENSE="BSD | GPL-2"
+
+# Should work on  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc 
+# REF http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=pdnsd
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~s390 ~amd64"
+
+S=${WORKDIR}/${PN}-${PV}
+
+
+# for debugging use
+use debug && RESTRICT="${RESTRICT} nostrip"
+
+src_compile() {
+	cd ${S} || die
+	local myconf
+
+	if use debug; then
+	 	myconf="${myconf} --with-debug=3"
+		CFLAGS="${CFLAGS} -g"
+	fi
+	[ -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_preinst() {
+	enewgroup pdnsd
+	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
+src_install() {
+
+	emake DESTDIR=${D} install || die
+
+	# Copy cache from prev 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 ] && \
+		cp ${ROOT}/var/cache/pdnsd/pdnsd.cache ${D}/var/cache/pdnsd/pdnsd.cache
+
+	dodoc AUTHORS COPYING* 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
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/pdnsd.rc6 pdnsd
+	newexe ${FILESDIR}/pdnsd.online pdnsd-online
+
+	use ipv6 && \
+		ewarn "make sure your servers in /etc/pdnsd/pdnsd.conf are reachable with IPv6"
+
+	keepdir /etc/conf.d
+	local config=${D}/etc/conf.d/pdnsd-online
+
+	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" > ${config}
+	echo -e "\n\n# 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}
+	echo "# Command line options" >> ${config}
+	use ipv6 && echo PDNSDCONFIG="-6" >> ${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"
+
+}