fix vsomething argument handling

Package-Manager: portage-2.1.2-r5

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index d0132b4a16faad0341025c811ed85d602dd68708..f90ee7ee90fea9e697dc9da93a1c05996a38d945 100644 (file)
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.72 2007/01/21 14:09:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.73 2007/02/05 18:19:16 hollow Exp $
+
+*util-vserver-0.30.212-r2 (05 Feb 2007)
+
+  05 Feb 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/util-vserver-0.30.212-vsomething-fix.patch,
+  +util-vserver-0.30.212-r2.ebuild:
+  fix vsomething argument handling
 
   21 Jan 2007; Benedikt Böhm <hollow@gentoo.org>
   -util-vserver-0.30.210-r13.ebuild, -util-vserver-0.30.211.ebuild,

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index b7c0808b4c96a4e8e070287a0159476b33dbfd0e..eeabf53506f356a66a75595cc753f49973bb34f5 100644 (file)
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -17,6 +17,10 @@ AUX util-vserver-0.30.212-initpost.patch 2066 RMD160 70194e005c573eba073d9541518
 MD5 793e69e656b487e92db95a258049413b files/util-vserver-0.30.212-initpost.patch 2066
 RMD160 70194e005c573eba073d95415188c9ed779511e9 files/util-vserver-0.30.212-initpost.patch 2066
 SHA256 231c86e9f2ce2aa2ac1643662162c9e064fbeff620b6781fd13e5edb2439d527 files/util-vserver-0.30.212-initpost.patch 2066
+AUX util-vserver-0.30.212-vsomething-fix.patch 2094 RMD160 806865a2dd603d19b5bb98e60864705a85d9a997 SHA1 862145a602dc040c0cc30a60f334dd747dc00620 SHA256 5f1492288b61511fd63634189a54f1e4bb664881f507e47283241caf376c75e8
+MD5 e8b430c7e4e21c6ce6ee95fd194dbf32 files/util-vserver-0.30.212-vsomething-fix.patch 2094
+RMD160 806865a2dd603d19b5bb98e60864705a85d9a997 files/util-vserver-0.30.212-vsomething-fix.patch 2094
+SHA256 5f1492288b61511fd63634189a54f1e4bb664881f507e47283241caf376c75e8 files/util-vserver-0.30.212-vsomething-fix.patch 2094
 AUX util-vserver-0.30.212-wrapper.patch 1349 RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 SHA1 2b5e04383bc3e5a52ae2fde86eb77a8f3cf8eeb5 SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe
 MD5 bc15d959f59fbe0250e0be2f2ca9ee70 files/util-vserver-0.30.212-wrapper.patch 1349
 RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 files/util-vserver-0.30.212-wrapper.patch 1349
@@ -26,10 +30,14 @@ EBUILD util-vserver-0.30.212-r1.ebuild 3757 RMD160 275973cb7a4cfb52c775a440e8881
 MD5 f89476c6d4bbdce62ccbfbc5a213dc64 util-vserver-0.30.212-r1.ebuild 3757
 RMD160 275973cb7a4cfb52c775a440e8881956b94515f5 util-vserver-0.30.212-r1.ebuild 3757
 SHA256 bbcf71fb7174272fb086a489d6bd778add6dee9d4595e73c006bfd29d4bd00c6 util-vserver-0.30.212-r1.ebuild 3757
