patch reordering; bash-completion; yum 2.6 support; misc fixes

Package-Manager: portage-2.1.1_pre4-r3

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 576031f92015470bc8d4babd81d53d2e4964665d..c2fa9856779dc5dc11335767585af6e87663b48a 100644 (file)
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.61 2006/07/24 08:20:57 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.62 2006/09/06 19:56:54 hollow Exp $
+
+*util-vserver-0.30.210-r18 (06 Sep 2006)
+
+  06 Sep 2006; Benedikt Böhm <hollow@gentoo.org>
+  +util-vserver-0.30.210-r18.ebuild:
+  patch reordering; bash-completion; yum 2.6 support; misc fixes
 
 *util-vserver-0.30.210-r17 (24 Jul 2006)
 

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 75b935d3e003d0eb89da3a4d16cc97e30dde9b26..d15cfd3a47afa2b51d5350eebeae36554f3303ec 100644 (file)
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 DIST util-vserver-0.30.210-patches-r13.tar.bz2 26978 RMD160 440aa77df60dccaceea9cd3bad7bb902c4252632 SHA1 6746c583f4b7018093050d0ed1e5df5857bdd9fb SHA256 26000063103fe822ede1f8ce0c14d6f79b4757f76863420d06f3164dc167ad9e
 DIST util-vserver-0.30.210-patches-r17.tar.bz2 27309 RMD160 5e0fbdae8b90e516b5257347b272821dde325ea4 SHA1 115920a2dcee9bb57a842798ff89dca1688a970e SHA256 4a03073fd9ba1435d6b140e5a98c1e18b9a47dda9924d558b4cf0a07c8eea467
 DIST util-vserver-0.30.210.tar.bz2 600032 RMD160 b8f426e319feeafc9be91315947c10a147586f1f SHA1 1075dc239277c7ecc76a644e7bbfeee869864595 SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04
+DIST util-vserver-patches-0.30.210-r18.tar.bz2 32668 RMD160 dc64a11620828f95859cbc2e25ee0f205c42212a SHA1 61faa28513b94eb36369b0fc413438d87b263964 SHA256 caf953981d52aa6e96058fe3acda299f394d2c415f8e4708fce8d3885f2da10f
 EBUILD util-vserver-0.30.210-r13.ebuild 3048 RMD160 7d9963719dce974bd29d23bdf14f61db8468f86f SHA1 80f7982695db7a29aa821f33cad3175565ead354 SHA256 33244f9cd2c5a450f5449ba4263b9ebf120aab822de344b93af815ce0db2261b
 MD5 de1cf005a317021660eee5ecd879a197 util-vserver-0.30.210-r13.ebuild 3048
 RMD160 7d9963719dce974bd29d23bdf14f61db8468f86f util-vserver-0.30.210-r13.ebuild 3048
@@ -12,10 +13,14 @@ EBUILD util-vserver-0.30.210-r17.ebuild 3069 RMD160 c5703b6a1c6db00b2d08dfe34c83
 MD5 96d0f5ff831cd9ab772045c4df899679 util-vserver-0.30.210-r17.ebuild 3069
 RMD160 c5703b6a1c6db00b2d08dfe34c838c4e40bd1a81 util-vserver-0.30.210-r17.ebuild 3069
 SHA256 8904e681349dcbbd40c6464bfd368291a85604906d13bf535ed171a78a6afc97 util-vserver-0.30.210-r17.ebuild 3069
-MISC ChangeLog 12304 RMD160 2db1db2e4cda58772387d077e62d09e5a6c83b3d SHA1 e2028e0c58117b5ebb3cf01c95aa86a48eeceec4 SHA256 c23035c657096bdec58f0a6c33a2f0897220d97d80dd363f6285052e132006b6
-MD5 ac0eab997cf1a7fa594d7b8229b3a399 ChangeLog 12304
-RMD160 2db1db2e4cda58772387d077e62d09e5a6c83b3d ChangeLog 12304
-SHA256 c23035c657096bdec58f0a6c33a2f0897220d97d80dd363f6285052e132006b6 ChangeLog 12304
+EBUILD util-vserver-0.30.210-r18.ebuild 3164 RMD160 6c04bac9fa1ee2db868fa0a1b149e541bf2e415f SHA1 ab798479a1aede468a44c11ff5b35152d1745a27 SHA256 5517717c01ffc6d304aa34054734c692516ea42737f48e888a2c5331073e73a9
+MD5 8914e8f60215b050da4610ddf8c5828d util-vserver-0.30.210-r18.ebuild 3164
+RMD160 6c04bac9fa1ee2db868fa0a1b149e541bf2e415f util-vserver-0.30.210-r18.ebuild 3164
+SHA256 5517717c01ffc6d304aa34054734c692516ea42737f48e888a2c5331073e73a9 util-vserver-0.30.210-r18.ebuild 3164
+MISC ChangeLog 12499 RMD160 a083ba22dd6731c5656e9f033f08541ce4c1c4b5 SHA1 4d2334369d78d474c5ea1842629e05710eccba0c SHA256 5616e70292f24f93c7a21c8fe68edec1f7bc2b15d7388caa248240b623d04b9e
+MD5 1d8f53980bbd3cd32dddf306ac9923d7 ChangeLog 12499
+RMD160 a083ba22dd6731c5656e9f033f08541ce4c1c4b5 ChangeLog 12499
+SHA256 5616e70292f24f93c7a21c8fe68edec1f7bc2b15d7388caa248240b623d04b9e ChangeLog 12499
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -26,10 +31,13 @@ SHA256 79be461cd53fcb5001642cba8bb6209721985b5ded8d0a1069a5fa5b00ac77f0 files/di
 MD5 cb2375309140d18624822898fb612092 files/digest-util-vserver-0.30.210-r17 569
 RMD160 6103d95f929824449ef71c1d341f41db62d44e62 files/digest-util-vserver-0.30.210-r17 569
 SHA256 18512ba16805d6c99920d331e1c5b5deff2a2a36b107b32acd63391caf54e427 files/digest-util-vserver-0.30.210-r17 569
