fix typo in gentoo/initpost

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 157 insertions, 2 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 270cd7967220..db7a2c5bdbef 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.94 2008/11/17 22:51:53 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.95 2009/03/04 21:20:24 hollow Exp $
+
+*util-vserver-0.30.215-r2 (04 Mar 2009)
+
+  04 Mar 2009; Benedikt Böhm <hollow@gentoo.org>
+  +files/util-vserver-0.30.215-typo.patch, +util-vserver-0.30.215-r2.ebuild:
+  fix typo in gentoo/initpost
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/util-vserver-0.30.215-capget.patch:
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch
new file mode 100644
index 000000000000..16078f31f9a2
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch
@@ -0,0 +1,13 @@
+Index: trunk/distrib/gentoo/initpost
+===================================================================
+--- trunk/distrib/gentoo/initpost (revision 2712)
++++ trunk/distrib/gentoo/initpost (revision 2715)
+@@ -66,6 +66,6 @@
+ 	# force /lib/rc/sh even if we don't have it in older stages
+ 	$_CHROOT_SH mkdir /lib 2>/dev/null || :
+-	$_CHROOT_SH mkdir /lib/rc 2/dev/null || :
+-	$_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
++	$_CHROOT_SH mkdir /lib/rc 2>/dev/null || :
++	$_CHROOT_SH mkdir /lib/rc/sh 2>/dev/null || :
+ 
+ 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215-r2.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215-r2.ebuild
new file mode 100644
index 000000000000..ecdcf3a83029
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.215-r2.ebuild
@@ -0,0 +1,136 @@
+# 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.215-r2.ebuild,v 1.1 2009/03/04 21:20:24 hollow Exp $
+
+inherit eutils bash-completion
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openrc.patch
+	epatch "${FILESDIR}"/${P}-capget.patch
+	epatch "${FILESDIR}"/${P}-typo.patch
+}
+
+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
+}