commit: 48b263e58650d1806699c58757b23d007b150904 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Apr 13 06:56:13 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Apr 13 06:57:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b263e5
sys-cluster/util-vserver: Remove last-rited pkg Closes: https://bugs.gentoo.org/680264 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 8 - sys-cluster/util-vserver/Manifest | 1 - sys-cluster/util-vserver/files/bash_completion | 300 --------------------- .../util-vserver-0.30.216_pre3120-dietlibc.patch | 23 -- ...r-0.30.216_pre3120-vserver-init-functions.patch | 11 - sys-cluster/util-vserver/metadata.xml | 16 -- .../util-vserver-0.30.216_pre3120-r1.ebuild | 115 -------- .../util-vserver-0.30.216_pre3120.ebuild | 109 -------- 8 files changed, 583 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 5e17f80595f..e0b51517a2b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -722,14 +722,6 @@ app-arch/createrepo dev-python/pyliblzma sys-apps/yum -# Michał Górny <[email protected]> (13 Mar 2019) -# Obscure package with multiple bugs open. Blocks removal -# of dev-libs/dietlibc (#498256) and dev-libs/beecrypt (#666599). -# Unresolved segfaults (#641112) or build failures (#650578), depending -# on the GCC version/profile. -# Removal in 30 days. Bug #680264. -sys-cluster/util-vserver - # Eray Aslan <[email protected]> (01 Mar 2019) # Mask experimental software =mail-mta/postfix-3.5* diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest deleted file mode 100644 index 7189e1ecda6..00000000000 --- a/sys-cluster/util-vserver/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST util-vserver-0.30.216-pre3120.tar.gz 990833 BLAKE2B a9227d4b4074300f188617c48ec7884f8cf34e8b2c2685eab7678b00fbca6ea5ad4bc9dd926f88e49633165b0402802a3077d029ee4c75447112705fdb41ca4c SHA512 eca7680a8b06fecd678b4dad5824c92b53d872b3e7ec9cc275425437fb7fcfb3991f58770096f20d8274e37927a39b64ed9db082ef806e76d0c603b2cd64ef32 diff --git a/sys-cluster/util-vserver/files/bash_completion b/sys-cluster/util-vserver/files/bash_completion deleted file mode 100644 index 73a9fef89f8..00000000000 --- a/sys-cluster/util-vserver/files/bash_completion +++ /dev/null @@ -1,300 +0,0 @@ -# Completion for the vserver command. Source this file (or on some systems -# add it to ~/.bash_completion and start a new shell) and bash's completion -# mechanism will know all about vserver's options! -# -# Copyright (C) Thomas Champagne <[email protected]> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The latest version of this software can be obtained here: -# -# http://linux-vserver.org/Vserver+Completion -# -# version 0.4.0 - -have vserver-info && { -: ${UTIL_VSERVER_VARS:=$(vserver-info - SYSINFO |grep prefix: | awk '{ print $2}')/lib/util-vserver/util-vserver-vars} - -test -e "$UTIL_VSERVER_VARS" && { - -. "$UTIL_VSERVER_VARS" -. "$_LIB_FUNCTIONS" - -_vserver() { - local cur cmds cmdOpts cmdMethodOpts helpCmds names names_pipe func i j method - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - # find available vServers: - # call function getAllVservers in vserver library - getAllVservers names - names_pipe=`echo ${names[@]} | sed 's/ /|/g'` - - # available commands - cmds='start stop restart condrestart suexec exec enter chkconfig \ - running status unify pkg apt-get apt-config apt-cache \ - rpm pkgmgmt delete' - - # options (long and short name) - cmdOpts='--help --version --debug --defaulttty -s --sync -v \ - --verbose --silent --' - - cmdMethodOpts='-m -n --context --confdir --lockfile \ - --hostname --netdev --netbcast --netmask \ - --netprefix --interface --cpuset \ - --cpusetcpus --cpusetmems --cpusetvirt \ - --initstyle --flags --help --' - - # if the previous option is a single option - helpCmds='--help|--version' - if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then - return 0 - fi - - # lookup the vServer name - for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do - if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then - # found it! - break - fi - done - - #a vserver has been found - if (( $i < ${#COMP_WORDS[@]}-1 )) ; then - # Show the vserver command without build - case "${COMP_WORDS[i+1]}" in - start) - COMPREPLY=( $( compgen -W "--rescue --rescue-cmd" -- $cur ) ) - ;; - # No completion for apt-config - stop|restart|condrestart|enter|running|status|apt-config|delete) - ;; - suexec) - # I don't know how to do - COMPREPLY=( $( compgen -W -- $cur ) ) - ;; - exec) - #I don't know how to do - COMPREPLY=( $( compgen -W "" -- $cur ) ) - ;; - unify) - COMPREPLY=( $( compgen -W "-R" -- $cur ) ) - ;; - apt-get|apt-cache) - func=${COMP_WORDS[i+1]} - COMP_WORDS=( ${COMP_WORDS[@]:$((i+1))} ) - COMP_CWORD=$((COMP_CWORD-i-1)) - declare -f _${func//-/_} > /dev/null && _${func//-/_} - ;; - *) - COMPREPLY=( $( compgen -W "$cmds" -- $cur ) ) - ;; - esac - return 0 - else - #no vserver name found - prev=${COMP_WORDS[COMP_CWORD-1]} - - #search the new name of vserver - for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do - if [[ ${COMP_WORDS[i]} == !(vserver|-*) ]] ; then - # found it! - break - fi - done - - if (( $i < ${#COMP_WORDS[@]}-1 )) ; then - j=$i - i=${#COMP_WORDS[@]} - for (( ; j < ${#COMP_WORDS[@]}-1; j++ )) ; do - if [[ ${COMP_WORDS[j]} == "--" ]]; then - # method's parameter - case "$method" in - legacy|copy) - ;; - apt-rpm) - COMPREPLY=( $( compgen -W "-d" -- $cur ) ) - ;; - yum) - COMPREPLY=( $( compgen -W "-d" -- $cur ) ) - ;; - rpm) - COMPREPLY=( $( compgen -W "-d --empty --force --nodeps" -- $cur ) ) - ;; - skeleton) - ;; - debootstrap) - COMPREPLY=( $( compgen -W "-d -m -s --" -- $cur ) ) - ;; - *) - ;; - esac - return 0 - break - fi - - if [[ ${COMP_WORDS[j]} == @(build|-m) ]]; then - i=$j - if (( $j+1 < ${#COMP_WORDS[@]}-1 )) ; then - method=${COMP_WORDS[j+1]} - fi - fi - done - - if (( $i < ${#COMP_WORDS[@]}-1 )) ; then - case $prev in - --help) - ;; - -n|--context|--confdir|--lockfile|--hostname|--netdev|--netbcast|--netmask|--netprefix|--interface|--cpuset|--cpusetcpus|--cpusetmems|--cpusetvirt|--initstyle|--flags) - COMPREPLY=( $( compgen -W "" -- $cur ) ) - ;; - -m) - COMPREPLY=( $( compgen -W "legacy copy apt-rpm yum rpm skeleton debootstrap" -- $cur ) ) - ;; - *) - COMPREPLY=( $( compgen -W "$cmdMethodOpts" -- $cur ) ) - ;; - esac - else - COMPREPLY=( $( compgen -W "build" -- $cur ) ) - fi - else - COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) - fi - - return 0 - fi - - return 0 -} - -complete -F _vserver vserver - -_vapt_rpm_yum() -{ - local cur cmds cmdOpts helpCmds names func i - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - # options (long and short name) - cmdOpts='--help --version --quiet -q --all' - - # if the previous option is a single option - helpCmds='--help|--version' - - if [[ "${COMP_WORDS[1]}" == "@($helpCmds)" ]] ; then - return 0 - fi - - # search -- - for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do - if [[ ${COMP_WORDS[i]} = "--" ]] ; then - # found it! - break - fi - done - - # find available vServers - # call function getAllVservers in vserver library - getAllVservers names - names_pipe=`echo ${names[@]}" --all" | sed 's/ /|/g'` - - if (( $i < ${#COMP_WORDS[@]}-1 )) && (( $i < $COMP_CWORD )) ; then - func=${COMP_WORDS[0]:1} - COMP_WORDS=( $func ${COMP_WORDS[@]:$((i+1))} ) - COMP_CWORD=$((COMP_CWORD-i)) - declare -f _${func//-/_} > /dev/null && _${func//-/_} - else - # search vServer name - for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do - if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then - # found it! - break - fi - done - - if (( $i < ${#COMP_WORDS[@]}-1 )) ; then - if [[ "${COMP_WORDS[i]}" = "--all" ]] ; then - cmdOpts='--' - COMPREPLY=( $( compgen -W "$cmdOpts" -- $cur ) ) - else - cmdOpts='--' - COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) - fi - else - COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) - fi - fi - - return 0 -} - -_vserver_copy() -{ - local cur prev cmdOpts helpCmds confCmds names names_pipe i - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - # find available vServers - # call function getAllVservers in vserver library - getAllVservers names - names_pipe=`echo ${names[@]} | sed 's/ /|/g'` - - # options (long and short name) - cmdOpts='--help -h --version -V --verbose -v --quiet -q \ - --vsroot -r --rsh -R --stopstart -s \ - --domain -d --ip -i' - - # if the previous option is a single option - helpCmds='--help|-h|--version|-V' - - if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then - return 0 - fi - - confCmds='--ip|-i|--domain|-d' - prev=${COMP_WORDS[COMP_CWORD-1]} - - if [[ $prev == @($confCmds) ]] ; then - return 0 - fi - - # search a vServer name - for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do - if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then - # found it! - break - fi - done - - if (( $i < ${#COMP_WORDS[@]}-1 )) ; then - return 0 - else - COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) - fi - - return 0 -} - -complete -F _vapt_rpm_yum vapt-get -complete -F _vapt_rpm_yum vrpm -complete -F _vapt_rpm_yum vyum -complete -F _vserver_copy vserver-copy - -} -} diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch deleted file mode 100644 index cde8ccc500a..00000000000 --- a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-dietlibc.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -puriN util-vserver-0.30.216-pre3120.orig/lib_internal/util-cleanupmount.c util-vserver-0.30.216-pre3120/lib_internal/util-cleanupmount.c ---- util-vserver-0.30.216-pre3120.orig/lib_internal/util-cleanupmount.c 2015-05-30 10:18:50.000000000 -0500 -+++ util-vserver-0.30.216-pre3120/lib_internal/util-cleanupmount.c 2019-02-19 02:36:55.000000000 -0600 -@@ -22,7 +22,6 @@ - - #include <stdio.h> - #include <sys/mount.h> --#include <linux/fs.h> - - #ifndef MS_REC - #define MS_REC 0x4000 -diff -puriN util-vserver-0.30.216-pre3120.orig/src/secure-mount.c util-vserver-0.30.216-pre3120/src/secure-mount.c ---- util-vserver-0.30.216-pre3120.orig/src/secure-mount.c 2015-05-30 10:18:50.000000000 -0500 -+++ util-vserver-0.30.216-pre3120/src/secure-mount.c 2019-02-19 02:37:17.000000000 -0600 -@@ -46,7 +46,7 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <sys/file.h> --#include <linux/fs.h> -+#include <limits.h> - #include <assert.h> - #include <ctype.h> - #include <sys/wait.h> diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch deleted file mode 100644 index 9026ba07c96..00000000000 --- a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/scripts/vserver-init.functions 2019-02-20 07:54:16.747585681 +0000 -+++ b/scripts/vserver-init.functions 2019-02-20 07:54:31.457661349 +0000 -@@ -80,7 +80,7 @@ - - function create_dirs() - { -- $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"` -+ $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p "$__PKGCACHEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"` - } - - function mount_cgroup() diff --git a/sys-cluster/util-vserver/metadata.xml b/sys-cluster/util-vserver/metadata.xml deleted file mode 100644 index 39c113a225e..00000000000 --- a/sys-cluster/util-vserver/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Patrice Clement</name> - </maintainer> - <longdescription> - util-vserver is a Linux virtual server utility framework, - allowing an administrator to set up multiple, isolated - virtual servers. It can be used to run various services - securely separated, without requiring special configuration. - Virtual servers are unable to interact with each other, or - the main server. - </longdescription> -</pkgmetadata> diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild deleted file mode 100644 index b64a51e5272..00000000000 --- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils bash-completion-r1 - -MY_P="${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.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" - -CDEPEND=" - net-misc/vconfig - dev-libs/beecrypt - sys-apps/iproute2 - net-firewall/iptables" - -DEPEND=" - ${CDEPEND} - >dev-libs/dietlibc-0.33" - -RDEPEND=" - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-vserver-init-functions.patch" - "${FILESDIR}/${P}-dietlibc.patch" -) - -DOCS=( README ChangeLog NEWS AUTHORS THANKS util-vserver.spec ) - -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 || die - - default -} - -src_configure() { - local myeconf=( - --with-vrootdir="${VDIRBASE}" - --with-initscripts=gentoo - --localstatedir=/var - ) - - econf "${myeconf[@]}" -} - -src_compile() { - emake -j1 -} - -src_install() { - make DESTDIR="${D}" install install-distribution || die - - # remove runtime paths - rm -r "${D}"/var/run || die - rm -r "${D}"/var/cache || die - - # keep dirs - keepdir "${VDIRBASE}" - keepdir "${VDIRBASE}"/.pkg - - # bash-completion - newbashcomp "${FILESDIR}"/bash_completion ${PN} -} - -pkg_postinst() { - # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also - # present when merging. - mkdir -p "${VDIRBASE}" || die - if ! setattr --barrier "${VDIRBASE}"; then - ewarn "Filesystem on ${VDIRBASE} does not support chroot barriers." - ewarn "Chroot barrier is additional security measure that is used" - ewarn "when two vservers or the host system share the same filesystem." - ewarn "If you intend to use separate filesystem for every vserver" - ewarn "you can safely ignore this warning." - ewarn "To manually apply a barrier use: setattr --barrier ${VDIRBASE}" - ewarn "For details see: http://linux-vserver.org/Secure_chroot_Barrier"; - fi - - rm /etc/vservers/.defaults/vdirbase || die - ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase || die - - 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 -} diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild deleted file mode 100644 index f78cde235aa..00000000000 --- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils bash-completion-r1 - -MY_P="${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.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 x86" - -CDEPEND=" - dev-libs/beecrypt - net-firewall/iptables - net-misc/vconfig - sys-apps/iproute2" - -DEPEND=" - ${CDEPEND} - >dev-libs/dietlibc-0.33" - -RDEPEND=" - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -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 || die - - default -} - -src_configure() { - local myeconf=( - --with-vrootdir="${VDIRBASE}" - --with-initscripts=gentoo - --localstatedir=/var - ) - - econf "${myeconf[@]}" -} - -src_compile() { - emake -j1 || die "emake failed!" -} - -src_install() { - make DESTDIR="${D}" install install-distribution \ - || die "make install failed!" - - # keep dirs - keepdir /var/cache/vservers - keepdir "${VDIRBASE}" - keepdir "${VDIRBASE}"/.pkg - - # bash-completion - newbashcomp "${FILESDIR}"/bash_completion ${PN} - - dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec -} - -pkg_postinst() { - # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also - # present when merging. - - mkdir -p "${VDIRBASE}" || die - if ! setattr --barrier "${VDIRBASE}"; then - ewarn "Filesystem on ${VDIRBASE} does not support chroot barriers." - ewarn "Chroot barrier is additional security measure that is used" - ewarn "when two vservers or the host system share the same filesystem." - ewarn "If you intend to use separate filesystem for every vserver" - ewarn "you can safely ignore this warning." - ewarn "To manually apply a barrier use: setattr --barrier ${VDIRBASE}" - ewarn "For details see: http://linux-vserver.org/Secure_chroot_Barrier"; - fi - - rm /etc/vservers/.defaults/vdirbase || die - ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase || die - - 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 -}
