amd64/x86 stable, bug #199738. Removed old.

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

6 files changed, 10 insertions, 224 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index b80ade17adae..07a13d274c79 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.76 2011/05/16 07:19:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.77 2011/05/16 07:25:18 pva Exp $
+
+  16 May 2011; Peter Volkov <pva@gentoo.org>
+  -files/vzctl-3.0.24.1-vzpostup.patch, -vzctl-3.0.24.2.ebuild,
+  -vzctl-3.0.26.2.ebuild, vzctl-3.0.26.2-r1.ebuild:
+  amd64/x86 stable, bug #199738. Removed old.
 
 *vzctl-3.0.26.3 (16 May 2011)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 7f5cc810e223..4e80b941b5f5 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -12,17 +12,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 846 RMD160 f7f844c2f4325f81e7de46f76c6ec5739ba885ff SHA1 dcd541bd9d021b02067f993001614d7d1182042b SHA256 718a00b7a02246e343f1726f8a12ad725f569ee1a9dbcd36f7d3be539a59a5c9
 AUX vzctl-3.0.26.2-vzeventd.patch 2315 RMD160 ebc24de1454ccdb6375be8562dbde0c0e233ecd0 SHA1 1b52d832b09dfc55e63e9c87324734311f6f27a6 SHA256 1f767c686841f24432ac4e75a9743b41362e096fbb01d99263e82853636c8c9e
 DIST vzctl-3.0.23.tar.bz2 361403 RMD160 6436843d4d7de8c98de3ec57c8003e3b625529ef SHA1 b94545dd5608bb48389abcb93e3fc8c91141461a SHA256 3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
-DIST vzctl-3.0.24.2.tar.bz2 399241 RMD160 93af0cbbcdf2789f505feab21ba0c48977cbcddc SHA1 bb222e985dbe09d28c8387a861636297d6c3eb93 SHA256 378839a4d5eda102df84ddd7daa170c9b28d7df355ed57b04c5a7e19b8203ae3
 DIST vzctl-3.0.26.2.tar.bz2 405656 RMD160 e67c18ccf54b92a12cd7d3470a2fc302869c9d98 SHA1 cbdb995999f96bf2192e820dccad222a0548ee0e SHA256 6533c15c967a294bf7566a2d0c8b486519f11af22d669df518f451510256887f
 DIST vzctl-3.0.26.3.tar.bz2 406377 RMD160 e36f924e8d46f7822125e7737551da46111e1295 SHA1 f95f0aee8592161fc3a4179aac11d694fecd57ee SHA256 2317cde3d5d8604739f78a3ac3b753d1c11f4dcff28390b54eb888bf425b451b
 EBUILD vzctl-3.0.23-r2.ebuild 2999 RMD160 1b0a21d0bf1b815a467c5d82535d9229860614b7 SHA1 56d478571bdbde2214b80ae255c89df93ad67a43 SHA256 35b495874f09fe1757d3cc24879cb936008d7ef8e5398396c90a6db3db70e23b
-EBUILD vzctl-3.0.24.2.ebuild 2960 RMD160 563e12f3c9f25c5c25e2e4c13519ac2d17990bf1 SHA1 4dc81e76e58c5f61769cb8374c5a7f133bc5bc3d SHA256 1e2091770232b1450398aab3592b3b9585b9a0d259c8dda3a996651d700b4abe
-EBUILD vzctl-3.0.26.2-r1.ebuild 2364 RMD160 337a893972eefd3764081ab277f83c620e611ffc SHA1 68353d74226ad3da50acf332985e8d5c14f2be92 SHA256 1271a1e069d0b78e6b212cc4d64df91edec6219da1af7c218af9f9e3f16995c9
-EBUILD vzctl-3.0.26.2.ebuild 2739 RMD160 f2a1b2484b2f2faff0b125bf7c18ecc0c8cb879f SHA1 b2071ef31313f9ecaa146b18443fbf524a01741f SHA256 11ed10eff020c9d6a791b183111b2d2eea0f36a0565d3fc32c8ff91c1e09f75e
+EBUILD vzctl-3.0.26.2-r1.ebuild 2362 RMD160 d5e81238399feb92bfde03980514adcab332b3ea SHA1 5ed058d01b16a24ce8dff3f4240a9bf0d1128636 SHA256 57e87865e0dbad8fd7dfe0b68eb77693327478f6665a1036b627575f81383e11
 EBUILD vzctl-3.0.26.3.ebuild 2303 RMD160 e9cf2682fc7daefc0f0855206b77c50b0d2c31d9 SHA1 105900feac648483d667a3031caadf103f2afb0f SHA256 7bcca46d92a48e7952c2ec2774c2dd60cc1f3935e8f8d6053bc3ecd4728b77d4
 EBUILD vzctl-9999.ebuild 2269 RMD160 77f7f409885c5cf3da2b3d35b369cf82f71568fe SHA1 8e401c8ba815e19431da0ce69896d795315aeee8 SHA256 c33562aab3f83ff7edacbe4c9bb8560f0fdfcb6a41a5261ee52ec505f1314c81
-MISC ChangeLog 16240 RMD160 76ebe869a8778cec3592ea06dd08ae752c165927 SHA1 8ad8ab369782055f5cdc1601330d6def11501913 SHA256 8eebfd1d93f99ea27aeba64e4c6d2b98d67d4f1f87c8368d63f45f4c36df3f38
+MISC ChangeLog 16448 RMD160 bfa64d4494e62eac165443e7e4878eecbb6780bc SHA1 5516817c0820a6d6aef519def9581c6e8c1dd431 SHA256 4b6ba350c9ba674de17bb05f090a773f7d52d06e14351fa04d284b7dc3c2545d
 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
deleted file mode 100644
index 2bda986fd50c..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.24.1-vzpostup.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 26b0fe7c39ac62cff3f5c09b5b76e595ce522e70 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..d74ac9e 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.2.ebuild b/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild
deleted file mode 100644
index fe43efb0106b..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.'
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild
index 723f495000f3..003f1df02fb8 100644
--- a/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild,v 1.1 2011/04/01 11:34:55 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild,v 1.2 2011/05/16 07:25:18 pva Exp $
 
 EAPI="4"
 
@@ -12,7 +12,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-3.0.26.2.ebuild b/sys-cluster/vzctl/vzctl-3.0.26.2.ebuild
deleted file mode 100644
index 662eda570dbd..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.26.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.26.2.ebuild,v 1.1 2011/03/22 16:28:14 pva Exp $
-
-EAPI="4"
-
-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_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
-		--enable-logrotate
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-gentoo
-
-	# install the bash-completion script into the right location
-	rm -rf "${ED}"/etc/bash_completion.d
-	dobashcompletion 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 "${EROOT}/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.'
-}