ersion bump as per bug #66219. -fbsd masked 1.1.11 due to upstream notice

6 files changed, 185 insertions, 15 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 0381c765d608..7d545c982652 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.35 2004/07/27 13:30:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.36 2004/10/04 09:20:45 dragonheart Exp $
+
+*pdnsd-1.1.12_pre3 (04 Oct 2004)
+
+  04 Oct 2004; Daniel Black <dragonheart@gentoo.org> +files/pdnsd.conf.test,
+  pdnsd-1.1.11.ebuild, +pdnsd-1.1.12_pre3.ebuild:
+  version bump as per bug #66219. -fbsd masked 1.1.11 due to upstream notice -
+  fixed in later versions. Thanks for the notification Daniel Webert
+  <rockoo@rockoo.homelinux.org>
 
   27 Jul 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.10.ebuild,
   pdnsd-1.1.11.ebuild, pdnsd-1.1.9.ebuild, -pdnsd-1.1.7a.ebuild:
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index c28503555a56..b3652880e311 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 806a773dc85e3ab73e7ff6d6c2b0033c ChangeLog 5186
 MD5 3f2d308116c7f37afe0a9a65df2f7e6f metadata.xml 436
+MD5 c71b4c9da2cfbcd6ff251a912f1f8ce1 pdnsd-1.1.11.ebuild 3372
+MD5 d9a1c48175a220040a9cebdd32116120 pdnsd-1.1.12_pre3.ebuild 3375
 MD5 03528813daa0cc69b62c1195cb29b91f pdnsd-1.1.9.ebuild 2677
 MD5 02081c8fddc1a29e756f864e85752b3b pdnsd-1.1.10.ebuild 3323
-MD5 c71b4c9da2cfbcd6ff251a912f1f8ce1 pdnsd-1.1.11.ebuild 3372
 MD5 1baae3c9299a34f6e8bebe43ca5b8883 files/digest-pdnsd-1.1.11 68
-MD5 65809ab9f525565a98ebe800edea45ab files/pdnsd.rc6 755
+MD5 147e8c75a789a5d99d888925128c5b4e files/digest-pdnsd-1.1.12_pre3 72
 MD5 2f4f436df1064eb21409e1ef613be068 files/digest-pdnsd-1.1.9 67
 MD5 27071ebe71d4f810d57d7cfbd4099788 files/pdnsd.online 452
+MD5 65809ab9f525565a98ebe800edea45ab files/pdnsd.rc6 755
 MD5 104a9136d4e55e47186ebcc1511b9f93 files/digest-pdnsd-1.1.10 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBUr7PHTu7gpaalycRAi2NAJ4oU4vL9wRvg3m8RkCYryHnA5uHLQCfWSn0
-MS81b6tdmKyrzYtj2DYIuI4=
-=9uba
------END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.1.12_pre3 b/net-dns/pdnsd/files/digest-pdnsd-1.1.12_pre3
new file mode 100644
index 000000000000..9aef8718e0d5
--- /dev/null
+++ b/net-dns/pdnsd/files/digest-pdnsd-1.1.12_pre3
@@ -0,0 +1 @@
+MD5 594ecd8ad6633673c4ba6eec7ee25fe8 pdnsd-1.1.12pre3-par.tar.gz 319996
diff --git a/net-dns/pdnsd/files/pdnsd.conf.test b/net-dns/pdnsd/files/pdnsd.conf.test
new file mode 100644
index 000000000000..90cae2c05ea5
--- /dev/null
+++ b/net-dns/pdnsd/files/pdnsd.conf.test
@@ -0,0 +1,27 @@
+// $Id: pdnsd.conf.test,v 1.1 2004/10/04 09:20:45 dragonheart Exp $
+
+global {
+	perm_cache=512;
+	cache_dir=;
+	max_ttl=604800;
+	paranoid=on;
+	server_port=33455;
+	server_ip=127.0.0.1;
+	status_ctl=on;
+}
+
+server {
+	ip=
+	timeout=30;
+	interval=30;
+	uptest=ping;
+	ping_timeout=50;
+	purge_cache=off;
+}
+
+source {
+	ttl=86400;
+	owner="localhost.";
+	serve_aliases=on;
+	file="/etc/hosts";
+}
diff --git a/net-dns/pdnsd/pdnsd-1.1.11.ebuild b/net-dns/pdnsd/pdnsd-1.1.11.ebuild
index 433b5dc3cc74..6eedf2196db2 100644
--- a/net-dns/pdnsd/pdnsd-1.1.11.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.8 2004/09/23 12:17:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.11.ebuild,v 1.9 2004/10/04 09:20:45 dragonheart Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/${MY_P}.tar.gz"
 
 LICENSE="BSD | GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~s390 ~sparc ~x86 -x86-fbsd"
 IUSE="ipv6 debug isdn"
 
 DEPEND="virtual/libc
diff --git a/net-dns/pdnsd/pdnsd-1.1.12_pre3.ebuild b/net-dns/pdnsd/pdnsd-1.1.12_pre3.ebuild
new file mode 100644
index 000000000000..4b40e8727180
--- /dev/null
+++ b/net-dns/pdnsd/pdnsd-1.1.12_pre3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.12_pre3.ebuild,v 1.1 2004/10/04 09:20:45 dragonheart Exp $
+
+inherit eutils
+
+MY_P=${PN}-${PV/_/}-par
+DESCRIPTION="Proxy DNS server with permanent caching"
+HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://home.t-online.de/home/Moestl"
+SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/${MY_P}.tar.gz"
+
+LICENSE="BSD | GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+IUSE="ipv6 debug isdn nptl"
+
+DEPEND="virtual/libc
+	sys-apps/sed
+	sys-apps/gawk
+	sys-devel/libtool
+	sys-devel/gcc
+	sys-devel/automake
+	sys-devel/autoconf"
+RDEPEND="virtual/libc"
+
+S=${WORKDIR}/${PN}-${PV/_*/}
+
+pkg_setup() {
+	enewgroup pdnsd
+	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
+src_compile() {
+	cd ${S} || die
+	local myconf
+
+	if useq debug; then
+	 	myconf="${myconf} --with-debug=3"
+		CFLAGS="${CFLAGS} -g"
+	fi
+	useq 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 /bin/false /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)
+		#IPS=$(grep ^nameserver ${ROOT}/etc/resolv.conf |  sed -e 's/nameserver//g' | head -n 1)
+		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"
+		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 communicate to daemon"
+		src/pdnsd-ctl/pdnsd-ctl   -c ${T}/pdnsd status || die "failed to communicate to daemon"
+		sleep 3
+
+		dig @127.0.0.1 -p 33455 www.gentoo.org  | fgrep "status: NOERROR" || die "www.gentoo.org lookup failed"
+		kill `cat ${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 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
+
+	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}
+
+}
+
+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"
+
+	use ipv6 && \
+		ewarn "make sure your servers in /etc/pdnsd/pdnsd.conf are reachable with IPv6"
+}