Version bump. Fix ${ROOT} abuse wrt bug #258100 by bangert. Make

/var/yp/Makefile CONFIG_PROTECTed and provide a migration path.
Package-Manager: portage-2.1.7.16/cvs/Linux i686

3 files changed, 88 insertions, 13 deletions

diff --git a/net-nds/ypserv/ChangeLog b/net-nds/ypserv/ChangeLog
index 2915a1041f0a..cc5bf92a8e0b 100644
--- a/net-nds/ypserv/ChangeLog
+++ b/net-nds/ypserv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/ypserv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.41 2009/06/20 19:07:32 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.42 2010/02/23 11:35:45 phajdan.jr Exp $
+
+*ypserv-2.22 (23 Feb 2010)
+
+  23 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> +ypserv-2.22.ebuild:
+  Version bump. Fix ${ROOT} abuse wrt bug #258100 by bangert. Make
+  /var/yp/Makefile CONFIG_PROTECTed and provide a migration path.
 
   20 Jun 2009; Mike Frysinger <vapier@gentoo.org> ypserv-2.19.ebuild:
   Fix stripping, use emake, and allow people to use rpcbind #272549 by
diff --git a/net-nds/ypserv/Manifest b/net-nds/ypserv/Manifest
index dab4c1bd0fc7..3dd9fb00f933 100644
--- a/net-nds/ypserv/Manifest
+++ b/net-nds/ypserv/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rpc.yppasswdd-r1 609 RMD160 0bfccbb0b41857f22e1aa78846c1b33ee0a7f498 SHA1 8b218fa8d51d01c99962e501cc628fd77532bd8a SHA256 e827778b8a8e6984b637c745c315a2e02ebc46af752651b7a70626ba545a84b6
 AUX rpc.yppasswdd.confd 260 RMD160 bf1d1393a9070b807fd2c483efe0824c20ea6b86 SHA1 b4670829d1aa98d03c9d82b6f317eda34a4d0ff8 SHA256 e46afe737bfc57aa31be1a441615fcc112e1ebf41d631c1929e00b81baca119d
 AUX rpc.ypxfrd 586 RMD160 c24a441a1a60bb255a8a293efbf58cc714b5d361 SHA1 57d95154a1a08c97cec05786ef6ba2783bb70102 SHA256 a6db8cbc0dc7a780bf2bcbd120bccedc53239faef7aa5c596379a92817078015
@@ -8,13 +5,8 @@ AUX rpc.ypxfrd.confd 122 RMD160 1620fa83b8d607ee69025d22de4ce4640ab151e5 SHA1 24
 AUX ypserv 582 RMD160 ccad8b628156e626f3d2ad91ad63f10c4c861e03 SHA1 4531cc9c7794f435c92f2c268fb9064a5088465a SHA256 08db79845b497f2ec8938854ffac904aeed747d98c0820ad0be9e5aa9377512b
 AUX ypserv.confd 95 RMD160 87324950e8b5408507109ccef5c061a981732fc8 SHA1 c6591a82bff557d6e17edca31e94d3b6e17c21d5 SHA256 4edd475ca95d31cfcea20a8e6268024f8128423bc7ae67edb535e6811c64668e
 DIST ypserv-2.19.tar.bz2 173747 RMD160 255bfa64d6e6a3d21ae33a9081d034ef92f46b63 SHA1 da5f713175c338e91ec1368f59de06a83074ed82 SHA256 b0912625264e184c377ea51851d383ee55861b274200294aa983e240e7d5370f
+DIST ypserv-2.22.tar.bz2 200346 RMD160 e1921d9e912bed05bc28d1a3bc6e7ce5eb3aa717 SHA1 22d5cd55b5c77865fff727c9da574b0649969c66 SHA256 0470ac199408d0f0df0b4be4248e11b841ad6aafe5233200448031ce8e2da6be
 EBUILD ypserv-2.19.ebuild 2131 RMD160 025499da2b626e9db48af2b54794ac28d1805a6b SHA1 1f4cb6801ac0b77a346f01a81866df19bb8977ba SHA256 364df92e3a1138bae62910986d2b3fa237877293a362f0bc5448df1a81d3ab25
