Version bump. Don't use full path in ip location to avoid bugs like #334277 from happening, thank Fabio Erculiani for report. Fixed outdated udev rule, bug 335762, thank Dennis Schridde for report.

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

5 files changed, 164 insertions, 2 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 4a382af56703..6279e7a699e9 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,16 @@
 # 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.72 2010/08/30 11:55:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.73 2010/09/10 07:46:45 pva Exp $
+
+*vzctl-3.0.24.2 (10 Sep 2010)
+
+  10 Sep 2010; Peter Volkov <pva@gentoo.org>
+  +files/0001-Don-t-prepend-full-path-for-ip-command.patch,
+  +vzctl-3.0.24.2.ebuild,
+  +files/0002-Update-udev-rules-to-match-current-specification.patch:
+  Version bump. Don't use full path in ip location to avoid bugs like
+  #334277 from happening, thank Fabio Erculiani for report. Fixed outdated
+  udev rule, bug 335762, thank Dennis Schridde for report.
 
 *vzctl-3.0.24.1-r1 (30 Aug 2010)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 1a27c9e3ed6f..9773f7dfea1e 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,3 +1,5 @@
+AUX 0001-Don-t-prepend-full-path-for-ip-command.patch 804 RMD160 7803452b7be31384c18735e4fb0ffdc5e037fb81 SHA1 85fc4d629585648c2e5aa9453425c1cb3b4151df SHA256 78c7626300031d8bb6ad74b4a1760dc27a050726cdb6f136c3ef02020d02cbdd
+AUX 0002-Update-udev-rules-to-match-current-specification.patch 805 RMD160 830d908c3a49457ce67f2a39fea5caa41d327005 SHA1 0f20242edce4bb0f92ea85dd0abb35a93ae43001 SHA256 079297ef98b632e80664003afed9bcbb3e080a2bf65a155da0e7a86554c2d22c
 AUX vzctl-3.0.23-UBC-parameter-swappages.patch 5482 RMD160 81ec766ef3263caf59e3e1c6048f632498949f5d SHA1 d1b0462ced780602cfcb850993f75a8a724b299d SHA256 c4ce00e8cddc8f3334847a3f8e700ab34a39b5dbfff8613a145de0f68147b2b0
 AUX vzctl-3.0.23-cronjobs-dstdir-check.patch 2119 RMD160 60b3d0b76e6cb393e04a8859eebf05d3da389247 SHA1 9429b33d2e276e0d80a07aa58555788ac7f31af1 SHA256 a896154cbcae99acdcfa5daae9b4a2f8dc5b6cccfd3aa20e9f0d9056cda459f3
 AUX vzctl-3.0.23-cronjobs-issue-warning.patch 1754 RMD160 0edc43b16922c975270c79b955e0c9d4e3aacec8 SHA1 b653c70f67681b6f0349a232b411a144cc214d2a SHA256 22f87a84e1a044766935745ec74967ca0490bc1a64a33fa64f5a3397db063c95
@@ -13,10 +15,12 @@ AUX vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch 2773 RMD160 f808e49ad253124bb1e
 AUX vzctl-3.0.24.1-vzpostup.patch 846 RMD160 f7f844c2f4325f81e7de46f76c6ec5739ba885ff SHA1 dcd541bd9d021b02067f993001614d7d1182042b SHA256 718a00b7a02246e343f1726f8a12ad725f569ee1a9dbcd36f7d3be539a59a5c9
 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.2.tar.bz2 399241 RMD160 93af0cbbcdf2789f505feab21ba0c48977cbcddc SHA1 bb222e985dbe09d28c8387a861636297d6c3eb93 SHA256 378839a4d5eda102df84ddd7daa170c9b28d7df355ed57b04c5a7e19b8203ae3
 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-r1.ebuild 2835 RMD160 7f3b3cac2b1829654be846e0f6d6633e57907d50 SHA1 aca9532c8df58dd559efe744d64f0673ff71c74a SHA256 100c083f517d3d26e274461f5d1cb70022f65ff51d8cb96161e43b169f61270a
