public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/
Date: Fri, 17 Jan 2020 16:02:41 +0000 (UTC)	[thread overview]
Message-ID: <1579276954.56f502eea34a0d9d50fac1ea9a7f28105cc9b6da.floppym@gentoo> (raw)

commit:     56f502eea34a0d9d50fac1ea9a7f28105cc9b6da
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 20:42:02 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 16:02:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f502ee

sys-apps/sed: remove forced-sandbox USE flag

This "feature" isn't supported by upstream, and breaks at least one
build system.

Closes: https://bugs.gentoo.org/705578
Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/sed/metadata.xml   |  7 -------
 sys-apps/sed/sed-4.5.ebuild | 31 ++-----------------------------
 sys-apps/sed/sed-4.7.ebuild | 29 +----------------------------
 sys-apps/sed/sed-4.8.ebuild | 29 +----------------------------
 4 files changed, 4 insertions(+), 92 deletions(-)

diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index 504b6a5e464..b738f8c54a0 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -8,11 +8,4 @@
 <upstream>
 	<remote-id type="sourceforge">sed</remote-id>
 </upstream>
-<use>
-	<flag name="forced-sandbox">
-		Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands).
-		Note: This may break many configure scripts, so it should be avoided on dev systems
-		(and generally used on binpkg/final systems only).
-	</flag>
-</use>
 </pkgmetadata>

diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index 555171c1e83..0d105052fcd 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="acl forced-sandbox nls selinux static"
+IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
 	nls? ( virtual/libintl )
