diff options
10 files changed, 244 insertions, 138 deletions
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest index 72c547d..355028a 100644 --- a/sys-cluster/util-vserver/Manifest +++ b/sys-cluster/util-vserver/Manifest @@ -1,9 +1,20 @@ -DIST util-vserver-0.30.211.tar.bz2 638003 RMD160 42856f7131756ffc278719831de9ae190943e532 SHA1 c4b28b10b38ba88d003ea45ab1b784e1b0b31324 SHA256 992a2dd76994813508cc043bbaf7c1f903166d2b7fbcb7bd1320aa285234df59 -DIST util-vserver-patches-0.30.211-r1.tar.bz2 30732 RMD160 d502c9cf3b5476833cfb19e7ff1f34e4ddfa4859 SHA1 f55cb981afa99b17c305a1cecc7ba417a4065de5 SHA256 a169ce29ab2e31b951d39bc9c298e5f34ca541a2f09c83c0d0f6472a6a6c60a5 -EBUILD util-vserver-0.30.211-r1.ebuild 3459 RMD160 ac45e6987ca168dd1c4ed1b4d840299d3379b771 SHA1 733f75ef39c8f0ead6121e1b7a44b64b7ee87e77 SHA256 265563cf83114b51229903cddb605d45e22d723b52e10f6f17f41fa56012d201 -MD5 cc822d1f80682a43504dc3ec39c6463e util-vserver-0.30.211-r1.ebuild 3459 -RMD160 ac45e6987ca168dd1c4ed1b4d840299d3379b771 util-vserver-0.30.211-r1.ebuild 3459 -SHA256 265563cf83114b51229903cddb605d45e22d723b52e10f6f17f41fa56012d201 util-vserver-0.30.211-r1.ebuild 3459 -MD5 1602d1a239d36fedab8130a44f758d0e files/digest-util-vserver-0.30.211-r1 566 -RMD160 a7cec451a449efd2cfdf5583ceeaa3343b27da1e files/digest-util-vserver-0.30.211-r1 566 -SHA256 35351dc7b38503bb3b9a8f56642ca02a2939f80539dad57cdc299ed640362f43 files/digest-util-vserver-0.30.211-r1 566 +AUX init.d/vprocunhide 506 RMD160 b26000655f88eba51e2e80b5665f49b7698324a3 SHA1 f1bf6bc18f228c16090bbd8daec0b1e497ef75a8 SHA256 4e7f95b4bd0aca85383d0fc5ce9ffd78869a60e6f0f2dffaa4b1c8ec9d9b2c3d +MD5 d5c496a8a3399c40a3c8b6d56de57aa2 files/init.d/vprocunhide 506 +RMD160 b26000655f88eba51e2e80b5665f49b7698324a3 files/init.d/vprocunhide 506 +SHA256 4e7f95b4bd0aca85383d0fc5ce9ffd78869a60e6f0f2dffaa4b1c8ec9d9b2c3d files/init.d/vprocunhide 506 +AUX init.d/vservers.default 328 RMD160 4ae796520847688da33befaa551faefd58be8184 SHA1 0fe4e1c1ee93bd9f28f2f4dbbc078fbdc2940620 SHA256 cdab1911b6d13a3253c2744ee1b007eda16d28c24d9eeea732d63934a1bdaaba +MD5 50181061681eac3cb085af7766987557 files/init.d/vservers.default 328 +RMD160 4ae796520847688da33befaa551faefd58be8184 files/init.d/vservers.default 328 +SHA256 cdab1911b6d13a3253c2744ee1b007eda16d28c24d9eeea732d63934a1bdaaba files/init.d/vservers.default 328 +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 +SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe files/util-vserver-0.30.212-wrapper.patch 1349 +DIST util-vserver-0.30.212.tar.bz2 643139 RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 SHA1 366e9aa56490de71dccebf7ee99a81e37a274267 SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484 +EBUILD util-vserver-0.30.212.ebuild 3835 RMD160 d17da1637252b2c9484f91bad9123046f97fef98 SHA1 e8a2c2a1e317280a7a85a044f3a7f7edf2d735e8 SHA256 33a7bcfa399bcd1d48da9ed1516b72470a2cd58860e415949d0d81ec43daca65 +MD5 d3703798d4c38e8983f51f22409144fb util-vserver-0.30.212.ebuild 3835 +RMD160 d17da1637252b2c9484f91bad9123046f97fef98 util-vserver-0.30.212.ebuild 3835 +SHA256 33a7bcfa399bcd1d48da9ed1516b72470a2cd58860e415949d0d81ec43daca65 util-vserver-0.30.212.ebuild 3835 +MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212 268 +RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212 268 +SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212 268 diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212 new file mode 100644 index 0000000..0babb2f --- /dev/null +++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212 @@ -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/init.d/CVS/Entries b/sys-cluster/util-vserver/files/init.d/CVS/Entries new file mode 100644 index 0000000..a0066a1 --- /dev/null +++ b/sys-cluster/util-vserver/files/init.d/CVS/Entries @@ -0,0 +1,3 @@ +/vprocunhide/1.1/Sat Dec 9 20:06:34 2006// +/vservers.default/1.1/Sat Dec 9 20:06:34 2006// +D diff --git a/sys-cluster/util-vserver/files/init.d/CVS/Repository b/sys-cluster/util-vserver/files/init.d/CVS/Repository new file mode 100644 index 0000000..d23fc7c --- /dev/null +++ b/sys-cluster/util-vserver/files/init.d/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/sys-cluster/util-vserver/files/init.d diff --git a/sys-cluster/util-vserver/files/init.d/CVS/Root b/sys-cluster/util-vserver/files/init.d/CVS/Root new file mode 100644 index 0000000..854246c --- /dev/null +++ b/sys-cluster/util-vserver/files/init.d/CVS/Root @@ -0,0 +1 @@ +phreak@cvs.gentoo.org:/var/cvsroot diff --git a/sys-cluster/util-vserver/files/init.d/vprocunhide b/sys-cluster/util-vserver/files/init.d/vprocunhide new file mode 100755 index 0000000..d7199ca --- /dev/null +++ b/sys-cluster/util-vserver/files/init.d/vprocunhide @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +start() { + : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} + if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then + eerror "Cannot find util-vserver installation" + eerror "(the file '$UTIL_VSERVER_VARS' would be expected)" + return 1 + fi + + source ${UTIL_VSERVER_VARS} + + ebegin "Fixing /proc entries visibility" + ${_VPROCUNHIDE} + eend $? +} + +# vim:ts=4:filetype=gentoo-init-d diff --git a/sys-cluster/util-vserver/files/init.d/vservers.default b/sys-cluster/util-vserver/files/init.d/vservers.default new file mode 100755 index 0000000..76f9ca3 --- /dev/null +++ b/sys-cluster/util-vserver/files/init.d/vservers.default @@ -0,0 +1,15 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +start() { + MARK=${SVCNAME#vservers.} /usr/lib/util-vserver/vserver-wrapper start +} + +stop() { + MARK=${SVCNAME#vservers.} /usr/lib/util-vserver/vserver-wrapper stop +} + + + +# vim:ts=4:filetype=gentoo-init-d diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.212-wrapper.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.212-wrapper.patch new file mode 100644 index 0000000..b712c7c --- /dev/null +++ b/sys-cluster/util-vserver/files/util-vserver-0.30.212-wrapper.patch @@ -0,0 +1,46 @@ +Index: /home/bene/work/vserver/util-vserver/scripts/vserver-wrapper +=================================================================== +--- scripts/vserver-wrapper (revision 2423) ++++ scripts/vserver-wrapper (working copy) +@@ -29,7 +29,7 @@ + + if test -e /etc/init.d/functions; then + . /etc/init.d/functions +- _beginResult() { echo -n "$@"; } ++ _beginResult() { echo -n "$@ ..."; } + lockfile=/var/lock/subsys/$LOCKFILE + elif test -e /etc/gentoo-release; then + . /sbin/functions.sh +@@ -39,7 +39,7 @@ + failure() { eend "$@"; } + lockfile=/var/lock/vservers/$LOCKFILE + else +- _beginResult() { echo -n "$@"; } ++ _beginResult() { echo -n "$@ ..."; } + success() { echo .; } + passed() { echo .; } + failure() { echo ERROR; } +@@ -54,13 +54,12 @@ + (2) passed; rc=0;; + (*) failure;; + esac +- echo + return $rc + } + + function start() + { +- _beginResult $"Starting vservers of type '$MARK'..." ++ _beginResult $"Starting vservers of type '$MARK'" + $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --start + _tellResult $? + local rc=$? +@@ -70,7 +69,7 @@ + + function stop() + { +- _beginResult $"Stopping vservers of type '$MARK'..." ++ _beginResult $"Stopping vservers of type '$MARK'" + $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --stop + _tellResult $? + local rc=$? diff --git a/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild deleted file mode 100644 index 726ad0c..0000000 --- a/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools 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 - 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="legacy" - -DEPEND=">=dev-libs/dietlibc-0.28 - dev-libs/beecrypt - net-firewall/iptables - net-misc/vconfig - sys-apps/iproute2 - sys-process/procps - =sys-devel/automake-1.9*" - -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 - - myconf="${myconf} --with-vrootdir=${VDIRBASE}" - - # default paths - myconf="${myconf} --localstatedir=/var" - myconf="${myconf} --with-initrddir=/etc/init.d" - - # needed for older vserver kernels not in portage (default: v13,net) - # we provide this just for convenience for people using self-made kernels - use legacy && myconf="${myconf} --enable-apis=compat,v11,fscompat,v13,net" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${WORKDIR}"/patches/*.patch - - eautomake -} - -src_compile() { - econf ${myconf} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install install-distribution || die "install failed" - - # remove non-legacy files - if ! use legacy ; then - rm -r -f "${D}/etc/vservers.conf" - rm -r -f "${D}/usr/lib/util-vserver/legacy" - rm -r -f "${D}/usr/sbin/vserver-copy" - rm -r -f "${D}/usr/share/man/man8/distrib-info.8.gz" - rm -r -f "${D}/usr/share/man/man8/vps.8.gz" - fi - - # keep dirs - keepdir /var/run/{vservers,vservers.rev,vshelper} - keepdir /var/lock/vservers - keepdir /var/cache/vservers - - keepdir "${VDIRBASE}" - - # remove the non-gentoo init-scripts: - rm -f "${D}"/etc/init.d/* - - # and install branded/customized init-scripts: - doinitd "${WORKDIR}"/init.d/v* || die "Failed to ins init.d/v*" - - # bash-completion - dobashcompletion "${S}"/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 vprocunhide default" - einfo - 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 - if has_version "<0.30.211-r1" ; then - ewarn "IMPORTANT UPGRADE WARNING:" - ewarn - ewarn "Since 0.30.211-r1 the vservers init-script has been split" - ewarn "into vprocunhide and vserver.defaults. The following steps" - ewarn "are required to keep current behaviour:" - ewarn - ewarn " rc-update del vservers" - ewarn " rc-update add vprocunhide default" - ewarn " rc-update add vservers.default default" - ewarn - fi -} diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild new file mode 100644 index 0000000..c0d27e5 --- /dev/null +++ b/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild @@ -0,0 +1,135 @@ +# 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.212.ebuild,v 1.2 2006/12/21 22:37:48 phreak Exp $ + +WANT_AUTOMAKE="1.9" +WANT_AUTOCONF="latest" + +inherit autotools 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="" + +DEPEND=">=dev-libs/dietlibc-0.30-r2 + dev-libs/beecrypt + net-firewall/iptables + net-misc/vconfig + sys-apps/iproute2" + +RDEPEND="sys-apps/iproute2 + net-misc/vconfig + net-firewall/iptables + dev-libs/beecrypt" + +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 +} + +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 +} |