fix testsuite; fix vlogin

(Portage version: 2.1_pre6-r3)

4 files changed, 129 insertions, 14 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index c81c21b1fd31..40edd9ef26ed 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.46 2006/03/12 07:42:48 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.47 2006/03/16 21:01:03 hollow Exp $
+
+*util-vserver-0.30.210-r6 (16 Mar 2006)
+
+  16 Mar 2006; Benedikt Boehm <hollow@gentoo.org>
+  +util-vserver-0.30.210-r6.ebuild:
+  fix testsuite; fix vlogin
 
 *util-vserver-0.30.210-r5 (12 Mar 2006)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index c955b1d2a44c..d2789aa72909 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7cd0468f9ba973dd9a0bd8e2cd2f7c43 ChangeLog 9237
-RMD160 1af6ba4443e664593861ea50d147477faa4e2d67 ChangeLog 9237
-SHA256 c63c826db937ee40b23b3adb2913635e52730cbc07183b8e91f5b8bfcfb91759 ChangeLog 9237
+MD5 1ee27b7834a5acda6bf70c4cb36dd9dd ChangeLog 9393
+RMD160 70ee94383c4b404a31f2bb7896e720c1ee104b17 ChangeLog 9393
+SHA256 08de08a05f637efe5a36a803086e428db24dc200bf5058c9b2ab41cc018552a5 ChangeLog 9393
 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
@@ -13,6 +10,9 @@ SHA256 c32a4f3d3f179735fdc7bad959294949fafc288d51880744c4d62d3dca7b174d files/di
 MD5 8d9cfa00af21d69beb6685341403bed7 files/digest-util-vserver-0.30.210-r5 566
 RMD160 af5b00631ce67db32a6ec003838c0e59b7acda7f files/digest-util-vserver-0.30.210-r5 566
 SHA256 77ea69fc68b2067c0d2e336724005cf332edaec688219620d5f2a8911f627830 files/digest-util-vserver-0.30.210-r5 566
+MD5 17eef7e9bb399a0981d47ffd4db05556 files/digest-util-vserver-0.30.210-r6 566
+RMD160 169c419de796e34c6a12c14a8cc2a67072104507 files/digest-util-vserver-0.30.210-r6 566
+SHA256 3aa7a439f0a9907c82a1a8b107dce0cb62eb2abee4223b68110883507374a3c9 files/digest-util-vserver-0.30.210-r6 566
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
 SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d metadata.xml 588
@@ -25,10 +25,6 @@ SHA256 95ca0c1dde0e9c37c64c592bc8d1931ff716e539d55012bd6fa5cb859bfa6436 util-vse
 MD5 1b904d6d52fa23073d9f23d5e1e86bc6 util-vserver-0.30.210-r5.ebuild 2940
 RMD160 b6be76e818cf2f10a9ffaaa71c950f09a2161bdb util-vserver-0.30.210-r5.ebuild 2940
 SHA256 7edf52e95d8fdc1dc3101f7d99ebab55b8ac2533993df4ce8f06cf00f302e853 util-vserver-0.30.210-r5.ebuild 2940
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEE9DrflZ8QqxhrsMRAnwtAJ0UiLQlLHiDt60KlvDxzZN2dpYoTQCgmRZQ
-Hsshy1S4POnBkmTC71mLK1w=
-=AHss
------END PGP SIGNATURE-----
+MD5 1b904d6d52fa23073d9f23d5e1e86bc6 util-vserver-0.30.210-r6.ebuild 2940
+RMD160 b6be76e818cf2f10a9ffaaa71c950f09a2161bdb util-vserver-0.30.210-r6.ebuild 2940
+SHA256 7edf52e95d8fdc1dc3101f7d99ebab55b8ac2533993df4ce8f06cf00f302e853 util-vserver-0.30.210-r6.ebuild 2940
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r6 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r6
new file mode 100644
index 000000000000..b708faa778ce
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r6
@@ -0,0 +1,6 @@
+MD5 71cfec63f70e59713aefe3c48bb18255 util-vserver-0.30.210-patches-r6.tar.bz2 16721
+RMD160 0238b2ba40fcea20a569e7159b6cbe117b6603d0 util-vserver-0.30.210-patches-r6.tar.bz2 16721
+SHA256 8296a8eda7014c6dc252df3423d703bbc330bf036dab094ef6c4cc175a13cfd9 util-vserver-0.30.210-patches-r6.tar.bz2 16721
+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-r6.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.210-r6.ebuild
new file mode 100644
index 000000000000..fbc9987d9969
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.210-r6.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-r6.ebuild,v 1.1 2006/03/16 21:01:04 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
+}