diff options
| -rw-r--r-- | sys-cluster/util-vserver/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch | 16 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/util-vserver-0.30.214.ebuild | 134 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/util-vserver-0.30.215-r1.ebuild | 135 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/util-vserver-0.30.216_pre2841.ebuild (renamed from sys-cluster/util-vserver/util-vserver-0.30.215-r2.ebuild) | 15 |
6 files changed, 17 insertions, 298 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog index d94a94314411..d52fbf222955 100644 --- a/sys-cluster/util-vserver/ChangeLog +++ b/sys-cluster/util-vserver/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-cluster/util-vserver # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.96 2009/03/24 09:26:03 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.97 2009/06/28 16:24:46 hollow Exp $ + +*util-vserver-0.30.216_pre2841 (28 Jun 2009) + + 28 Jun 2009; Benedikt Böhm <hollow@gentoo.org> + -files/util-vserver-0.30.214-baselayout2_path.patch, + -util-vserver-0.30.214.ebuild, -util-vserver-0.30.215-r1.ebuild, + -util-vserver-0.30.215-r2.ebuild, util-vserver-0.30.215-r3.ebuild, + +util-vserver-0.30.216_pre2841.ebuild: + 0.30.215-r3 stable on amd64/x86; new snapshot for experimental kernels; cleanup *util-vserver-0.30.215-r3 (24 Mar 2009) diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch deleted file mode 100644 index 0aa8a5b5f0c0..000000000000 --- a/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: scripts/vserver.functions -=================================================================== ---- scripts/vserver.functions (revision 2626) -+++ scripts/vserver.functions (revision 2634) -@@ -315,9 +315,10 @@ - - (xgentoo) - test -n "$RUNLEVEL_START" || RUNLEVEL_START="default" -+ RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin - - INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" ) -- INITCMD_STOP=( env -i TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown ) -+ INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown ) - INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp ) - ;; - diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild deleted file mode 100644 index 7811d5f76126..000000000000 --- a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2008 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.214.ebuild,v 1.6 2008/08/08 08:40:14 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="" - -CDEPEND="dev-libs/beecrypt - net-firewall/iptables - net-misc/vconfig - sys-apps/iproute2 - || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )" - -DEPEND=">=dev-libs/dietlibc-0.30-r2 - ${CDEPEND}" - -RDEPEND="${CDEPEND}" - -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}-baselayout2_path.patch -} - -src_compile() { - econf --with-vrootdir=${VDIRBASE} \ - --with-initscripts=gentoo \ - --localstatedir=/var || die "econf failed!" - emake || die "emake failed!" -} - -src_install() { - make DESTDIR="${D}" install install-distribution \ - || die "make 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}" - keepdir "${VDIRBASE}"/.pkg - - # remove legacy config file - rm -f "${D}"/etc/vservers.conf - - # bash-completion - dobashcompletion "${FILESDIR}"/bash_completion util-vserver - - dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.30.211" - old_init_script_warn=$? -} - -pkg_postinst() { - # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also - # present when merging. - - [ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null - setattr --barrier "${VDIRBASE}" &> /dev/null - - rm /etc/vservers/.defaults/vdirbase - ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase - - 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 [[ $old_init_script_warn = 0 ]] ; 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 -} diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215-r1.ebuild deleted file mode 100644 index 8b92282fc421..000000000000 --- a/sys-cluster/util-vserver/util-vserver-0.30.215-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2008 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.215-r1.ebuild,v 1.1 2008/08/08 08:40:14 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 ~hppa ~ppc ~sparc ~x86" - -IUSE="" - -CDEPEND="dev-libs/beecrypt - net-firewall/iptables - net-misc/vconfig - sys-apps/iproute2 - || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )" - -DEPEND=">=dev-libs/dietlibc-0.30-r2 - ${CDEPEND}" - -RDEPEND="${CDEPEND}" - -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}-openrc.patch - epatch "${FILESDIR}"/${P}-capget.patch -} - -src_compile() { - econf --with-vrootdir=${VDIRBASE} \ - --with-initscripts=gentoo \ - --localstatedir=/var || die "econf failed!" - emake || die "emake failed!" -} - -src_install() { - make DESTDIR="${D}" install install-distribution \ - || die "make 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}" - keepdir "${VDIRBASE}"/.pkg - - # remove legacy config file - rm -f "${D}"/etc/vservers.conf - - # bash-completion - dobashcompletion "${FILESDIR}"/bash_completion util-vserver - - dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.30.211" - old_init_script_warn=$? -} - -pkg_postinst() { - # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also - # present when merging. - - [ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null - setattr --barrier "${VDIRBASE}" &> /dev/null - - rm /etc/vservers/.defaults/vdirbase - ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase - - 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 [[ $old_init_script_warn = 0 ]] ; 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 -} diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild index a30036dd5d74..55eb0c58fa79 100644 --- a/sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild +++ b/sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.215-r3.ebuild,v 1.1 2009/03/24 09:26:03 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild,v 1.2 2009/06/28 16:24:46 hollow Exp $ inherit eutils bash-completion @@ -10,7 +10,7 @@ SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ppc ~sparc x86" IUSE="" diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215-r2.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2841.ebuild index ecdcf3a83029..e64f3eb5c2ae 100644 --- a/sys-cluster/util-vserver/util-vserver-0.30.215-r2.ebuild +++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2841.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2009 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.215-r2.ebuild,v 1.1 2009/03/04 21:20:24 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.216_pre2841.ebuild,v 1.1 2009/06/28 16:24:46 hollow Exp $ inherit eutils bash-completion +MY_P=${P/_/-} +S="${WORKDIR}"/${MY_P} + 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" +SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -39,14 +42,6 @@ pkg_setup() { einfo } -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-openrc.patch - epatch "${FILESDIR}"/${P}-capget.patch - epatch "${FILESDIR}"/${P}-typo.patch -} - src_compile() { econf --with-vrootdir=${VDIRBASE} \ --with-initscripts=gentoo \ |