+MD5 e40e1a7de54a69bba45107114250131e files/digest-util-vserver-0.30.210-r18 569
+RMD160 fc670d1fa2d6ca2b3278974ac0a2f4e4aea1e00b files/digest-util-vserver-0.30.210-r18 569
+SHA256 1988272f4e575006f37181a3aafb203d19a5244a99824867b402a5deacc7ae2a files/digest-util-vserver-0.30.210-r18 569
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFExILymPFBzbX68WERAm2gAKCC83FmLYYGgtiB2QENCe3qwW9QtwCeJR0t
-k9ZdzyRYmU2vel2XqdXmwX4=
-=wHpG
+iD8DBQFE/ygkmPFBzbX68WERAp20AJsGY7JeTKmd6EafDBy677eOIkwz3wCdF8Gl
+IdMgZna9KVnuaJoZFsd0EOQ=
+=flqC
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r18 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r18
new file mode 100644 (file)
index 0000000..9eebec2
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r18
@@ -0,0 +1,6 @@
+MD5 1e8fff7cb6246d21ed029f082123019b util-vserver-0.30.210.tar.bz2 600032
+RMD160 b8f426e319feeafc9be91315947c10a147586f1f util-vserver-0.30.210.tar.bz2 600032
+SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04 util-vserver-0.30.210.tar.bz2 600032
+MD5 d8bae5c9bc7a0dc23ee0c4f080f66fd4 util-vserver-patches-0.30.210-r18.tar.bz2 32668
+RMD160 dc64a11620828f95859cbc2e25ee0f205c42212a util-vserver-patches-0.30.210-r18.tar.bz2 32668
+SHA256 caf953981d52aa6e96058fe3acda299f394d2c415f8e4708fce8d3885f2da10f util-vserver-patches-0.30.210-r18.tar.bz2 32668

diff --git a/sys-cluster/util-vserver/util-vserver-0.30.210-r18.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.210-r18.ebuild
new file mode 100644 (file)
index 0000000..d70f133
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.210-r18.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.210-r18.ebuild,v 1.1 2006/09/06 19:56:54 hollow Exp $
+
+inherit autotools eutils toolchain-funcs bash-completion
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2
+       http://dev.gentoo.org/~hollow/distfiles/${PN}-patches-${PVR}.tar.bz2
+       http://dev.gentoo.org/~phreak/distfiles/${PN}-patches-${PVR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE=""
+
+DEPEND=">=dev-libs/dietlibc-0.28
+       dev-libs/beecrypt
+       net-firewall/iptables
+       net-misc/vconfig
+       sys-apps/iproute2
+       sys-process/procps"
+
+RDEPEND="sys-apps/iproute2
+       net-misc/vconfig
+       net-firewall/iptables
+       dev-libs/beecrypt
+       sys-process/procps"
+
+pkg_setup() {
+       if [[ -z "${VDIRBASE}" ]]; then
+               einfo
+               einfo "You can change the default vserver base directory (/vservers)"
+               einfo "by setting the VDIRBASE environment variable."
+       fi
+
+       : ${VDIRBASE:=/vservers}
+
+       einfo
+       einfo "Using \"${VDIRBASE}\" as vserver base directory"
+       einfo
+}
+
+src_unpack() {
+       unpack ${A} || die
+       cd "${S}" || die
+
+       cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
+       epatch "${WORKDIR}"/patches/*.patch
+
+       AT_M4DIR="-I m4" \
+       eautoreconf
+}
+
+src_compile() {
+       econf --localstatedir=/var \
+             --with-initrddir=/etc/init.d \
+             --with-vrootdir="${VDIRBASE}" || die "econf failed"
+       emake || die "emake failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "install failed"
+
+       # keep dirs
+       keepdir /var/run/vservers
+       keepdir /var/run/vservers.rev
+       keepdir /var/run/vshelper
+       keepdir /var/lock/vservers
+       keepdir /var/cache/vservers
+
+       keepdir "${VDIRBASE}"
+       fperms 000 "${VDIRBASE}"
+
+       # remove the non-gentoo init-scripts:
+       rm -f "${D}"/etc/init.d/*
+
+       # and install gentoo'ized ones:
+       doinitd "${WORKDIR}"/init.d/vservers
+       doconfd "${WORKDIR}"/conf.d/vservers
+
+       # bash-completion
+       dobashcompletion contrib/bash_completion util-vserver
+
+       dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+       einfo
+       einfo "You have to run the vprocunhide command after every reboot"
+       einfo "in order to setup /proc permissions correctly for vserver"
+       einfo "use. An init script has been installed by this package."
+       einfo "To use it you should add it to a runlevel:"
+       einfo
+       einfo " rc-update add vservers default"
+       einfo
+       einfo "This init script will also help you to start/stop your vservers"
+       einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
+       ewarn
+       ewarn "You should definitly fix up the barrier of your vserver"
+       ewarn "base directory by using the following command in a root shell:"
+       ewarn
+       ewarn " setattr --barrier ${VDIRBASE}"
+       ewarn
+       ewarn "IMPORTANT UPGRADE WARNING:"
+       ewarn
+       ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
+       ewarn "with the vservers init script. The following steps are"
+       ewarn "required to keep current behaviour:"
+       ewarn
+       ewarn " rc-update del vprocunhide"
+       ewarn " rc-update add vservers default"
+       ewarn
+}