amd64/x86 stable, bug #199738. Removed old. Added git ebuild, thank Andrian Nord for suggestion in bug #259433.

Package-Manager: portage-2.1.7.1/cvs/Linux x86_64

5 files changed, 118 insertions, 86 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 39b9d25973e7..8ecae4f7ef7f 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.63 2009/04/05 19:34:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.64 2009/10/20 16:31:02 pva Exp $
+
+*vzctl-9999 (20 Oct 2009)
+
+  20 Oct 2009; Peter Volkov <pva@gentoo.org> -vzctl-3.0.22-r1.ebuild,
+  vzctl-3.0.23-r2.ebuild, +vzctl-9999.ebuild:
+  amd64/x86 stable, bug #199738. Removed old. Added git ebuild, thank
+  Andrian Nord for suggestion in bug #259433.
 
 *vzctl-3.0.23-r2 (05 Apr 2009)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index bb8209cc82ee..f0ff07d72ea7 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -17,8 +17,8 @@ AUX vzctl-3.0.23-vzarp-on-ifup.patch 3404 RMD160 d08123addc176a5532bfd8b264b4e54
 AUX vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch 2773 RMD160 f808e49ad253124bb1edf32ff31773eb2f3026ab SHA1 59845fa8f10fcda7f2a390205858ccb032eaaf6b SHA256 2225bcf154ca629ce9ef5d390eed19b5fbdbee4b902e203cfca9854c951a3035
 DIST vzctl-3.0.22.tar.bz2 360012 RMD160 53353981fefea94d997b3555600583f4c5818833 SHA1 58e5c55855aebf9e4ca032b325d8960a3836d648 SHA256 20f75e8342b85909d6bf01d0db47acaa088125da7f203b5e6e6169aa4c139166
 DIST vzctl-3.0.23.tar.bz2 361403 RMD160 6436843d4d7de8c98de3ec57c8003e3b625529ef SHA1 b94545dd5608bb48389abcb93e3fc8c91141461a SHA256 3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
-EBUILD vzctl-3.0.22-r1.ebuild 2585 RMD160 3a26d40c46dc4e7052184eaf9fb7f96bb1cbdf76 SHA1 0e673748b748658799e7e4646c789e73fc44161f SHA256 be918b625ea4a3c411402f596a04939912e82c6de1a173fb9f86180fc08e9b73
 EBUILD vzctl-3.0.22-r2.ebuild 2633 RMD160 416a8558e8c3b288b881471afc0993d100f3dcd7 SHA1 c42b7522a90ec4ef62c25e46c5b1714cd5f1c9c9 SHA256 90515e307ea9a494a6e3b726967117f14b5013ab9e8282925948ff7857c35281
-EBUILD vzctl-3.0.23-r2.ebuild 3007 RMD160 24c1404bd8b11a0e2ae96ad09052c210c363a14a SHA1 8ca3b4064538c68a8213fb773521f4f47bc0ce31 SHA256 ba56d34391af5338e74167c3769c85380448b49bdcd9ac3e9531452642e18384
-MISC ChangeLog 13366 RMD160 8c034ce4fb56b2c129f033cb0777a4f81224337a SHA1 d9999a36f915769d7c85467b595770f5c98a440f SHA256 2268eb5106967f80c2731be48cd7e6fbff00df12e0df1b74bfe4f12dd9516b79
+EBUILD vzctl-3.0.23-r2.ebuild 2999 RMD160 1b0a21d0bf1b815a467c5d82535d9229860614b7 SHA1 56d478571bdbde2214b80ae255c89df93ad67a43 SHA256 35b495874f09fe1757d3cc24879cb936008d7ef8e5398396c90a6db3db70e23b
+EBUILD vzctl-9999.ebuild 3193 RMD160 52f536da1809ac7812a46055cfd8b40034d79b93 SHA1 d6db6b1072bca2b4fc5827c0a4ee52eb3eaea570 SHA256 3ba045871d85f70657a2487aa7018a1f3ecb470f11c2c4dc4d17b79892f8492e
+MISC ChangeLog 13626 RMD160 b5546b697a71739b5ac9c6e127151c01e601294b SHA1 3e2735f28d9f1f9d12efbc59d40a885afa07140f SHA256 0af2078c29af40a54fc79420bad9d742b03903b3753872ca9879eb9119160e15
 MISC metadata.xml 332 RMD160 b40e74088fb74ddb66a5eda7f46bf63742e2258a SHA1 719e3d0e91af2df78aa7478990ef65c307fb0c31 SHA256 30e1f46e13b10bc59d15c29e986bf8d8aab98ce8338c33d6f37650f399ebb4b2
