From 6fe08077266d0d668f5327ca45645427e94d0a5d Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 29 May 2020 23:53:48 -0400 Subject: [PATCH] Revert "sys-apps/gawk: restore USE=forced-sandbox" This reverts commit d19efe2a0c309bde3ceda7e7a9fba3fc9864d124. Signed-off-by: Mike Gilbert --- sys-apps/gawk/gawk-4.2.1-r1.ebuild | 20 +------------------- sys-apps/gawk/gawk-5.0.1.ebuild | 20 +------------------- sys-apps/gawk/gawk-5.1.0.ebuild | 20 +------------------- sys-apps/gawk/metadata.xml | 1 - 4 files changed, 3 insertions(+), 58 deletions(-) diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild index 6982b29dc59b..807061875e31 100644 --- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild +++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="forced-sandbox mpfr nls readline" +IUSE="mpfr nls readline" RDEPEND=" dev-libs/gmp:0= @@ -38,16 +38,6 @@ src_prepare() { -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \ extension/inplace.c || die fi - - 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 '/^int do_flags = false;/s:false:DO_SANDBOX:' \ - main.c || die - # Make sure the sed took. - grep -q '^int do_flags = DO_SANDBOX;' main.c || die "forcing sandbox failed" - fi } src_configure() { @@ -71,14 +61,6 @@ src_install() { rm "${ED%/}"/usr/include/awk/config.h || die } -src_test() { - if use forced-sandbox ; then - ewarn "Tests disabled as they don't account for this mode." - return - fi - default -} - pkg_postinst() { # symlink creation here as the links do not belong to gawk, but to any awk if has_version app-admin/eselect \ diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild index 42d0a4c55254..b44a5513e78b 100644 --- a/sys-apps/gawk/gawk-5.0.1.ebuild +++ b/sys-apps/gawk/gawk-5.0.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="forced-sandbox mpfr nls readline" +IUSE="mpfr nls readline" RDEPEND=" dev-libs/gmp:0= @@ -40,16 +40,6 @@ src_prepare() { -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \ extension/inplace.c || die fi - - 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 '/^int do_flags = false;/s:false:DO_SANDBOX:' \ - main.c || die - # Make sure the sed took. - grep -q '^int do_flags = DO_SANDBOX;' main.c || die "forcing sandbox failed" - fi } src_configure() { @@ -73,14 +63,6 @@ src_install() { rm "${ED}"/usr/include/awk/config.h || die } -src_test() { - if use forced-sandbox ; then - ewarn "Tests disabled as they don't account for this mode." - return - fi - default -} - pkg_postinst() { # symlink creation here as the links do not belong to gawk, but to any awk if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild index d0cc5570fb28..850ebc1769ed 100644 --- a/sys-apps/gawk/gawk-5.1.0.ebuild +++ b/sys-apps/gawk/gawk-5.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="forced-sandbox mpfr nls readline" +IUSE="mpfr nls readline" RDEPEND=" dev-libs/gmp:0= @@ -42,16 +42,6 @@ src_prepare() { -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \ extension/inplace.c || die fi - - 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 '/^int do_flags = false;/s:false:DO_SANDBOX:' \ - main.c || die - # Make sure the sed took. - grep -q '^int do_flags = DO_SANDBOX;' main.c || die "forcing sandbox failed" - fi } src_configure() { @@ -75,14 +65,6 @@ src_install() { rm "${ED}"/usr/include/awk/config.h || die } -src_test() { - if use forced-sandbox ; then - ewarn "Tests disabled as they don't account for this mode." - return - fi - default -} - pkg_postinst() { # symlink creation here as the links do not belong to gawk, but to any awk if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml index 58cec04bdcb0..3fa1f9889991 100644 --- a/sys-apps/gawk/metadata.xml +++ b/sys-apps/gawk/metadata.xml @@ -6,7 +6,6 @@ Gentoo Base System - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands) use mpfr for high precision arithmetic (-M / --bignum) -- 2.26.2