Upstream accepted patches merged back, some other bits rewritten as they asked us.

Package-Manager: portage-2.2_rc28/cvs/Linux i686

9 files changed, 248 insertions, 59 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index ff88b5e05f97..39b9d25973e7 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,19 @@
 # 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.62 2009/03/31 09:47:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.63 2009/04/05 19:34:37 pva Exp $
+
+*vzctl-3.0.23-r2 (05 Apr 2009)
+
+  05 Apr 2009; Peter Volkov <pva@gentoo.org>
+  +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-typo-fix.patch,
+  +files/vzctl-3.0.23-cronjobs-wightspace.patch,
+  +files/vzctl-3.0.23-multiple-cron-jobs.patch, -vzctl-3.0.23-r1.ebuild,
+  +vzctl-3.0.23-r2.ebuild:
+  Upstream accepted patches merged back, some other bits rewritten as they
+  asked us.
 
   31 Mar 2009; Peter Volkov <pva@gentoo.org> vzctl-3.0.23-r1.ebuild:
   Nuke logrotate USE flag, bug #258174.
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index ac66e7481992..e3dbe338f150 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -4,10 +4,13 @@ AUX vzctl-3.0.22-document-disable-modules.patch 843 RMD160 635e9417e3bbdef88d447
 AUX vzctl-3.0.22-glibc28.patch 758 RMD160 633a9feb1a7101a166aa8e090fac4b5720546d0c SHA1 d19fb01c59366eb97da8178864ddda88010b7110 SHA256 36021ca9dabe548075ca016db047131f3536f916b2fa620ed61b00c41545e19e
 AUX vzctl-3.0.22-workaround-gentoo-add_ip.patch 1250 RMD160 d77d99b74ed55894a947d6651f3a8471f3f582ff SHA1 a3da293f85076cc8c86f68c128733e57ddba8b56 SHA256 b5d52398a85d947ceebcd7db17fbd6ec602bb03c338ec4af5b202a814e226730
 AUX vzctl-3.0.23-UBC-parameter-swappages.patch 5482 RMD160 81ec766ef3263caf59e3e1c6048f632498949f5d SHA1 d1b0462ced780602cfcb850993f75a8a724b299d SHA256 c4ce00e8cddc8f3334847a3f8e700ab34a39b5dbfff8613a145de0f68147b2b0
-AUX vzctl-3.0.23-cronjobs-issue-warning.patch 1567 RMD160 016c173d75e910e76aaa2b782de726b9209b2eba SHA1 47563dbb5bd724d8f2d572b93a3ff7cd76f21500 SHA256 851974e6a4c62f521aae23479ddb9d6c454b6a7dd3aeec31de20985291870825
-AUX vzctl-3.0.23-cronjobs-typo-fix.patch 1245 RMD160 0223c824fa7aca9f068c467a3249908d1a87998e SHA1 ba0581fc88b0fc96bc2f1b7ff6cb5dbc5cddcb94 SHA256 d80ec64e83bf56742567855b24c1dbdefcf1f5f52f7f2f35f8fb6d30d79af8de
+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
@@ -16,6 +19,6 @@ DIST vzctl-3.0.22.tar.bz2 360012 RMD160 53353981fefea94d997b3555600583f4c5818833
 DIST vzctl-3.0.23.tar.bz2 361403 RMD160 6436843d4d7de8c98de3ec57c8003e3b625529ef SHA1 b94545dd5608bb48389abcb93e3fc8c91141461a SHA256 3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
 EBUILD vzctl-3.0.22-r1.ebuild 2585 RMD160 3a26d40c46dc4e7052184eaf9fb7f96bb1cbdf76 SHA1 0e673748b748658799e7e4646c789e73fc44161f SHA256 be918b625ea4a3c411402f596a04939912e82c6de1a173fb9f86180fc08e9b73
 EBUILD vzctl-3.0.22-r2.ebuild 2633 RMD160 416a8558e8c3b288b881471afc0993d100f3dcd7 SHA1 c42b7522a90ec4ef62c25e46c5b1714cd5f1c9c9 SHA256 90515e307ea9a494a6e3b726967117f14b5013ab9e8282925948ff7857c35281
