Version bump wrt bug #437684, thanks to Andreis Vinogradovs. Add him and proxy maintainers to metadata

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 99 insertions, 3 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 66fc560a111f..8f9735e211f8 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.94 2012/12/10 13:06:59 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.95 2012/12/10 13:23:51 pinkbyte Exp $
+
+*vzctl-4.1.1 (10 Dec 2012)
+
+  10 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> +vzctl-4.1.1.ebuild,
+  metadata.xml:
+  Version bump wrt bug #437684, thanks to Andreis Vinogradovs. Add him and
+  proxy maintainers to metadata
 
   10 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> vzctl-3.1.ebuild,
   vzctl-3.3.ebuild, vzctl-3.3-r1.ebuild:
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 10bf9901c816..9fb129e54561 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -2,11 +2,13 @@ DIST vzctl-3.0.29.3.tar.bz2 421448 SHA256 1af2a6c61ee39e9f51128dd1b78b5d1adfaa12
 DIST vzctl-3.0.30.2.tar.bz2 425118 SHA256 c100914ec10db7cce6114bb8fcfdf67dd406d0547ac07ea8d2994e6ca7299635 SHA512 2487482c96666bf73e961bb2849fafb54463ccf63b44dfbb7c5e6cedc19a7d029bcb66d902d67d1709b8899f61e014d938c150dcfe7b560800710d78ac6cf8f4 WHIRLPOOL 045826e689244d8fc5b60d32a5c0f26ae713693afc3f823b7d5229477db730c25fbea69edeb41de0add55362fc607e09eeb79dedb13d5705f530ee5372bf5c45
 DIST vzctl-3.1.tar.bz2 442684 SHA256 c2b3f37df56613bdd137dbc7d144d146e7f6737bbfae9490458056c7ff8e31ca SHA512 0a49a2a67ec47542a48da6ca43f1fb46d756378cde2453d128d1a8ebcaa7f8814d2a94f0d5dfe9f3e70c72b0aca01704f367d8ffd387bb4afccc2a33b63e5347 WHIRLPOOL fb07e83c2b82d04de0ad9d9cc9f70f733cb97c367d26f8f0862f6626eb2a2e6350cad2f81f9af2fa103b91a4e35075393bbae8174fb09cb8db1e6ccafb0209b2
 DIST vzctl-3.3.tar.bz2 445649 SHA256 cc421a2cb61fdf09ef11516c8a22962d07795096487e65382f0cdaedfdfadf63 SHA512 c464f53f6c9aa2b1d721fe10d031401fffa4055b3101a82eaf1eafce3ffa9d1828e3c1f9e56fb42e8617ae290ac3c4e9d504095089bed3fe56804cd5735b62d1 WHIRLPOOL fdeb767d4bbdbcf1e257afa19dee6a9246bf0fc47d56d045556fc11684523d45338f47884549bb08e59c53556065d5127abec2ccbddf8294566e19151ce24c52
