Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 134 insertions, 2 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index ea8c76bad0d9..fd03584c86c6 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.70 2010/07/02 15:11:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.71 2010/07/30 10:29:50 pva Exp $
+
+*vzctl-3.0.24.1 (30 Jul 2010)
+
+  30 Jul 2010; Peter Volkov <pva@gentoo.org> +vzctl-3.0.24.1.ebuild,
+  +files/vzctl-3.0.24.1-vzpostup.patch:
+  Version bump.
 
   02 Jul 2010; Peter Volkov <pva@gentoo.org> vzctl-3.0.24.ebuild:
   Fix QA warning: econf should be in src_configure.
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 2ab707175548..7db924aac1dc 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -10,10 +10,13 @@ AUX vzctl-3.0.23-ppp-feature.patch 1648 RMD160 371662db2df2f9308a10a07469b00fc8a
 AUX vzctl-3.0.23-ve-unlimited.conf-sample.patch 6820 RMD160 22f36eb040cc0d7c4e5234202d5f6ac8e30dadfb SHA1 bec42c124cb4770aa68c798f8f1e1c9ce5adc40a SHA256 33727682809532feb195249f655759468da05ef879d854c841de98e5cfa3b192
 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
+AUX vzctl-3.0.24.1-vzpostup.patch 848 RMD160 bd62efb3f9c6273aa4de56f2829ccb7fb80225fe SHA1 9c8982d9ef4d19b5731842b71df888d4c9e159c0 SHA256 1572c444a1a13cb7a63915ecd0d46e37d8fceff30e4be7582a47aa505de61f51
 DIST vzctl-3.0.23.tar.bz2 361403 RMD160 6436843d4d7de8c98de3ec57c8003e3b625529ef SHA1 b94545dd5608bb48389abcb93e3fc8c91141461a SHA256 3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
+DIST vzctl-3.0.24.1.tar.bz2 399161 RMD160 6cbe312018e40f067ba4f5d492b41b98106689fb SHA1 43e6da25473b51ee4ca1971d9347d66a7feb1ec2 SHA256 f0ff98e7ed4871d9435bbabfd2c8c6e23710fab43ec1827f246fd80d586e6fab
 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-3.0.24.1.ebuild 2832 RMD160 796138f4e0971c98c4ca1d7df0d0052e0dbb71b9 SHA1 b46bf5e62fc00ee1062c1b0c8ab97db2e4b4e091 SHA256 8a7954878c49bca6ae477de4bef662ea58aa3d5437767ad37f9a204cf955f037
 EBUILD vzctl-3.0.24.ebuild 2788 RMD160 fb18540313e60d9c354df9d25fdc7dd7b83fe9ab SHA1 33ee149dad35e186ea5c3c3ff6cb3d6b91106cd2 SHA256 1e4328a3712d718323031921c7dd24f19bad290fa0152ec0921025a86d6d79ce
 EBUILD vzctl-9999.ebuild 2750 RMD160 b24a40302cbfb30f696e91b0bd91b2702db8e274 SHA1 b73e15b8614b793b4965deb96e5946f7f93910f3 SHA256 4900e93be1351e331dd44ab43a823d379a3cfa2689fe3ff44baead208765b11e
-MISC ChangeLog 14648 RMD160 fc29a22bd173d06a04acd02cd979cce89f09dab2 SHA1 588c6237e8d9f8d30fe917ffd5db5e7be457fc5c SHA256 f093194743f7a50892b8a3be498742c4e0053dd266b143bf3dd98acd406cc506
+MISC ChangeLog 14805 RMD160 fe455fd8f47d0917548e457d3df650083efe55d6 SHA1 0295b31efdf08637b9d4ec0fd43d599c9851f0c5 SHA256 35ae826bbcb9c859ef2a29f986bb94f71d16f408465e399f52cb9d6b9770b554
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.24.1-vzpostup.patch b/sys-cluster/vzctl/files/vzctl-3.0.24.1-vzpostup.patch
new file mode 100644
index 000000000000..1a98fe52243e
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.24.1-vzpostup.patch
@@ -0,0 +1,30 @@
+From 05b5befcbac2d907e6a7b317895bfbbeef74443d Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@gentoo.org>
+Date: Thu, 22 Jul 2010 18:30:38 +0400
+Subject: [PATCH] vzifup-post: fix device for proxy arp
+
+We need to del/add routing to detect correct device for proxy arp in
+NEIGHBOUR_DEVS=detect mode.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1587
+---
+ bin/vzifup-post.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/bin/vzifup-post.in b/bin/vzifup-post.in
+index bba7d11..2979907 100755
+--- a/bin/vzifup-post.in
++++ b/bin/vzifup-post.in
+@@ -24,7 +24,9 @@ update_arp()
+ {
+ 	local veip
+ 	for veip in $(awk '!/^Version/ { print $1 }' /proc/vz/veip); do
++		[ "$NEIGHBOUR_DEVS" != 'detect' ] && vzdelrouting "${veip}"
+ 		vzarp add ${veip}
++		[ "$NEIGHBOUR_DEVS" != 'detect' ] && vzaddrouting "${veip}"
+ 	done
+ }
+ 
+-- 
+1.7.1
+
diff --git a/sys-cluster/vzctl/vzctl-3.0.24.1.ebuild b/sys-cluster/vzctl/vzctl-3.0.24.1.ebuild
new file mode 100644
index 000000000000..d5aee6cb2fb0
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.24.1.ebuild
@@ -0,0 +1,93 @@
+# 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.1.ebuild,v 1.1 2010/07/30 10:29:50 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
+	epatch "${FILESDIR}/${P}-vzpostup.patch"
+}
+
+src_configure() {
+	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.'
+}