fix ovz bug #108 and #111

Package-Manager: portage-2.1_pre4-r1

4 files changed, 99 insertions, 7 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 4b678c4499f8..82efde291320 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.14 2006/02/23 16:03:03 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.15 2006/03/01 14:58:46 hollow Exp $
+
+*vzctl-3.0.0.2-r1 (01 Mar 2006)
+
+  01 Mar 2006; Benedikt Boehm <hollow@gentoo.org> +vzctl-3.0.0.2-r1.ebuild:
+  fix ovz bug #108 and #111
 
 *vzctl-3.0.0.2 (23 Feb 2006)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 9a3640ea611e..23ccbd47bf39 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 585299bbf55c768d6990cc6f7fb8eac7 ChangeLog 2713
-RMD160 c372670232df7502c5f28a77ee7719edefb5d115 ChangeLog 2713
-SHA256 209f02fe5b8e91f9deb9cb7f36581743cb8d43f43c9565550851ab9189160a9d ChangeLog 2713
+MD5 9487c8008150027ac08b5f6d54060d64 ChangeLog 2851
+RMD160 8f03bb68131fc8c2a128c2371ac2ddc3b7da5d59 ChangeLog 2851
+SHA256 550f0a936d8a9a2f9ff309cac6682d4ed0e5866724776ac17a400c55ee41713c ChangeLog 2851
 MD5 3236a2f9ce3ca6d1b4bd679a1a9f7d23 files/digest-vzctl-2.7.0.24 518
 RMD160 7583c7394f5774b22756ca351b7e1905cab5a918 files/digest-vzctl-2.7.0.24 518
 SHA256 163bc729b5ce1ee15d1f284baf29c2b780304a89f36cfcf0f3b5ac4f448e8441 files/digest-vzctl-2.7.0.24 518
@@ -13,6 +13,9 @@ SHA256 d507f1c8f52ad4c1260fb980353f7706a3ab1c675b0cd6e3c63c33e69b28e2f1 files/di
 MD5 ba5b3be9f9474a09c6c16453f4bbd6d4 files/digest-vzctl-3.0.0.2 512
 RMD160 243d82b7ac64627c852a9df7812bcb567290c8b2 files/digest-vzctl-3.0.0.2 512
 SHA256 0ea79597fdb616a460e9bb28774f67bc6b94c3defb15da9bdaa6cd0ec493e47f files/digest-vzctl-3.0.0.2 512
+MD5 61f4b675752a7523a6c531ef1c6125d4 files/digest-vzctl-3.0.0.2-r1 512
+RMD160 eb7fdb9bbd9057ae37b0f8dac933f30442bf9f27 files/digest-vzctl-3.0.0.2-r1 512
+SHA256 23db4001b9728851ba465e42fe42b53878a34d715e5ad45a817e8b767498074d files/digest-vzctl-3.0.0.2-r1 512
 MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465
 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 files/vz.initd 5465
 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0 files/vz.initd 5465
@@ -25,13 +28,16 @@ SHA256 b26a6c6adaff7530dcd5c9cd15ab03451cf94c38ff68cd775a4955554e1657e7 vzctl-2.
 MD5 93a856c300e9844d90e19d467e15ee93 vzctl-2.7.0.26.ebuild 1808
 RMD160 2d8e0e67dbf918f2c76c6b2b8ad541ca9d7d75f8 vzctl-2.7.0.26.ebuild 1808
 SHA256 751a629c38ead46b124fd2f0830985065d9698f38a36d54904fb78f312e0438b vzctl-2.7.0.26.ebuild 1808
