[gentoo-commits] repo/gentoo:master commit in: sys-apps/proot/files/, sys-apps/proot/

[Sergey Popov]

commit:     696f994460597f835f57e3d0d65211056391333d
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 14:26:08 2018 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 14:27:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f9944

sys-apps/proot: drop old versions

As those versions are broken since kernel 4.8
Drop entire package to be unstable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/proot/Manifest                           |   4 -
 sys-apps/proot/files/proot-3.2.1-makefile.patch   |  11 --
 sys-apps/proot/files/proot-3.2.2-build-care.patch |  20 ----
 sys-apps/proot/files/proot-4.0.1-argv.patch       | 125 ----------------------
 sys-apps/proot/proot-3.2.2-r1.ebuild              |  72 -------------
 sys-apps/proot/proot-4.0.1.ebuild                 |  67 ------------
 sys-apps/proot/proot-4.0.3.ebuild                 |  68 ------------
 sys-apps/proot/proot-5.0.0.ebuild                 |  68 ------------
 sys-apps/proot/proot-5.1.0.ebuild                 |  68 ------------
 9 files changed, 503 deletions(-)

diff --git a/sys-apps/proot/Manifest b/sys-apps/proot/Manifest
index 0cc284692be..37f988ee1d1 100644
--- a/sys-apps/proot/Manifest
+++ b/sys-apps/proot/Manifest
@@ -1,5 +1 @@
-DIST proot-3.2.2.tar.gz 171047 BLAKE2B a99f7e27e57bc63508cd31b39d15cade0ffadc6b92a4f9acdf92d41afcbc9e294962d8f7b0114eade568f15b0262065ae20b3308f5b5d03a973c896ecffecaea SHA512 baf8df06a463978f0faf36f9d81935d6583b99b7e8c54b8ac330478ed92bb3a5d5cd624e028247c50bb9bc6fbe1300c5736a38c0aff250b23614aa52f922dfdd
-DIST proot-4.0.1.tar.gz 218732 BLAKE2B 2df499190bf4ffc2c60a9b4dcff21b21aa23647e958c49731679d0a8ca4ac33f8ffb2c52729179efd4dd6d0df78c92861e17061145527f0bc1aba574350a45c4 SHA512 df6ea412856268af65ed5fd3ede8ae099c70e9b08d7875e3e2d8e44e9d4288de93e3844aa361db0b7b579b68b5e7a983989ec0742a6d31d7bef889f739db2158
-DIST proot-4.0.3.tar.gz 222716 BLAKE2B 40a0f99926db386f4018612035812246b67e2070ebd343183dfc6f1e5a53f1c3718352e1042e9727d9e617c0591b6fdcb90745d8d359d607dec95e015ac2704e SHA512 1c74219d44ea79a4573c6dd21a5b62df8e93522886cadb1175044b782f40a711193af348763663d24ab634fbe13b67264f0bff061a980947810e38850d0133f8
-DIST proot-5.0.0.tar.gz 250005 BLAKE2B 89b4f9cb5507b87ae52e82502846fa66a0083618672599068620f7f21ea750524f56f9159e81e1e96bee2ac476b1c49aeb58429178b70c01f26f34065f443fdf SHA512 0617142d5bfe40329c12f5cbe3c850d01b82f10a8b44d63acb64e7e880af652fb60d05610fb91ce317353986eb30f031d82114661e5d58a38696d242ccd366ee
 DIST proot-5.1.0.tar.gz 253251 BLAKE2B 8dc147d6c6ee303baf0c86f2fa4a8c17a58e76d9da9432635fc70ee06a65aa748ad617735012a1a18a520775fbe38c2264dcccefb681e8e829a5e7e1ddb05cca SHA512 26be26d405a8bcbe94377c3e9c18a571e4b61e3074f0716b0db3517d147d9d4a07c80f7312171cf9580ac7748e72e688efaf1b8e4a0ca3bfc31c802aa351346f

diff --git a/sys-apps/proot/files/proot-3.2.1-makefile.patch b/sys-apps/proot/files/proot-3.2.1-makefile.patch
deleted file mode 100644
index 854c48ef081..00000000000
--- a/sys-apps/proot/files/proot-3.2.1-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/GNUmakefile.orig	2013-12-06 10:47:18.554784621 +0400
-+++ src/GNUmakefile	2013-12-06 10:47:43.129785804 +0400
-@@ -9,7 +9,7 @@
- CC       = gcc
- LD       = $(CC)
- CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH)
--CFLAGS   += -Wall -Wextra -O2
-+CFLAGS   += -Wall -Wextra
- LDFLAGS  += -ltalloc
- 
- OBJECTS = \

