Version bump. Drop old.

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

18 files changed, 106 insertions, 1095 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 07a13d274c79..38e685bceba5 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,25 @@
 # 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.77 2011/05/16 07:25:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.78 2011/05/27 12:48:35 pva Exp $
+
+*vzctl-3.0.27 (27 May 2011)
+
+  27 May 2011; Peter Volkov <pva@gentoo.org>
+  -files/0001-Don-t-prepend-full-path-for-ip-command.patch,
+  -vzctl-3.0.23-r2.ebuild, -files/vzctl-3.0.23-UBC-parameter-swappages.patch,
+  -files/vzctl-3.0.23-cronjobs-dstdir-check.patch,
+  -files/vzctl-3.0.23-cronjobs-issue-warning.patch,
+  -files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch,
+  -files/vzctl-3.0.23-cronjobs-wightspace.patch,
+  -files/vzctl-3.0.23-debian-CT-ipv6-fix.patch,
+  -files/vzctl-3.0.23-forwarding-issue-warning.patch,
+  -files/0002-Update-udev-rules-to-match-current-specification.patch,
+  -files/vzctl-3.0.23-multiple-cron-jobs.patch,
+  -files/vzctl-3.0.23-ppp-feature.patch,
+  -files/vzctl-3.0.23-ve-unlimited.conf-sample.patch,
+  -files/vzctl-3.0.23-vzarp-on-ifup.patch,
+  -files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch, +vzctl-3.0.27.ebuild:
+  Version bump. Drop old.
 
   16 May 2011; Peter Volkov <pva@gentoo.org>
   -files/vzctl-3.0.24.1-vzpostup.patch, -vzctl-3.0.24.2.ebuild,
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 4e80b941b5f5..2155119a6094 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,24 +1,10 @@
-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
-AUX vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch 1427 RMD160 f486917985c78e066b5c5c371059d2d430be742c SHA1 996e86fd1819930ef749010240482dcf83cedf43 SHA256 59d9b1a3b0617194b8cbf90a7545e2a03dbea2368a28e646dc246ff567160c23
-AUX vzctl-3.0.23-cronjobs-wightspace.patch 1774 RMD160 c608bb1916d219c1f0701e70f631db3868eebc97 SHA1 a4048a1b28e8efc822ed2ddc98f692128b7faf7f SHA256 aa1f41aca441570711fe62c4f6a3f7a0517ba69a8c64c653e4e38f36678a15d8
-AUX vzctl-3.0.23-debian-CT-ipv6-fix.patch 891 RMD160 5610360392dec91ce24bd810d70541ae81f21bb1 SHA1 bad520de9e46491c2eebeb765a9719618ee35b12 SHA256 c4cc9a343faccb322e62a0166f6bf01d2073c29c444e236eaf30439f5cd530ab
-AUX vzctl-3.0.23-forwarding-issue-warning.patch 902 RMD160 17fd5c6d70acd9c8899bc0148a66dd5351c6428a SHA1 9b0fd5844f84537c81744d3ddfd85d8336f0a5c5 SHA256 2aaf9294ec640e31b741f9b3886ba1022706abbe5300b238eb0a54440c74b079
-AUX vzctl-3.0.23-multiple-cron-jobs.patch 1337 RMD160 402daa3ba45855763365cb0387c58892c98a4626 SHA1 d9512478786edbd1620322afc235d4d53b005e1f SHA256 b068abb8cc6a77d19d870740f5aea375114ed628422496b504df50a516eb3d0e
-AUX vzctl-3.0.23-ppp-feature.patch 1648 RMD160 371662db2df2f9308a10a07469b00fc8a02f630e SHA1 40e4b653065fd4a904daeef7a746acdef21ad17e SHA256 e21c74505660d0a26b2803ce1bd86ac3c45d60f2d44a46327bf0fd4934699eaf
-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.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.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
+DIST vzctl-3.0.27.tar.bz2 410626 RMD160 83b1b64fb755df58ea944a1d7a1aab4e35abb9ed SHA1 f3c417828fdc5e9f947f97a803520badb6a80c79 SHA256 cd43d048e2669c43a187c696a2efb395e91123186cd21fde7be74b698f7486a2
 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-3.0.27.ebuild 2301 RMD160 a3c8f82f38f075491c229b67f0e6a95bd1ede1e2 SHA1 37dfeb6ca482a9c4e4daef2f10acf5dc24325b59 SHA256 7da395055d37a2b97f0950966ce781f6037b3b79f64439124c5ef0fc58b534ad
 EBUILD vzctl-9999.ebuild 2269 RMD160 77f7f409885c5cf3da2b3d35b369cf82f71568fe SHA1 8e401c8ba815e19431da0ce69896d795315aeee8 SHA256 c33562aab3f83ff7edacbe4c9bb8560f0fdfcb6a41a5261ee52ec505f1314c81
-MISC ChangeLog 16448 RMD160 bfa64d4494e62eac165443e7e4878eecbb6780bc SHA1 5516817c0820a6d6aef519def9581c6e8c1dd431 SHA256 4b6ba350c9ba674de17bb05f090a773f7d52d06e14351fa04d284b7dc3c2545d
+MISC ChangeLog 17331 RMD160 56f28a26531c61921021f3b52b0a4d45a1878ea8 SHA1 32b107df0fbd82911a39eff36f66c20a196b444b SHA256 059bb61e43e33af0fbbe8ebd114a53b37b2ceea9e5b76836e8048068d7b1ed4c
 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
