diff options
author | Maxim Koltsov <maksbotan@gentoo.org> | 2013-01-02 16:52:51 +0000 |
---|---|---|
committer | Maxim Koltsov <maksbotan@gentoo.org> | 2013-01-02 16:52:51 +0000 |
commit | d280efd222671eb591e5ebbf3e9d5ed0fbcf1554 (patch) | |
tree | 40c79fb89215c1b85305a4175de42edfed024c0a /sys-cluster | |
parent | Actually include the package atom in the mask. (diff) | |
download | gentoo-2-d280efd222671eb591e5ebbf3e9d5ed0fbcf1554.tar.gz gentoo-2-d280efd222671eb591e5ebbf3e9d5ed0fbcf1554.tar.bz2 gentoo-2-d280efd222671eb591e5ebbf3e9d5ed0fbcf1554.zip |
Bump to 4.1.2, drop 4.1.1, thanks to slepnoga
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/vzctl/ChangeLog | 10 | ||||
-rw-r--r-- | sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch | 32 | ||||
-rw-r--r-- | sys-cluster/vzctl/metadata.xml | 12 | ||||
-rw-r--r-- | sys-cluster/vzctl/vzctl-4.1.2.ebuild (renamed from sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild) | 7 |
4 files changed, 16 insertions, 45 deletions
diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog index 1012cb114d2e..89d2ae839146 100644 --- a/sys-cluster/vzctl/ChangeLog +++ b/sys-cluster/vzctl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-cluster/vzctl -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.99 2012/12/29 02:26:45 floppym Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.100 2013/01/02 16:52:51 maksbotan Exp $ + +*vzctl-4.1.2 (02 Jan 2013) + + 02 Jan 2013; Maxim Koltsov <maksbotan@gentoo.org> +vzctl-4.1.2.ebuild, + -files/vzctl-4.1.1-VZREBOOTDIR.patch, -vzctl-4.1.1-r1.ebuild, metadata.xml: + Bump to 4.1.2, drop 4.1.1, thanks to slepnoga *vzctl-4.1.1-r1 (29 Dec 2012) diff --git a/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch b/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch deleted file mode 100644 index c868918b84ae..000000000000 --- a/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=449110 - -From 9e84e33023a31bc65479784113aad10c69ba0e36 Mon Sep 17 00:00:00 2001 -From: Kir Kolyshkin <kir@openvz.org> -Date: Fri, 28 Dec 2012 13:31:07 -0800 -Subject: [PATCH] etc/init.d/vz-gentoo: fix missing VZREBOOTDIR - -That was pretty lame from my side. Fix for commit af5bf43. - -http://bugzilla.openvz.org/2467 - -Reported-by: Andrei Vinogradov <spamslepnoga@inbox.ru> -Signed-off-by: Kir Kolyshkin <kir@openvz.org> ---- - etc/init.d/vz-gentoo.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in -index 05ef4e7..2dd2186 100755 ---- a/etc/init.d/vz-gentoo.in -+++ b/etc/init.d/vz-gentoo.in -@@ -17,6 +17,7 @@ check_config() { - : ${VZVEINFO:=/proc/vz/veinfo} - : ${VESTAT:=/proc/vz/vestat} - : ${VPSCONFDIR:=@VPSCONFDIR@} -+ : ${VZREBOOTDIR:=@VZREBOOTDIR@} - : ${VZDEV:=venet0} - : ${VZCONF:=@PKGCONFDIR@/vz.conf} - : ${VE_STOP_MODE:=suspend} --- -1.7.1 - diff --git a/sys-cluster/vzctl/metadata.xml b/sys-cluster/vzctl/metadata.xml index ba59b261db5a..96f2e5754ff6 100644 --- a/sys-cluster/vzctl/metadata.xml +++ b/sys-cluster/vzctl/metadata.xml @@ -4,14 +4,14 @@ <herd>vserver</herd> <herd>proxy-maintainers</herd> <maintainer> - <email>pva@gentoo.org</email> - <name>Peter Volkov</name> - <description>Primary maintainer</description> - </maintainer> - <maintainer> <email>andreis.vinogradovs@gmail.com</email> <name>Andreis Vinogradovs</name> - <description>Co-maintainer</description> + <description>Primary maintainer, assign bugs to him</description> + </maintainer> + <maintainer> + <email>pva@gentoo.org</email> + <name>Peter Volkov</name> + <description>Comitter</description> </maintainer> <use> <flag name='ploop'>Add support for ploop devices via <pkg>sys-cluster/ploop</pkg></flag> diff --git a/sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild b/sys-cluster/vzctl/vzctl-4.1.2.ebuild index 3f4c4e3a857b..6e393fbbf4ec 100644 --- a/sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild +++ b/sys-cluster/vzctl/vzctl-4.1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild,v 1.1 2012/12/29 02:26:45 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.2.ebuild,v 1.1 2013/01/02 16:52:51 maksbotan Exp $ EAPI="5" @@ -32,9 +32,6 @@ src_prepare() { sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed' sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' - - local PATCHES=( "${FILESDIR}/${P}-VZREBOOTDIR.patch" ) - base_src_prepare } src_configure() { |