From d2f8a9a47e7e63c3b544934f3c2c4c505ccf7a19 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Tue, 19 Apr 2011 07:20:03 +0000 Subject: bump to latest snapshot (fix #297982) and remove old ebuild (Portage version: 2.2.0_alpha23/cvs/Linux x86_64) --- sys-cluster/util-vserver/ChangeLog | 8 +- .../util-vserver/util-vserver-0.30.215-r3.ebuild | 146 --------------------- .../util-vserver-0.30.216_pre2955.ebuild | 136 +++++++++++++++++++ 3 files changed, 143 insertions(+), 147 deletions(-) delete mode 100644 sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild create mode 100644 sys-cluster/util-vserver/util-vserver-0.30.216_pre2955.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog index c146dd1b7623..975d10022ec8 100644 --- a/sys-cluster/util-vserver/ChangeLog +++ b/sys-cluster/util-vserver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-cluster/util-vserver # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.105 2011/03/07 21:18:19 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.106 2011/04/19 07:20:03 hollow Exp $ + +*util-vserver-0.30.216_pre2955 (19 Apr 2011) + + 19 Apr 2011; Benedikt Böhm + -util-vserver-0.30.215-r3.ebuild, +util-vserver-0.30.216_pre2955.ebuild: + bump to latest snapshot (fix #297982) and remove old ebuild 07 Mar 2011; Jeroen Roovers util-vserver-0.30.216_pre2910.ebuild: 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 deleted file mode 100644 index 93eb16de8157..000000000000 --- a/sys-cluster/util-vserver/util-vserver-0.30.215-r3.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# 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.3 2009/11/12 14:28:48 jer 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}" - - # openrc support - epatch "${FILESDIR}"/${P}-openrc.patch - epatch "${FILESDIR}"/${P}-typo.patch - - # linux capability fixes - epatch "${FILESDIR}"/${P}-capget.patch - - # changeset 2718: fix error reporting if mmap() fails - epatch "${FILESDIR}"/${P}-2718.patch - - # avoid a bug in dietlibc - #227793 - use hppa && epatch "${FILESDIR}"/${P}-dietmmap.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." - 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.216_pre2955.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2955.ebuild new file mode 100644 index 000000000000..a49205767107 --- /dev/null +++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2955.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2011 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.216_pre2955.ebuild,v 1.1 2011/04/19 07:20:03 hollow Exp $ + +EAPI=4 + +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://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_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_test() { + # do not use $D from portage by accident (#297982) + sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh + default +} + +src_configure() { + econf --with-vrootdir=${VDIRBASE} \ + --with-initscripts=gentoo \ + --localstatedir=/var +} + +src_compile() { + 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." + ewarn + fi +} -- cgit v1.2.3-65-gdbad