fix VPSCONFDIR in init script; let user configure UBC for VE0; add udev rules for /dev/vzctl; fix check for /dev/vzctl

(Portage version: 2.1.1_pre4-r3)

3 files changed, 88 insertions, 1 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 910a8c984cd8..730878a1e02d 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.31 2006/08/27 10:25:21 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.32 2006/09/06 14:40:54 hollow Exp $
+
+*vzctl-3.0.11-r1 (06 Sep 2006)
+
+  06 Sep 2006; Benedikt Böhm <hollow@gentoo.org>
+  -files/vzctl-3.0.10-Makefile.patch, -files/vzctl-3.0.10-as-needed.patch,
+  -vzctl-3.0.10-r2.ebuild, +vzctl-3.0.11-r1.ebuild:
+  fix VPSCONFDIR in init script; let user configure UBC for VE0; add udev
+  rules for /dev/vzctl; fix check for /dev/vzctl
 
 *vzctl-3.0.11 (27 Aug 2006)
 
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.11-r1 b/sys-cluster/vzctl/files/digest-vzctl-3.0.11-r1
new file mode 100644
index 000000000000..2ec4a2c6848b
--- /dev/null
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.11-r1
@@ -0,0 +1,6 @@
+MD5 d8b637e3ff9e7831f013bc2472f59227 vzctl-3.0.11-patches-r1.tar.bz2 10808
+RMD160 b1da2a6bafcc0b6bb1261a13d52b1ea8298a6d5e vzctl-3.0.11-patches-r1.tar.bz2 10808
+SHA256 c514ac4698dca559de34c24421790f14b46acfbcc69fc2c208004f989e6efc39 vzctl-3.0.11-patches-r1.tar.bz2 10808
+MD5 a2f7500961047b971dc7cde761e5ed3f vzctl-3.0.11.tar.bz2 125685
+RMD160 af04926dc3971d4078e83333d015a9db49e63ff7 vzctl-3.0.11.tar.bz2 125685
+SHA256 03b255ba3cdc700178bb7d20af928ab3896ac799404866187f0293ed87a9aecb vzctl-3.0.11.tar.bz2 125685
diff --git a/sys-cluster/vzctl/vzctl-3.0.11-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.11-r1.ebuild
new file mode 100644
index 000000000000..825eecdb11fa
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.11-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.11-r1.ebuild,v 1.1 2006/09/06 14:40:54 hollow Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="OpenVZ VPS control utility"
+HOMEPAGE="http://openvz.org/"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="udev"
+
+RDEPEND="app-admin/logrotate
+	sys-apps/ed
+	net-firewall/iptables
+	sys-fs/vzquota
+	sys-apps/iproute2
+	udev? ( sys-fs/udev )"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${WORKDIR}"/patches/*.patch
+}
+
+src_compile() {
+	append-flags -Wall -g2
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed"
+
+	# the get_libdir breaks stupid src/Makefile (all contained tools)
+	# so we have to create a env.d entry for vzctl's LDPATH
+	dodir /etc/env.d
+	echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl
+
+	# setup udev rules for /dev/vzctl
+	if use udev; then
+		dodir /etc/udev/rules.d
+		echo 'KERNEL="vzctl", NAME="%k", MODE="0600"' > "${D}"/etc/udev/rules.d/60-vzctl.rules
+	fi
+
+	# Provide a symlink for vz.conf (part 1 of fixing #138462)
+	dosym /etc/vz/vz.conf /etc/conf.d/vz
+
+	# Install gentoo specific init script
+	rm -f "${D}"/etc/init.d/*
+	newinitd "${WORKDIR}"/init.d/vz.initd vz
+
+	dodoc "${WORKDIR}/patches/000_README"
+}
+
+pkg_postinst() {
+	if has_version "<3.0.10"; then
+		ewarn
+		ewarn "The location of some vzctl files have changed. Most notably,"
+		ewarn "VE configuration files and samples directory has changed from"
+		ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
+		ewarn "your VEs, please do the following:"
+		ewarn
+		ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
+		ewarn
+	fi
+}