added metadata.xml, removed old versions. added 0.30.196

Package-Manager: portage-2.0.51-r14

15 files changed, 168 insertions, 288 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index cbcdce65e65b..5f2bfbfba91b 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,16 @@
 # 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.10 2004/09/19 18:59:13 tantive Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.11 2005/01/23 08:49:41 hollow Exp $
+
+*util-vserver-0.30.196 (23 Jan 2005)
+
+  23 Jan 2005; Benedikt Boehm <hollow@gentoo.org> +metadata.xml,
+  -files/configure.patch, -files/vprocunhide,
+  -files/vserver-build-029p214.patch, -files/vservers-conf.d,
+  -files/vservers-init, +files/0.30.196/vservers.confd,
+  +files/0.30.196/vservers.initd, -util-vserver-0.29_p214.ebuild,
+  +util-vserver-0.30.196.ebuild:
+  Removed old versions. Added 0.30.196
 
   19 Sep 2004; Michael Imhof <tantive@gentoo.org> -util-vserver-0.29.5.ebuild,
   -util-vserver-0.29_p196-r1.ebuild:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index ad1144f9a179..65a8655a989b 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cff01d152628ab55c43cca83d0a576a4 ChangeLog 1616
-MD5 71d963ee6718e6ef0d32b98ed714b0be util-vserver-0.30.ebuild 1338
-MD5 e9ce3ebab93b61e6aec608d5deb49d6f util-vserver-0.29_p214.ebuild 2115
-MD5 de373141d8d3eeffd74dccdd3b7e7196 files/digest-util-vserver-0.30 70
-MD5 1cb2a7908a23ba002862f1885b136418 files/vservers.initd 2501
+MD5 9c760add6c9c1acc9005f451786091e3 ChangeLog 2021
+MD5 db4295d67ea5ff66ec872fa3563f146c util-vserver-0.30.ebuild 1337
+MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
+MD5 2f53c8eb1d63c11023789c2e4fb4737a util-vserver-0.30.196.ebuild 1351
 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 1cb2a7908a23ba002862f1885b136418 files/vservers.initd 2501