@@ -20,33 +20,6 @@ RDEPEND="acl? ( virtual/acl )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_bootstrap_sed() {
-	# make sure system-sed works #40786 #650052
-	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
-		mkdir -p "${T}/bootstrap"
-		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
-		chmod a+rx "${T}/bootstrap/sed"
-		PATH="${T}/bootstrap:${PATH}"
-	fi
-}
-
-src_prepare() {
-	# Don't use sed before bootstrap if we have to recover a broken host sed.
-	src_bootstrap_sed
-
-	default
-
-	if use forced-sandbox ; then
-		# Upstream doesn't want to add a configure flag for this.
-		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
-		sed -i \
-			-e '/^bool sandbox = false;/s:false:true:' \
-			sed/sed.c || die
-		# Make sure the sed took.
-		grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
-	fi
-}
-
 src_configure() {
 	local myconf=()
 	if use userland_GNU; then

diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
index 778456b7525..f57b47cb55a 100644
--- a/sys-apps/sed/sed-4.7.ebuild
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
-IUSE="acl forced-sandbox nls selinux static"
+IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
 	nls? ( virtual/libintl )
@@ -20,33 +20,6 @@ RDEPEND="acl? ( virtual/acl )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_bootstrap_sed() {
-	# make sure system-sed works #40786 #650052
-	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
-		mkdir -p "${T}/bootstrap"
-		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
-		chmod a+rx "${T}/bootstrap/sed"
-		PATH="${T}/bootstrap:${PATH}"
-	fi
-}
-
-src_prepare() {
-	# Don't use sed before bootstrap if we have to recover a broken host sed.
-	src_bootstrap_sed
-
-	default
-
-	if use forced-sandbox ; then
-		# Upstream doesn't want to add a configure flag for this.
-		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
-		sed -i \
-			-e '/^bool sandbox = false;/s:false:true:' \
-			sed/sed.c || die
-		# Make sure the sed took.
-		grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
-	fi
-}
-
 src_configure() {
 	local myconf=()
 	if use userland_GNU; then

diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index eee25f42b28..b2801d707f7 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="acl forced-sandbox nls selinux static"
+IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
 	nls? ( virtual/libintl )
@@ -20,33 +20,6 @@ RDEPEND="acl? ( virtual/acl )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_bootstrap_sed() {
-	# make sure system-sed works #40786 #650052
-	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
-		mkdir -p "${T}/bootstrap"
-		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
-		chmod a+rx "${T}/bootstrap/sed"
-		PATH="${T}/bootstrap:${PATH}"
-	fi
-}
-
-src_prepare() {
-	# Don't use sed before bootstrap if we have to recover a broken host sed.
-	src_bootstrap_sed
-
-	default
-
-	if use forced-sandbox ; then
-		# Upstream doesn't want to add a configure flag for this.
-		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
-		sed -i \
-			-e '/^bool sandbox = false;/s:false:true:' \
-			sed/sed.c || die
-		# Make sure the sed took.
-		grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
-	fi
-}
-
 src_configure() {
 	local myconf=()
 	if use userland_GNU; then


             reply	other threads:[~2020-01-17 16:02 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-17 16:02 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-29 21:05 [gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/ Sam James
2024-05-19 16:02 Sam James
2023-05-15  4:10 Sam James
2023-05-15  4:10 Sam James
2022-12-28  0:38 Sam James
2022-12-11 18:01 Arthur Zamarin
2022-12-10  4:48 Sam James
2022-12-10  4:19 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-12-10  4:17 Sam James
2022-11-07  2:57 Sam James
2022-10-30 15:51 Sam James
2022-09-21  4:21 Sam James
2022-04-07  3:57 Sam James
2022-01-06  9:07 David Seifert
2021-05-14 22:14 David Seifert
2021-04-21 19:02 Sam James
2020-06-11 22:08 Mart Raudsepp
2020-06-11 18:01 Sergei Trofimovich
2020-06-11  8:34 Agostino Sarubbo
2020-06-11  8:31 Agostino Sarubbo
2020-06-11  8:29 Agostino Sarubbo
2020-06-11  8:27 Agostino Sarubbo
2020-06-11  8:25 Agostino Sarubbo
2020-06-10 13:01 Agostino Sarubbo
2020-06-10 13:00 Agostino Sarubbo
2020-05-25 15:54 Mike Gilbert
2020-05-04 17:36 Thomas Deutschmann
2020-04-21  7:44 Lars Wendler
2020-03-21 20:16 Lars Wendler
2020-03-17 10:17 Mart Raudsepp
2020-02-12 16:14 Agostino Sarubbo
2020-01-27 11:22 Mikle Kolyada
2020-01-18  9:54 Sergei Trofimovich
2020-01-17 18:43 Mike Gilbert
2020-01-17  8:09 Sergei Trofimovich
2020-01-17  8:07 Sergei Trofimovich
2020-01-16  9:24 Lars Wendler
2020-01-15 23:52 Sergei Trofimovich
2020-01-15  9:17 Agostino Sarubbo
2020-01-15  7:30 Lars Wendler
2019-05-03 23:45 Mikle Kolyada
2018-12-22 13:24 Lars Wendler
2018-12-20 14:13 Mikle Kolyada
2018-07-11 21:35 Mikle Kolyada
2018-06-27  7:25 Tobias Klausmann
2018-06-24 20:25 Sergei Trofimovich
2018-06-23 14:59 Mart Raudsepp
2018-06-23  8:24 Sergei Trofimovich
2018-06-22  7:20 Mikle Kolyada
2018-06-19 19:13 Sergei Trofimovich
2018-06-19 12:55 Thomas Deutschmann
2018-06-19  8:17 Sergei Trofimovich
2018-04-01 14:13 Lars Wendler
2018-04-01 14:13 Lars Wendler
2018-03-11 22:37 Mike Frysinger
2018-03-11 22:37 Mike Frysinger
2018-03-05 18:37 Mike Frysinger
2017-02-04 13:41 Lars Wendler
2017-01-04 16:49 Lars Wendler
2016-12-07  8:32 Mike Frysinger
2016-09-23 17:40 Tobias Klausmann
2016-08-06 11:11 Markus Meier
2016-07-24 13:09 Jeroen Roovers
2016-07-24 10:22 Jeroen Roovers
2016-06-10  7:20 Benda XU

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1579276954.56f502eea34a0d9d50fac1ea9a7f28105cc9b6da.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox