fix etc_vz patch

(Portage version: 2.0.53_rc5)

3 files changed, 177 insertions, 13 deletions

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index b231dde318ff..4da498492035 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a0d8ebddb2faf2cea1bbee02cbeb901b ChangeLog 782
 MD5 59b8869cf562ff10c9561f1f38cd37cc files/digest-vzctl-2.7.0.21 66
 MD5 090adf5c130cc2cd5a761354e80590c8 files/digest-vzctl-2.7.0.22 66
@@ -8,14 +5,8 @@ MD5 fcbd31791ac21aa1698228fde3a600ef files/digest-vzctl-2.7.0.23 66
 MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465
 MD5 687eaa4427600a7a5edfc0b8b7f69480 files/vzctl-2.7.0-gentoo_conf_d.patch 3899
 MD5 9ab78117d5f3fb123a7c44f948aafb3d files/vzctl-2.7.0-gentoo_etc_vz.patch 7412
+MD5 48002ae17f4c768412ac70a33023d09d files/vzctl-2.7.0.23-gentoo_etc_vz.patch 7115
 MD5 b55bfb88b955107a0f0e6c5aaef21723 metadata.xml 162
 MD5 9dd7479c278946fc668a457f0256d77f vzctl-2.7.0.21.ebuild 1577
 MD5 67c5b5981b6aefbbdac3ce516b3a7ddb vzctl-2.7.0.22.ebuild 1575