deleted file mode 100644
index 62ddac67fbc2..000000000000
--- a/sys-cluster/vzctl/files/0001-Don-t-prepend-full-path-for-ip-command.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 4072a1dd2a51..000000000000
--- a/sys-cluster/vzctl/files/0002-Update-udev-rules-to-match-current-specification.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/files/vzctl-3.0.23-UBC-parameter-swappages.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-UBC-parameter-swappages.patch
deleted file mode 100644
index 6d89cba37fa3..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-UBC-parameter-swappages.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From: Igor Sukhih <igor@openvz.org>
-Date: Tue, 10 Feb 2009 16:45:49 +0000 (+0300)
-Subject: Added new UBC parameter: swappages
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=6b819fb60634a109200b7a749aa40d595fcd4895
-
-Added new UBC parameter: swappages
-
-[kir@openvz.org: man page modifications]
----
-
-diff --git a/include/ub.h b/include/ub.h
-index 35868aa..e6f0bf3 100644
---- a/include/ub.h
-+++ b/include/ub.h
-@@ -97,6 +97,9 @@
- #ifndef UB_IPTENTRIES
- #define UB_IPTENTRIES	23	/* Number of iptables rules */
- #endif
-+#ifndef UB_SWAPPAGES
-+#define UB_SWAPPAGES	24
-+#endif
- #define UB_DUMMY	255
- 
- /** Data structure for UBC parameter.
-@@ -130,6 +133,7 @@ struct ub_struct {
- 	unsigned long *dcachesize;
- 	unsigned long *numiptent;
- 	unsigned long *avnumproc;
-+	unsigned long *swappages;
- };
- typedef struct ub_struct ub_param;
- 
-diff --git a/include/vzctl_param.h b/include/vzctl_param.h
-index 83919e8..afb8898 100644
---- a/include/vzctl_param.h
-+++ b/include/vzctl_param.h
-@@ -134,6 +134,7 @@
- #define PARAM_NETIF_MAC_FILTER	360
- #define PARAM_NETIF_BRIDGE	361
- #define PARAM_DESCRIPTION	362
-+#define PARAM_SWAPPAGES		363
- 
- #define PARAM_LINE		"e:p:f:t:i:l:k:a:b:n:x:h"
- #endif
-diff --git a/man/vzctl.8 b/man/vzctl.8
-index 92d49e3..01c9d59 100644
---- a/man/vzctl.8
-+++ b/man/vzctl.8
-@@ -315,6 +315,15 @@ This is currently an accounting-only parameter. It shows the usage of RAM
- by this container. Barrier should be set to 0, and limit should be set to
- \fBunlimited\fR.
- .TP
-+\fB--swappages\fR \fIpages\fR[:\fIpages\fR]
-+The limit, if set, is used to show a total amount of swap space available
-+inside the container. The barrier of this parameter is currently ignored.
-+The default value is \fBunlimited\fR, meaning total swap will be reported
-+as 0.
-+
-+Note that in order for the value to be shown as total swap space,
-+\fB--meminfo\fR parameter should be set to value other than \fBnone\fR.
-+.TP
- \fBCPU fair scheduler parameters\fR
- 
- These parameters control CPU usage by container.
-@@ -345,7 +354,8 @@ This parameter control output of /proc/meminfo inside a container
- No /proc/meminfo virtualization (the same as on host system).
- .IP "\fB--meminfo\fR \fImode\fR:\fIvalue\fR"
- Configure total memory output in a container. Reported free memory is evaluated
--accordingly to the mode being set.
-+accordingly to the mode being set. Reported swap is evaluated
-+according to the settings of \fB--swappages\fR parameter.
- .br
- You can use the following modes for \fImode\fR:
- .br
-diff --git a/src/lib/config.c b/src/lib/config.c
-index bb8953f..a16fe54 100644
---- a/src/lib/config.c
-+++ b/src/lib/config.c
-@@ -83,6 +83,7 @@ static vps_config config[] = {
- {"NUMIPTENT",	NULL, PARAM_NUMIPTENT},
- {"IPTENTRIES",	"NUMIPTENT", -1},
- {"AVNUMPROC",	NULL, PARAM_AVNUMPROC},
-+{"SWAPPAGES",	NULL, PARAM_SWAPPAGES},
- /*	Capability */
- {"CAPABILITY",	NULL, PARAM_CAP},
- /*	Network	*/
-@@ -163,6 +164,7 @@ static struct option set_opt[] = {
- {"dcachesize",	required_argument, NULL, PARAM_DCACHESIZE},
- {"numiptent",	required_argument, NULL, PARAM_NUMIPTENT},
- {"avnumproc",	required_argument, NULL, PARAM_AVNUMPROC},
-+{"swappages",	required_argument, NULL, PARAM_SWAPPAGES},
- /*	Capability */
- {"capability",	required_argument, NULL, PARAM_CAP},
- /*	Network	*/
-@@ -685,6 +687,7 @@ if (ub->res != NULL) {							\
- 	ADD_UB_PARAM(dcachesize, PARAM_DCACHESIZE)
- 	ADD_UB_PARAM(numiptent, PARAM_NUMIPTENT)
- 	ADD_UB_PARAM(avnumproc, PARAM_AVNUMPROC)
-+	ADD_UB_PARAM(swappages, PARAM_SWAPPAGES)
- #undef ADD_UB_PARAM
- 
- 	return 0;
-@@ -1933,6 +1936,7 @@ static int parse(envid_t veid, vps_param *vps_p, char *val, int id)
- 	case PARAM_PHYSPAGES:
- 	case PARAM_VMGUARPAGES:
- 	case PARAM_OOMGUARPAGES:
-+	case PARAM_SWAPPAGES:
- 		ret = parse_ub(vps_p, val, id, _page_size);
- 		break;
- 	case PARAM_NUMPROC:
-diff --git a/src/lib/ub.c b/src/lib/ub.c
-index a50a1dc..f25522f 100644
---- a/src/lib/ub.c
-+++ b/src/lib/ub.c
-@@ -61,6 +61,7 @@ static struct ubname2id {
- 	{"DCACHESIZE",	PARAM_DCACHESIZE},
- 	{"NUMIPTENT",	PARAM_NUMIPTENT},
- 	{"AVNUMPROC",	PARAM_AVNUMPROC},
-+	{"SWAPPAGES",	PARAM_SWAPPAGES},
- 	{NULL, 0},
- };
- 
-@@ -128,6 +129,7 @@ inline static int is_ub_empty(ub_param *ub)
- 	CHECK_UB(numfile)
- 	CHECK_UB(dcachesize)
- 	CHECK_UB(numiptent)
-+	CHECK_UB(swappages)
- #undef CHECK_UB
- 
- 	return 1;
-@@ -185,6 +187,16 @@ if (ub->name != NULL) {							\
- 	SET_UB_LIMIT(numfile, UB_NUMFILE)
- 	SET_UB_LIMIT(dcachesize, UB_DCACHESIZE)
- 	SET_UB_LIMIT(numiptent, UB_IPTENTRIES)
-+	if (ub->swappages &&
-+	    setublimit(veid, UB_SWAPPAGES, ub->swappages) == -1)
-+	{
-+		if (errno == EINVAL) {
-+			logger(-1, ENOSYS, "failed to set swappages");
-+		} else {
-+			logger(-1, errno, "failed to set swappages");
-+			return VZ_SETUBC_ERROR;
-+		}
-+	}
- #undef SET_UB_LIMIT
- 
- 	return 0;
-@@ -327,6 +339,7 @@ if ((src->x) != NULL) {						\
- 	MERGE_P2(dcachesize)
- 	MERGE_P2(numiptent)
- 	MERGE_P2(avnumproc)
-+	MERGE_P2(swappages)
- #undef MERGE_P2
- }
- 
-diff --git a/src/vzctl.c b/src/vzctl.c
-index 448b83a..58715ae 100644
---- a/src/vzctl.c
-+++ b/src/vzctl.c
-@@ -91,7 +91,9 @@ void usage(int rc)
- "   --oomguarpages P[:P]	--lockedpages P[:P]	--privvmpages P[:P]\n"
- "   --shmpages P[:P]	--numfile N[:N]		--numflock N[:N]\n"
- "   --numpty N[:N]	--numsiginfo N[:N]	--dcachesize N[:N]\n"
--"   --numiptent N[:N]	--physpages P[:P]	--avnumproc N[:N]\n");
-+"   --numiptent N[:N]	--physpages P[:P]	--avnumproc N[:N]\n"
-+"   --swappages P[:P]\n"
-+);
- 	memset(&mod, 0, sizeof(mod));
- 	set_log_level(0);
- 	init_modules(&mod, NULL);
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-dstdir-check.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-dstdir-check.patch
deleted file mode 100644
index 48ea502411bc..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-dstdir-check.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Tue, 31 Mar 2009 12:05:53 +0000 (+0400)
-Subject: etc/init.d/vz*: check for DST_CRONSCRIPT_DIR
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=d4d3bca4052daaf265946159a71fc9ed16c33cb8
-
-etc/init.d/vz*: check for DST_CRONSCRIPT_DIR
-
-Before commits df09d4ed and 00a5a95c we used 'install' to put the cronscript
-into DST_CRONSCRIPT_DIR (/etc/cron.d), and it was making sure that DST
-dir existed.
-
-Since we're now using 'cat' not 'install' we have to check for DST directory
-explicitly. More to say, if there's no /etc/cron.d/ than there's probably
-no sense to create it (crond is missing or smth). So just silently exit.
-
-Should fix http://bugzilla.openvz.org/1078
-
-Reported-by: Peter Volkov <pva@gentoo.org>
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
-
-diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
-index b1a1a59..8836768 100755
---- a/etc/init.d/vz-gentoo.in
-+++ b/etc/init.d/vz-gentoo.in
-@@ -58,6 +58,7 @@ setup_cron()
- {
- 	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
- 	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
-+	[ -d "$DST_CRONSCRIPT_DIR" ] || return
- 	cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz &&
- 		chmod 644 $DST_CRONSCRIPT_DIR/vz
- }
-@@ -66,6 +67,7 @@ remove_cron()
- {
- 	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
- 	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
-+	[ -d "$DST_CRONSCRIPT_DIR" ] || return
- 	cat > $DST_CRONSCRIPT_DIR/vz <<EOF
- # DO NOT EDIT THIS FILE!
- #
-diff --git a/etc/init.d/vz-redhat.in b/etc/init.d/vz-redhat.in
-index a75c2b3..7733389 100755
---- a/etc/init.d/vz-redhat.in
-+++ b/etc/init.d/vz-redhat.in
-@@ -129,6 +129,7 @@ setup_cron()
- 	check_old_cron_files
- 	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
- 	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
-+	[ -d "$DST_CRONSCRIPT_DIR" ] || return
- 	cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz &&
- 		chmod 644 $DST_CRONSCRIPT_DIR/vz
- }
-@@ -138,6 +139,7 @@ remove_cron()
- 	check_old_cron_files
- 	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
- 	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
-+	[ -d "$DST_CRONSCRIPT_DIR" ] || return
- 	cat > $DST_CRONSCRIPT_DIR/vz <<EOF
- # DO NOT EDIT THIS FILE!
- #
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-issue-warning.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-issue-warning.patch
deleted file mode 100644
index 6bebd48dd478..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-issue-warning.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit f576ed041ccd50b1e87e0adf4a0774c2de6a5264
-Author: Peter Volkov <pva@gentoo.org>
-Date:   Sun Apr 5 21:51:01 2009 +0400
-
-    Issue warning if cronjobs aren't automatically set
-    
-    Init script is supposed to set cronjobs automatically on start and remove
-    them on stop. This works only with cron daemons that may hook at runtime
-    scripts at ${DST_CRONSCRIPT_DIR} (e.g. sys-process/vixie-cron can). For
-    other cron daemons it's safer to warn users and ask them to set cronjobs
-    manually.
-
-diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
-index 8836768..465fab2 100755
---- a/etc/init.d/vz-gentoo.in
-+++ b/etc/init.d/vz-gentoo.in
-@@ -58,7 +58,23 @@ setup_cron()
- {
- 	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
- 	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
--	[ -d "$DST_CRONSCRIPT_DIR" ] || return
-+	if [ ! -d "${DST_CRONSCRIPT_DIR}" ]; then
-+		if [ "x${SKIP_CRON_WARNINGS}" != "xyes" ]; then
-+			ewarn "Automatic setup of cron jobs works only if a system cron daemon can use"
-+			ewarn "\${DST_CRONSCRIPT_DIR} (${DST_CRONSCRIPT_DIR}) as a spool directory"
-+			ewarn "(e.g. sys-process/vixie-cron can). On your system ${DST_CRONSCRIPT_DIR}"
-+			ewarn "is not a directory even, thus you need manually set the following cron jobs:"
-+			echo
-+			grep -E -v '(^#|^$)' ${SRC_CRONSCRIPT_DIR}/vz*
-+			echo
-+			ewarn "Alternatevely, please, set cron execution of scripts inside ${SRC_CRONSCRIPT_DIR}"
-+			ewarn "so that modifications in those scripts be handled automatically."
-+			ewarn
-+			ewarn "If you already did that and wish to avoid this warning message put"
-+			ewarn "SKIP_CRON_WARNINGS=yes into /etc/conf.d/vz."
-+		fi
-+		return
-+	fi
- 	cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz &&
- 		chmod 644 $DST_CRONSCRIPT_DIR/vz
- }
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch
deleted file mode 100644
index 95f90e793ecc..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Tue, 31 Mar 2009 12:02:45 +0000 (+0400)
-Subject: etc/init.d/vz-gentoo: add processing of multiple cron files
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=df09d4ede93d20ed755f0d97778be359182fbcc7
-
-etc/init.d/vz-gentoo: add processing of multiple cron files
-
-This is an addition to commit 00a5a95c02c05e0070a1dd10b47c90b3715c9ff5
-for gentoo initscript. The idea is to be able to have multiple cronjob
-files managed by initscript.
-
-The only problem is there's no update_cron task for Gentoo initscript.
-
-http://bugzilla.openvz.org/599
-
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
-
-diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
-index 5050005..b1a1a59 100755
---- a/etc/init.d/vz-gentoo.in
-+++ b/etc/init.d/vz-gentoo.in
-@@ -58,8 +58,8 @@ setup_cron()
- {
- 	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
- 	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
--	install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \
--		$DST_CRONSCRIPT_DIR
-+	cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz &&
-+		chmod 644 $DST_CRONSCRIPT_DIR/vz
- }
- 
- remove_cron()
-@@ -70,8 +70,8 @@ remove_cron()
- # DO NOT EDIT THIS FILE!
- #
- # Contents of this file managed by /etc/init.d/vz script
--# Master copy is $SRC_CRONSCRIPT_DIR/vz.
--# Consult that file for documentation.
-+# Master copy is in $SRC_CRONSCRIPT_DIR/vz* file(s).
-+# Consult $SRC_CRONSCRIPT_DIR/vz* for documentation.
- EOF
- }
- 
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch
deleted file mode 100644
index 874b647b008e..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Tue, 31 Mar 2009 11:39:17 +0000 (+0400)
-Subject: etc/init.d/*: whitespace fixes
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=b9be63ff5a33955ce80384523b4712b0b032d4b4
-
-etc/init.d/*: whitespace fixes
-
-As per http://bugzilla.openvz.org/1078
-
-Reported-by: Peter Volkov <pva@gentoo.org>
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
-
-diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
-index 005813f..5050005 100755
---- a/etc/init.d/vz-gentoo.in
-+++ b/etc/init.d/vz-gentoo.in
-@@ -56,17 +56,17 @@ check_config() {
- # being enabled or not.
- setup_cron()
- {
--       [ -z "$SRC_CRONSCRIPT_DIR" ] && return
--       [ -d "$SRC_CRONSCRIPT_DIR" ] || return
--       install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \
--               $DST_CRONSCRIPT_DIR
-+	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
-+	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
-+	install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \
-+		$DST_CRONSCRIPT_DIR
- }
- 
- remove_cron()
- {
--       [ -z "$SRC_CRONSCRIPT_DIR" ] && return
--       [ -d "$SRC_CRONSCRIPT_DIR" ] || return
--       cat > $DST_CRONSCRIPT_DIR/vz <<EOF
-+	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
-+	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
-+	cat > $DST_CRONSCRIPT_DIR/vz <<EOF
- # DO NOT EDIT THIS FILE!
- #
- # Contents of this file managed by /etc/init.d/vz script
-diff --git a/etc/init.d/vz-redhat.in b/etc/init.d/vz-redhat.in
-index f311190..a75c2b3 100755
---- a/etc/init.d/vz-redhat.in
-+++ b/etc/init.d/vz-redhat.in
-@@ -70,7 +70,7 @@ if [ "${MODULES_DISABLED}" != "yes" ]; then
- 	fi
- 	IPT_MODULES="ip_tables ${IPTABLES} xt_tcpudp"
- 	if [ "${IPV6}" = "yes" ]; then
--    		IPT_MODULES="${IPT_MODULES} ${IP6TABLES}"
-+		IPT_MODULES="${IPT_MODULES} ${IP6TABLES}"
- 	fi
- 	VZFS_MODULES="simfs"
- fi
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-debian-CT-ipv6-fix.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-debian-CT-ipv6-fix.patch
deleted file mode 100644
index eec864c90a01..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-debian-CT-ipv6-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: mathgl <mathgl@freesurf.fr>
-Date: Mon, 17 Nov 2008 18:27:19 +0000 (+0300)
-Subject: Fix IPv6 configuration on a debian lenny container
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=9fe02f4a9a42d8d608c401d2508da01f2a07a13e
-
-Fix IPv6 configuration on a debian lenny container
-
-http://bugzilla.openvz.org/show_bug.cgi?id=824
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505792
----
-
-diff --git a/etc/dists/scripts/debian-add_ip.sh b/etc/dists/scripts/debian-add_ip.sh
-index ca87137..b9bda3e 100755
---- a/etc/dists/scripts/debian-add_ip.sh
-+++ b/etc/dists/scripts/debian-add_ip.sh
-@@ -79,7 +79,7 @@ iface ${VENET_DEV}:${ifnum} inet static
- " >> ${CFGFILE}.bak
- 
- 	else
--	    sed -i -e "s/netmask\ 128/netmask\ 128\n\tup ifconfig venet0 add ${ip}/" ${CFGFILE}.bak
-+	    sed -i -e "s/netmask\ 128/netmask\ 128\n\tup ifconfig venet0 add ${ip}\/0/" ${CFGFILE}.bak
- 	fi
- 
- }
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-forwarding-issue-warning.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-forwarding-issue-warning.patch
deleted file mode 100644
index 8c93a513517b..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-forwarding-issue-warning.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 78ef67a523e7f2589e49a082376ee56ce1a5d76e
-Author: Peter Volkov <pva@gentoo.org>
-Date:   Tue Mar 31 13:03:44 2009 +0400
-
-    Issue warning if forwarding is disabled
-    
-    In case forwarding is disabled let's warn user about that. This is
-    alternative solution for http://bugzilla.openvz.org/show_bug.cgi?id=1079
-
-diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
-index dc87d41..7c57370 100755
---- a/etc/init.d/vz-gentoo.in
-+++ b/etc/init.d/vz-gentoo.in
-@@ -128,6 +128,11 @@ start_net() {
- 	ebegin "Configuring interface ${VZDEV}"
- 		/sbin/sysctl -q -w net.ipv4.conf.${VZDEV}.send_redirects=0
- 	eend $?
-+
-+	if [ "x$(/sbin/sysctl net.ipv4.ip_forward 2>/dev/null | awk '{print $3}')" = "x0" ]; then
-+		ewarn "It looks like you have ip forwarding disabled. To make networking"
-+		ewarn "available for containers, please, run sysctl -w net.ipv4.ip_forward=1"
-+	fi
- }
- 
- stop_net() {
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch
deleted file mode 100644
index bf76b38b7161..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit df09d4ede93d20ed755f0d97778be359182fbcc7
-Author: Kir Kolyshkin <kir@openvz.org>
-Date:   Tue Mar 31 16:02:45 2009 +0400
-
-    etc/init.d/vz-gentoo: add processing of multiple cron files
-    
-    This is an addition to commit 00a5a95c02c05e0070a1dd10b47c90b3715c9ff5
-    for gentoo initscript. The idea is to be able to have multiple cronjob
-    files managed by initscript.
-    
-    The only problem is there's no update_cron task for Gentoo initscript.
-    
-    http://bugzilla.openvz.org/599
-    
-    Signed-off-by: Kir Kolyshkin <kir@openvz.org>
-
-diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
-index 5050005..b1a1a59 100755
---- a/etc/init.d/vz-gentoo.in
-+++ b/etc/init.d/vz-gentoo.in
-@@ -58,8 +58,8 @@ setup_cron()
- {
- 	[ -z "$SRC_CRONSCRIPT_DIR" ] && return
- 	[ -d "$SRC_CRONSCRIPT_DIR" ] || return
--	install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \
--		$DST_CRONSCRIPT_DIR
-+	cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz &&
-+		chmod 644 $DST_CRONSCRIPT_DIR/vz
- }
- 
- remove_cron()
-@@ -70,8 +70,8 @@ remove_cron()
- # DO NOT EDIT THIS FILE!
- #
- # Contents of this file managed by /etc/init.d/vz script
--# Master copy is $SRC_CRONSCRIPT_DIR/vz.
--# Consult that file for documentation.
-+# Master copy is in $SRC_CRONSCRIPT_DIR/vz* file(s).
-+# Consult $SRC_CRONSCRIPT_DIR/vz* for documentation.
- EOF
- }
- 
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-ppp-feature.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-ppp-feature.patch
deleted file mode 100644
index 9eab5d02d959..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-ppp-feature.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Cyrill Gorcunov <gorcunov@openvz.org>
-Date: Tue, 3 Feb 2009 19:45:36 +0000 (+0300)
-Subject: Introduce new "ppp" feature
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=d78a7653d983269553763d536f69de0bb5109353
-
-Introduce new "ppp" feature
-
-Allow an user to turn "ppp" feature on and off.
-
-Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
----
-
-diff --git a/include/linux/vzcalluser.h b/include/linux/vzcalluser.h
-index 045a0e1..66d61cd 100644
---- a/include/linux/vzcalluser.h
-+++ b/include/linux/vzcalluser.h
-@@ -202,6 +202,7 @@ struct env_create_param3 {
- #define VE_FEATURE_DEF_PERMS	(1ULL << 2)
- #define VE_FEATURE_SIT		(1ULL << 3)
- #define VE_FEATURE_IPIP		(1ULL << 4)
-+#define VE_FEATURE_PPP		(1ULL << 5)
- 
- #define VE_FEATURES_OLD		(VE_FEATURE_SYSFS)
- #define VE_FEATURES_DEF		(VE_FEATURE_SYSFS | \
-diff --git a/man/vzctl.8 b/man/vzctl.8
-index 85d3b0d..92d49e3 100644
---- a/man/vzctl.8
-+++ b/man/vzctl.8
-@@ -446,7 +446,7 @@ designated by its \fImajor\fR and \fIminor\fR numbers. Device file have to be cr
- .TP
- \fB--features\fR \fIname\fR:\fBon|off\fR
- Enable or disable a specific container feature.
--Known features are: \fIsysfs\fR, \fInfs\fR, \fIsit\fR, \fIipip\fR.
-+Known features are: \fIsysfs\fR, \fInfs\fR, \fIsit\fR, \fIipip\fR, \fIppp\fR.
- .TP
- \fBApply config\fR
- .TP
-diff --git a/src/lib/vzfeatures.c b/src/lib/vzfeatures.c
-index 2f5596a..c6af929 100644
---- a/src/lib/vzfeatures.c
-+++ b/src/lib/vzfeatures.c
-@@ -27,6 +27,7 @@ static struct feature_s features[] = {
- 	{ "nfs",	0,	VE_FEATURE_NFS },
- 	{ "sit",	0,	VE_FEATURE_SIT},
- 	{ "ipip",	0,	VE_FEATURE_IPIP},
-+	{ "ppp",	0,	VE_FEATURE_PPP},
- 	{ NULL}
- };
- 
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-ve-unlimited.conf-sample.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-ve-unlimited.conf-sample.patch
deleted file mode 100644
index d3c803ee4307..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-ve-unlimited.conf-sample.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From: Peter Volkov <pva@gentoo.org>
-Date: Sun, 30 Nov 2008 13:48:39 +0000 (+0300)
-Subject: Added unlimited CT config
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=c8dc6e5a60137eafca882c39ffbeb0177e65a064
-
-Added unlimited CT config
-
-This implements (again thank Daniel Robbins for suggestion and initial
-work) ve-unlimited.conf-sample configuration file. It sets CT resources
-to unlimited values. Not to repeating his reasoning I cite him here:
-
-"I think that adding this to the /etc/vz/conf directory would be a big
-step forward. I think that OpenVZ is going to be used more and more for
-single-developer workstations where developers want to use containers to
-create test environments. In these single-user situations, resource limits
-just get in the way."
-
-I tend to aggree. If you just want to use containers like very smart
-chroots resource limits just make things harder.
----
-
-diff --git a/etc/conf/Makefile.am b/etc/conf/Makefile.am
-index 963abdc..52c16e8 100644
---- a/etc/conf/Makefile.am
-+++ b/etc/conf/Makefile.am
-@@ -18,7 +18,7 @@
- include $(top_srcdir)/paths.am
- 
- VE0CONFIG = 0.conf
--VECONFIG  = ve-light.conf-sample ve-vps.basic.conf-sample
-+VECONFIG  = ve-light.conf-sample ve-vps.basic.conf-sample ve-unlimited.conf-sample
- 
- if ARCH_IA64
- VECONFIG_EXT = .ia64
-diff --git a/etc/conf/ve-unlimited.conf-sample b/etc/conf/ve-unlimited.conf-sample
-new file mode 100644
-index 0000000..2b9febd
---- /dev/null
-+++ b/etc/conf/ve-unlimited.conf-sample
-@@ -0,0 +1,51 @@
-+#  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+#
-+
-+VERSION="2"
-+
-+ONBOOT="no"
-+
-+# UBC parameters (in form of barrier:limit)
-+# Primary parameters
-+AVNUMPROC="unlimited"
-+NUMPROC="unlimited"
-+NUMTCPSOCK="419430"
-+NUMOTHERSOCK="419430"
-+VMGUARPAGES="unlimited"
-+# Secondary parameters
-+KMEMSIZE="unlimited"
-+#TCPSNDBUF="2147483647:2147483647"
-+TCPSNDBUF="1073741823:2147483647"
-+TCPRCVBUF="1073741823:2147483647"
-+OTHERSOCKBUF="1073741823:2147483647"
-+DGRAMRCVBUF="unlimited"
-+OOMGUARPAGES="unlimited"
-+# Auxiliary parameters
-+LOCKEDPAGES="unlimited"
-+SHMPAGES="unlimited"
-+PRIVVMPAGES="unlimited"
-+NUMFILE="unlimited"
-+NUMFLOCK="unlimited"
-+NUMPTY="unlimited"
-+NUMSIGINFO="unlimited"
-+DCACHESIZE="unlimited"
-+
-+PHYSPAGES="0:unlimited"
-+NUMIPTENT="unlimited"
-+
-+# Disk quota parameters (in form of softlimit:hardlimit)
-+DISK_QUOTA="no"
-diff --git a/etc/conf/ve-unlimited.conf-sample.ia64 b/etc/conf/ve-unlimited.conf-sample.ia64
-new file mode 100644
-index 0000000..42fd7f6
---- /dev/null
-+++ b/etc/conf/ve-unlimited.conf-sample.ia64
-@@ -0,0 +1,51 @@
-+#  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+#
-+
-+VERSION="2"
-+
-+ONBOOT="no"
-+
-+# UBC parameters (in form of barrier:limit)
-+# Primary parameters
-+AVNUMPROC="unlimited"
-+NUMPROC="unlimited"
-+NUMTCPSOCK="1801439850948198"
-+NUMOTHERSOCK="1801439850948198"
-+VMGUARPAGES="unlimited"
-+# Secondary parameters
-+KMEMSIZE="unlimited"
-+#TCPSNDBUF="2147483647:2147483647"
-+TCPSNDBUF="4611686018427387903:9223372036854775807"
-+TCPRCVBUF="4611686018427387903:9223372036854775807"
-+OTHERSOCKBUF="4611686018427387903:9223372036854775807"
-+DGRAMRCVBUF="unlimited"
-+OOMGUARPAGES="unlimited"
-+# Auxiliary parameters
-+LOCKEDPAGES="unlimited"
-+SHMPAGES="unlimited"
-+PRIVVMPAGES="unlimited"
-+NUMFILE="unlimited"
-+NUMFLOCK="unlimited"
-+NUMPTY="unlimited"
-+NUMSIGINFO="unlimited"
-+DCACHESIZE="unlimited"
-+
-+PHYSPAGES="0:unlimited"
-+NUMIPTENT="unlimited"
-+
-+# Disk quota parameters (in form of softlimit:hardlimit)
-+DISK_QUOTA="no"
-diff --git a/etc/conf/ve-unlimited.conf-sample.x86_64 b/etc/conf/ve-unlimited.conf-sample.x86_64
-new file mode 100644
-index 0000000..42fd7f6
---- /dev/null
-+++ b/etc/conf/ve-unlimited.conf-sample.x86_64
-@@ -0,0 +1,51 @@
-+#  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+#
-+
-+VERSION="2"
-+
-+ONBOOT="no"
-+
-+# UBC parameters (in form of barrier:limit)
-+# Primary parameters
-+AVNUMPROC="unlimited"
-+NUMPROC="unlimited"
-+NUMTCPSOCK="1801439850948198"
-+NUMOTHERSOCK="1801439850948198"
-+VMGUARPAGES="unlimited"
-+# Secondary parameters
-+KMEMSIZE="unlimited"
-+#TCPSNDBUF="2147483647:2147483647"
-+TCPSNDBUF="4611686018427387903:9223372036854775807"
-+TCPRCVBUF="4611686018427387903:9223372036854775807"
-+OTHERSOCKBUF="4611686018427387903:9223372036854775807"
-+DGRAMRCVBUF="unlimited"
-+OOMGUARPAGES="unlimited"
-+# Auxiliary parameters
-+LOCKEDPAGES="unlimited"
-+SHMPAGES="unlimited"
-+PRIVVMPAGES="unlimited"
-+NUMFILE="unlimited"
-+NUMFLOCK="unlimited"
-+NUMPTY="unlimited"
-+NUMSIGINFO="unlimited"
-+DCACHESIZE="unlimited"
-+
-+PHYSPAGES="0:unlimited"
-+NUMIPTENT="unlimited"
-+
-+# Disk quota parameters (in form of softlimit:hardlimit)
-+DISK_QUOTA="no"
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-vzarp-on-ifup.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-vzarp-on-ifup.patch
deleted file mode 100644
index a0d020d409c6..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-vzarp-on-ifup.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-http://556.bugzilla.openvz.org/attachment.cgi?id=829
-
-We need to test this patch. Hey, anybody?
-
-diff --git a/Makefile.am b/Makefile.am
-index 3b67cd8..ae05b3b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -53,6 +53,7 @@ DISTRO_TARGETS = \
- 
- $(DISTRO_TARGETS):
- 	$(MAKE) $(AM_MAKEFLAGS) -C etc $@
-+	$(MAKE) $(AM_MAKEFLAGS) -C scripts $@
- 
- install-data-hook:
- 	@echo
-diff --git a/scripts/Makefile.am b/scripts/Makefile.am
-index a2bde7e..85ea8fd 100644
---- a/scripts/Makefile.am
-+++ b/scripts/Makefile.am
-@@ -22,7 +22,8 @@ vzlib_SCRIPTS = \
- 	vps-functions \
- 	vps-net_add \
- 	vps-net_del \
--	vps-stop
-+	vps-stop \
-+	ifup-vz-arp
- 
- vzcron_SCRIPTS = \
- 	vpsnetclean \
-@@ -35,3 +36,36 @@ EXTRA_DIST = \
- CLEANFILES = \
- 	$(vzlib_SCRIPTS) \
- 	$(vzcron_SCRIPTS)
-+
-+# FIXME: what to do in case DESTDIR is set? I guess nothing...
-+install-redhat:
-+	if [ ! -e /sbin/ifup-local ]; then \
-+		ln -sf @PKGLIBDIR@/scripts/ifup-vz-arp /sbin/ifup-local; \
-+	else \
-+		@echo; \
-+		@echo " ***************************************************"; \
-+		@echo " WARNING: /sbin/ifup-local is present!"; \
-+		@echo " You have to manually edit /sbin/ifup-local so that "; \
-+		@echo " @PKGLIBDIR@/scripts/ifup-vz-arp"; \
-+		@echo " is called from it."; \
-+		@echo " ***************************************************"; \
-+		@echo; \
-+	fi
-+
-+
-+install-suse:
-+	ln -sf @PKGLIBDIR@/scripts/ifup-vz-arp /etc/sysconfig/network/if-up.d/
-+
-+install-debian:
-+	ln -sf @PKGLIBDIR@/scripts/ifup-vz-arp /etc/network/if-up.d/
-+
-+install-gentoo:
-+	@echo
-+	@echo " ***************************************************"
-+	@echo " Please add the following code to /etc/conf.d/net:"
-+	@echo
-+	@echo "postup() {"
-+	@echo "	@PKGLIBDIR@/scripts/ifup-vz-arp" '"${IFACE}"'
-+	@echo "}"
-+	@echo " ***************************************************"
-+	@echo
-diff --git a/scripts/ifup-vz-arp.in b/scripts/ifup-vz-arp.in
-new file mode 100755
-index 0000000..7e2346b
---- /dev/null
-+++ b/scripts/ifup-vz-arp.in
-@@ -0,0 +1,25 @@
-+#!/bin/bash
-+# Copyright (C) 2008, Parallels, Inc. All rights reserved.
-+#
-+# Update ARP table for all containers on interface up
-+
-+[ ! -f /proc/vz/veinfo ] && exit 0
-+
-+test -f @PKGLIBDIR@/scripts/vps-functions || exit 1
-+test -f @PKGCONFDIR@/vz.conf || exit 1
-+. @PKGLIBDIR@/scripts/vps-functions
-+. @PKGCONFDIR@/vz.conf
-+
-+update_arp()
-+{
-+	local veip
-+	for veip in $(awk '!/^Version/ { print $1 }' /proc/vz/veip); do
-+		vzarp add ${veip}
-+	done
-+}
-+
-+DEV=$1
-+[ -z "${DEV}" ] && exit 0
-+NETDEVICES="${DEV}"
-+update_arp
-+exit 0
-diff --git a/vzctl.spec b/vzctl.spec
-index ae3ed8c..adc6702 100644
---- a/vzctl.spec
-+++ b/vzctl.spec
-@@ -108,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT
- %attr(755,root,root) %{_sbindir}/vzmigrate
- %attr(755,root,root) %{_scriptdir}/vpsreboot
- %attr(755,root,root) %{_scriptdir}/vpsnetclean
-+%attr(755,root,root) %{_scriptdir}/ifup-vz-arp
- %attr(644,root,root) %{_logrdir}/vzctl
- %attr(644,root,root) %{_distconfdir}/distribution.conf-template
- %attr(644,root,root) %{_distconfdir}/default
-@@ -161,6 +162,11 @@ if [ -f /etc/SuSE-release ]; then
- 	for file in ${NET_CFG}; do
- 		ln -sf /etc/sysconfig/network-scripts/${file} /etc/sysconfig/network/scripts/${file}
- 	done
-+	ln -sf /usr/share/vzctl/scripts/ifup-vz-arp /etc/sysconfig/network/if-up.d/ifup-arp
-+else # RedHat/Fedora/CentOS case
-+	if [ ! -e /sbin/ifup-local ]; then
-+		ln -sf /usr/share/vzctl/scripts/ifup-vz-arp /sbin/ifup-local
-+	fi
- fi
- 
- %preun
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch
deleted file mode 100644
index b8361e487349..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: Dmitry V. Levin <ldv@altlinux.org>
-Date: Fri, 31 Oct 2008 11:54:47 +0000 (+0000)
-Subject: vznetaddbr.in: Rewrite without bash-isms and ifconfig
-X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=93ef4d978a8c609cc04c53f39bc4fe674a089811
-
-vznetaddbr.in: Rewrite without bash-isms and ifconfig
-
-Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
----
-
-diff --git a/bin/vznetaddbr.in b/bin/vznetaddbr.in
-index eb2ba70..e8599e9 100755
---- a/bin/vznetaddbr.in
-+++ b/bin/vznetaddbr.in
-@@ -1,53 +1,39 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Add virtual network interfaces (veth's) in a container to a bridge on CT0
- 
- CONFIGFILE=@PKGCONFDIR@/conf/$VEID.conf
- . $CONFIGFILE
- 
--NETIFLIST=$(echo $NETIF | sed 's/;/\n/g')
-+NETIFLIST=$(printf %s "$NETIF" |tr ';' '\n')
- 
--if [ ! -n "$NETIFLIST" ]; then
--   echo "According to $CONFIGFILE, CT$VEID has no veth interface configured."
-+if [ -z "$NETIFLIST" ]; then
-+   echo >&2 "According to $CONFIGFILE, CT$VEID has no veth interface configured."
-    exit 1
- fi
- 
--IFACES=$(echo $NETIFLIST | sed 's/;/\n/g')
--for tmp in $IFACES; do 
--    CTIFNAME=
--    CTBRIDGE=
--    VZHOSTIF=
--
--    NETIF_OPTIONS=$(echo $tmp | sed 's/,/\n/g')
--    for str in $NETIF_OPTIONS; do 
--        # getting 'ifname' parameter value
--        if [[ "$str" =~ ^ifname= ]]; then
--            # remove the parameter name from the string (along with '=')
--	    CTIFNAME=${str#*=}
--        fi
--        if [[ "$str" =~ ^bridge= ]]; then
--            # remove the parameter name from the string (along with '=')
--	    CTBRIDGE=${str#*=}
--        fi
--        # getting 'host_ifname' parameter value
--        if [[ "$str" =~ ^host_ifname= ]]; then
--            # remove the parameter name from the string (along with '=')
--	    VZHOSTIF=${str#*=}
--        fi
-+for iface in $NETIFLIST; do
-+    bridge=
-+    host_ifname=
-+
-+    for str in $(printf %s "$iface" |tr ',' '\n'); do
-+	case "$str" in
-+	    bridge=*|host_ifname=*)
-+		eval "${str%%=*}=\${str#*=}" ;;
-+	esac
-     done
- 
--    if [ "$VZHOSTIF" != "$3" ]; then
--	continue 
--    fi
--    if [ ! -n "$CTBRIDGE" ]; then
--	CTBRIDGE=vmbr0
--    fi
--
--    echo "Adding interface $VZHOSTIF to bridge $CTBRIDGE on CT0 for CT$VEID"
--    /sbin/ifconfig $VZHOSTIF 0
--    echo 1 > /proc/sys/net/ipv4/conf/$VZHOSTIF/proxy_arp
--    echo 1 > /proc/sys/net/ipv4/conf/$VZHOSTIF/forwarding
--    /usr/sbin/brctl addif $CTBRIDGE $VZHOSTIF
-+    [ "$host_ifname" = "$3" ] ||
-+	continue
-+
-+    [ -n "$bridge" ] ||
-+	bridge=vmbr0
-+
-+    echo "Adding interface $host_ifname to bridge $bridge on CT0 for CT$VEID"
-+    ip addr add 0 dev "$host_ifname"
-+    echo 1 >"/proc/sys/net/ipv4/conf/$host_ifname/proxy_arp"
-+    echo 1 >"/proc/sys/net/ipv4/conf/$host_ifname/forwarding"
-+    brctl addif "$bridge" "$host_ifname"
- 
-     break
- done
diff --git a/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild b/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild
deleted file mode 100644
index c2e093c266b4..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild
+++ /dev/null
@@ -1,93 +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.23-r2.ebuild,v 1.3 2009/10/20 16:31:02 pva Exp $
-
-inherit bash-completion eutils autotools
-
-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"
-
-RDEPEND="
-	net-firewall/iptables
-	sys-apps/ed
-	sys-apps/iproute2
-	sys-fs/vzquota
-	virtual/cron"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	has_version "<sys-cluster/vzctl-3.0.10" && OLD_VZCTL=true || OLD_VZCTL=false
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-vznetaddbr.in-no-bashisms.patch"
-	epatch "${FILESDIR}/${P}-debian-CT-ipv6-fix.patch"
-	epatch "${FILESDIR}/${P}-ve-unlimited.conf-sample.patch"
-	epatch "${FILESDIR}/${P}-ppp-feature.patch"
-	epatch "${FILESDIR}/${P}-UBC-parameter-swappages.patch"
-	epatch "${FILESDIR}/${P}-cronjobs-wightspace.patch"
-	epatch "${FILESDIR}/${P}-cronjobs-multiple-cron-jobs.patch"
-	epatch "${FILESDIR}/${P}-cronjobs-dstdir-check.patch"
-
-	epatch "${FILESDIR}/${P}-cronjobs-issue-warning.patch"
-
-	epatch "${FILESDIR}/${P}-vzarp-on-ifup.patch"
-	epatch "${FILESDIR}/${P}-forwarding-issue-warning.patch"
-	eautomake
-}
-
-src_compile() {
-	econf --localstatedir=/var \
-		--enable-cron \
-		--enable-udev \
-		$(use_enable bash-completion bashcomp) \
-		--enable-logrotate
-
-	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 ${OLD_VZCTL}; 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/"
-		einfo
-	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.'
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.27.ebuild b/sys-cluster/vzctl/vzctl-3.0.27.ebuild
new file mode 100644
index 000000000000..e1d0ffa9584d
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.27.ebuild
@@ -0,0 +1,83 @@
+# 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.27.ebuild,v 1.1 2011/05/27 12:48:35 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"
+
+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 " }"
+
+	ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs."
+	ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and"
+	ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use"
+	ewarn "/etc/init.d/vzeventd."
+}