11 files changed, 32 insertions, 263 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 4891c7eda248..33d6eb5ec7de 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.34 2005/11/26 09:25:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.35 2005/11/26 09:44:04 hollow Exp $
+
+  26 Nov 2005; Benedikt Boehm <hollow@gentoo.org> -files/vprocunhide,
+  -files/vserver-new_dev-fix.patch,
+  -files/vserver-new_drop-defaulttar.patch, -files/vservers.confd,
+  -files/vservers.initd, -util-vserver-0.30.205-r1.ebuild,
+  util-vserver-0.30.208-r5.ebuild, util-vserver-0.30.209.ebuild:
+  208-r5 to stable x86; cleanup
 
   26 Nov 2005; Christian Heim <phreak@gentoo.org>
   -util-vserver-0.30.208-r3.ebuild, -util-vserver-0.30.208-r4.ebuild,
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 730d9fd6fd0c..3bac4b84cd09 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,23 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3f22d55034f9ec88668904d5d83cbe5a ChangeLog 6736
-MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
+MD5 6c94b380dab80b6902843b9a51f01e6e ChangeLog 7066
 MD5 0722ed435a03b8e1c03b0b319045891c files/digest-util-vserver-0.30.208-r5 157
 MD5 2c8a53015c77a0f7222ab5e18ca59246 files/digest-util-vserver-0.30.209 154
-MD5 09276c3e50cf5c0f8d30ef0422f05fd8 files/vprocunhide 570
-MD5 bb0aa3e0f3b2d4216d303bd8ff6ebcb4 files/vserver-new_dev-fix.patch 393
-MD5 5e3714a49fe3701ba1d3e5a0c210f888 files/vserver-new_drop-defaulttar.patch 840
-MD5 b3c3f9e3c220a288d48c43ef109ddf2b files/vservers.confd 1560
-MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
-MD5 c5f348ce535b90b26e953ef356181e1d util-vserver-0.30.205-r1.ebuild 1946
-MD5 c4f21ce40342f7b4a6ab561de19df27e util-vserver-0.30.208-r5.ebuild 2603
-MD5 5d6b7d306af2ed8b3447c9d0f7df8205 util-vserver-0.30.209.ebuild 2588
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDiCoAflZ8QqxhrsMRAtYqAKCXruguMm7o75uhbtdmGdboPSTZYwCgqsJv
-wPQCWuEw9aVWXSN2cmMprDA=
-=vh2l
------END PGP SIGNATURE-----
+MD5 b07e489e373b424625ef731f60cc56f6 util-vserver-0.30.208-r5.ebuild 2915
+MD5 db72b96cbb2c3d23890eb066d4ad0dfc util-vserver-0.30.209.ebuild 2901
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205-r1 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205-r1
deleted file mode 100644
index 67554560bf5b..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d509327744fd5dfa84faa68531853c3 util-vserver-0.30.205.tar.bz2 556725
diff --git a/sys-cluster/util-vserver/files/vprocunhide b/sys-cluster/util-vserver/files/vprocunhide
deleted file mode 100644
index aa8e3b667700..000000000000
--- a/sys-cluster/util-vserver/files/vprocunhide
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vprocunhide,v 1.3 2005/07/18 15:27:15 hollow Exp $
-
-start() {
-	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
-	if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
-		eerror "Cannot find util-vserver installation"
-		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
-		exit 1
-	fi
-	. ${UTIL_VSERVER_VARS}
-	
-	ebegin "Unhiding /proc entries"
-	${_VPROCUNHIDE}
-	eend $?
-}
diff --git a/sys-cluster/util-vserver/files/vserver-new_dev-fix.patch b/sys-cluster/util-vserver/files/vserver-new_dev-fix.patch
deleted file mode 100644
index d0b25cf4bd41..000000000000
--- a/sys-cluster/util-vserver/files/vserver-new_dev-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/vserver-new.old	2005-10-01 18:58:31.580500000 +0200
-+++ tools/vserver-new	2005-10-01 18:57:19.179975250 +0200
-@@ -244,6 +244,7 @@
- 	cp -L /etc/resolv.conf etc/resolv.conf || die "failed to copy DNS information"
- 	
- 	mount -t proc none proc/ || die "failed to mount procfs"
-+	mount --bind /dev dev/ || die "failed to mount dev"
- 	
- 	cat <<EOF > tmp/vserver-new-stage3.sh
- #!/bin/bash
diff --git a/sys-cluster/util-vserver/files/vserver-new_drop-defaulttar.patch b/sys-cluster/util-vserver/files/vserver-new_drop-defaulttar.patch
deleted file mode 100644
index 502583959e31..000000000000
--- a/sys-cluster/util-vserver/files/vserver-new_drop-defaulttar.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- tools/vserver-new.old	2005-10-04 16:34:08.818098750 +0200
-+++ tools/vserver-new	2005-10-04 16:26:13.416388000 +0200
-@@ -186,9 +186,6 @@
- # Target: stage3                                                               #
- #------------------------------------------------------------------------------#
- 
--STAGE3_DEFAULTTAR="stage3-i686-latest.tar.bz2"
--STAGE3_DEFAULTURL="http://dev.gentoo.org/~hollow/vserver/stages/${STAGE3_DEFAULTTAR}"
--
- stage3_usage() {
- 	echo "Usage: vserver-new <name> <globalopts> stage3 [<tar>]"
- 	echo
-@@ -205,10 +202,10 @@
- 		exit 0
- 	fi
- 	
--	if [ -n "$1" ]; then
--		tarball=$1
--		[ "${tarball#/}" == "${tarball}" ] && tarball="`pwd`/${tarball}"
--	fi
-+	[ -z "$1" ] && die "Missing required argument <tar>"
-+	
-+	tarball=$1
-+	[ "${tarball#/}" == "${tarball}" ] && tarball="`pwd`/${tarball}"
- 	
- 	stage3_build
- }
diff --git a/sys-cluster/util-vserver/files/vservers.confd b/sys-cluster/util-vserver/files/vservers.confd
deleted file mode 100644
index 2282ef000d7f..000000000000
--- a/sys-cluster/util-vserver/files/vservers.confd
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vservers.confd,v 1.3 2005/07/19 16:32:12 hollow Exp $
-
-# A space-delimited list of vserver MARKS to start. 
-# Identification of vservers happens by
-# putting the flavor into /etc/vservers/<vserver-id>/apps/init/mark.
-MARKS="default"
-
-# Wether to start all vservers by default (supersedes MARKS)
-# This will be enabled if STARTALL is set regardless of its content
-# i.e. you have to comment to disable it
-#STARTALL=yes
-
-# Wether to stop all vservers by default (supersedes MARKS)
-# This will be enabled if STOPALL is set regardless of its content
-# i.e. you have to comment to disable it
-STOPALL=yes
-
-# Number of vservers which shall be started in parallel; since most
-# initmethods are spending much time in sleeps, it is safe to
-# use a high number here, though you should pay attention if you make 
-# use of depends in /etc/vservers as some services may not be up if
-# started in parallel
-#NUMPARALLEL=6
-
-# The name of the vserver lock directory which is used by the init script
-# to determine which MARKS have already been started (used within
-# vstatus() to show the status of MARKS). Default should be good
-# for everyone. Change at your own risk
-#LOCKDIR=/var/lock/vservers
-
-# The location of util-vserver-vars
-# This file contains variables to util-vserver scripts used within the
-# init script. Change at your own risk.
-#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
diff --git a/sys-cluster/util-vserver/files/vservers.initd b/sys-cluster/util-vserver/files/vservers.initd
deleted file mode 100644
index a8cab109f24d..000000000000
--- a/sys-cluster/util-vserver/files/vservers.initd
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vservers.initd,v 1.3 2005/07/18 15:27:15 hollow Exp $
-
-opts="${opts} vstatus"
-
-checkconfig() {
-	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
-	if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
-		eerror "Cannot find util-vserver installation"
-		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
-		exit 1
-	fi
-	. ${UTIL_VSERVER_VARS}
-	
-	: ${MARKS:=default}
-	: ${NUMPARALLEL:=1}
-	: ${LOCKDIR:=/var/lock/vservers}
-}
-
-start() {
-	checkconfig
-	
-	if [[ -n ${STARTALL} ]]; then
-		ebegin "Starting all vservers"
-		${_START_VSERVERS} -j ${NUMPARALLEL} --all --start
-		local rc=$?
-		[[ $rc -eq 0 ]] && touch ${LOCKDIR}/all
-		eend $rc
-	else
-		for MARK in ${MARKS}; do
-			ebegin "Starting vservers of type '${MARK}'"
-			${_START_VSERVERS} -m ${MARK} -j ${NUMPARALLEL} --all --start
-			local rc=$?
-			[[ $rc -eq 0 ]] && touch ${LOCKDIR}/${MARK}
-			eend $rc
-		done
-	fi
-}
-
-stop() {
-	checkconfig
-	
-	if [[ -n ${STOPALL} ]]; then
-		ebegin "Stopping all vservers"
-		${_START_VSERVERS} -j ${NUMPARALLEL} --all --stop
-		local rc=$?
-		rm -f ${LOCKDIR}/all
-		eend $rc
-	else
-		for MARK in ${MARKS}; do
-			ebegin "Stopping vservers of type '${MARK}'"
-			${_START_VSERVERS} -m ${MARK} -j ${NUMPARALLEL} --all --stop
-			local rc=$?
-			rm ${LOCKDIR}/${MARK}
-			eend $rc
-		done
-	fi
-
-}
-
-vstatus() {
-	checkconfig
-
-	einfo "${LOCKDIR} shows the follwing types of vservers running:"
-	for i in ${LOCKDIR}/*; do
-		einfo "  ${i}"
-		local running="true"
-	done
-	
-	if [[ "${running}" != "true" ]]; then
-		einfo "  none"
-	fi
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
deleted file mode 100644
index 2e07202397a4..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2005 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.205-r1.ebuild,v 1.7 2005/10/02 19:19:08 phreak Exp $
-
-inherit eutils
-
-DESCRIPTION="Linux-VServer admin utilities"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="glibc"
-DEPEND="!glibc? ( >=dev-libs/dietlibc-0.26-r1 )
-	glibc? ( sys-libs/glibc )
-	sys-apps/iproute2
-	net-misc/vconfig
-	sys-process/procps
-	net-firewall/iptables"
-
-src_compile() {
-	local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
-
-	use glibc && myconf="${myconf} --disable-dietlibc"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake 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 /vservers
-
-	# remove the non-gentoo init-scripts:
-	rm -f ${D}/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/vservers.initd vservers
-	newexe ${FILESDIR}/vprocunhide vprocunhide
-
-	# install conf.d files
-	insinto /etc/conf.d
-	newins ${FILESDIR}/vservers.confd vservers
-
-	dodoc README ChangeLog NEWS AUTHORS INSTALL 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 is provided by this package. To use it"
-	einfo "you should add it to a runlevel:"
-	einfo
-	einfo " rc-update add vprocunhide default"
-	einfo
-
-	ewarn "You should definitly fix up the barrier of your /vserver"
-	ewarn "basedir by using the following command in a root shell: "
-	ewarn
-	ewarn " setattr --barrier /vservers"
-	ewarn
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild
index 75fd1abc5185..b870c9e5544a 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208-r5.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/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.2 2005/11/26 09:25:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.3 2005/11/26 09:44:04 hollow Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE=""
 
@@ -94,4 +94,13 @@ pkg_postinst() {
 	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 vserver default"
+	ewarn
 }
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild
index 803ac130c586..4f2f26f4028b 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.209.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/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild,v 1.2 2005/11/26 09:25:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild,v 1.3 2005/11/26 09:44:04 hollow Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -94,4 +94,13 @@ pkg_postinst() {
 	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 vserver default"
+	ewarn
 }