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

[Michał Górny]

commit:     530aaa039c7d23c9f5e0eae7ebafd4b7814d9310
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 22:00:45 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 22:04:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530aaa03

sys-apps/sandbox: Remove permanently broken sandbox 3.0+

The unreviewed changes in sandbox 3.0 has broken a number of packages,
and the versions have been masked since November 2021.  It seems
that the author is not interested in fixing them, so remove them.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 profiles/package.mask                              |  8 ---
 sys-apps/sandbox/Manifest                          |  2 -
 .../sandbox/files/sandbox-3.1-label-decl.patch     | 41 --------------
 sys-apps/sandbox/sandbox-3.0.ebuild                | 62 --------------------
 sys-apps/sandbox/sandbox-3.1.ebuild                | 66 ----------------------
 5 files changed, 179 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 1f333a383968..556faa3898f7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -410,14 +410,6 @@ dev-tex/pdfannotextractor
 dev-lang/vala:0.54
 dev-lang/vala:0.56
 
-# Sam James <sam@g.o> (2021-11-03)
-# Known issues with YAMA (kernel.yama.ptrace_scope=1) which is on by default
-# in at least the sys-kernel/gento-kernel kernel config.
-# Work is in progress to fix these but latest sandbox versions still seem
-# to cause hangs in some situations. Mask for now to avoid duplicate reports.
-# bug #821532, bug #821523 (and bug #821403 but shouldn't be in 3.1+).
->=sys-apps/sandbox-3.0
-
 # Ionen Wolkens <ionen@g.o> (2021-10-09)
 # Vulkan beta driver branch aimed at Vulkan developers for testing
 # new features. Beside vulkan, it is typically behind the main branch

diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index b3f61f637d3e..50fedc869e8e 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -4,5 +4,3 @@ DIST sandbox-2.26.tar.xz 444412 BLAKE2B 3bc88d86ba4e2522895c4448dff6da2cffceb912
 DIST sandbox-2.27.tar.xz 448948 BLAKE2B 03a311c8c7c8719bac398e39ce49e7149bdaa1d5b2811f395eb2251a32aabba995f97c3d5d27461aadb64bf43adf2b0cbaa7c2f141dd86f64f8dd326422ac104 SHA512 2a53e6fc87cec975962737b1fadc447d86985d27b18ad2caed711116da2ba435f54db0f7dadb02664b2638b9dc77752831cd4820390f5c3e61a42429e13462a7
 DIST sandbox-2.28.tar.xz 450840 BLAKE2B 1a144db1dcd140ce393f47b224c4389693bd3db6d056749968a9e78730b1075192148aa63fdfd5ab93893dfb96a87bcc36bee8b4540abefca0590a8def8365f2 SHA512 eaac54fbc35f51da3c94bfa10e0556f0fd39c20660fea2aa7d3cbf76dd3e4c9fb4a16cc198425988b79313f9331af030e1dca431c3f057ee4a04927c96897895
 DIST sandbox-2.29.tar.xz 452784 BLAKE2B 388f5d9c49134696bafbc6b882581396a9fa2e7caa6ccfb4376706d653f836ce18e0d77527c4c4f2ff753c0b920ab5ab60e151dd8a4e399e13dbc3fe7c0533d6 SHA512 15c0e6b71e8b8547b8188f857568c99b1925d5a837a289b21c4f842341361bf7119b96083697dc83546caf530daab700fb8c2704974e7cfb804d64bb5257a4b4
-DIST sandbox-3.0.tar.xz 454384 BLAKE2B b4f38b7c5ed2dc52e558f1b7e36d2308e6017c9d14861c60eace0f240a909f11184e259b2359ea96cad81d21234cc9a6bcd9f313ce56bd2f3bb1ce836f006a50 SHA512 3a35ee0b19a356b1986468ef5d2ecd553b88cbdaf287ce31a211b4072097a9844fca413ffa0f2858b9a4e75ead822fe9d9834f17c241ba32c2f14e02619a70b3
-DIST sandbox-3.1.tar.xz 454404 BLAKE2B f8cc2960f1c7b3367d375952f0a7ca978c1a2cc27b63137046152d1080a1a7b6b99d356af0776d3b57a5c260b2d89f0b7bfb127967407b537642be04e92b8603 SHA512 e57c0fc1ddb5a63012abd02080770d49deaa1d0168508a794df2eaa25b2b7a4fa6c505e8b93572a3745912819202c264cdf980f10dc7101c487a9b03e7f65815

diff --git a/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch b/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch
deleted file mode 100644
index b17f4b866f5a..000000000000
--- a/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 82f6d876660ba1132d75ccfef5c4301d123ea505 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Wed, 3 Nov 2021 12:25:10 -0400
-Subject: [PATCH] libsandbox: tweak label/decl code for some compiler settings
-
-Looks like gcc is inconsistent in when it chokes on this code:
-> a label can only be part of a statement and a declaration is not a statement
-
-Hoist the decl up to the top of scope to avoid the issue.
-
-Bug: https://bugs.gentoo.org/821433
-Signed-off-by: Mike Frysinger <vapier@g.o>
----
- libsandbox/trace.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libsandbox/trace.c b/libsandbox/trace.c
-index f3390d99822e..d2899b743048 100644
---- a/libsandbox/trace.c
-+++ b/libsandbox/trace.c
-@@ -704,6 +704,8 @@ static char *flatten_args(char *const argv[])
- 
- bool trace_possible(const char *filename, char *const argv[], const void *data)
- {
-+	char *args;
-+
- 	/* If YAMA ptrace_scope is very high, then we can't trace at all.  #771360 */
- 	int yama = trace_yama_level();
- 	if (yama >= 2) {
-@@ -721,7 +723,7 @@ bool trace_possible(const char *filename, char *const argv[], const void *data)
- 	}
- 
-  fail:
--	char *args = flatten_args(argv);
-+	args = flatten_args(argv);
- 	sb_eqawarn("Unable to trace static ELF: %s: %s\n", filename, args);
- 	free(args);
- 	return false;
--- 
-2.33.0
-

diff --git a/sys-apps/sandbox/sandbox-3.0.ebuild b/sys-apps/sandbox/sandbox-3.0.ebuild
deleted file mode 100644
index 83e908988817..000000000000
--- a/sys-apps/sandbox/sandbox-3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic multilib-minimal multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+nnp"
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-src_prepare() {
-	default
-
-	if ! use nnp ; then
-		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
-	fi
-
-	# sandbox uses `__asm__ (".symver "...` which does
-	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
-	append-flags -fno-lto
-	append-ldflags -fno-lto
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	dodoc AUTHORS ChangeLog* README.md
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/var/log/sandbox
-	chown root:portage "${EROOT}"/var/log/sandbox
-	chmod 0770 "${EROOT}"/var/log/sandbox
-}

diff --git a/sys-apps/sandbox/sandbox-3.1.ebuild b/sys-apps/sandbox/sandbox-3.1.ebuild
deleted file mode 100644
index 1c11a7faf157..000000000000
--- a/sys-apps/sandbox/sandbox-3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic multilib-minimal multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+nnp"
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-label-decl.patch #821433
-)
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-src_prepare() {
-	default
-
-	if ! use nnp ; then
-		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
-	fi
-
-	# sandbox uses `__asm__ (".symver "...` which does
-	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
-	append-flags -fno-lto
-	append-ldflags -fno-lto
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	dodoc AUTHORS ChangeLog* README.md
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/var/log/sandbox
-	chown root:portage "${EROOT}"/var/log/sandbox
-	chmod 0770 "${EROOT}"/var/log/sandbox
-}