+MD5 de373141d8d3eeffd74dccdd3b7e7196 files/digest-util-vserver-0.30 70
+MD5 0f34731a7d8119fc5e3f9322bf727521 files/digest-util-vserver-0.30.196 74
+MD5 f7a463d2443b495aa0e2554051ad5949 files/0.30.196/vservers.confd 1020
+MD5 67a441a0026927594aaa0926fbb5a13f files/0.30.196/vservers.initd 1270
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBTdcOKtJO8LeSoosRAvYUAJ9G8jcIbLI3rIr1bIrXxKr/+nb+RwCfVbM8
-JwicT9URHrujYwLUPEZUWiw=
-=Jx0k
+iD8DBQFB82UgmPFBzbX68WERAla1AJ4y8FCTJR1p9+YOpIjsDS8v1TOvIgCfabx0
+asjEBu5kRQhUMB64BL8VIbk=
+=QE3e
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/0.30.196/vservers.confd b/sys-cluster/util-vserver/files/0.30.196/vservers.confd
new file mode 100644
index 000000000000..7d688903efc7
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.196/vservers.confd
@@ -0,0 +1,21 @@
+# 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/0.30.196/vservers.confd,v 1.1 2005/01/23 08:49:41 hollow Exp $
+
+# The *basename* of the lockfile; this must be the same name like
+# this if the initscript. Else, the vservers will not be stopped at
+# shutdown
+LOCKFILE=/var/lock/vservers-default
+
+# Number of vservers which shall be started in parallel; since most
+# initmethods are spending much time time in sleeps, it is safe to
+# use a high number here
+NUMPARALLEL=6
+
+# The vserver-flavor; the 'default' vservers will be started very late
+# which may be inappropriately for early services like nameservers or
+# VPN tunnels. By copying this initscript to a new name and adapting
+# the startup-position (for RH/Fedora the numbers in line 2), other
+# vservers can be selected. Identification of vservers happens by
+# putting the flavor into /etc/vservers/<vserver-id>/apps/init/mark.
+MARK=default
diff --git a/sys-cluster/util-vserver/files/0.30.196/vservers.initd b/sys-cluster/util-vserver/files/0.30.196/vservers.initd
new file mode 100755
index 000000000000..f9e60b1d619a
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.196/vservers.initd
@@ -0,0 +1,57 @@
+#!/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/0.30.196/vservers.initd,v 1.1 2005/01/23 08:49:41 hollow Exp $
+
+opts="${opts} vstatus condrestart"
+
+checkconfig() {
+	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
+	[ -e $UTIL_VSERVER_VARS ] || {
+		eerror "Cannot find util-vserver installation"
+		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
+		exit 1
+	}
+	. $UTIL_VSERVER_VARS
+	
+	: ${MARK:=default}
+	: ${LOCKFILE:=/var/lock/vservers-$MARK}
+	: ${NUMPARALLEL:=6}
+}
+
+start() {
+	checkconfig
+	
+	ebegin "Unhiding /proc entries"
+	$_VPROCUNHIDE
+	eend $?
+	
+	ebegin "Starting vservers of type '$MARK'"
+	$_START_VSERVERS -m $MARK -j $NUMPARALLEL --all --start
+	local rc=$?
+	[ $rc -eq 0 ] && touch ${LOCKFILE}
+	eend $rc
+}
+
+stop() {
+	checkconfig
+	
+	ebegin "Stopping vservers of type '$MARK'"
+	$_START_VSERVERS -m $MARK -j $NUMPARALLEL --all --stop
+	local rc=$?
+	rm -f ${LOCKFILE}
+	eend $rc
+}
+
+condrestart() {
+	[ -f $lockfile ] && restart || :
+}
+
+vstatus() {
+	checkconfig
+	[ -f $lockfile ] && {
+	    einfo "vservers of type '$MARK' were started"
+	    exit 0
+	}
+	einfo "vservers of type '$MARK' are not started"
+}
diff --git a/sys-cluster/util-vserver/files/configure.patch b/sys-cluster/util-vserver/files/configure.patch
deleted file mode 100644
index f503e04a33d0..000000000000
--- a/sys-cluster/util-vserver/files/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur util-vserver-0.29-orig/configure.ac util-vserver-0.29/configure.ac
---- util-vserver-0.29-orig/configure.ac 2004-02-11 22:06:17.000000000 +0100
-+++ util-vserver-0.29/configure.ac      2004-03-18 19:50:35.000000000 +0100
-@@ -41,2 +41,2 @@
--ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W -Wno-unused-parameter])
--ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
-+ENSC_CHECK_CC_FLAG([-std=c99 -Wall -W -Wno-unused-parameter])
-+ENSC_CHECK_CXX_FLAG([-ansi   -Wall -W -fmessage-length=0])
-
- AC_ARG_VAR(CC, [The C compiler])
- ENSC_KERNEL_HEADERS(kernelincludedir)
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
deleted file mode 100644
index a28993986012..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.29_p214
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d2f838084faad2cc822b72d7e28bec4 util-vserver-0.29.214.tar.bz2 504660
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.196 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.196
new file mode 100644
index 000000000000..c97631be2d85
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.196
@@ -0,0 +1 @@
+MD5 84e966a7e657ea1bb7bc35a8d369882b util-vserver-0.30.196.tar.bz2 497922
diff --git a/sys-cluster/util-vserver/files/vprocunhide b/sys-cluster/util-vserver/files/vprocunhide
deleted file mode 100644
index e337317e5223..000000000000
--- a/sys-cluster/util-vserver/files/vprocunhide
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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
deleted file mode 100644
index 90f847bbdef5..000000000000
--- a/sys-cluster/util-vserver/files/vserver-build-029p214.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 5e9f67a71ded..000000000000
--- a/sys-cluster/util-vserver/files/vservers-conf.d
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
deleted file mode 100644
index 48d660b1dcb7..000000000000
--- a/sys-cluster/util-vserver/files/vservers-init
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/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/metadata.xml b/sys-cluster/util-vserver/metadata.xml
new file mode 100644
index 000000000000..0fb4a0cdedca
--- /dev/null
+++ b/sys-cluster/util-vserver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>hollow@gentoo.org</email>
+  <name>Benedikt Boehm</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-cluster/util-vserver/util-vserver-0.29_p214.ebuild b/sys-cluster/util-vserver/util-vserver-0.29_p214.ebuild
deleted file mode 100644
index c811a187d4b4..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.29_p214.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.2 2004/08/26 17:30:15 mr_bones_ 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
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.196.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.196.ebuild
new file mode 100644
index 000000000000..21623e8b98a9
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.196.ebuild
@@ -0,0 +1,54 @@
+# 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.196.ebuild,v 1.1 2005/01/23 08:49:41 hollow Exp $
+
+inherit eutils
+
+DESCRIPTION="vserver admin utilities (alpha version)"
+SRC_URI="http://www-user.tu-chemnitz.de/~ensc/util-vserver/alpha/${P}.tar.bz2"
+HOMEPAGE="http://www-user.tu-chemnitz.de/~ensc/util-vserver/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE=""
+DEPEND=">=dev-libs/dietlibc-0.24"
+
+src_compile() {
+	local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
+
+	econf ${myconf} || die "econf failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+
+	# keep state dir
+	keepdir /var/run/vservers
+
+	# keep & secure /vservers
+	keepdir /vservers
+	fperms 000 /vservers
+
+	# remove the non-gentoo init-scripts:
+	rm -f ${D}/etc/init.d/*
+
+	# and install gentoo'ized ones:
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/${PV}/vservers.initd vservers
+
+	# install conf.d files
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PV}/vservers.confd vservers
+
+	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To make use of the tools in this package"
+	einfo "you need to run a vserver-enabled kernel"
+	einfo
+}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.ebuild
index 27561d550e94..011173347f0c 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.1 2004/07/09 20:27:31 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.ebuild,v 1.2 2005/01/23 08:49:41 hollow Exp $
 
 inherit eutils