Version bump. Everything we did is finally upstream! Dropped old warn message from 9999 version.

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

4 files changed, 107 insertions, 17 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 13e8a32bcced..2591da468657 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.68 2009/11/21 12:30:27 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.69 2010/06/29 09:26:42 pva Exp $
+
+*vzctl-3.0.24 (29 Jun 2010)
+
+  29 Jun 2010; Peter Volkov <pva@gentoo.org> +vzctl-3.0.24.ebuild,
+  vzctl-9999.ebuild:
+  Version bump. Everything we did is finally upstream! Dropped old warn
+  message from 9999 version.
 
   21 Nov 2009; Peter Volkov <pva@gentoo.org> -vzctl-3.0.22-r2.ebuild,
   -files/vzctl-3.0.22-adjust-meminfo.patch,
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 3fbd58db9f4d..94cb9179d138 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -11,7 +11,9 @@ AUX vzctl-3.0.23-ve-unlimited.conf-sample.patch 6820 RMD160 22f36eb040cc0d7c4e52
 AUX vzctl-3.0.23-vzarp-on-ifup.patch 3404 RMD160 d08123addc176a5532bfd8b264b4e5470fd49b72 SHA1 39c7254e2e0e0800e3714eaadd9c8cb26e2508c7 SHA256 ddaed5b15ad397f29643fec51b0720b0bf1ca1fcb218613c05c9d115f46b6ce7
 AUX vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch 2773 RMD160 f808e49ad253124bb1edf32ff31773eb2f3026ab SHA1 59845fa8f10fcda7f2a390205858ccb032eaaf6b SHA256 2225bcf154ca629ce9ef5d390eed19b5fbdbee4b902e203cfca9854c951a3035
 DIST vzctl-3.0.23.tar.bz2 361403 RMD160 6436843d4d7de8c98de3ec57c8003e3b625529ef SHA1 b94545dd5608bb48389abcb93e3fc8c91141461a SHA256 3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
+DIST vzctl-3.0.24.tar.bz2 399118 RMD160 5e3c295a37b3a38980b4931ddabbe6624b001346 SHA1 12aee6917bac4466019d000b444c5eef0dd92019 SHA256 6a853339409b8305516850c8d09aa3c4c62c7e5ec841e8dbc91e6d26de1e6d45
 EBUILD vzctl-3.0.23-r2.ebuild 2999 RMD160 1b0a21d0bf1b815a467c5d82535d9229860614b7 SHA1 56d478571bdbde2214b80ae255c89df93ad67a43 SHA256 35b495874f09fe1757d3cc24879cb936008d7ef8e5398396c90a6db3db70e23b
-EBUILD vzctl-9999.ebuild 3137 RMD160 064c0a045357cd10717feebc3cc6e611573b407c SHA1 fcd09e6f67fcc0c03d58ba2ae557d68ddc04af89 SHA256 52a623051cb875c11aa9d81e8dd5bcf584ba50f399af5d79062823763217735c
-MISC ChangeLog 14310 RMD160 16b2b972d8ba5f19efbe78e24a922d50da85ca07 SHA1 d31865b6c6ca15abd3f1d088906187c0258c6b3f SHA256 518d09ca825227564560b3e53a32a4890b1f32d745caee8c2f8146e53716f93e
+EBUILD vzctl-3.0.24.ebuild 2786 RMD160 f9a4116620ce0b61b9ac557ee27ce5af87623dcc SHA1 aa195fa752c7222f9883a8cb920c3486168e7df9 SHA256 19d504831325b712b9200a632e5d85a9a33542c0a1f685d0dec85bf8e0a86481
+EBUILD vzctl-9999.ebuild 2750 RMD160 b24a40302cbfb30f696e91b0bd91b2702db8e274 SHA1 b73e15b8614b793b4965deb96e5946f7f93910f3 SHA256 4900e93be1351e331dd44ab43a823d379a3cfa2689fe3ff44baead208765b11e
+MISC ChangeLog 14529 RMD160 8dec130073dfc90f90ee4e3bcf624a78ca5e53b4 SHA1 7f7f67a95c715db6b35a152f8fa260e7bcc1e2e8 SHA256 b58c0c70cbe50b8fcff9fd33e4c4238e05427bc5bfbf19e6441285d8072bb908
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
diff --git a/sys-cluster/vzctl/vzctl-3.0.24.ebuild b/sys-cluster/vzctl/vzctl-3.0.24.ebuild
new file mode 100644
index 000000000000..15d0ef57037c
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.24.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.24.ebuild,v 1.1 2010/06/29 09:26:42 pva Exp $
+
+EAPI="2"
+
+inherit bash-completion eutils
+
+DESCRIPTION="OpenVZ ConTainers 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"
+
+RDEPEND="
+	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
+}
+
+src_compile() {
+	econf \
+		--localstatedir=/var \
+		--enable-cron \
+		--enable-udev \
+		$(use_enable bash-completion bashcomp) \
+		--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
+	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 CT IP addresses"
+	elog "are not on the same subnet as HN IPs, it may lead to such CTs being"
+	elog "unreachable from the outside world."
+	elog
+	elog "The solution is to set up a device route(s) for the network your CTs 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.'
+}
diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild
index 5e88f77d1a91..9739686ed99d 100644
--- a/sys-cluster/vzctl/vzctl-9999.ebuild
+++ b/sys-cluster/vzctl/vzctl-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.4 2009/11/06 13:12:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.5 2010/06/29 09:26:42 pva Exp $
 
 EAPI="2"
 
@@ -53,17 +53,6 @@ src_install() {
 
 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 "CT 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 CTs, 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