Remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

7 files changed, 10 insertions, 382 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 6415a1192fa0..3338d956f478 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.114 2014/01/16 13:55:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.115 2014/06/26 14:00:22 kensington Exp $
+
+  26 Jun 2014; Michael Palimaka <kensington@gentoo.org>
+  -files/util-vserver-0.30.215-2718.patch,
+  -files/util-vserver-0.30.215-capget.patch,
+  -files/util-vserver-0.30.215-dietmmap.patch,
+  -files/util-vserver-0.30.215-openrc.patch,
+  -files/util-vserver-0.30.215-typo.patch,
+  -util-vserver-0.30.216_pre2910.ebuild:
+  Remove old.
 
   16 Jan 2014; Jeroen Roovers <jer@gentoo.org>
   util-vserver-0.30.216_pre2910.ebuild, util-vserver-0.30.216_pre3025.ebuild,
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch
deleted file mode 100644
index fc9ea6164fba..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nru util-vserver-0.30.215.orig/lib_internal/unify-copy.c util-vserver-0.30.215/lib_internal/unify-copy.c
---- util-vserver-0.30.215.orig/lib_internal/unify-copy.c	2008-03-17 09:59:50.000000000 +0100
-+++ util-vserver-0.30.215/lib_internal/unify-copy.c	2008-06-17 15:38:50.000000000 +0200
-@@ -132,8 +132,8 @@
-       buf_size = in_len - offset;
-       if (buf_size > MMAP_BLOCKSIZE) buf_size = MMAP_BLOCKSIZE;
-       
--      if ((in_buf  = mmap(0, buf_size, PROT_READ,  MAP_SHARED,  in_fd, offset))==0 ||
--	  (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==0) {
-+      if ((in_buf  = mmap(0, buf_size, PROT_READ,  MAP_SHARED,  in_fd, offset))==MAP_FAILED ||
-+	  (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==MAP_FAILED) {
- 	perror("mmap()");
- 	goto out;
-       }
-diff -Nru util-vserver-0.30.215.orig/src/check-unixfile.c util-vserver-0.30.215/src/check-unixfile.c
---- util-vserver-0.30.215.orig/src/check-unixfile.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/check-unixfile.c	2008-06-17 15:39:11.000000000 +0200
-@@ -73,7 +73,7 @@
-   }
-   else if (l>0) {
-     data = mmap(0, l, PROT_READ, MAP_PRIVATE, fd, 0);
--    if (data==0) {
-+    if (data==MAP_FAILED) {
-       perror("mmap()");
-       exit(wrapper_exit_code);
-     }
-diff -Nru util-vserver-0.30.215.orig/src/h2ext.c util-vserver-0.30.215/src/h2ext.c
---- util-vserver-0.30.215.orig/src/h2ext.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/h2ext.c	2008-06-17 15:39:41.000000000 +0200
-@@ -148,7 +148,7 @@
-   fd = EopenD(file, O_RDONLY, 0);
-   Efstat(fd, &st);
-   mapping = mmap(NULL, MIN(st.st_size, MAX_PEEK_SIZE), PROT_READ, MAP_SHARED, fd, 0);
--  if (!mapping) {
-+  if (mapping == MAP_FAILED) {
-     perror("mmap()");
-     Eclose(fd);
-     return -1;
-diff -Nru util-vserver-0.30.215.orig/src/testsuite/hashcalc-plain.c util-vserver-0.30.215/src/testsuite/hashcalc-plain.c
---- util-vserver-0.30.215.orig/src/testsuite/hashcalc-plain.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/testsuite/hashcalc-plain.c	2008-06-17 15:40:08.000000000 +0200
-@@ -76,7 +76,7 @@
-     void const *		buf;
-     if (buf_size>HASH_BLOCKSIZE) buf_size = HASH_BLOCKSIZE;
- 
--    assert((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))!=0);
-+    assert((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))!=MAP_FAILED);
-     offset += buf_size;
-     assert(ensc_crypto_hashctx_update(&hash_context, buf, buf_size)!=-1);
-     munmap((void *)(buf), buf_size);
-diff -Nru util-vserver-0.30.215.orig/src/vhashify.c util-vserver-0.30.215/src/vhashify.c
---- util-vserver-0.30.215.orig/src/vhashify.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/vhashify.c	2008-06-17 15:40:28.000000000 +0200
-@@ -332,7 +332,7 @@
-       buf_size = size-offset;
-       if (buf_size>HASH_BLOCKSIZE) buf_size = HASH_BLOCKSIZE;
- 
--      if ((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))==0) {
-+      if ((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))==MAP_FAILED) {
- 	perror("mmap(<hash>)");
- 	goto out;
-       }
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-capget.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-capget.patch
deleted file mode 100644
index 3452d6b1c79a..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-capget.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: /trunk/src/vserver-info.c
-===================================================================
---- a/src/vserver-info.c (revision 2589)
-+++ b/src/vserver-info.c (revision 2717)
-@@ -186,7 +186,9 @@
- verifyCap()
- {
-+  int retried = 0;
-   struct __user_cap_header_struct header;
--  struct __user_cap_data_struct user;
--  header.version = _LINUX_CAPABILITY_VERSION;
-+  struct __user_cap_data_struct user[2];
-+
-+  header.version = _LINUX_CAPABILITY_VERSION_2;
-   header.pid     = 0;
- 
-@@ -200,15 +202,22 @@
- //    return false;
- //  }
--  
--  if (capget(&header, &user)==-1) {
-+
-+retry:
-+  if (capget(&header, user)==-1) {
-+    if (!retried &&
-+	header.version != _LINUX_CAPABILITY_VERSION_2) {
-+      header.version = _LINUX_CAPABILITY_VERSION_1;
-+      retried = 1;
-+      goto retry;
-+    }
-     perror("capget()");
-     return false;
-   }
- 
--  user.effective   = 0;
--  user.permitted   = 0;
--  user.inheritable = 0;
--
--  if (capset(&header, &user)==-1) {
-+  user[0].effective   = user[1].effective   = 0;
-+  user[0].permitted   = user[1].permitted   = 0;
-+  user[0].inheritable = user[1].inheritable = 0;
-+
-+  if (capset(&header, user)==-1) {
-     perror("capset()");
-     return false;
-Index: /trunk/src/rpm-fake.c
-===================================================================
---- a/src/rpm-fake.c (revision 2693)
-+++ b/src/rpm-fake.c (revision 2717)
-@@ -420,20 +420,28 @@
- reduceCapabilities()
- {
-+  int retried = 0;
-   struct __user_cap_header_struct header;
--  struct __user_cap_data_struct user;
--  
--  header.version = _LINUX_CAPABILITY_VERSION;
-+  struct __user_cap_data_struct user[2];
-+  
-+  header.version = _LINUX_CAPABILITY_VERSION_2;
-   header.pid     = 0;
- 
--  if (capget(&header, &user)==-1) {
-+retry:
-+  if (capget(&header, user)==-1) {
-+    if (!retried &&
-+	header.version != _LINUX_CAPABILITY_VERSION_2) {
-+      header.version = _LINUX_CAPABILITY_VERSION_1;
-+      retried = 1;
-+      goto retry;
-+    }
-     perror("capget()");
-     exit(wrapper_exit_code);
-   }
- 
--  user.effective   &= ~(1<<CAP_MKNOD);
--  user.permitted   &= ~(1<<CAP_MKNOD);
--  user.inheritable &= ~(1<<CAP_MKNOD);
--
--  if (capset(&header, &user)==-1) {
-+  user[0].effective   &= ~(1<<CAP_MKNOD);
-+  user[0].permitted   &= ~(1<<CAP_MKNOD);
-+  user[0].inheritable &= ~(1<<CAP_MKNOD);
-+
-+  if (capset(&header, user)==-1) {
-     perror("capset()");
-     exit(wrapper_exit_code);
-Index: /trunk/src/capability-compat.h
-===================================================================
---- a/src/capability-compat.h (revision 1822)
-+++ b/src/capability-compat.h (revision 2717)
-@@ -30,2 +30,10 @@
- 
- #endif
-+
-+#ifndef _LINUX_CAPABILITY_VERSION_1
-+#  define _LINUX_CAPABILITY_VERSION_1	_LINUX_CAPABILITY_VERSION
-+#endif
-+
-+#ifndef _LINUX_CAPABILITY_VERSION_2
-+#  define _LINUX_CAPABILITY_VERSION_2	0x20071026
-+#endif
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch
deleted file mode 100644
index bb6342608c70..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nru util-vserver-0.30.215.orig/Makefile.in util-vserver-0.30.215/Makefile.in
---- util-vserver-0.30.215.orig/Makefile.in	2008-03-17 10:00:13.000000000 +0100
-+++ util-vserver-0.30.215/Makefile.in	2008-06-18 19:24:54.000000000 +0200
-@@ -1496,7 +1496,7 @@
- 	$(lib_internal_testsuite_sigbus_gnu_SOURCES) \
- 	$(src_capchroot_SOURCES) $(src_chain_echo_SOURCES) \
- 	$(src_chbind_compat_SOURCES) $(src_chcontext_compat_SOURCES) \
--	src/check-unixfile.c $(src_chroot_sh_SOURCES) \
-+	$(src_chroot_sh_SOURCES) \
- 	$(src_chxid_SOURCES) $(src_exec_cd_SOURCES) \
- 	$(src_exec_ulimit_SOURCES) $(src_fakerunlevel_SOURCES) \
- 	$(src_filetime_SOURCES) $(src_h2ext_SOURCES) \
-@@ -1818,7 +1818,7 @@
- 	ensc_fmt/lib_libvserver_a-% lib/testsuite/cflags \
- 	lib/testsuite/personality lib/testsuite/fmt \
- 	src/chcontext-compat src/capchroot src/chain-echo \
--	src/check-unixfile src/chroot-sh src/filetime src/lockfile \
-+	src/chroot-sh src/filetime src/lockfile \
- 	src/readlink src/secure-mount src/save_ctxinfo src/mask2prefix \
- 	src/chbind-compat src/exec-cd src/fakerunlevel \
- 	src/keep-ctx-alive src/exec-ulimit src/vps src/lsxid src/chxid \
-@@ -1828,7 +1828,7 @@
- 	src/vsched src/vshelper-sync src/vrsetup src/vserver-stat \
- 	src/vserver-info src/vdlimit src/vdu src/vwait src/ncontext \
- 	src/nattribute src/naddress src/vdevmap src/vsysctl src/vclone \
--	src/h2ext src/vtag src/vspace src/vmemctrl src/tunctl \
-+	src/vtag src/vspace src/vmemctrl src/tunctl \
- 	$(am__append_3) $(tests_dietprogs) \
- 	lib_internal/libinternal-diet.a \
- 	lib_internal/testsuite/isnumber lib_internal/testsuite/sigbus \
-diff -Nru util-vserver-0.30.215.orig/src/Makefile-files util-vserver-0.30.215/src/Makefile-files
---- util-vserver-0.30.215.orig/src/Makefile-files	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/Makefile-files	2008-06-18 17:49:42.000000000 +0200
-@@ -38,7 +38,6 @@
- DIETPROGS +=		src/chcontext-compat \
- 			src/capchroot \
- 			src/chain-echo \
--			src/check-unixfile \
- 			src/chroot-sh \
- 			src/filetime \
- 			src/lockfile \
-@@ -81,7 +80,6 @@
- 			src/vdevmap \
- 			src/vsysctl \
- 			src/vclone \
--			src/h2ext \
- 			src/vtag \
- 			src/vspace \
- 			src/vmemctrl \
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
deleted file mode 100644
index db4cf4b32f16..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: scripts/vserver-init.functions
-===================================================================
---- scripts/vserver-init.functions	(revision 2711)
-+++ scripts/vserver-init.functions	(revision 2712)
-@@ -21,7 +21,7 @@
-     _postResult() { echo; }
-     lockfile=/var/lock/subsys/$LOCKFILE
- elif test -e /etc/gentoo-release; then
--    . /sbin/functions.sh
-+    . /etc/init.d/functions.sh
-     _beginResult() { ebegin "$@"; }
-     _postResult() { :; }
-     success() { eend 0; }
-Index: distrib/gentoo/initpost
-===================================================================
---- distrib/gentoo/initpost	(revision 2711)
-+++ distrib/gentoo/initpost	(revision 2712)
-@@ -63,6 +63,11 @@
- if test "$initstyle" == "gentoo"; then
- 	echo ">>> Installing special init-style magic ... "
- 
-+	# force /lib/rc/sh even if we don't have it in older stages
-+	$_CHROOT_SH mkdir /lib 2>/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc 2/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
-+
- 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
- 	$_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
- 	$_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch
deleted file mode 100644
index 16078f31f9a2..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/distrib/gentoo/initpost
-===================================================================
---- trunk/distrib/gentoo/initpost (revision 2712)
-+++ trunk/distrib/gentoo/initpost (revision 2715)
-@@ -66,6 +66,6 @@
- 	# force /lib/rc/sh even if we don't have it in older stages
- 	$_CHROOT_SH mkdir /lib 2>/dev/null || :
--	$_CHROOT_SH mkdir /lib/rc 2/dev/null || :
--	$_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc 2>/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc/sh 2>/dev/null || :
- 
- 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild
deleted file mode 100644
index ee57e8020822..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 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_pre2910.ebuild,v 1.5 2014/01/16 13:55:04 jer 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://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~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_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
-}