Version bumped. Closes #58770.

8 files changed, 284 insertions, 2 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 8407bb3bb19a..d851f08ed2bd 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.8 2004/07/09 20:27:31 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.9 2004/08/25 14:53:29 tantive Exp $
+
+*util-vserver-0.29_p214 (25 Aug 2004)
+
+  25 Aug 2004; Michael Imhof <tantive@gentoo.org> +files/vprocunhide,
+  +files/vserver-build-029p214.patch, +files/vservers-conf.d,
+  +files/vservers-init, +util-vserver-0.29_p214.ebuild:
+  Version bumped. Closes #58770.
 
 *util-vserver-0.30 (09 Jul 2004)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 4ef398fc3e53..428725320f14 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,5 +1,9 @@
-MD5 297325fa584871fa7984cb8da4ea33cf ChangeLog 1210
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bc6c8255f9375fc18e1a6520b0a50ba2 ChangeLog 1471
 MD5 71d963ee6718e6ef0d32b98ed714b0be util-vserver-0.30.ebuild 1338
+MD5 95154cdbceaa2d2ac9362297cbbcca3f util-vserver-0.29_p214.ebuild 2242
 MD5 7f147ec6ddc340f546070e3045f75edc util-vserver-0.29.5.ebuild 1345
 MD5 db37aff1e6c2f62af0035ea8615d7a33 util-vserver-0.29_p196-r1.ebuild 1389
 MD5 de373141d8d3eeffd74dccdd3b7e7196 files/digest-util-vserver-0.30 70
@@ -7,4 +11,16 @@ MD5 af1503bee29c51dd40f8a675c89c47d8 files/digest-util-vserver-0.29_p196-r1 74
 MD5 1cb2a7908a23ba002862f1885b136418 files/vservers.initd 2501
 MD5 3fb961ce171c0f04c695c76f698daa94 files/rebootmgr.initd 966
 MD5 b2b8518d47de9e56f0ddbe7c724c5153 files/configure.patch 588
+MD5 e9e0e5d1c6b7b26a7a2f2dbd27f9ce1d files/vprocunhide 779
+MD5 bb2e87b9dec28f87c0f884a6bdb97777 files/vservers-init 1442
+MD5 d594dbc3171e5b45319a01d12c7e6d7e files/digest-util-vserver-0.29_p214 74
+MD5 42078263eccf1f9d58f0e74ddff51bdb files/vservers-conf.d 908
+MD5 9c223495a65c74f9819c5ee880a428bf files/vserver-build-029p214.patch 864
 MD5 f1ba37a847314029535da6bb7f620e17 files/digest-util-vserver-0.29.5 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBLKg9KtJO8LeSoosRArniAJ4zAh6FH7Q1y9PRBXx/6p9DAvz86ACaA7Y9