-MD5 0aaf59453295091ec912e4fc30eb17cf vzctl-2.7.0.23.ebuild 1575
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDWSW7mPFBzbX68WERAtoeAJ0VYpMuDBDxB9OyXFkXGeeEMDvD/QCfTybC
-YW7TRWQyLjQYSieNRNDtSzU=
-=zmdb
------END PGP SIGNATURE-----
+MD5 6c530cb771970844edd079a7ba5dfa50 vzctl-2.7.0.23.ebuild 1578
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch b/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch
new file mode 100644
index 000000000000..3d8054e28c16
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch
@@ -0,0 +1,173 @@
+diff -urN vzctl-2.7.0-23/etc/cron.d/vpsnetclean vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsnetclean
+--- vzctl-2.7.0-23/etc/cron.d/vpsnetclean	2005-08-05 19:46:38.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsnetclean	2005-10-23 00:31:40.956253816 +0400
+@@ -10,5 +10,5 @@
+ # Clean VPS network rules (arp,route,iptables)
+ #
+ 
+-*/5 * * * * root /etc/sysconfig/vz-scripts/vpsnetclean
++*/5 * * * * root /etc/vz/vpsnetclean
+ 
+diff -urN vzctl-2.7.0-23/etc/cron.d/vpsreboot vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsreboot
+--- vzctl-2.7.0-23/etc/cron.d/vpsreboot	2005-08-05 20:40:45.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsreboot	2005-10-23 00:31:40.957253664 +0400
+@@ -11,4 +11,4 @@
+ # If vzagent not installed you can enable reboot functionality by
+ # commented out the line below.
+ 
+-*/5 * * * * root /etc/sysconfig/vz-scripts/vpsreboot
++*/5 * * * * root /etc/vz/vpsreboot
+diff -urN vzctl-2.7.0-23/etc/dists/Makefile vzctl-2.7.0-23_etc_vz/etc/dists/Makefile
+--- vzctl-2.7.0-23/etc/dists/Makefile	2005-08-12 16:37:33.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/etc/dists/Makefile	2005-10-23 00:31:40.957253664 +0400
+@@ -8,7 +8,7 @@
+ # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ INSTALL = install
+-DISTCONFDIR = /etc/sysconfig/vz-scripts/dists
++DISTCONFDIR = /etc/vz/dists
+ DISTSCRIPTDIR = ${DISTCONFDIR}/scripts
+ DISTSCRIPTS = debian-add_ip.sh debian-del_ip.sh debian-set_hostname.sh 	\
+ 	functions postcreate.sh redhat-7.x_add_ip.sh redhat-add_ip.sh 	\
+diff -urN vzctl-2.7.0-23/etc/vps-functions vzctl-2.7.0-23_etc_vz/etc/vps-functions
+--- vzctl-2.7.0-23/etc/vps-functions	2005-10-17 13:55:59.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/etc/vps-functions	2005-10-23 00:31:40.957253664 +0400
+@@ -26,7 +26,7 @@
+ 
+ # iptables parameters
+ VE_STATE_DIR="/var/vz/veip/"
+-CONF_DIR="/etc/sysconfig/vz-scripts/"
++CONF_DIR="/etc/vz/"
+ 
+ ARPSEND_CMD="arpsend -c 1 -w 1"
+ IP_CMD=/sbin/ip
+diff -urN vzctl-2.7.0-23/etc/vpsreboot vzctl-2.7.0-23_etc_vz/etc/vpsreboot
+--- vzctl-2.7.0-23/etc/vpsreboot	2005-10-23 00:30:51.060839072 +0400
++++ vzctl-2.7.0-23_etc_vz/etc/vpsreboot	2005-10-23 00:31:40.958253512 +0400
+@@ -11,7 +11,7 @@
+ # Script to start VPS was rebooted
+ #
+ 
+-CONF_DIR=/etc/sysconfig/vz-scripts
++CONF_DIR=/etc/vz
+ VE_INFO=/proc/vz/veinfo
+ REBOOT_MARK='reboot'
+ LOCKFILE='/var/lock/vereboot.lock'
+diff -urN vzctl-2.7.0-23/include/dist.h vzctl-2.7.0-23_etc_vz/include/dist.h
+--- vzctl-2.7.0-23/include/dist.h	2005-08-19 18:08:38.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/include/dist.h	2005-10-23 00:31:40.958253512 +0400
+@@ -23,7 +23,7 @@
+ #define	SET_UGID_QUOTA		6
+ #define	POST_CREATE		7
+ 
+-#define DIST_DIR		"/etc/sysconfig/vz-scripts/dists"
++#define DIST_DIR		"/etc/vz/dists"
+ 
+ typedef struct {
+ 	char *def_ostmpl;
+diff -urN vzctl-2.7.0-23/include/types.h vzctl-2.7.0-23_etc_vz/include/types.h
+--- vzctl-2.7.0-23/include/types.h	2005-10-23 00:30:51.060839072 +0400
++++ vzctl-2.7.0-23_etc_vz/include/types.h	2005-10-23 00:31:40.958253512 +0400
+@@ -12,7 +12,7 @@
+ #define	_TYPES_H_
+ 
+ #define GLOBAL_CFG              "/etc/conf.d/vz"
+-#define VPS_CONF_DIR            "/etc/sysconfig/vz-scripts/"
++#define VPS_CONF_DIR            "/etc/vz/"
+ #define LIB_DIR			"/usr/lib/vzctl/lib/"
+ #define VPS_SCRIPTS_DIR         "/usr/lib/vzctl/scripts/"
+ 
+diff -urN vzctl-2.7.0-23/include/vzlist.h vzctl-2.7.0-23_etc_vz/include/vzlist.h
+--- vzctl-2.7.0-23/include/vzlist.h	2005-10-23 00:30:51.061838920 +0400
++++ vzctl-2.7.0-23_etc_vz/include/vzlist.h	2005-10-23 00:31:40.959253360 +0400
+@@ -25,7 +25,7 @@
+ #define PROCVEINFO	"/proc/vz/veinfo"
+ #define PROCFSHED	"/proc/fairsched"
+ 
+-#define SCRIPT_DIR	"/etc/sysconfig/vz-scripts/"
++#define SCRIPT_DIR	"/etc/vz/"
+ #define CFG_FILE	"/etc/conf.d/vz"
+ #define VZQUOTA		"/usr/sbin/vzquota"
+ 
+diff -urN vzctl-2.7.0-23/man/vps.conf.5 vzctl-2.7.0-23_etc_vz/man/vps.conf.5
+--- vzctl-2.7.0-23/man/vps.conf.5	2005-10-17 16:50:30.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/man/vps.conf.5	2005-10-23 00:31:40.959253360 +0400
+@@ -3,10 +3,10 @@
+ .SH NAME
+ vps.conf \- configuration file for a Virtual Private Server.
+ .SH SYNOPSIS
+-/etc/sysconfig/vz-scripts/XXX.conf
++/etc/vz/XXX.conf
+ .SH DESCRIPTION
+ This is a configuration file for a VPS. It is stored as
+-\fB/etc/sysconfig/vz-scripts/\fR\fIXXX\fB.conf\fR, where \fIXXX\fR
++\fB/etc/vz/\fR\fIXXX\fB.conf\fR, where \fIXXX\fR
+ is the ID of the given VPS.
+ .PP
+ Configuration file consists of lines in the form
+diff -urN vzctl-2.7.0-23/man/vzctl.8 vzctl-2.7.0-23_etc_vz/man/vzctl.8
+--- vzctl-2.7.0-23/man/vzctl.8	2005-10-23 00:30:51.062838768 +0400
++++ vzctl-2.7.0-23_etc_vz/man/vzctl.8	2005-10-23 00:31:40.960253208 +0400
+@@ -318,7 +318,7 @@
+ .TP
+ \fB--applyconfig\fR \fIname\fR
+ Read VPS parameters from VPS sample configuration file
+-\f(CW\fB/etc/sysconfig/vz-scripts/ve-\fIname\fR\f(CW\fB.conf-sample\fR, and
++\f(CW\fB/etc/vz/ve-\fIname\fR\f(CW\fB.conf-sample\fR, and
+ apply them, if --save option specified save to VPS config file. These parameters
+ are not changed (\fBHOSTNAME\fR \fBIP_ADDRESS\fR \fBOSTEMPLATE\fR \fBVE_ROOT\fR \fBVE_PRIVATE\fR)
+ .SS Performing VPS actions
+@@ -328,7 +328,7 @@
+ 
+ If the \fB--config\fR \fIname\fR option is specified, values from
+ example configuration file
+-\f(CW\fB/etc/sysconfig/vz-scripts/ve-\fIname\fR\f(CW\fB.conf-sample\fR
++\f(CW\fB/etc/vz/ve-\fIname\fR\f(CW\fB.conf-sample\fR
+ are put into VPS configuration file. If VPS configuration file already exists,
+ it will be removed.
+ 
+@@ -422,7 +422,7 @@
+ \f(CR
+ /etc/conf.d/vz
+ .br
+-/etc/sysconfig/vz-scripts/vpsid.conf
++/etc/vz/vpsid.conf
+ .br
+ /proc/vz/veinfo
+ .br
+diff -urN vzctl-2.7.0-23/man/vzsplit.8 vzctl-2.7.0-23_etc_vz/man/vzsplit.8
+--- vzctl-2.7.0-23/man/vzsplit.8	2005-10-17 16:50:30.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/man/vzsplit.8	2005-10-23 00:31:54.328220968 +0400
+@@ -16,7 +16,7 @@
+ .TP
+ \fB-f\fR \fIconf_name\fR
+ Specify the configuration file name. The program output is placed to
+-/etc/sysconfig/vz-scripts/ve-\fIconf_name\fR.conf-sample.
++/etc/vz/ve-\fIconf_name\fR.conf-sample.
+ .TP
+ \fB-s\fR \fIswapsize\fR
+ Specify the swap size in Kbytes. If not provided in the option, the swap size will be read from /proc/meminfo.
+diff -urN vzctl-2.7.0-23/src/Makefile vzctl-2.7.0-23_etc_vz/src/Makefile
+--- vzctl-2.7.0-23/src/Makefile	2005-10-23 00:30:51.063838616 +0400
++++ vzctl-2.7.0-23_etc_vz/src/Makefile	2005-10-23 00:31:40.961253056 +0400
+@@ -14,7 +14,7 @@
+       LIBDIR = $(PREFIX)/lib/vzctl
+     CACHEDIR = /vz/template/cache
+    VZCONFDIR = /etc/conf.d
+-  VPSCONFDIR = /etc/sysconfig/vz-scripts
++  VPSCONFDIR = /etc/vz
+  DISTCONFDIR = $(VPSCONFDIR)/dists
+ NETSCRIPTDIR = /etc/sysconfig/network-scripts
+     CRONDDIR = /etc/cron.d
+diff -urN vzctl-2.7.0-23/src/vzsplit.c vzctl-2.7.0-23_etc_vz/src/vzsplit.c
+--- vzctl-2.7.0-23/src/vzsplit.c	2005-09-27 15:01:16.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/src/vzsplit.c	2005-10-23 00:31:40.962252904 +0400
+@@ -27,7 +27,7 @@
+ 
+ #define PROCMEM		"/proc/meminfo"
+ #define PROCTHREADS	"/proc/sys/kernel/threads-max"
+-#define OUTPATH		"/etc/sysconfig/vz-scripts/"
++#define OUTPATH		"/etc/vz/"
+ #define PROCCPU		"/proc/cpuinfo"
+ 
+ #define MAX_SL		3
diff --git a/sys-cluster/vzctl/vzctl-2.7.0.23.ebuild b/sys-cluster/vzctl/vzctl-2.7.0.23.ebuild
index ff16643be05f..4018064446b3 100644
--- a/sys-cluster/vzctl/vzctl-2.7.0.23.ebuild
+++ b/sys-cluster/vzctl/vzctl-2.7.0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.23.ebuild,v 1.1 2005/10/21 17:26:53 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.23.ebuild,v 1.2 2005/10/21 20:42:06 hollow Exp $
 
 inherit eutils toolchain-funcs versionator linux-info
 
@@ -46,7 +46,7 @@ src_unpack() {
 	cd ${S} || die
 
 	epatch ${FILESDIR}/vzctl-2.7.0-gentoo_conf_d.patch
-	epatch ${FILESDIR}/vzctl-2.7.0-gentoo_etc_vz.patch
+	epatch ${FILESDIR}/vzctl-2.7.0.23-gentoo_etc_vz.patch
 }
 
 src_compile() {