-EBUILD vzctl-3.0.23-r1.ebuild 2881 RMD160 3c5e3ea0b606c4b1faf441effdfb136553b0c23f SHA1 d30050ec919583e07bff297f264581c1587f84ea SHA256 69e97717e0a5f1d01987361e27e00410ff6097d6426ccf3fc731437e14029b6e
-MISC ChangeLog 12846 RMD160 42feefba87ac0b2f01542c0e8e4dfdb9a4c8b598 SHA1 e0c7d445ba25c15ef47dff148c435a27e622303e SHA256 42fb21bb8abd2e1550434aca83fd50e21268b5d214d3c72670a48cc771ef424f
+EBUILD vzctl-3.0.23-r2.ebuild 3002 RMD160 831f3a2eca4c04909e68cc8548574ba884129aef SHA1 aa3ed09d3c40a035cb8dc4b4e4887bcc9bc51748 SHA256 73e6f12df6d6ec9eca7b99231da807f5d4faf3b877f974caf5184218f94e253e
+MISC ChangeLog 13366 RMD160 8c034ce4fb56b2c129f033cb0777a4f81224337a SHA1 d9999a36f915769d7c85467b595770f5c98a440f SHA256 2268eb5106967f80c2731be48cd7e6fbff00df12e0df1b74bfe4f12dd9516b79
 MISC metadata.xml 332 RMD160 b40e74088fb74ddb66a5eda7f46bf63742e2258a SHA1 719e3d0e91af2df78aa7478990ef65c307fb0c31 SHA256 30e1f46e13b10bc59d15c29e986bf8d8aab98ce8338c33d6f37650f399ebb4b2
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
new file mode 100644
index 000000000000..48ea502411bc
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-dstdir-check.patch
@@ -0,0 +1,61 @@
+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
index 5c9bd9225dae..6bebd48dd478 100644
--- 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
@@ -1,22 +1,23 @@
-commit 5f0d3dbcdb5f1f1f9d019619c4e3dd3b2f2d29f3
+commit f576ed041ccd50b1e87e0adf4a0774c2de6a5264
 Author: Peter Volkov <pva@gentoo.org>
-Date:   Tue Mar 31 12:31:01 2009 +0400
+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 to set cronjobs manually.
+    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 97ea313..dc87d41 100755
+index 8836768..465fab2 100755
 --- a/etc/init.d/vz-gentoo.in
 +++ b/etc/init.d/vz-gentoo.in
-@@ -57,7 +57,19 @@ check_config() {
- setup_cron()
+@@ -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
@@ -24,13 +25,17 @@ index 97ea313..dc87d41 100755
 +			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:"
-+			ewarn "*/5 * * * * root  @PKGDATADIR@/scripts/vpsnetclean"
-+			ewarn "*/5 * * * * root  @PKGDATADIR@/scripts/vpsreboot"
-+			ewarn "If you already did that and wish to avoid this warning put"
++			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
- 	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
  }
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
new file mode 100644
index 000000000000..95f90e793ecc
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch
@@ -0,0 +1,44 @@
+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-typo-fix.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-typo-fix.patch
deleted file mode 100644
index 038b7a21cde8..000000000000
--- a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-typo-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit b57ce68fae2ce2642a36746b8e7b7216a02bfc8c
-Author: Peter Volkov <pva@gentoo.org>
-Date:   Sun Feb 22 19:40:34 2009 +0300
-
-    vz-gentoo.in typo: check for DST_CRONSCRIPT_DIR
-    
-    Fixed indentation and typo to make script really check for
-    $DST_CRONSCRIPT_DIR directory existence.
-
-diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
-index 005813f..97ea313 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 "$DST_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 "$DST_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/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch
new file mode 100644
index 000000000000..874b647b008e
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch
@@ -0,0 +1,55 @@
+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-multiple-cron-jobs.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch
new file mode 100644
index 000000000000..bf76b38b7161
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch
@@ -0,0 +1,42 @@
+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/vzctl-3.0.23-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild
index 46558f748b72..954567efd6bc 100644
--- a/sys-cluster/vzctl/vzctl-3.0.23-r1.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2009/03/31 09:47:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.23-r2.ebuild,v 1.1 2009/04/05 19:34:37 pva Exp $
 
 inherit bash-completion eutils autotools
 
@@ -30,13 +30,17 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-vznetaddbr.in-no-bashisms.patch"
-	epatch "${FILESDIR}/${P}-ve-unlimited.conf-sample.patch"
 	epatch "${FILESDIR}/${P}-debian-CT-ipv6-fix.patch"
-	epatch "${FILESDIR}/${P}-cronjobs-typo-fix.patch"
-	epatch "${FILESDIR}/${P}-cronjobs-issue-warning.patch"
-	epatch "${FILESDIR}/${P}-vzarp-on-ifup.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
 }