+ERH9fDtSKwdOUq2dCJ4LxY0=
+=Wapn
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.29_p214 b/sys-cluster/util-vserver/files/digest-util-vserver-0.29_p214
new file mode 100644
index 000000000000..a28993986012
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.29_p214
@@ -0,0 +1 @@
+MD5 1d2f838084faad2cc822b72d7e28bec4 util-vserver-0.29.214.tar.bz2 504660
diff --git a/sys-cluster/util-vserver/files/vprocunhide b/sys-cluster/util-vserver/files/vprocunhide
new file mode 100644
index 000000000000..e337317e5223
--- /dev/null
+++ b/sys-cluster/util-vserver/files/vprocunhide
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+}
+
+start() {
+
+	ebegin "Fixing /proc entries visibility..."
+	lockfile=/var/run/vprocunhide.lock
+
+        /usr/lib/util-vserver/vprocunhide
+
+        rc=$?
+        case "$rc" in
+	2)	rc=0;;
+	esac
+        test "$rc" -ne 0 || touch "$lockfile"
+	eend $rc "Failed"
+
+}
+
+stop()
+{
+    ebegin "Stopping vprocunhide"
+    lockfile=/var/run/vprocunhide.lock
+    rm -f "$lockfile"
+    eend $? "Failed"
+}
+
+
+restart()
+{
+    stop
+    start
+}
+
+status()
+{
+     lockfile=/var/run/vprocunhide.lock
+
+     test -f $lockfile && {
+        echo $"/proc entries were fixed"
+        exit 0
+     }
+     echo $"/proc entries are not fixed"
+     exit 1
+
+}
+
+
diff --git a/sys-cluster/util-vserver/files/vserver-build-029p214.patch b/sys-cluster/util-vserver/files/vserver-build-029p214.patch
new file mode 100644
index 000000000000..90f847bbdef5
--- /dev/null
+++ b/sys-cluster/util-vserver/files/vserver-build-029p214.patch
@@ -0,0 +1,21 @@
+--- scripts/vserver-build.functions	2004-03-23 00:27:41.000000000 +0100
++++ ../util-vserver-0.30.190/scripts/vserver-build.functions	2004-06-27 15:05:29.000000000 +0200
+@@ -1,4 +1,4 @@
+-# $Id: vserver-build-029p214.patch,v 1.1 2004/08/25 14:53:29 tantive Exp $	--*- sh -*--
++# $Id: vserver-build-029p214.patch,v 1.1 2004/08/25 14:53:29 tantive Exp $	--*- sh -*--
+ 
+ # Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ #  
+@@ -130,6 +130,12 @@
+     elif test -e /etc/SuSE-release; then
+ 	set -- $(cat /etc/SuSE-release)
+ 	DISTRIBUTION=suse$3
++    elif test -e /etc/gentoo-release; then
++	set -- $(cat /etc/gentoo-release)
++	DISTRIBUTION=gentoo$5
++    elif test -e /etc/slackware-release; then
++	set -- $(cat /etc/slackware-release)
++	DISTRIBUTION=slackware$2
+     else
+ 	echo \
+ "Can not determine distribution; please specify it manually
diff --git a/sys-cluster/util-vserver/files/vservers-conf.d b/sys-cluster/util-vserver/files/vservers-conf.d
new file mode 100644
index 000000000000..5e9f67a71ded
--- /dev/null
+++ b/sys-cluster/util-vserver/files/vservers-conf.d
@@ -0,0 +1,22 @@
+# Distributed under the terms of the GNU General Public License v2
+# /etc/conf.d/vservers - Defines which vservers are launched as well as the launch order
+#
+# Parts from lmsensors (Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>)
+#
+# This file is used by /etc/init.d/vservsers and defines the vservers to
+# be started/stopped. This file is sourced into /etc/init.d/vservers.
+#
+# The format of this file is a shell script that simply defines the marks
+# of vservers to be launched in order as normal variables with the special names:
+#    MARK_0, MARK_1, MARK_2, etc.
+#
+# Please note that the numbers in MARK_X must start at 0 and increase in
+# steps of 1. Any number that is missing will make the init script skip the
+# rest of the marks. 
+#
+# If you want the vserver "foo" to belong to group "bar" of vservers, type the command:
+# echo bar >/etc/vservers/foo/apps/init/mark
+#
+# 
+MARK_0=default
+
diff --git a/sys-cluster/util-vserver/files/vservers-init b/sys-cluster/util-vserver/files/vservers-init
new file mode 100644
index 000000000000..48d660b1dcb7
--- /dev/null
+++ b/sys-cluster/util-vserver/files/vservers-init
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# Parts taken from lm_sensors package
+
+depend() {
+	need vprocunhide
+}
+
+start(){ 
+	if ! [ -f /etc/conf.d/vservers ] ; then
+        	eerror "/etc/conf.d/vservers does not exist, nothing to do"
+		return 1
+        fi
+	. /etc/conf.d/lm_sensors
+  	
+
+	if [ -z "${MARK_0}" ] ; then
+		eerror "MARK_0 is not set in /etc/conf.d/vservers, nothing to do"
+		return 1
+	fi
+
+	einfo "Launching vservers..."
+
+	i=0
+	while true; do
+		mark=`eval echo '$'MARK_${i}`
+		if [ -z "${mark}" ] ; then
+			break
+		fi
+		ebegin "  Starting vservers with mark ${mark}"
+		export MARK=${mark}
+		/usr/lib/util-vserver/vserver-wrapper start
+		eend $?
+		i=$((i+1))
+        done
+}
+
+
+stop() {
+	if ! [ -f /etc/conf.d/vservers ] ; then
+		eerror "/etc/conf.d/vservers does not exist, nothing to do"
+		return 1
+	fi
+
+	. /etc/conf.d/lm_sensors
+  	
+
+	if [ -z "${MARK_0}" ] ; then
+		eerror "MARK_0 is not set in /etc/conf.d/vservers, nothing to do"
+		return 1
+	fi
+
+	einfo "Stopping vservers..."
+
+	# we determine the number of vserver marks
+	i=0
+		while true; do
+		mark=`eval echo '$'MARK_${i}`
+		if [ -z "${mark}" ] ; then
+			break
+		fi
+		i=$((i+1))
+		done
+
+
+		i=$((i-1))
+
+		while true; do
+			mark=`eval echo '$'MARK_${i}`
+			if [ -z "${mark}" ] ; then
+				break
+			fi
+			ebegin "  Stopping vservers with mark ${mark}"
+			export MARK=${mark}
+			/usr/lib/util-vserver/vserver-wrapper stop
+				eend $?
+			if [ "0" -eq "${i}" ] ; then
+				break
+			fi
+			i=$((i-1))
+		done
+}
+
+
diff --git a/sys-cluster/util-vserver/util-vserver-0.29_p214.ebuild b/sys-cluster/util-vserver/util-vserver-0.29_p214.ebuild
new file mode 100644
index 000000000000..90333abd6f81
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.29_p214.ebuild
@@ -0,0 +1,79 @@
+# 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/util-vserver-0.29_p214.ebuild,v 1.1 2004/08/25 14:53:29 tantive Exp $
+# 
+
+inherit eutils
+
+MY_P="${P/_p/.}"
+DESCRIPTION="Vserver admin-tools."
+#SRC_URI="http://www-user.tu-chemnitz.de/~ensc/util-vserver/${P}.tar.bz2"
+SRC_URI="http://www.13thfloor.at/vserver/d_rel26/v1.9.1/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.13thfloor.at/vserver/ http://savannah.nongnu.org/projects/util-vserver/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+
+## TODO: optional (though NOT recommended) depend on dietlibc?
+## hmm, dietlibc-linking results in ld-errors ...
+#DEPEND="dev-libs/dietlibc"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+    unpack ${A}
+    cd ${S}/scripts
+    # upgrade vserver-build to 0.30.190 version
+    epatch  ${FILESDIR}/vserver-build-029p214.patch 
+}
+
+src_compile() {
+    #./configure --prefix=/usr --disable-internal-headers || die "configure failed"
+    econf || die "econf failed"
+    make || die "compile failed"
+}
+
+src_install() {
+    make DESTDIR=${D} install || die "install failed"
+    
+    ## state-dir:
+    keepdir /var/run/vservers
+    ## the actual vservers go there:
+    keepdir /vservers
+    fperms 000 /vservers
+    
+    dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
+    
+    ## remove the non-gentoo init-scripts:
+    rm -r ${D}/etc/init.d
+    ## ... and install gentoo'ized ones:
+    exeinto /etc/init.d/
+    doexe ${FILESDIR}/vprocunhide
+    newexe ${FILESDIR}/vservers-init vservers
+    insinto /etc/conf.d
+    newins ${FILESDIR}/vservers-conf.d vservers
+}
+
+pkg_postinst() {
+    einfo
+    einfo "Vservers are launched/stopped with /etc/init.d/vservers"
+    einfo "You might want to edit /etc/conf.d/vservers"
+    einfo
+    einfo "You might want to disable namespace:"
+    einfo
+    einfo "	touch /etc/vservers/.defaults/nonamespace"
+    einfo
+    einfo "And vshelper:"
+    einfo
+    einfo "	mkdir -p /etc/vservers/.defaults/apps/vshelper/"
+    einfo "	touch /etc/vservers/.defaults/apps/vshelper/disabled"
+    einfo
+    ewarn
+    ewarn "Legacy configuration style is *not* supported by this package."
+    ewarn
+}
+