From 0f87599b7b9f5acc4bf450abef682e9d0302273c Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Wed, 29 Nov 2006 22:17:20 +0000 Subject: [PATCH] Version bump, UPSTREAM accepted all our patches (so no need to use our seperate tarball)! Package-Manager: portage-2.1.2_rc2-r1 --- sys-cluster/vzctl/ChangeLog | 9 ++- sys-cluster/vzctl/Manifest | 41 +++++------ sys-cluster/vzctl/files/digest-vzctl-3.0.12 | 3 - sys-cluster/vzctl/files/digest-vzctl-3.0.13 | 3 + sys-cluster/vzctl/vzctl-3.0.12.ebuild | 19 +---- sys-cluster/vzctl/vzctl-3.0.13.ebuild | 77 +++++++++++++++++++++ 6 files changed, 109 insertions(+), 43 deletions(-) create mode 100644 sys-cluster/vzctl/files/digest-vzctl-3.0.13 create mode 100644 sys-cluster/vzctl/vzctl-3.0.13.ebuild diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog index 0bd37c504963..8404e05b331b 100644 --- a/sys-cluster/vzctl/ChangeLog +++ b/sys-cluster/vzctl/ChangeLog @@ -1,6 +1,13 @@ # 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.36 2006/10/12 10:56:41 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.37 2006/11/29 22:17:20 phreak Exp $ + +*vzctl-3.0.13 (29 Nov 2006) + + 29 Nov 2006; Christian Heim vzctl-3.0.12.ebuild, + +vzctl-3.0.13.ebuild: + Version bump, UPSTREAM accepted all our patches (so no need to use our + seperate tarball)! *vzctl-3.0.12 (12 Oct 2006) diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest index ca27b3d82f77..5d5c1b9ebe2e 100644 --- a/sys-cluster/vzctl/Manifest +++ b/sys-cluster/vzctl/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX vz-3.0.10.initd 5857 RMD160 20c18e403ee8d5c2fea72026f0c0d4f6d00a7381 SHA1 b6f6a00399cab7d8249d8a744ad86135e80be15f SHA256 ce3f721de30e3ae18286cdfccdac44c9b01f84838e336a9d1b9a5ff59e8a0480 MD5 65ad1bf9fada9b4649e5e85cf5750b7b files/vz-3.0.10.initd 5857 RMD160 20c18e403ee8d5c2fea72026f0c0d4f6d00a7381 files/vz-3.0.10.initd 5857 @@ -14,7 +11,7 @@ DIST vzctl-3.0.0.8-patches-r0.tar.bz2 3816 RMD160 33fa63aa9749beedf6bd7dfd03f116 DIST vzctl-3.0.11-patches-r1.tar.bz2 10808 RMD160 b1da2a6bafcc0b6bb1261a13d52b1ea8298a6d5e SHA1 5ab93262d2d9cab58256db689b0223394d15b846 SHA256 c514ac4698dca559de34c24421790f14b46acfbcc69fc2c208004f989e6efc39 DIST vzctl-3.0.11.tar.bz2 125685 RMD160 af04926dc3971d4078e83333d015a9db49e63ff7 SHA1 77edcc11bc2013068f51706280ecc5010d0630c0 SHA256 03b255ba3cdc700178bb7d20af928ab3896ac799404866187f0293ed87a9aecb DIST vzctl-3.0.12.tar.bz2 127309 RMD160 9e94be2d61a8e1c9c9be1947d45677c24f763649 SHA1 14cecffd1b28d319553d68327b82aa9b494c1270 SHA256 d165f551c2004211d4001d5f8764dbe0249d61fe61632f4ce5b26c01b99897f9 -DIST vzctl-patches-3.0.12.tar.bz2 3307 RMD160 6f504387ed20f25f9f10724e835a3207be0f49af SHA1 06b66969ac3817ae42cca1e541445698bc36df72 SHA256 0efd0c067743501dc12f96d58849717e1442e1b8e4a6763a9e3ee5d32c35ac41 +DIST vzctl-3.0.13.tar.bz2 129562 RMD160 8d161c1249c90d817044c0638da0bbae4d3041b1 SHA1 f7b4ea671146f43e7fdd9876b8e963211208a2a2 SHA256 c087a6ac18249e9050825fc371b324757ef2ff26de747e25bcaacf591bbd8b76 EBUILD vzctl-3.0.0.8.ebuild 1720 RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 SHA1 a3d5124f6e47ff95f5b7fc5359533f88e893542e SHA256 05e79597417cca500073db713bed3da8c4ea95ed4f0788279c7235dc789fbe3c MD5 8c19abdd920fd9bc4734c496aae0bec4 vzctl-3.0.0.8.ebuild 1720 RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 vzctl-3.0.0.8.ebuild 1720 @@ -23,14 +20,18 @@ EBUILD vzctl-3.0.11-r1.ebuild 2296 RMD160 7d47aac8004ed8e2675c896a38984e56641d50 MD5 bc15aa7401e17ff434dacd299fe92497 vzctl-3.0.11-r1.ebuild 2296 RMD160 7d47aac8004ed8e2675c896a38984e56641d5054 vzctl-3.0.11-r1.ebuild 2296 SHA256 ead248b1c73915457c5aa771a7aa34342b0ae60f2e529ccd647e7b9dbf322517 vzctl-3.0.11-r1.ebuild 2296 -EBUILD vzctl-3.0.12.ebuild 2294 RMD160 1f1b0be90ad481fe9e64e4fd527a6fba7ae991d1 SHA1 eb942dfd19885ebbc7fad19e3a5d0cc828290fa3 SHA256 23532200315dab0fb6e8253d9b0575a19861f247ac8a338ce95bbd65587101ac -MD5 39d54cddeb2ac20c02daeeeaf44e33e2 vzctl-3.0.12.ebuild 2294 -RMD160 1f1b0be90ad481fe9e64e4fd527a6fba7ae991d1 vzctl-3.0.12.ebuild 2294 -SHA256 23532200315dab0fb6e8253d9b0575a19861f247ac8a338ce95bbd65587101ac vzctl-3.0.12.ebuild 2294 -MISC ChangeLog 6645 RMD160 dbe91f1337df4d68ccc3018acd1b395f99b35500 SHA1 8e399e7bcce3b15caf6b09b11d35433f7bcad77a SHA256 a5751041b71134b8e9b718efe5f37f0b1ca50406b01e718f2d335a32fe691bbe -MD5 70fed52b047b70860537e1a1d58ce80b ChangeLog 6645 -RMD160 dbe91f1337df4d68ccc3018acd1b395f99b35500 ChangeLog 6645 -SHA256 a5751041b71134b8e9b718efe5f37f0b1ca50406b01e718f2d335a32fe691bbe ChangeLog 6645 +EBUILD vzctl-3.0.12.ebuild 1879 RMD160 689e6f36124350b213288ede8f6476f6f0bdcb9c SHA1 b7fd8391917eff55bec626c1db1e967445227467 SHA256 6518ab1cd3bab119b8c2e6d16fc96c678bc3ad897df9031f44c4d04df101c5a6 +MD5 65b58c4c9c41926d39679e00e96a6463 vzctl-3.0.12.ebuild 1879 +RMD160 689e6f36124350b213288ede8f6476f6f0bdcb9c vzctl-3.0.12.ebuild 1879 +SHA256 6518ab1cd3bab119b8c2e6d16fc96c678bc3ad897df9031f44c4d04df101c5a6 vzctl-3.0.12.ebuild 1879 +EBUILD vzctl-3.0.13.ebuild 2298 RMD160 4291630f34206c4b2ccaf055ec6477c771d93141 SHA1 262e98e4c20f71de22c6bad205571935ac7c13ce SHA256 f463354d3e6868e71e713172644cbf913aac4aca5bbca4e67b9f733b8333428d +MD5 571b88480532321cf8811400768abde6 vzctl-3.0.13.ebuild 2298 +RMD160 4291630f34206c4b2ccaf055ec6477c771d93141 vzctl-3.0.13.ebuild 2298 +SHA256 f463354d3e6868e71e713172644cbf913aac4aca5bbca4e67b9f733b8333428d vzctl-3.0.13.ebuild 2298 +MISC ChangeLog 6864 RMD160 b4f828126171810f165d3111d6a74d3b537625db SHA1 f09d0fea71c41f7105a33b928a90ee7ce51657d1 SHA256 9032aadf8144bfe2ec02c29d0320ebf569ddd47c020c70059ea52a33ecce01b5 +MD5 71ed0b61cf2e801c2b3e87e47d5fb26b ChangeLog 6864 +RMD160 b4f828126171810f165d3111d6a74d3b537625db ChangeLog 6864 +SHA256 9032aadf8144bfe2ec02c29d0320ebf569ddd47c020c70059ea52a33ecce01b5 ChangeLog 6864 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231 @@ -41,13 +42,9 @@ SHA256 dc1dba3fb70c9a7212de8916eaaeb3c2b4a6b847702d90e0c58d06c62e9b3dc2 files/di MD5 8d85d47388a7b8ba79c87325b83f9577 files/digest-vzctl-3.0.11-r1 512 RMD160 0b01afe81799a9ac967c7a309fe815e924aef50e files/digest-vzctl-3.0.11-r1 512 SHA256 952d478acc62c00bc8276a90bb112e36b889fcb3ec5aab69e02ccbcfc9aee88b files/digest-vzctl-3.0.11-r1 512 -MD5 2ca9ffa4469faf6fe584f874f0c75d86 files/digest-vzctl-3.0.12 500 -RMD160 446a01823a163383d5fbaf092778fbc5a6333dcb files/digest-vzctl-3.0.12 500 -SHA256 6343368ebc79899582e3ca7a4229314df2555f110410e051c71ce7c1ce492db0 files/digest-vzctl-3.0.12 500 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFLh92yuNVb5qfaOYRAhF4AJ4h+CjDNNCgaYS/donNZuOnZxO3tgCgr7qF -bWSi1MtXmz9Wuh5DGrBmpWw= -=/ciz ------END PGP SIGNATURE----- +MD5 796bb76d6987bd4708b6ce22f8631752 files/digest-vzctl-3.0.12 241 +RMD160 334c8049e5298ae73915fc18247f984fb3db2afc files/digest-vzctl-3.0.12 241 +SHA256 c9ac49a68a3507f6550aa814c4ab549d506755b38a156a540c8410dae9bcff80 files/digest-vzctl-3.0.12 241 +MD5 aaaf174fe27349eec16072c6523280ed files/digest-vzctl-3.0.13 241 +RMD160 b6e8fa07379d2c8c884ac9025d8720addab2eb88 files/digest-vzctl-3.0.13 241 +SHA256 335b6a51a7ca25cc81b1106514f4ef55a1016edf9393aeaca6b5dcf1281889a0 files/digest-vzctl-3.0.13 241 diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.12 b/sys-cluster/vzctl/files/digest-vzctl-3.0.12 index fc32606b6db6..4f62d67310fc 100644 --- a/sys-cluster/vzctl/files/digest-vzctl-3.0.12 +++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.12 @@ -1,6 +1,3 @@ MD5 ba83f2b8949d9c1ed469bd325fb47840 vzctl-3.0.12.tar.bz2 127309 RMD160 9e94be2d61a8e1c9c9be1947d45677c24f763649 vzctl-3.0.12.tar.bz2 127309 SHA256 d165f551c2004211d4001d5f8764dbe0249d61fe61632f4ce5b26c01b99897f9 vzctl-3.0.12.tar.bz2 127309 -MD5 2c63e918c4a4946d0ba752ad5081a57a vzctl-patches-3.0.12.tar.bz2 3307 -RMD160 6f504387ed20f25f9f10724e835a3207be0f49af vzctl-patches-3.0.12.tar.bz2 3307 -SHA256 0efd0c067743501dc12f96d58849717e1442e1b8e4a6763a9e3ee5d32c35ac41 vzctl-patches-3.0.12.tar.bz2 3307 diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.13 b/sys-cluster/vzctl/files/digest-vzctl-3.0.13 new file mode 100644 index 000000000000..e96a7d077bb7 --- /dev/null +++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.13 @@ -0,0 +1,3 @@ +MD5 3931ceb56b22bf5e0ad1f9977fff4005 vzctl-3.0.13.tar.bz2 129562 +RMD160 8d161c1249c90d817044c0638da0bbae4d3041b1 vzctl-3.0.13.tar.bz2 129562 +SHA256 c087a6ac18249e9050825fc371b324757ef2ff26de747e25bcaacf591bbd8b76 vzctl-3.0.13.tar.bz2 129562 diff --git a/sys-cluster/vzctl/vzctl-3.0.12.ebuild b/sys-cluster/vzctl/vzctl-3.0.12.ebuild index b2df99bef181..d167185a7bfd 100644 --- a/sys-cluster/vzctl/vzctl-3.0.12.ebuild +++ b/sys-cluster/vzctl/vzctl-3.0.12.ebuild @@ -1,14 +1,12 @@ # 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.12.ebuild,v 1.1 2006/10/12 10:56:41 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.12.ebuild,v 1.2 2006/11/29 22:17:20 phreak Exp $ inherit bash-completion eutils flag-o-matic multilib DESCRIPTION="OpenVZ VPS control utility" HOMEPAGE="http://openvz.org/" -SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2 - http://dev.gentoo.org/~phreak/distfiles/${PN}-patches-${PVR}.tar.bz2 - http://dev.gentoo.org/~hollow/distfiles/${PN}-patches-${PVR}.tar.bz2" +SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -25,12 +23,6 @@ RDEPEND="logrotate? ( app-admin/logrotate ) DEPEND="${RDEPEND}" -src_unpack() { - unpack ${A} - - epatch "${WORKDIR}/patches"/*.patch -} - src_compile() { append-flags -Wall -g2 emake CFLAGS="${CFLAGS}" || die @@ -54,13 +46,6 @@ src_install() { # Remove the logrotate entr unless USE=logrotate use logrotate || rm -rf "${D}"/etc/logrotate.d - - # Provide a symlink for vz.conf (fixing #138462) -# dosym /etc/vz/vz.conf /etc/conf.d/vz - - # Remove cruftie sysconfig entries - # We can get rid of that once ovz #254 is solved - rm -rf "${D}"/etc/sysconfig } pkg_postinst() { diff --git a/sys-cluster/vzctl/vzctl-3.0.13.ebuild b/sys-cluster/vzctl/vzctl-3.0.13.ebuild new file mode 100644 index 000000000000..41477361256e --- /dev/null +++ b/sys-cluster/vzctl/vzctl-3.0.13.ebuild @@ -0,0 +1,77 @@ +# 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.13.ebuild,v 1.1 2006/11/29 22:17:20 phreak Exp $ + +inherit bash-completion eutils flag-o-matic multilib + +DESCRIPTION="OpenVZ VPS control utility" +HOMEPAGE="http://openvz.org/" +SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" +# http://dev.gentoo.org/~phreak/distfiles/${PN}-patches-${PVR}.tar.bz2 +# http://dev.gentoo.org/~hollow/distfiles/${PN}-patches-${PVR}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bash-completion logrotate udev" + +RDEPEND="logrotate? ( app-admin/logrotate ) + net-firewall/iptables + sys-apps/ed + sys-apps/iproute2 + sys-fs/vzquota + udev? ( sys-fs/udev ) + virtual/cron" + +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + +# epatch "${WORKDIR}/patches"/*.patch +} + +src_compile() { + append-flags -Wall -g2 + emake CFLAGS="${CFLAGS}" || die +} + +src_install() { + make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install install-gentoo || die "make install failed" + + # the get_libdir in `make install' breaks src/Makefile's logic (and thus all + # contained tools), so we have to create a env.d entry for vzctl's LDPATH. + dodir /etc/env.d + echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl + + # Remove udev files unless USE=udev + use udev || rm -rf "${D}"/etc/udev + + # Remove the bash-completion and use dobashcompletion to install it in the + # right place! + rm -rf "${D}"/etc/bash_completion.d + dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl + + # Remove the logrotate entr unless USE=logrotate + use logrotate || rm -rf "${D}"/etc/logrotate.d + + # Provide a symlink for vz.conf (fixing #138462) +# dosym /etc/vz/vz.conf /etc/conf.d/vz + + # Remove cruftie sysconfig entries + # We can get rid of that once ovz #254 is solved + rm -rf "${D}"/etc/sysconfig +} + +pkg_postinst() { + if has_version "<3.0.10"; then + ewarn + ewarn "The location of some vzctl files have changed. Most notably," + ewarn "VE configuration files and samples directory has changed from" + ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with" + ewarn "your VEs, please do the following:" + ewarn + ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/" + ewarn + fi +} -- 2.26.2