diff --git a/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild
deleted file mode 100644
index cbdc16a897b8..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22-r1.ebuild,v 1.2 2008/10/13 09:35:18 pva Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="OpenVZ VE control utility"
-HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
-IUSE="bash-completion logrotate"
-
-RDEPEND="logrotate? ( app-admin/logrotate )
-	net-firewall/iptables
-	sys-apps/ed
-	sys-apps/iproute2
-	sys-fs/vzquota
-	virtual/cron"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-capability-fix.patch
-	epatch "${FILESDIR}"/${P}-glibc28.patch
-	epatch "${FILESDIR}"/${P}-document-disable-modules.patch
-	epatch "${FILESDIR}"/${P}-workaround-gentoo-add_ip.patch
-}
-
-src_compile() {
-	econf --localstatedir=/var \
-		--enable-cron \
-		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
-		$(use_enable logrotate) || die "econf failed!"
-
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-gentoo || die "make install failed"
-
-	# install the bash-completion script into the right location
-	rm -rf "${D}"/etc/bash_completion.d
-	dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
-
-	# We need to keep some dirs
-	keepdir /vz/{dump,lock,root,private,template/cache}
-	keepdir /etc/vz/names /var/lib/vzctl/veip
-}
-
-pkg_postinst() {
-	bash-completion_pkg_postinst
-	ewarn
-	if has_version "<sys-cluster/vzctl-3.0.10"; then
-		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
-	ewarn "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the"
-	ewarn "interfaces to send ARP requests to has been improved (see description"
-	ewarn "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case VE IP addresses"
-	ewarn "are not on the same subnet as HN IPs, it may lead to such VEs being"
-	ewarn "unreachable from the outside world."
-	ewarn
-	ewarn "The solution is to set up a device route(s) for the network your VEs are"
-	ewarn "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1"
-	ewarn
-	ewarn "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any"
-	ewarn 'value other than "detect" in /etc/vz/vz.conf.'
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild b/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild
index a0c87f5cedee..c2e093c266b4 100644
--- a/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild,v 1.2 2009/04/05 21:28:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild,v 1.3 2009/10/20 16:31:02 pva Exp $
 
 inherit bash-completion eutils autotools
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
 IUSE="bash-completion"
 
 RDEPEND="
diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild
new file mode 100644
index 000000000000..d763dca07da3
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-9999.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.1 2009/10/20 16:31:02 pva Exp $
+
+EAPI="2"
+inherit bash-completion eutils autotools
+
+DESCRIPTION="OpenVZ VE control utility"
+HOMEPAGE="http://openvz.org/"
+
+EGIT_REPO_URI="git://git.openvz.org/pub/vzctl"
+inherit git
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="bash-completion logrotate"
+
+RDEPEND="logrotate? ( app-admin/logrotate )
+	net-firewall/iptables
+	sys-apps/ed
+	sys-apps/iproute2
+	sys-fs/vzquota
+	virtual/cron"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Set default OSTEMPLATE on gentoo
+	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--enable-cron \
+		--enable-udev \
+		$(use_enable bash-completion bashcomp) \
+		$(use_enable logrotate)
+}
+
+src_install() {
+	make DESTDIR="${D}" install install-gentoo || die "make install failed"
+
+	# install the bash-completion script into the right location
+	rm -rf "${D}"/etc/bash_completion.d
+	dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
+
+	# We need to keep some dirs
+	keepdir /vz/{dump,lock,root,private,template/cache}
+	keepdir /etc/vz/names /var/lib/vzctl/veip
+}
+
+pkg_postinst() {
+	bash-completion_pkg_postinst
+	ewarn
+	if has_version "<sys-cluster/vzctl-3.0.10"; then
+		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
+
+	local conf_without_OSTEMPLATE
+	for file in \
+		$(find "${ROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
+		if ! grep '^OSTEMPLATE' $file > /dev/null; then
+			conf_without_OSTEMPLATE+=" $file"
+		fi
+	done
+
+	if [[ -n ${conf_without_OSTEMPLATE} ]]; then
+		ewarn
+		ewarn "OSTEMPLATE default was changed from redhat-like to gentoo."
+		ewarn "This means that any VEID.conf files without explicit or correct"
+		ewarn "OSTEMPLATE set will use gentoo scripts instead of redhat."
+		ewarn "Please check the following configs:"
+		for file in ${conf_without_OSTEMPLATE}; do
+			ewarn "${file}"
+		done
+		ewarn
+	fi
+
+	ewarn "To avoid loosing network to CTs on iface down/up, please, add the"
+	ewarn "following code to /etc/conf.d/net:"
+	ewarn " postup() {"
+	ewarn "     /usr/sbin/vzifup-post \${IFACE}"
+	ewarn " }"
+
+	elog "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the"
+	elog "interfaces to send ARP requests to has been improved (see description"
+	elog "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case VE IP addresses"
+	elog "are not on the same subnet as HN IPs, it may lead to such VEs being"
+	elog "unreachable from the outside world."
+	elog
+	elog "The solution is to set up a device route(s) for the network your VEs are"
+	elog "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1"
+	elog
+	elog "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any"
+	elog 'value other than "detect" in /etc/vz/vz.conf.'
+}