fix #130783

(Portage version: 2.1_pre7-r5)

4 files changed, 129 insertions, 14 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 6b139c242d7d..b4e4fb0afe20 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.54 2006/04/14 11:17:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.55 2006/04/22 10:46:45 hollow Exp $
+
+*util-vserver-0.30.210-r13 (22 Apr 2006)
+
+  22 Apr 2006; Benedikt Boehm <hollow@gentoo.org>
+  +util-vserver-0.30.210-r13.ebuild:
+  fix #130783
 
   14 Apr 2006; Benedikt Boehm <hollow@gentoo.org>
   -util-vserver-0.30.210-r11.ebuild, util-vserver-0.30.210-r12.ebuild:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index c3be538ff463..90a84e0dcafd 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c09efc21e5d9b60195653738e23481ad ChangeLog 10927
-RMD160 63aaa2ce954303760342f2abddc20ad55fedd729 ChangeLog 10927
-SHA256 bc3ed07ad316fde26462651f72b9b925469ed0b4de144ae6560ec0d7220498c4 ChangeLog 10927
+MD5 9ebe777c02f9ca5506aacbfcf9b6257b ChangeLog 11071
+RMD160 8f04962550da4c931c9a5480f8832cff71879c00 ChangeLog 11071
+SHA256 9c5c33236df8887ff689e5a466e781a12c18fe414f5c55b04495e996e1e6d0a1 ChangeLog 11071
 MD5 1b6464d33781295408a0040f65ef0518 files/digest-util-vserver-0.30.209-r1 563
 RMD160 33ef3a9600aee4254ead602205309ccb8b083211 files/digest-util-vserver-0.30.209-r1 563
 SHA256 63d21d3dfaf63cb2aa1fbe4cd9b3e710ee0647f963f41c7b586eb86728e4aab3 files/digest-util-vserver-0.30.209-r1 563
 MD5 6395d5c7448190c6fab531ac9715089b files/digest-util-vserver-0.30.210-r12 569
 RMD160 0b98c67583c59a723c29766bf41197d2aabfb065 files/digest-util-vserver-0.30.210-r12 569
 SHA256 41ff17f47f0db569fdb623a74df1e1817739accb1903e5abdf6fc8e612d28dd3 files/digest-util-vserver-0.30.210-r12 569
+MD5 0aec3bb8905993fbfdfea185685b14ff files/digest-util-vserver-0.30.210-r13 569
+RMD160 efac97c6e2e183aecebedb51641c161dc72400c6 files/digest-util-vserver-0.30.210-r13 569
+SHA256 79be461cd53fcb5001642cba8bb6209721985b5ded8d0a1069a5fa5b00ac77f0 files/digest-util-vserver-0.30.210-r13 569
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
 SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d metadata.xml 588
