set enewuser's shell argument to -1 (#103421); version bump

Package-Manager: portage-2.0.51.22-r2

6 files changed, 162 insertions, 16 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 7fee09fd9e1a..85d8d352b69a 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.42 2005/06/17 20:42:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.43 2005/09/08 05:36:19 mrness Exp $
+
+*pdnsd-1.2.3 (08 Sep 2005)
+
+  08 Sep 2005; Alin Nastac <mrness@gentoo.org> pdnsd-1.1.10.ebuild,
+  pdnsd-1.2.2.ebuild, +pdnsd-1.2.3.ebuild:
+  Set enewuser's shell argument to -1, for compatibility with BSD (#103421).
+  Version bump.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> pdnsd-1.2.2.ebuild:
   Stable on ppc.
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 6363d5e996b7..835ac60fffec 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d69c3041fad3e9668321665b6292f6de ChangeLog 6369
-MD5 104a9136d4e55e47186ebcc1511b9f93 files/digest-pdnsd-1.1.10 68
-MD5 a8701579c070fdd7891f1bccaf63ae95 files/digest-pdnsd-1.2.2 67
-MD5 2a7e9d9f54bd31a3675c491d0b6ee187 files/pdnsd.conf.test 377
+MD5 9b0155cb6a57b15a565f131f5d6deef2 pdnsd-1.2.3.ebuild 4305
+MD5 8301c55d83768bf974a2d51c44b5d320 pdnsd-1.2.2.ebuild 4300
+MD5 0231656330c37864dde358dd0fa721f6 pdnsd-1.1.10.ebuild 3287
+MD5 257a9d222f92d4c657d24b1cccf30841 ChangeLog 6602
+MD5 4ddec129fff42063dc6b05493cd55a78 metadata.xml 264
 MD5 27071ebe71d4f810d57d7cfbd4099788 files/pdnsd.online 452
 MD5 65809ab9f525565a98ebe800edea45ab files/pdnsd.rc6 755
-MD5 4ddec129fff42063dc6b05493cd55a78 metadata.xml 264
-MD5 5c4daaf4920af14f61df05f3de873c95 pdnsd-1.1.10.ebuild 3297
-MD5 8bc27c529e62eb94a4fc3fb4dd352c84 pdnsd-1.2.2.ebuild 4308
+MD5 a8701579c070fdd7891f1bccaf63ae95 files/digest-pdnsd-1.2.2 67
+MD5 841f98e9e42888ec6d3869f716017c5f files/digest-pdnsd-1.2.3 67
+MD5 104a9136d4e55e47186ebcc1511b9f93 files/digest-pdnsd-1.1.10 68
+MD5 2a7e9d9f54bd31a3675c491d0b6ee187 files/pdnsd.conf.test 377
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCz/C3I1lqEGTUzyQRAjwrAJ9aGRwQqr+z79N+uiSVTtfWLZIpUgCdHNzL
-+vNLbsxNngdr7SoiOTHblzc=
-=9fBK
+iD8DBQFDH83oNSP4Vda7IdsRArcHAJ9evVQ/7M86tC5hbslDOUd4lKamKQCeL5Us
+BoCT+dBOdV4+b7dCmRdPPDM=
+=34s4
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.3 b/net-dns/pdnsd/files/digest-pdnsd-1.2.3
new file mode 100644
index 000000000000..af44654c35c4
--- /dev/null
+++ b/net-dns/pdnsd/files/digest-pdnsd-1.2.3
@@ -0,0 +1 @@
+MD5 76f8be89e8fd0c8f08ba0d919216e475 pdnsd-1.2.3-par.tar.gz 532232
diff --git a/net-dns/pdnsd/pdnsd-1.1.10.ebuild b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
index a658b10127e2..02fce55d1c32 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 Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.20 2005/07/09 15:43:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.21 2005/09/08 05:36:19 mrness Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ RDEPEND="virtual/libc"
 
 pkg_setup() {
 	enewgroup pdnsd
-	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
 }
 
 src_compile() {
diff --git a/net-dns/pdnsd/pdnsd-1.2.2.ebuild b/net-dns/pdnsd/pdnsd-1.2.2.ebuild
index b7031bc90c0f..18b9e3fbdbe1 100644
--- a/net-dns/pdnsd/pdnsd-1.2.2.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.2.ebuild,v 1.5 2005/07/07 00:30:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.2.ebuild,v 1.6 2005/09/08 05:36:19 mrness Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ RDEPEND="virtual/libc"
 
 pkg_setup() {
 	enewgroup pdnsd
-	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
 }
 
 src_compile() {
diff --git a/net-dns/pdnsd/pdnsd-1.2.3.ebuild b/net-dns/pdnsd/pdnsd-1.2.3.ebuild
new file mode 100644
index 000000000000..9bdc4abc0fbb
--- /dev/null
+++ b/net-dns/pdnsd/pdnsd-1.2.3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.3.ebuild,v 1.1 2005/09/08 05:36:19 mrness 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"
+
+DEPEND="virtual/libc
+	sys-apps/sed
+	sys-apps/gawk
+	sys-devel/libtool
+	sys-devel/gcc
+	sys-devel/automake
+	sys-devel/autoconf"
+RDEPEND="virtual/libc"
+
+pkg_setup() {
+	enewgroup pdnsd
+	enewuser pdnsd -1 -1 /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"
+}