-MISC ChangeLog 15089 RMD160 fbbbe1cf69b1111e28008d048086ed2646ee4542 SHA1 0fd6b165f339e331a8f45172cb370bae31422a06 SHA256 2c3522745efa328bf63803eef5b088fed870bb43d6db06bb623fccf66b6fd6fc
-MD5 5741c8d40f5aa937b895ef8be44e6524 ChangeLog 15089
-RMD160 fbbbe1cf69b1111e28008d048086ed2646ee4542 ChangeLog 15089
-SHA256 2c3522745efa328bf63803eef5b088fed870bb43d6db06bb623fccf66b6fd6fc ChangeLog 15089
+EBUILD util-vserver-0.30.212-r2.ebuild 3805 RMD160 0458dbb0559ffd332f313caed2548dfb7c97a891 SHA1 83bf584d99911f1e22dbc7e408875c95f5636414 SHA256 9202e553354bf78d90b8f2675521722591a08b500be15732c1b013a5943af676
+MD5 052cc36651d1aa8595583af1a85a315d util-vserver-0.30.212-r2.ebuild 3805
+RMD160 0458dbb0559ffd332f313caed2548dfb7c97a891 util-vserver-0.30.212-r2.ebuild 3805
+SHA256 9202e553354bf78d90b8f2675521722591a08b500be15732c1b013a5943af676 util-vserver-0.30.212-r2.ebuild 3805
+MISC ChangeLog 15305 RMD160 9d88aa9de355da0325b38fb9cdf980fbace3f641 SHA1 18838b999099883f8ac50da52cf966fe009c3848 SHA256 c106e7b5cd2a7ec8bf4087e41f26fc181a13b1521cf9b3bce5ca4814cbd5a01e
+MD5 98ff2c956fecf1e282a5d1ab577bc394 ChangeLog 15305
+RMD160 9d88aa9de355da0325b38fb9cdf980fbace3f641 ChangeLog 15305
+SHA256 c106e7b5cd2a7ec8bf4087e41f26fc181a13b1521cf9b3bce5ca4814cbd5a01e ChangeLog 15305
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -37,10 +45,13 @@ SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d metadata
 MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212-r1 268
 RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212-r1 268
 SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212-r1 268
+MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212-r2 268
+RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212-r2 268
+SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212-r2 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFs3QYmPFBzbX68WERAvCfAJ9vz07QuD897bpp5lyEwGW7g3Yo2ACfVYaS
-FqlOO0GHivLP6gIxImUJhIU=
-=KPgm
+iD8DBQFFx3UumPFBzbX68WERAqQzAJ9I+ZARzhUIe0GgvvgYS89wqv37bwCePDls
+++U3erC7xbXZRopuyWaYntE=
+=aLn/
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r2 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r2
new file mode 100644 (file)
index 0000000..0babb2f
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r2
@@ -0,0 +1,3 @@
+MD5 386b91732b7f0f132b4e9d978389dcc2 util-vserver-0.30.212.tar.bz2 643139
+RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 util-vserver-0.30.212.tar.bz2 643139
+SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484 util-vserver-0.30.212.tar.bz2 643139

diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch
new file mode 100644 (file)
index 0000000..50ad54f
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch
@@ -0,0 +1,55 @@
+Index: /trunk/scripts/vupdateworld\r
+===================================================================\r
+--- /trunk/scripts/vupdateworld (revision 2452)\r
++++ /trunk/scripts/vupdateworld (revision 2486)\r
+@@ -65,4 +65,14 @@\r
+ done\r
+ \r
++declare -a vserver_names\r
++\r
++while [ $# -gt 0 ]; do\r
++    case "$1" in\r
++      (--)            shift; break;;\r
++      (*)             vserver_names=( "${vserver_names[@]}" "$1" );;\r
++    esac\r
++    shift\r
++done\r
++\r
+ VSOMETHING_TITLE=vemerge\r
+ VSOMETHING_PKGMGMT=1\r
+@@ -71,3 +81,3 @@\r
+ \r
+ test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )\r
+-exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --update --deep --newuse "$@"\r
++exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@"\r
+Index: /trunk/scripts/vdispatch-conf\r
+===================================================================\r
+--- /trunk/scripts/vdispatch-conf (revision 2363)\r
++++ /trunk/scripts/vdispatch-conf (revision 2486)\r
+@@ -70,3 +70,3 @@\r
+ export VSOMETHING_TITLE VSOMETHING_PKGMGMT\r
+ \r
+-exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}"\r
++exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@"\r
+Index: /trunk/scripts/vesync\r
+===================================================================\r
+--- /trunk/scripts/vesync (revision 2363)\r
++++ /trunk/scripts/vesync (revision 2486)\r
+@@ -76,15 +76,13 @@\r
+ export VSOMETHING_TITLE VSOMETHING_PKGMGMT\r
+ \r
+-test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )\r
+-\r
+ ret=0\r
+ \r
+ test $overlay_only -eq 0 && \\r
+-      $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --metadata\r
++      $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" -- --metadata\r
+ \r
+ ret=$?\r
+ \r
+ test -n "$overlay" -a -n "$overlay_host" && \\r
+-      $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" \\r
++      $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$@" -- \\r
+       -rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/"\r
+ \r

diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212-r2.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.212-r2.ebuild
new file mode 100644 (file)
index 0000000..e3a10cf
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.212-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2007 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.212-r2.ebuild,v 1.1 2007/02/05 18:19:16 hollow Exp $
+
+inherit eutils bash-completion
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+
+IUSE=""
+
+RDEPEND="dev-libs/beecrypt
+       net-firewall/iptables
+       net-misc/vconfig
+       sys-apps/iproute2"
+
+DEPEND="${RDEPEND}
+       >=dev-libs/dietlibc-0.30-r2"
+
+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}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-wrapper.patch
+       epatch "${FILESDIR}"/${P}-initpost.patch
+       epatch "${FILESDIR}"/${P}-vsomething-fix.patch
+}
+
+src_compile() {
+       econf --with-vrootdir=${VDIRBASE} \
+               --localstatedir=/var \
+               --with-initrddir=/etc/init.d || die "econf failed!"
+       emake || die "emake failed!"
+}
+
+src_install() {
+       make DESTDIR="${D}" install install-distribution \
+               || die "make install failed!"
+
+       # create the /sbin/vshelper symlink so we don't have to mess around with
+       # (a) echoing stuff to /etc/sysctl.conf
+       # (b) changing the default vshelper in the kernel sources.
+       dosym /usr/lib/util-vserver/vshelper /sbin/vshelper
+
+       # 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}"
+
+       # remove legacy config file
+       rm -f "${D}"/etc/vservers.conf
+
+       # remove the non-gentoo init-scripts:
+       rm -f "${D}"/etc/init.d/*
+
+       # and install gentoo'ized ones:
+       doinitd "${FILESDIR}"/init.d/vservers.default
+       doinitd "${FILESDIR}"/init.d/vprocunhide
+
+       # bash-completion
+       dobashcompletion "${FILESDIR}"/bash_completion util-vserver
+
+       dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+       elog
+       elog "You have to run the vprocunhide command after every reboot"
+       elog "in order to setup /proc permissions correctly for vserver"
+       elog "use. An init script has been installed by this package."
+       elog "To use it you should add it to a runlevel:"
+       elog
+       elog " rc-update add vprocunhide default"
+       elog
+
+       if has_version "<0.30.211" ; then
+               ewarn "Please make sure, that you remove the old init-script from any"
+               ewarn "runlevel and remove it from your init.d dir!"
+               ewarn
+               ewarn "# rc-update del vservers"
+               ewarn "# rm -f ${ROOT}etc/init.d/vservers"
+               ewarn
+               ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
+               ewarn "have been merged upstream, and may now have a slightly"
+               ewarn "different syntax, i.e. you have to update scripts that"
+               ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
+               ewarn "and vdispatch-conf)"
+               ewarn
+               ewarn "Additionally the init scripts have changed and now use"
+               ewarn "upstream scripts as backend. An init script to start"
+               ewarn "virtual servers in the 'default' group/mark has been"
+               ewarn "installed by this ebuild:"
+               ewarn
+               ewarn "  rc-update add vservers.default default"
+               ewarn
+               ewarn "To start vservers in other groups/marks, you have to"
+               ewarn "symlink the default init script the same way you do"
+               ewarn "with net.* scripts:"
+               ewarn
+               ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
+               ewarn
+       fi
+
+       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
+}