8 files changed, 9 insertions, 239 deletions
diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 2b466e43012e..13e8a32bcced 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,14 @@
 # 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.67 2009/11/06 13:12:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.68 2009/11/21 12:30:27 pva Exp $
+
+  21 Nov 2009; Peter Volkov <pva@gentoo.org> -vzctl-3.0.22-r2.ebuild,
+  -files/vzctl-3.0.22-adjust-meminfo.patch,
+  -files/vzctl-3.0.22-capability-fix.patch,
+  -files/vzctl-3.0.22-document-disable-modules.patch,
+  -files/vzctl-3.0.22-glibc28.patch,
+  -files/vzctl-3.0.22-workaround-gentoo-add_ip.patch, metadata.xml:
+  Drop old.
 
   06 Nov 2009; Peter Volkov <pva@gentoo.org> vzctl-9999.ebuild:
   Rename VE -> CT (like upstream already did).
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.22-adjust-meminfo.patch b/sys-cluster/vzctl/files/vzctl-3.0.22-adjust-meminfo.patch
deleted file mode 100644
index f26a789b6fd9..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.22-adjust-meminfo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Igor Sukhih <igor@openvz.org>
-Date: Thu, 30 Oct 2008 13:00:46 +0000 (+0300)
-Subject: vzctl: adjust /proc/meminfo when privvmpages or --meminfo changes
-X-Git-Tag: vzctl-3.0.23~1
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=17705858ad37d34c2caa3f89d3af5bf2ad34073a;hp=372cd4f09f58a62a3dc05152ae288ad2b083a5b2
-
-vzctl: adjust /proc/meminfo when privvmpages or --meminfo changes
-
-Fixes http://bugzilla.openvz.org/623
----
-
-diff --git a/src/lib/meminfo.c b/src/lib/meminfo.c
-index 6c686ad..c4102c0 100644
---- a/src/lib/meminfo.c
-+++ b/src/lib/meminfo.c
-@@ -51,13 +51,20 @@ int vps_meminfo_set(vps_handler *h, envid_t veid, meminfo_param *gparam,
- 		/* update meminfo on --privvmpages, --meminfo */
- 		if (param->mode < 0 && privvmpages == NULL)
- 			return 0;
--		if (gparam->mode < 0 && vps_p->g_param != NULL) {
--			param = &vps_p->g_param->res.meminfo;
--			if (param->mode != VE_MEMINFO_PRIVVMPAGES)
--				return 0;
-+		if (vps_p->g_param != NULL) {
-+			if (privvmpages == NULL)
-+				/* use privvmpages from VE.conf on --meminfo */
-+				privvmpages = vps_p->g_param->res.ub.privvmpages;
-+
-+			if (param->mode < 0) {
-+				/* use meminfo from VE.conf on --privvmpages */
-+				param = &vps_p->g_param->res.meminfo;
-+				if (param->mode < 0)
-+					param = &default_param;
-+				if (param->mode != VE_MEMINFO_PRIVVMPAGES)
-+					return 0;
-+			}
- 		}
--		if (privvmpages == NULL && vps_p->g_param != NULL)
--			privvmpages = vps_p->g_param->res.ub.privvmpages;
- 	}
- 	if (param->mode < 0)
- 		param = &default_param;
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.22-capability-fix.patch b/sys-cluster/vzctl/files/vzctl-3.0.22-capability-fix.patch
deleted file mode 100644
index b653387a9416..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.22-capability-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Sat, 7 Jun 2008 14:16:46 +0000 (+0400)
-Subject: Fix inability to start a container
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=0d6bfad92c7cb6a193801ce8dac3a0dc64396ca8;hp=3223b438683eba695ecaff2be65d08cb231bb471
-
-Fix inability to start a container
-
-Container start could fail with the following message:
-
-	Unable to set capability: Invalid argument
-
-It is caused by changed value of LINUX_CAPABILITY_VERSION
-(defined in /usr/include/linux/capability.h).
-
-The fix is to get this version from kernel (as libcap-2.0.0 does).
-
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
-
-diff --git a/src/lib/cap.c b/src/lib/cap.c
-index 428bd43..67d95e3 100644
---- a/src/lib/cap.c
-+++ b/src/lib/cap.c
-@@ -165,6 +165,7 @@ static int set_cap(envid_t veid, cap_t mask, int pid)
- 
- 	memset(&header, 0, sizeof(header));
- 	header.version = _LINUX_CAPABILITY_VERSION;
-+	capget(&header, NULL); /* Get linux capability version from kernel */
- 	header.pid = pid;
- 
- 	memset(&data, 0, sizeof(data));
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.22-document-disable-modules.patch b/sys-cluster/vzctl/files/vzctl-3.0.22-document-disable-modules.patch
deleted file mode 100644
index 2a766753b895..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.22-document-disable-modules.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Mon, 9 Jun 2008 10:38:13 +0000 (+0400)
-Subject: etc/vz/vz.conf: document MODULES_DISABLED
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=626325d26903279dbe64a966eed5199be4316aa0;hp=d5fba5eee206a84557c0654a7998edf133039e36
-
-etc/vz/vz.conf: document MODULES_DISABLED
-
-Original report and patch by Peter <pva@gentoo.org>
-
-Fixes http://bugzilla.openvz.org/888
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
-
----
-
---- etc/vz.conf	2008-07-14 06:02:01 +0000
-+++ etc/vz.conf	2008-07-14 06:02:14 +0000
-@@ -14,6 +14,9 @@
- DISK_QUOTA=yes
- VZFASTBOOT=no
- 
-+# Disable module loading. If set, vz initscript do not load any modules.
-+#MODULES_DISABLED=yes
-+
- # The name of the device whose ip address will be used as source ip for VE.
- # By default automatically assigned.
- #VE_ROUTE_SRC_DEV="eth0"
-
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.22-glibc28.patch b/sys-cluster/vzctl/files/vzctl-3.0.22-glibc28.patch
deleted file mode 100644
index ca66ce43000a..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.22-glibc28.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nru vzctl-3.0.22.orig/src/lib/config.c vzctl-3.0.22/src/lib/config.c
---- vzctl-3.0.22.orig/src/lib/config.c	2008-06-18 20:12:15.000000000 -0400
-+++ vzctl-3.0.22/src/lib/config.c	2008-06-18 20:12:58.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <linux/vzcalluser.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <limits.h>
- 
- #include "logger.h"
- #include "list.h"
-diff -Nru vzctl-3.0.22.orig/src/lib/util.c vzctl-3.0.22/src/lib/util.c
---- vzctl-3.0.22.orig/src/lib/util.c	2008-06-18 20:12:15.000000000 -0400
-+++ vzctl-3.0.22/src/lib/util.c	2008-06-18 20:14:08.000000000 -0400
-@@ -28,7 +28,7 @@
- #include <fcntl.h>
- #include <arpa/inet.h>
- #include <stdarg.h>
--#include <linux/limits.h>
-+#include <limits.h>
- #include <dirent.h>
- 
- #include "util.h"
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.22-workaround-gentoo-add_ip.patch b/sys-cluster/vzctl/files/vzctl-3.0.22-workaround-gentoo-add_ip.patch
deleted file mode 100644
index 7184feefbd0b..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.22-workaround-gentoo-add_ip.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Daniel Robbins <drobbins@funtoo.org>
-Date: Thu, 13 Mar 2008 07:17:31 +0000 (+0300)
-Subject: gentoo-add_ip.sh: fix the case then config_venet0 is commented out
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=fa72a4fdc14db95b24cfb757f6506e89ad2268df
-
-gentoo-add_ip.sh: fix the case then config_venet0 is commented out
-
-I had some config entries commented out in /etc/conf.d/net which
-caused the add ip script (/etc/vz/dists/scripts/gentoo-add_ip.sh) to
-fail. I fixed this by adding a "^" to the beginning of the grep -qw
-command, as below....
-
-There are still other potential problems with parsing the scripts in
-the way you do, but this at least will deal with the situation where
-someone has commented-out config_venet0 lines in their
-/etc/conf.d/net.
----
-
-diff --git a/etc/dists/scripts/gentoo-add_ip.sh b/etc/dists/scripts/gentoo-add_ip.sh
-index f660da3..b5dfd27 100755
---- a/etc/dists/scripts/gentoo-add_ip.sh
-+++ b/etc/dists/scripts/gentoo-add_ip.sh
-@@ -71,7 +71,7 @@ function add_ip()
- 	fi
- 
- 	for ip in ${IP_ADDR}; do
--		grep -qw "config_${VENET_DEV}=\(.*\"${ip}[\"\/].*\)" ${IFCFG} ||
-+		grep -qw "^config_${VENET_DEV}=\(.*\"${ip}[\"\/].*\)" ${IFCFG} ||
- 			add_param3 "${IFCFG}" "config_${VENET_DEV}" "${ip}/32"
- 	done
- 
diff --git a/sys-cluster/vzctl/metadata.xml b/sys-cluster/vzctl/metadata.xml
index f41ac6361986..1301c983d813 100644
--- a/sys-cluster/vzctl/metadata.xml
+++ b/sys-cluster/vzctl/metadata.xml
@@ -6,7 +6,4 @@
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
 	</maintainer>
-	<use>
-		<flag name='logrotate'>Enable logrotate file installation</flag>
-	</use>
 </pkgmetadata>
diff --git a/sys-cluster/vzctl/vzctl-3.0.22-r2.ebuild b/sys-cluster/vzctl/vzctl-3.0.22-r2.ebuild
deleted file mode 100644
index b40a01a78b5a..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.22-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.22-r2.ebuild,v 1.2 2009/03/31 09:16:33 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"
-	epatch "${FILESDIR}/${P}-adjust-meminfo.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.'
-}