-MISC ChangeLog 6495 RMD160 e0186c3b8193640c7d5b910196c97d95878734db SHA1 187e8b7832ce0543ab680b208e8559df6758271a SHA256 511123a9c97632f83f43c00f21094b9e10a340df190bfb264f0ea4fe4a87486b
+EBUILD ypserv-2.22.ebuild 2528 RMD160 af55078da2f30d116d3379f847b2bc482f8bfeab SHA1 a508d8b434f7873ca6116d705d0cc9ee5aef87f4 SHA256 f1078de7c72f87ba0bbed33d4a80953d38b806713d30b57d69dfdb9aa8bd65dd
+MISC ChangeLog 6737 RMD160 103c839f2b25e0ca817002293b1058c59d620dbd SHA1 beede5a6b153ecd4e36101fe5241584537e778f0 SHA256 65fe85710689ac8550680d387a9a118cfa55291bdda209049b481d9d6a55ed6d
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko9M3sACgkQlPl3HsVfCDpXNACfX/oSo2x3TYPoo30pHyy2bzyW
-SJMAn37e3aKaQmxbduQKd7XPZMSVEERz
-=gqX3
------END PGP SIGNATURE-----
diff --git a/net-nds/ypserv/ypserv-2.22.ebuild b/net-nds/ypserv/ypserv-2.22.ebuild
new file mode 100644
index 000000000000..18da325dfe15
--- /dev/null
+++ b/net-nds/ypserv/ypserv-2.22.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.22.ebuild,v 1.1 2010/02/23 11:35:45 phajdan.jr Exp $
+
+EAPI="2"
+
+inherit autotools
+
+DESCRIPTION="Network Information Service server"
+HOMEPAGE="http://www.linux-nis.org/nis/"
+SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="slp"
+
+DEPEND=">=sys-libs/gdbm-1.8.0
+	 slp? ( net-libs/openslp )"
+RDEPEND="${DEPEND}
+	 || ( net-nds/rpcbind net-nds/portmap )"
+
+src_prepare() {
+	# The configure script does not provide a command-line flag to control usage
+	# of slp. Use a brutal method in case we need to disable it.
+	if ! use slp; then
+		sed -i -e 's/USE_SLP=1/USE_SLP=0/g' configure.in
+		eautoreconf
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	insinto /etc
+	doins etc/ypserv.conf etc/netgroup etc/netmasks
+	insinto /var/yp
+	newins etc/securenets securenets.default
+
+	newconfd "${FILESDIR}/ypserv.confd" ypserv
+	newconfd "${FILESDIR}/rpc.yppasswdd.confd" rpc.yppasswdd
+	newconfd "${FILESDIR}/rpc.ypxfrd.confd" rpc.ypxfrd
+
+	newinitd "${FILESDIR}/ypserv" ypserv
+	newinitd "${FILESDIR}/rpc.yppasswdd-r1" rpc.yppasswdd
+	newinitd "${FILESDIR}/rpc.ypxfrd" rpc.ypxfrd
+
+	echo "CONFIG_PROTECT=\"/var/yp/Makefile\"" > "${T}"/10ypserv
+	doenvd "${T}"/10ypserv
+}
+
+pkg_preinst() {
+	# This ebuilds installs an env file which CONFIG_PROTECTs /var/yp/Makefile,
+	# but if the user is migrating from older ypserv, this won't take effect
+	# immediately. Keep the older setup with Makefile.dist file and ask the user
+	# to migrate.
+	if [ -f "${ROOT}/var/yp/Makefile.dist" ]; then
+		mv "${D}/var/yp/Makefile" "${D}/var/yp/Makefile.dist" \
+			|| die "mv failed"
+		cp "${ROOT}/var/yp/Makefile" "${D}/var/yp/Makefile" \
+			|| die "cp failed"
+		elog "Please remove ${ROOT}/var/yp/Makefile.dist after making sure that"
+		elog "${ROOT}/var/yp/Makefile looks fine to you. It is now"
+		elog "CONFIG_PROTECTed, so further changes should be managed with"
+		elog "usual config management tools like etc-update or dispatch-conf."
+	fi
+}
+
+pkg_postinst() {
+	einfo "To complete setup, you will need to edit /var/yp/securenets,"
+	einfo "/etc/conf.d/ypserv, /etc/ypserv.conf, /etc/conf.d/rpc.yppasswdd"
+	einfo "and possibly /var/yp/Makefile."
+
+	einfo "To start the services at boot, you need to enable ypserv and optionally"
+	einfo "the rpc.yppasswdd and/or rpc.ypxfrd services"
+}