+EBUILD vzctl-3.0.24.2.ebuild 2960 RMD160 563e12f3c9f25c5c25e2e4c13519ac2d17990bf1 SHA1 4dc81e76e58c5f61769cb8374c5a7f133bc5bc3d SHA256 1e2091770232b1450398aab3592b3b9585b9a0d259c8dda3a996651d700b4abe
 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 15039 RMD160 7837956c027096e45c0d6c4e3e093e02a2f763bb SHA1 7c01ebfc07e9f7bf7b055e250e321e6cfb12c9bf SHA256 dbe3fe34bdc1aa116101c0b8cf686a2ed6c229834bd35e0bd7536b439a7ab2b3
+MISC ChangeLog 15476 RMD160 0274dc15ed387eda461ba50ef08b08e00e9f9f78 SHA1 0f4ab34593b5d89e075ab4df5264f9518e854729 SHA256 3affc0440bea720235b2b38988852d2061c31addcc51ac98253b9f5cf208e50d
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
diff --git a/sys-cluster/vzctl/files/0001-Don-t-prepend-full-path-for-ip-command.patch b/sys-cluster/vzctl/files/0001-Don-t-prepend-full-path-for-ip-command.patch
new file mode 100644
index 000000000000..62ddac67fbc2
--- /dev/null
+++ b/sys-cluster/vzctl/files/0001-Don-t-prepend-full-path-for-ip-command.patch
@@ -0,0 +1,27 @@
+From 910a076f426d40772fcf6e0560136511f9571b41 Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@gentoo.org>
+Date: Mon, 30 Aug 2010 16:19:17 +0400
+Subject: [PATCH 1/2] Don't prepend full path for ip command
+
+Some distributions have ip in /sbin some in /bin. Actually it's good
+idea to drop path completely and let users to set $PATH correctly.
+---
+ scripts/vps-functions.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/vps-functions.in b/scripts/vps-functions.in
+index 0bcc65b..4a83a23 100755
+--- a/scripts/vps-functions.in
++++ b/scripts/vps-functions.in
+@@ -38,7 +38,7 @@ VE_STATE_DIR="/var/lib/vzctl/veip/"
+ CONF_DIR="@PKGCONFDIR@/conf/"
+ 
+ ARPSEND_CMD="arpsend -c 1 -w 1"
+-IP_CMD=/sbin/ip
++IP_CMD="ip"
+ 
+ # Prints error message and exits
+ # Parameters:
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/vzctl/files/0002-Update-udev-rules-to-match-current-specification.patch b/sys-cluster/vzctl/files/0002-Update-udev-rules-to-match-current-specification.patch
new file mode 100644
index 000000000000..4072a1dd2a51
--- /dev/null
+++ b/sys-cluster/vzctl/files/0002-Update-udev-rules-to-match-current-specification.patch
@@ -0,0 +1,27 @@
+From e90a9bb36dc07246d49d5fe9ee693c7e22289847 Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@gentoo.org>
+Date: Fri, 10 Sep 2010 11:19:32 +0400
+Subject: [PATCH 2/2] Update udev rules to match current specification
+
+Udev-151 issues following warning:
+
+udevd[569]: NAME="%k" is superfluous and breaks kernel supplied names,
+please remove it from /etc/udev/rules.d/60-vzctl.rules:1
+
+This patch fixes it.
+
+Original report: http://bugs.gentoo.org/show_bug.cgi?id=335762
+---
+ etc/udev/60-vzctl.rules |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/etc/udev/60-vzctl.rules b/etc/udev/60-vzctl.rules
+index 95cb609..e44fec5 100644
+--- a/etc/udev/60-vzctl.rules
++++ b/etc/udev/60-vzctl.rules
+@@ -1 +1 @@
+-KERNEL=="vzctl", NAME="%k", MODE="0600"
++KERNEL=="vzctl", MODE="0600"
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild b/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild
new file mode 100644
index 000000000000..fe43efb0106b
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild
@@ -0,0 +1,94 @@
+# 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.2.ebuild,v 1.1 2010/09/10 07:46:45 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}/0001-Don-t-prepend-full-path-for-ip-command.patch" #334277
+	epatch "${FILESDIR}/0002-Update-udev-rules-to-match-current-specification.patch" #335762
+}
+
+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.'
+}