new snapshot, fixes #279549

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 141 insertions, 2 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index d52fbf222955..22e32dca420e 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.97 2009/06/28 16:24:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.98 2009/09/23 14:33:21 hollow Exp $
+
+*util-vserver-0.30.216_pre2849 (23 Sep 2009)
+
+  23 Sep 2009; Benedikt Böhm <hollow@gentoo.org>
+  +util-vserver-0.30.216_pre2849.ebuild:
+  new snapshot, fixes #279549
 
 *util-vserver-0.30.216_pre2841 (28 Jun 2009)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 89ceef7dff6e..6bb1468c86e8 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -6,8 +6,10 @@ AUX util-vserver-0.30.215-openrc.patch 1138 RMD160 936fe40430a9dcd0f8924d4359524
 AUX util-vserver-0.30.215-typo.patch 564 RMD160 7b0619e24b9e30b4ba4bca2f0476a1f62206a3f4 SHA1 53d8d6e205175736280bafde41274501adbbfd9d SHA256 f0e809a33f32cf49e34f9c8c65803ba6bf96ecd2a233eb48338dbab3923a3c6b
 DIST util-vserver-0.30.215.tar.bz2 695414 RMD160 62d34d2149fc949f27f7e08e8f4077919dfac838 SHA1 798fb71752420d1dd3d4807eeae37d3d8076662a SHA256 40686ac0652b245fcbb34e52ac8d80ae6b4ea3f73150ebc1ce7c69660ccaa35e
 DIST util-vserver-0.30.216-pre2841.tar.bz2 727646 RMD160 946d2202633e7aeafcf367d78d2e1f1512ed2a00 SHA1 cabeef873ddecbe2b48db7396441b96a0b4afb6d SHA256 6f2dd9892b290f15dcada18c21feeda14a578c65e97210e5934f856552c28e1a
+DIST util-vserver-0.30.216-pre2849.tar.bz2 727961 RMD160 a2785c70837539332c11075486e2c7006865999d SHA1 2aeeff4a99a4448bdb3f3fc8899a4406212e6f02 SHA256 522febeef51fcc7c18d32d15224ae3b2e45e8ca6ca8f60c951c351ad6dc645a7
 EBUILD util-vserver-0.30.215-r3.ebuild 4105 RMD160 707db49899e45e53cc997a711fd11c7be70828df SHA1 0e88cbf72f3d1d3e11b3b0f21b244b9479d9e183 SHA256 f0bf8d48a6977f4d65976f7673aa4cafeafecb7352841cd9f039ac915c0e7886
 EBUILD util-vserver-0.30.215.ebuild 3792 RMD160 11914d6a9270117bebdc4923e21d536c0143b66b SHA1 45a56191b6cbca887a403290a3b02d3bcf4bcdaa SHA256 f0197cd48fb18fb97f223e460819c81b9f489d5402821383090f5bdbf54e97f7
 EBUILD util-vserver-0.30.216_pre2841.ebuild 3769 RMD160 c5c4c1c3cd23a137f2ad217fad827f75b096dcae SHA1 974dfa6ab682a2da0581ab06b2ecf477917f34f0 SHA256 591173444fe7d95c204b129c77482191f6cf0b60b4f346eb5f2786f926368c13
-MISC ChangeLog 20197 RMD160 03f31a9c9a0e8d2df96315e0d8bfcd1e1698b116 SHA1 e31da13c712bddf4d03e775283ffec73d0b0eb50 SHA256 06a77a329a0fb6ea78a06187c6d6ca97229854f0e37503c6e3a946838eb125e1
+EBUILD util-vserver-0.30.216_pre2849.ebuild 3769 RMD160 99b2296f1074b959a1a98f4d60949dbb5c3d79c0 SHA1 e9f36be164db63c31c6b6ae6fcb92982e69f5dc3 SHA256 6b75a84f644fad75b9a3f6a144393e5eeb03b6798c923fd1784b7e0b07ca924e
+MISC ChangeLog 20365 RMD160 5269c3369d8372dbca631ee70abe61983f0cb0eb SHA1 66a9f8a39a2af788f0be833106145b86a7227319 SHA256 1b08c9c97375edb5c5c9e321beecaedce65dde203fa24fed40bcdbf62407845d
 MISC metadata.xml 518 RMD160 62a73756fb710a0464dd24600e7ec70c82e13021 SHA1 78ee9f24180c1215ebe02ac3dbba80a7a0c4a82e SHA256 5a4f424248d873af9f0a66aca2e3e60c6165288fa649ef44de4d8418232c5ac0
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2849.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2849.ebuild
new file mode 100644
index 000000000000..58d4d7bb31c9
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2849.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2009 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.216_pre2849.ebuild,v 1.1 2009/09/23 14:33:21 hollow Exp $
+
+inherit eutils bash-completion
+
+MY_P=${P/_/-}
+S="${WORKDIR}"/${MY_P}
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+IUSE=""
+
+CDEPEND="dev-libs/beecrypt
+	net-firewall/iptables
+	net-misc/vconfig
+	sys-apps/iproute2
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
+
+DEPEND=">=dev-libs/dietlibc-0.30-r2
+	${CDEPEND}"
+
+RDEPEND="${CDEPEND}"
+
+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_compile() {
+	econf --with-vrootdir=${VDIRBASE} \
+		--with-initscripts=gentoo \
+		--localstatedir=/var || die "econf failed!"
+	emake || die "emake failed!"
+}
+
+src_install() {
+	make DESTDIR="${D}" install install-distribution \
+		|| die "make 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}"
+	keepdir "${VDIRBASE}"/.pkg
+
+	# remove legacy config file
+	rm -f "${D}"/etc/vservers.conf
+
+	# bash-completion
+	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
+
+	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.30.211"
+	old_init_script_warn=$?
+}
+
+pkg_postinst() {
+	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
+	# present when merging.
+
+	[ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null
+	setattr --barrier "${VDIRBASE}" &> /dev/null
+
+	rm /etc/vservers/.defaults/vdirbase
+	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
+
+	elog
+	elog "You have to run the vprocunhide command after every reboot"
+	elog "in order to setup /proc permissions correctly for vserver"
+	elog "use. An init script has been installed by this package."
+	elog "To use it you should add it to a runlevel:"
+	elog
+	elog " rc-update add vprocunhide default"
+	elog
+
+	if [[ $old_init_script_warn = 0 ]] ; then
+		ewarn "Please make sure, that you remove the old init-script from any"
+		ewarn "runlevel and remove it from your init.d dir!"
+		ewarn
+		ewarn "# rc-update del vservers"
+		ewarn "# rm -f ${ROOT}etc/init.d/vservers"
+		ewarn
+		ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
+		ewarn "have been merged upstream, and may now have a slightly"
+		ewarn "different syntax, i.e. you have to update scripts that"
+		ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
+		ewarn "and vdispatch-conf)"
+		ewarn
+		ewarn "Additionally the init scripts have changed and now use"
+		ewarn "upstream scripts as backend. An init script to start"
+		ewarn "virtual servers in the 'default' group/mark has been"
+		ewarn "installed by this ebuild:"
+		ewarn
+		ewarn "  rc-update add vservers.default default"
+		ewarn
+		ewarn "To start vservers in other groups/marks, you have to"
+		ewarn "symlink the default init script the same way you do"
+		ewarn "with net.* scripts:"
+		ewarn
+		ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
+		ewarn
+	fi
+
+	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
+}