+MD5 655b49e1b3e157fe6e0494b3bbf5d5a2 vzctl-3.0.0.2-r1.ebuild 1933
+RMD160 a7e65c0eeddf78af80fd41836886babd3325348f vzctl-3.0.0.2-r1.ebuild 1933
+SHA256 f96234497e477b09b4341cbee439cccaa44175c7a908c9f7431076cecb0bd650 vzctl-3.0.0.2-r1.ebuild 1933
 MD5 02342f126580fcdea8083b915502049e vzctl-3.0.0.2.ebuild 1807
 RMD160 764cbf4bd51f508341f023e96f694ad29561d92c vzctl-3.0.0.2.ebuild 1807
 SHA256 3ba22af3727bf1242a5d253cc7e74253aaf73a7b21cbc6e6aca275a7ad95dc9f vzctl-3.0.0.2.ebuild 1807
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD/dzLmPFBzbX68WERAjP1AJ9WswLvca9sss8VjgvRWoVU4QYtiACfSUaf
-5gDGkDeoC7lGd6f3QQ7p0AU=
-=6ybN
+iD8DBQFEBba8mPFBzbX68WERAvhuAJ4luLr25m8tWYhy+KS6FyseghvvLgCZASRS
+bJn7FjZO4ZwtOFUhXkk8vpo=
+=C7gR
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.0.2-r1 b/sys-cluster/vzctl/files/digest-vzctl-3.0.0.2-r1
new file mode 100644
index 000000000000..4fd0e49605a7
--- /dev/null
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.0.2-r1
@@ -0,0 +1,6 @@
+MD5 591607bc83e050dd9e3f2ee878eaeff3 vzctl-3.0.0-2.tar.bz2 99661
+RMD160 5bbd986792051629a068878e8839a3abbfbbc287 vzctl-3.0.0-2.tar.bz2 99661
+SHA256 d66c347a0176ea067c51d87faa5976b2bc4f236cdef937dd83b94b7a5200f8d6 vzctl-3.0.0-2.tar.bz2 99661
+MD5 a381883d8912c591def2b482aec30023 vzctl-3.0.0.2-patches-r1.tar.bz2 5046
+RMD160 b6e6f981f08e08311104a0a28ac8ec153b349b55 vzctl-3.0.0.2-patches-r1.tar.bz2 5046
+SHA256 5ab695fc90284ba30ccf88ce7787432015191d9908a965986bcfce1807909c05 vzctl-3.0.0.2-patches-r1.tar.bz2 5046
diff --git a/sys-cluster/vzctl/vzctl-3.0.0.2-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.0.2-r1.ebuild
new file mode 100644
index 000000000000..c6ff65d522f9
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.0.2-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.0.2-r1.ebuild,v 1.1 2006/03/01 14:58:46 hollow Exp $
+
+inherit eutils toolchain-funcs versionator linux-info
+
+VVER="$(get_version_component_range 1-3 ${PV})"
+VREL="$(get_version_component_range 4 ${PV})"
+MY_PV="${VVER}-${VREL}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenVZ VPS control utility"
+HOMEPAGE="http://openvz.org/"
+SRC_URI="http://download.openvz.org/utils/${PN}/${MY_PV}/src/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2"
+
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/logrotate
+	app-shells/bash
+	sys-apps/sed
+	sys-apps/ed
+	sys-apps/grep
+	sys-apps/gawk
+	sys-apps/coreutils
+	net-firewall/iptables
+	app-arch/tar
+	sys-fs/vzquota
+	sys-process/procps
+	sys-apps/iproute2"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFIG_CHECK="FAIRSCHED VE VE_CALLS VE_NETDEV VE_IPTABLES"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	check_kernel_built
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-gentoo_conf_d.patch
+	epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-gentoo_etc_vz.patch
+	epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-create_param2.patch
+	epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-put_param3.patch
+
+	# fix hardcoded lib paths
+	use amd64 && epatch "${WORKDIR}"/patches/vzctl-3.0.0.2-amd64.patch
+}
+
+src_compile() {
+	emake VZKERNEL_HEADERS=${KV_DIR}/include || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" VZCONFDIR=/etc/conf.d/ install || die "make install failed"
+
+	# sysconfig is vendor specific
+	rm -rf ${D}/etc/sysconfig
+
+	# Install gentoo specific init script
+	rm -f ${D}/etc/init.d/*
+	newinitd ${FILESDIR}/vz.initd vz
+
+	# Fix permissions on cron.d files
+	chmod 0644 ${D}/etc/cron.d/*
+}