diff --git a/sys-apps/proot/files/proot-3.2.2-build-care.patch b/sys-apps/proot/files/proot-3.2.2-build-care.patch
deleted file mode 100644
index c52a39cf787..00000000000
--- a/sys-apps/proot/files/proot-3.2.2-build-care.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Skip check for building care, patch by Patrick Lauer <patrick AT gentoo.org>
-
---- src/GNUmakefile   2014-02-25 16:42:04.336863622 +0800
-+++ src/GNUmakefile.new       2014-02-25 16:42:26.063050467 +0800
-@@ -54,15 +54,6 @@
- all: proot
- 
- ######################################################################
--# Sanity checks
--
--ifneq (,$(findstring care,$(MAKECMDGOALS)))
--ifneq ($(CARE_BUILD_ENV),ok)
--$(error care is supposed to be built with: http://build.reproducible.io)
--endif
--endif
--
--######################################################################
- # Beautified output
- 
- quiet_GEN = @echo "  GEN       $@"; $(GEN)

diff --git a/sys-apps/proot/files/proot-4.0.1-argv.patch b/sys-apps/proot/files/proot-4.0.1-argv.patch
deleted file mode 100644
index df580563458..00000000000
--- a/sys-apps/proot/files/proot-4.0.1-argv.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-commit 520fa3601c36dd0a3c84e310bd2a1189259000bd
-Author: Cédric VINCENT <cedric.vincent@××.com>
-Date:   Thu Aug 7 14:29:37 2014 +0200
-
-    Don't dereference argv[0] when launching a script through a symlink.
-    
-    Reported-by: Joakim Tjernlund <Joakim.Tjernlund@×××××××××.se>
-    Ref: https://bugs.gentoo.org/show_bug.cgi?id=517496
-    
-    Also, don't complain about non-regular or non-executable files that
-    are not explicitely candidates.
-
-diff --git a/src/path/path.c b/src/path/path.c
-index 4225876..ecdef70 100644
---- a/src/path/path.c
-+++ b/src/path/path.c
-@@ -219,17 +219,21 @@ int which(Tracee *tracee, const char *paths, char host_path[PATH_MAX], char *con
- 	/* Is the command available without any $PATH look-up?  */
- 	status = realpath2(tracee, host_path, command, true);
- 	if (status == 0 && stat(host_path, &statr) == 0) {
--		if (!S_ISREG(statr.st_mode)) {
-+		if (is_explicit && !S_ISREG(statr.st_mode)) {
- 			notice(tracee, ERROR, USER, "'%s' is not a regular file", command);
- 			return -EACCES;
- 		}
- 
--		if ((statr.st_mode & S_IXUSR) == 0) {
-+		if (is_explicit && (statr.st_mode & S_IXUSR) == 0) {
- 			notice(tracee, ERROR, USER, "'%s' is not executable", command);
- 			return -EACCES;
- 		}
- 
- 		found = true;
-+
-+		/* Don't dereference the final component to preserve
-+		 * argv0 in case it is a symlink to script.  */
-+		(void) realpath2(tracee, host_path, command, false);
- 	}
- 	else
- 		found = false;
-@@ -274,8 +278,12 @@ int which(Tracee *tracee, const char *paths, char host_path[PATH_MAX], char *con
- 		if (status == 0
- 		    && stat(host_path, &statr) == 0
- 		    && S_ISREG(statr.st_mode)
--		    && (statr.st_mode & S_IXUSR) != 0)
--				return 0;
-+		    && (statr.st_mode & S_IXUSR) != 0) {
-+			/* Don't dereference the final component to preserve
-+			 * argv0 in case it is a symlink to script.  */
-+			(void) realpath2(tracee, host_path, path, false);
-+			return 0;
-+		}
- 	} while (*(cursor - 1) != '\0');
- 
- not_found:
-diff --git a/src/tracee/event.c b/src/tracee/event.c
-index 70668d6..5905c43 100644
---- a/src/tracee/event.c
-+++ b/src/tracee/event.c
-@@ -92,7 +92,7 @@ int launch_process(Tracee *tracee)
- 		 * guest rootfs.  Note: Valgrind can't handle execve(2) on
- 		 * "foreign" binaries (ENOEXEC) but can handle execvp(3) on such
- 		 * binaries.  */
--		execvp(tracee->exe, tracee->cmdline);
-+		execv(tracee->exe, tracee->cmdline);
- 		return -errno;
- 
- 	default: /* parent */
-diff --git a/tests/test-713b6910.sh b/tests/test-713b6910.sh
-new file mode 100644
-index 0000000..82e01fd
---- /dev/null
-+++ b/tests/test-713b6910.sh
-@@ -0,0 +1,51 @@
-+if [ -z `which mcookie` ] || [ -z `which rm` ] || [ -z `which cat` ] || [ -z `which chmod` ] || [ -z `which ln` ] || [ -z `which grep` ] || [ -z `which mkdir` ] || [ ! -x  ${ROOTFS}/bin/readlink ]; then
-+    exit 125;
-+fi
-+
-+######################################################################
-+
-+TMP1=/tmp/$(mcookie)
-+TMP2=/tmp/$(mcookie)
-+TMP3=/tmp/$(mcookie)
-+TMP4=/tmp/$(mcookie)
-+
-+rm -fr ${TMP1} ${TMP2} ${TMP3} ${TMP4}
-+
-+######################################################################
-+
-+cat > ${TMP1} <<'EOF'
-+#!/bin/sh
-+echo $0
-+EOF
-+
-+chmod +x ${TMP1}
-+ln -s ${TMP1} ${TMP2}
-+
-+${PROOT} ${TMP2} | grep -v ${TMP1}
-+${PROOT} ${TMP2} | grep ${TMP2}
-+
-+######################################################################
-+
-+mkdir -p ${TMP3}
-+cd ${TMP3}
-+
-+ln -s $(which true) false
-+! ${PROOT} false
-+
-+echo "#!$(which false)" > true
-+chmod a-x true
-+${PROOT} true
-+
-+######################################################################
-+
-+ln -s ${ROOTFS}/bin/readlink ${TMP4}
-+
-+TEST1=$(${PROOT} ${ROOTFS}/bin/readlink /proc/self/exe)
-+TEST2=$(${PROOT} ${TMP4} /proc/self/exe)
-+
-+test "${TEST1}" = "${TEST2}"
-+
-+######################################################################
-+
-+cd /
-+rm -fr ${TMP1} ${TMP2} ${TMP3} ${TMP4}

diff --git a/sys-apps/proot/proot-3.2.2-r1.ebuild b/sys-apps/proot/proot-3.2.2-r1.ebuild
deleted file mode 100644
index ef14402f083..00000000000
--- a/sys-apps/proot/proot-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils pax-utils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch" \
-		"${FILESDIR}/${P}-build-care.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(usex care "care" "" "" "")
-}
-
-src_install() {
-	if use care; then
-		# Workaround for bug #493416
-		pax-mark -Emp src/care
-		dobin src/care
-	fi
-	# Workaround for bug #493416
-	pax-mark -Emp src/proot
-
-	dobin src/proot
-	doman doc/proot.1
-	dodoc doc/*.txt doc/articles/*
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}

diff --git a/sys-apps/proot/proot-4.0.1.ebuild b/sys-apps/proot/proot-4.0.1.ebuild
deleted file mode 100644
index 33b2ca7192b..00000000000
--- a/sys-apps/proot/proot-4.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch" \
-		"${FILESDIR}/${PN}-3.2.2-build-care.patch" \
-		"${FILESDIR}/${PN}-4.0.1-argv.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(use care && echo "care")
-}
-
-src_install() {
-	use care && dobin src/care
-	dobin src/proot
-	newman doc/proot/man.1 proot.1
-	dodoc doc/proot/*.txt
-	dodoc -r doc/articles
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}

diff --git a/sys-apps/proot/proot-4.0.3.ebuild b/sys-apps/proot/proot-4.0.3.ebuild
deleted file mode 100644
index 6e07802ddcb..00000000000
--- a/sys-apps/proot/proot-4.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(use care && echo "care")
-}
-
-src_install() {
-	if use care; then
-		dobin src/care
-		dodoc doc/care/*.txt
-	fi
-	dobin src/proot
-	newman doc/proot/man.1 proot.1
-	dodoc doc/proot/*.txt
-	dodoc -r doc/articles
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}

diff --git a/sys-apps/proot/proot-5.0.0.ebuild b/sys-apps/proot/proot-5.0.0.ebuild
deleted file mode 100644
index 6e07802ddcb..00000000000
--- a/sys-apps/proot/proot-5.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(use care && echo "care")
-}
-
-src_install() {
-	if use care; then
-		dobin src/care
-		dodoc doc/care/*.txt
-	fi
-	dobin src/proot
-	newman doc/proot/man.1 proot.1
-	dodoc doc/proot/*.txt
-	dodoc -r doc/articles
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}

diff --git a/sys-apps/proot/proot-5.1.0.ebuild b/sys-apps/proot/proot-5.1.0.ebuild
deleted file mode 100644
index 6e07802ddcb..00000000000
--- a/sys-apps/proot/proot-5.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(use care && echo "care")
-}
-
-src_install() {
-	if use care; then
-		dobin src/care
-		dodoc doc/care/*.txt
-	fi
-	dobin src/proot
-	newman doc/proot/man.1 proot.1
-	dodoc doc/proot/*.txt
-	dodoc -r doc/articles
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}