+DIST vzctl-4.1.1.tar.bz2 470133 SHA256 d0249a9f61ec3afbca54eb34dc8743be3ff2777f7fd9fb507b2c4673f539f616 SHA512 a0ae760176c967ec0da49e927e0e81bf6ebecbadbecb30a7893a697febd6612a2f651f36189c9091ce62ea7d12f3f0b3e0eca756ccc9ef61f8e60b1a0a9d4458 WHIRLPOOL 3eeebd177c74dac3509f71cab89cbb0898e314ee51a64200d0737d98119368b4b79a5009dde70aed1da3af7019ea7d113ca65a068b4f065c3de3e580ae6e80f7
 EBUILD vzctl-3.0.29.3.ebuild 1644 SHA256 24ac616e9ca8d26a479e908ae4f7754db26d63ef4265ff5480cb01e9b12c8714 SHA512 608c2d3ee525bf480eb93cf3abfbecd0e5e36546cdfaaefe62b541b7687f254f74a2be64a7460e8104deb1edf7463a5ea2bb49de06680c7da93a23b2ee303eea WHIRLPOOL c21d6141baa116680a7fca92a28c17abb810815de9448ec3dbc60e3830aa2ba9362a45acc4e010f111dce27e1cbf018ae94e571a8ffba8e6abf2d2ee786e974c
 EBUILD vzctl-3.0.30.2.ebuild 1616 SHA256 4ba3695d31139f2b4c2828fd6038274f5f5821e732c4f27e4bf9f2a1feb91835 SHA512 0a84524f0e6a623eed9c33b1499f64062fe4f5a45cc0aacdcf62243b6fac3f8e471f7d4bf48bef68d1edb18eb6b39c35f39cb8f1d38d40bcf26de78f65fc48de WHIRLPOOL f8f4d6e14a5b98b4a3a6a725990f71db0d416d9d6615420733d03e1e72b31c5f6dfe90f15a61c10c26330e49a92cfc0f020925a3bed7be57d13851190bc7894e
 EBUILD vzctl-3.1.ebuild 1629 SHA256 c75acf1c39a6197260e23301bdc3e90a2e3c15bd74853a2ff86652d1f8dc5ece SHA512 a12f09c174cdb18f81315f4b127242c41af787e23975fca1de2f318c3108c8982a6f8d7c7eb120b5a085ea4ad4e43f3cf57eda0eb82845a6c5b8c444db299d2f WHIRLPOOL 432d967eea2c350b2105deeee158b4c881d0f5ffe4a54525bd13b59b52dc347a3f2f30a58f6a3971dcce0a93d31915a40a7f27e5f0d0d85c38eb30354f2d02df
 EBUILD vzctl-3.3-r1.ebuild 1975 SHA256 b728beaf9578ef684471a1225650b7a72661d64b1940415432a4a78bfce6c120 SHA512 c24cf6783b1af8452bf0fbc8cef4abdec8bf82f0765a66030f6c4d1bc431faf82edf34bd9ceb5ea43f4c87c912d5557f77132cdd76f5a5ae5517379ba2f44df5 WHIRLPOOL bc1a837c9b1e06a65cf1318934ac4119368380c7f90cb304e39eb6c9bb368a6b18830c26ad0e19f7086977867ee17df468f0a81524b2933377e92c83a374bb99
 EBUILD vzctl-3.3.ebuild 1703 SHA256 cb4120c9d9a9d4caf212228454cc49b353d0209b620c86bf688aa654dcb3d053 SHA512 752d6aa1651a2656c7da16fcf2fcc662f3fd41f1e83a81b235f4de5e9d3761cf31d00bdd8abc3cacfab8084e78910afed5552edbd02549e72660822d2bac763c WHIRLPOOL e5cda5b715e915e6536323de602464480b2df4dd54a914a703a754b3cd78e78622c15e86d7bba15a05713a08646981641727c04a208c8a8ac16c468717d08cd4
+EBUILD vzctl-4.1.1.ebuild 2180 SHA256 7531b50c61b820e1ff27d333f96579f91f76d8a33e5ab3da02233c335fc02df9 SHA512 f256da795ca3db0fba5baf85c5b6a7c060db1873d070bf6156643e7156d2d949d4a4f0166448e3d64311506c3bec8e861ede6c5a6f83d762e175d2697fccf957 WHIRLPOOL a22daa800c17c958b1ac7b910b9bfd857bba61f063c47400fbe9de589aac48bd27398c6ca88109d05bc8550568bbb2eb98b8c64cd4e60bd127727611ecd76fb5
 EBUILD vzctl-9999.ebuild 1963 SHA256 49a86d4a5331a136c7d9bf13721e4c63f0ce6e6a4a1531157f114cb541c55825 SHA512 75da27b7a44aa82a6216a082afd64ff1f8918b02d8aff10f4b7c13df97d43588a8fcb9a8596f2df93fca7ce7ef329f285a435ba1255d27d8d5b1a8602cb7a1e1 WHIRLPOOL 5ff4c7db865dc43c02118c1375ed04693c8d94e87aa63febcf57ecbc9571b8a9f0f0adcfaef9d08f3dab93b9179c65461a41b1ccc9b7b4cce7a002e6409f51c0
-MISC ChangeLog 19805 SHA256 4e853e20630d44e4dc808b482a3c8ef838efcf74ee60b2205365f53aeb6a7ebb SHA512 442be7d4b2ce3541a9b496d77edc4653c203bffa3de38424aa108ef345844a52a3b1c79dfa1e22ff4f935475e42a0bdbfefc4013e8bf7c8bb19371addeb05c83 WHIRLPOOL 5a948db2dd71873bd780519bc8002a1886a9884aa1780b07c6bfb6eafefb98804749283497b48b4b1a09e34c3cd4d421477f60162db1b835326e58aea050e168
-MISC metadata.xml 250 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215 SHA512 d378cec9c749bf85f754be36421be56bf106797a87e27827d59dd52329c0c1be22fef943d677b75e6b687eebce165f006b09f3f9f36e753f0abd2c822c1e5dec WHIRLPOOL c0a4e94df0bf2e419416ba84ac8f66ebc2a1a6385a44a52d96a5c3979d182f37821f22ac1f8265d559c1f6468d2d8d17c6a2290b69783b26ba5ff55f0a629a0b
+MISC ChangeLog 20028 SHA256 d2fb274e9fcaba708a7475d1c4187ea45d9252c0cee2e2a13f18beb23f794ad8 SHA512 6eddbd8d40b3d5abc5da5179cd63b9c22f68dc31d830e5e8622b33895fa8f0f61829833ff37f235b44f0b49ec5bd80790b81a219b5713f306282b735cd1fb873 WHIRLPOOL 74710adc354716fa9128882d090ee1609aa8da47ce39256f07c15f04fdc94072019fdc806aa426b901853ad5cf82df5f44a85cf46046cfb3565c49c236adf6b2
+MISC metadata.xml 663 SHA256 33959534b64f468d5067d847dc4366a984a7ce9c6bcf701f7cfa44c3f639aa0b SHA512 61aec027e85c81be42306a604252316e92f5e2dd8bfbbd6955c10a6df0b02ccbb54397717fd2d598070c380c712c79b4a2cbfa0ae73ef0673ab8479decda3d3b WHIRLPOOL aa36244bf8ce2dc51fa094a5a38be250d6ba97d03611f3be2495c4095f81f24e54cf539b7bb9f1301abb416f717301e48e1f6c3bf9c39ef30646305628d4cacf
diff --git a/sys-cluster/vzctl/metadata.xml b/sys-cluster/vzctl/metadata.xml
index 1301c983d813..ba59b261db5a 100644
--- a/sys-cluster/vzctl/metadata.xml
+++ b/sys-cluster/vzctl/metadata.xml
@@ -2,8 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<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>
+	</maintainer>
+	<use>
+		<flag name='ploop'>Add support for ploop devices via <pkg>sys-cluster/ploop</pkg></flag>
+		<flag name='cgroup'>Add support to Linux kernel cgroup subsytem</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-cluster/vzctl/vzctl-4.1.1.ebuild b/sys-cluster/vzctl/vzctl-4.1.1.ebuild
new file mode 100644
index 000000000000..ac3ddc6c274b
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-4.1.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/12/10 13:23:51 pinkbyte Exp $
+
+EAPI="5"
+
+inherit base bash-completion-r1 eutils toolchain-funcs
+
+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 ~x86"
+IUSE="+ploop +cgroup"
+
+RDEPEND="
+	net-firewall/iptables
+	sys-apps/ed
+	>=sys-apps/iproute2-3.0
+	sys-fs/vzquota
+	ploop? ( >=sys-cluster/ploop-1.5 )
+	cgroup? ( >=dev-libs/libcgroup-0.37 )
+	"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Set default OSTEMPLATE on gentoo added
+	sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s:/lib/udev:${udevdir}:" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
+
+	base_src_prepare
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--enable-udev \
+		--enable-bashcomp \
+		--enable-logrotate \
+		$(use_with ploop) \
+		$(use_with cgroup)
+}
+
+src_install() {
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	emake DESTDIR="${D}" udevdir="${udevdir}"/rules.d install install-gentoo
+
+	# install the bash-completion script into the right location
+	rm -rf "${ED}"/etc/bash_completion.d
+	newbashcomp etc/bash_completion.d/vzctl.sh ${PN}
+
+	# We need to keep some dirs
+	keepdir /vz/{dump,lock,root,private,template/cache}
+	keepdir /etc/vz/names /var/lib/vzctl/veip
+}
+
+pkg_postinst() {
+	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."
+}