@@ -19,10 +19,6 @@ SHA256 6679506da923d54bf212fededb8a739af243f5376e790dc9c427f8ebe581f930 util-vse
 MD5 51c094aa8c81874cf1116202f8d2eeca util-vserver-0.30.210-r12.ebuild 2939
 RMD160 dc65f30f5290b30243fa9f9b46ab151f48679852 util-vserver-0.30.210-r12.ebuild 2939
 SHA256 07abe4883b7a63cd5a457261df1c7a3e1a81735a846f22771b7ddb26146c4dcc util-vserver-0.30.210-r12.ebuild 2939
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEP4UAmPFBzbX68WERAgkeAJ9wc873Du3ma7BL4u0E5tWq6/B//gCgiB9K
-GOmbACRlS+55m7eY+m1vozI=
-=STL4
------END PGP SIGNATURE-----
+MD5 3b6ff2a4af49134e275e3ff583b6290f util-vserver-0.30.210-r13.ebuild 2941
+RMD160 5829e9d39a937f200b4c946f3d580b8d15518054 util-vserver-0.30.210-r13.ebuild 2941
+SHA256 4d33f0ad023a6c94c65435c3750583c4f4dc1f92a1d581891b22a04ee99cca09 util-vserver-0.30.210-r13.ebuild 2941
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r13 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r13
new file mode 100644
index 000000000000..6ff5759b58b2
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r13
@@ -0,0 +1,6 @@
+MD5 24673e9e291d7b844eab07f0a4349efe util-vserver-0.30.210-patches-r13.tar.bz2 26978
+RMD160 440aa77df60dccaceea9cd3bad7bb902c4252632 util-vserver-0.30.210-patches-r13.tar.bz2 26978
+SHA256 26000063103fe822ede1f8ce0c14d6f79b4757f76863420d06f3164dc167ad9e util-vserver-0.30.210-patches-r13.tar.bz2 26978
+MD5 1e8fff7cb6246d21ed029f082123019b util-vserver-0.30.210.tar.bz2 600032
+RMD160 b8f426e319feeafc9be91315947c10a147586f1f util-vserver-0.30.210.tar.bz2 600032
+SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04 util-vserver-0.30.210.tar.bz2 600032
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.210-r13.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.210-r13.ebuild
new file mode 100644
index 000000000000..5b5240643973
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.210-r13.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.210-r13.ebuild,v 1.1 2006/04/22 10:46:48 hollow Exp $
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=">=dev-libs/dietlibc-0.28
+	dev-libs/beecrypt
+	net-firewall/iptables
+	net-misc/vconfig
+	sys-apps/iproute2
+	sys-process/procps"
+
+pkg_setup() {
+	if [[ -z "${VDIRBASE}" ]]; then
+		einfo
+		einfo "You can change the default vserver base directory (/vservers)"
+		einfo "by setting the VDIRBASE environment variable."
+	fi
+
+	: ${VDIRBASE:=/vservers}
+
+	einfo
+	einfo "Using \"${VDIRBASE}\" as vserver base directory"
+	einfo
+}
+
+src_unpack() {
+	unpack ${A} || die
+	cd "${S}" || die
+
+	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
+	epatch "${WORKDIR}"/patches/*.patch
+
+	AT_M4DIR="-I m4" \
+	eautoreconf
+}
+
+src_compile() {
+	econf --localstatedir=/var \
+	      --with-initrddir=/etc/init.d \
+	      --with-vrootdir="${VDIRBASE}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	# keep dirs
+	keepdir /var/run/vservers
+	keepdir /var/run/vservers.rev
+	keepdir /var/run/vshelper
+	keepdir /var/lock/vservers
+	keepdir /var/cache/vservers
+
+	keepdir "${VDIRBASE}"
+	fperms 000 "${VDIRBASE}"
+
+	# remove the non-gentoo init-scripts:
+	rm -f "${D}"/etc/init.d/*
+
+	# and install gentoo'ized ones:
+	doinitd "${WORKDIR}"/init.d/vservers
+	doconfd "${WORKDIR}"/conf.d/vservers
+
+	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You have to run the vprocunhide command after every reboot"
+	einfo "in order to setup /proc permissions correctly for vserver"
+	einfo "use. An init script has been installed by this package."
+	einfo "To use it you should add it to a runlevel:"
+	einfo
+	einfo " rc-update add vservers default"
+	einfo
+	einfo "This init script will also help you to start/stop your vservers"
+	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
+	ewarn
+	ewarn "You should definitly fix up the barrier of your vserver"
+	ewarn "base directory by using the following command in a root shell:"
+	ewarn
+	ewarn " setattr --barrier ${VDIRBASE}"
+	ewarn
+	ewarn "IMPORTANT UPGRADE WARNING:"
+	ewarn
+	ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
+	ewarn "with the vservers init script. The following steps are"
+	ewarn "required to keep current behaviour:"
+	ewarn
+	ewarn " rc-update del vprocunhide"
+	ewarn " rc-update add vservers default"
+	ewarn
+}