commit: 5b9ec59fc1deff3bcb27831eeacfcb9f08389407 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Jun 18 10:13:04 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Jun 18 10:13:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9ec59f
sys-apps/sed: Removed old. Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-apps/sed/Manifest | 2 - sys-apps/sed/files/sed-4.3-dfa-segv-1.patch | 175 ---------------------------- sys-apps/sed/files/sed-4.3-dfa-segv-2.patch | 112 ------------------ sys-apps/sed/files/sed-4.3-dfa-segv-3.patch | 146 ----------------------- sys-apps/sed/sed-4.3-r1.ebuild | 60 ---------- sys-apps/sed/sed-4.4-r1.ebuild | 64 ---------- 6 files changed, 559 deletions(-) diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index ab61ab27d0e..ec23d184ad7 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -1,4 +1,2 @@ DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 -DIST sed-4.3.tar.xz 1167168 BLAKE2B 5751943cb64d03afef727deba3bee7027a1611b4729c7b33497c28513b61571d1c323f1d07ab68a252a9e45d0f7c95e303f05443310dcae74bedab28160b079d SHA512 4d76a099cf7115763b79b45be5c96338750baa47e34c36075f714e022614397aa9240099d6d009e69aa4d06b6cfc14dcc0f8313442a1465f448b36fb6874a26d -DIST sed-4.4.tar.xz 1181664 BLAKE2B 03804c209c2108cca4aa991cd68065fd03a15c726b6daf5212603835b5c046c63e9c2e4c28f76dfe165128f060db5b992c981f314d2fe230f30521545d00a468 SHA512 4e1b0a7403913f1e25047eb2292a0a9b3488b15b4463ce2803e05eaecbc2da19f477a18e6a70c992461c38ced90774415091aa2d8ce85cb74e391610d9eedb70 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196 diff --git a/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch deleted file mode 100644 index f82adc71253..00000000000 --- a/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch +++ /dev/null @@ -1,175 +0,0 @@ -fix from upstream gnulib (fudged to apply to sed-4.3) - -From 823b5cb589366f7c8742503af980803afad0978f Mon Sep 17 00:00:00 2001 -From: Paul Eggert <[email protected]> -Date: Sun, 8 Jan 2017 12:44:29 -0800 -Subject: [PATCH] dfa: fix reallocation bug when matching newlines - -Problem reported for sed by S. Gilles (Bug#25390). -* lib/dfa.c (realloc_trans_if_necessary): Move earlier. -(dfastate): Reallocate before moving any newline transition ... -(build_state): ... instead of reallocating here, where it is too late. ---- - ChangeLog | 8 +++++ - lib/dfa.c | 114 ++++++++++++++++++++++++++++++-------------------------------- - 2 files changed, 63 insertions(+), 59 deletions(-) - -diff --git a/lib/dfa.c b/lib/dfa.c -index 8276db160a4b..141888a978fa 100644 ---- a/lib/dfa.c -+++ b/lib/dfa.c -@@ -2574,6 +2574,40 @@ dfaanalyze (struct dfa *d, bool searchflag) - free (merged.elems); - } - -+/* Make sure D's state arrays are large enough to hold NEW_STATE. */ -+static void -+realloc_trans_if_necessary (struct dfa *d, state_num new_state) -+{ -+ state_num oldalloc = d->tralloc; -+ if (oldalloc <= new_state) -+ { -+ state_num **realtrans = d->trans ? d->trans - 2 : NULL; -+ ptrdiff_t newalloc1 = realtrans ? d->tralloc + 2 : 0; -+ realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1, -+ -1, sizeof *realtrans); -+ realtrans[0] = realtrans[1] = NULL; -+ d->trans = realtrans + 2; -+ ptrdiff_t newalloc = d->tralloc = newalloc1 - 2; -+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails); -+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success); -+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines); -+ if (d->localeinfo.multibyte) -+ { -+ realtrans = d->mb_trans ? d->mb_trans - 2 : NULL; -+ realtrans = xnrealloc (realtrans, newalloc1, sizeof *realtrans); -+ if (oldalloc == 0) -+ realtrans[0] = realtrans[1] = NULL; -+ d->mb_trans = realtrans + 2; -+ } -+ for (; oldalloc < newalloc; oldalloc++) -+ { -+ d->trans[oldalloc] = NULL; -+ d->fails[oldalloc] = NULL; -+ if (d->localeinfo.multibyte) -+ d->mb_trans[oldalloc] = NULL; -+ } -+ } -+} - - /* Return the transition out of state s of d for the input character uc, - updating the slots in trans accordingly. -@@ -2810,20 +2844,25 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - } - - /* Set the transitions for each character in the label. */ -+ state_num maxstate = -1; - for (i = 0; i < NOTCHAR; i++) - if (tstbit (i, label)) -- switch (d->syntax.sbit[i]) -- { -- case CTX_NEWLINE: -- trans[i] = state_newline; -- break; -- case CTX_LETTER: -- trans[i] = state_letter; -- break; -- default: -- trans[i] = state; -- break; -- } -+ { -+ switch (d->syntax.sbit[i]) -+ { -+ case CTX_NEWLINE: -+ trans[i] = state_newline; -+ break; -+ case CTX_LETTER: -+ trans[i] = state_letter; -+ break; -+ default: -+ trans[i] = state; -+ break; -+ } -+ if (maxstate < trans[i]) -+ maxstate = trans[i]; -+ } - - #ifdef DEBUG - fprintf (stderr, "trans table %td", s); -@@ -2840,6 +2879,9 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - free (follows.elems); - free (tmp.elems); - -+ /* Reallocate now, to reallocate any newline transition properly. */ -+ realloc_trans_if_necessary (d, maxstate); -+ - /* Keep the newline transition in a special place so we can use it as - a sentinel. */ - if (tstbit (d->syntax.eolbyte, label)) -@@ -2851,42 +2893,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - return trans[uc]; - } - --/* Make sure D's state arrays are large enough to hold NEW_STATE. */ --static void --realloc_trans_if_necessary (struct dfa *d, state_num new_state) --{ -- state_num oldalloc = d->tralloc; -- if (oldalloc <= new_state) -- { -- state_num **realtrans = d->trans ? d->trans - 2 : NULL; -- ptrdiff_t newalloc, newalloc1; -- newalloc1 = realtrans ? d->tralloc + 2 : 0; -- realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1, -- -1, sizeof *realtrans); -- realtrans[0] = realtrans[1] = NULL; -- d->trans = realtrans + 2; -- d->tralloc = newalloc = newalloc1 - 2; -- d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails); -- d->success = xnrealloc (d->success, newalloc, sizeof *d->success); -- d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines); -- if (d->localeinfo.multibyte) -- { -- realtrans = d->mb_trans ? d->mb_trans - 2 : NULL; -- realtrans = xnrealloc (realtrans, newalloc1, sizeof *realtrans); -- if (oldalloc == 0) -- realtrans[0] = realtrans[1] = NULL; -- d->mb_trans = realtrans + 2; -- } -- for (; oldalloc < newalloc; oldalloc++) -- { -- d->trans[oldalloc] = NULL; -- d->fails[oldalloc] = NULL; -- if (d->localeinfo.multibyte) -- d->mb_trans[oldalloc] = NULL; -- } -- } --} -- - /* Calculate the transition table for a new state derived from state s - for a compiled dfa d after input character uc, and return the new - state number. */ -@@ -2932,18 +2939,7 @@ build_state (state_num s, struct dfa *d, unsigned char uc) - if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) - d->success[s] |= CTX_NONE; - -- s = dfastate (s, d, uc, trans); -- -- /* Now go through the new transition table, and make sure that the trans -- and fail arrays are allocated large enough to hold a pointer for the -- largest state mentioned in the table. */ -- state_num maxstate = -1; -- for (int i = 0; i < NOTCHAR; i++) -- if (maxstate < trans[i]) -- maxstate = trans[i]; -- realloc_trans_if_necessary (d, maxstate); -- -- return s; -+ return dfastate (s, d, uc, trans); - } - - /* Multibyte character handling sub-routines for dfaexec. */ --- -2.11.0 - diff --git a/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch deleted file mode 100644 index 4e4fb2c648c..00000000000 --- a/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch +++ /dev/null @@ -1,112 +0,0 @@ -fix from upstream gnulib (fudged to apply to sed-4.3) - -From aff55692da81f702ccbc461ad4f896b23c398638 Mon Sep 17 00:00:00 2001 -From: Norihiro Tanaka <[email protected]> -Date: Mon, 9 Jan 2017 07:46:13 +0900 -Subject: [PATCH] dfa: simplify transition table allocation - -* src/dfa.c (realloc_trans_if_necessary): Remove second argument. -Its value is derived from other variable. Update callers. -(dfastate): Remove calculation of max number of state. ---- - lib/dfa.c | 44 ++++++++++++++++++++------------------------ - 1 file changed, 20 insertions(+), 24 deletions(-) - -diff --git a/lib/dfa.c b/lib/dfa.c -index 141888a978fa..bda4602b1094 100644 ---- a/lib/dfa.c -+++ b/lib/dfa.c -@@ -2576,14 +2576,14 @@ dfaanalyze (struct dfa *d, bool searchflag) - - /* Make sure D's state arrays are large enough to hold NEW_STATE. */ - static void --realloc_trans_if_necessary (struct dfa *d, state_num new_state) -+realloc_trans_if_necessary (struct dfa *d) - { - state_num oldalloc = d->tralloc; -- if (oldalloc <= new_state) -+ if (oldalloc < d->sindex) - { - state_num **realtrans = d->trans ? d->trans - 2 : NULL; - ptrdiff_t newalloc1 = realtrans ? d->tralloc + 2 : 0; -- realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1, -+ realtrans = xpalloc (realtrans, &newalloc1, d->sindex - oldalloc, - -1, sizeof *realtrans); - realtrans[0] = realtrans[1] = NULL; - d->trans = realtrans + 2; -@@ -2825,6 +2825,9 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - state_letter = state_index (d, &follows, CTX_LETTER); - else - state_letter = state; -+ -+ /* Reallocate now, to reallocate any newline transition properly. */ -+ realloc_trans_if_necessary (d); - } - - /* If we are a searching matcher, the default transition is to a state -@@ -2847,22 +2850,18 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - state_num maxstate = -1; - for (i = 0; i < NOTCHAR; i++) - if (tstbit (i, label)) -- { -- switch (d->syntax.sbit[i]) -- { -- case CTX_NEWLINE: -- trans[i] = state_newline; -- break; -- case CTX_LETTER: -- trans[i] = state_letter; -- break; -- default: -- trans[i] = state; -- break; -- } -- if (maxstate < trans[i]) -- maxstate = trans[i]; -- } -+ switch (d->syntax.sbit[i]) -+ { -+ case CTX_NEWLINE: -+ trans[i] = state_newline; -+ break; -+ case CTX_LETTER: -+ trans[i] = state_letter; -+ break; -+ default: -+ trans[i] = state; -+ break; -+ } - - #ifdef DEBUG - fprintf (stderr, "trans table %td", s); -@@ -2879,9 +2878,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - free (follows.elems); - free (tmp.elems); - -- /* Reallocate now, to reallocate any newline transition properly. */ -- realloc_trans_if_necessary (d, maxstate); -- - /* Keep the newline transition in a special place so we can use it as - a sentinel. */ - if (tstbit (d->syntax.eolbyte, label)) -@@ -3042,7 +3038,7 @@ transit_state (struct dfa *d, state_num s, unsigned char const **pp, - - separate_contexts = state_separate_contexts (&d->mb_follows); - s2 = state_index (d, &d->mb_follows, separate_contexts ^ CTX_ANY); -- realloc_trans_if_necessary (d, s2); -+ realloc_trans_if_necessary (d); - - d->mb_trans[s][d->states[s1].mb_trindex] = s2; - -@@ -3137,7 +3133,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl, - } - - if (!d->tralloc) -- realloc_trans_if_necessary (d, 0); -+ realloc_trans_if_necessary (d); - - s = s1 = 0; - p = mbp = (unsigned char const *) begin; --- -2.11.0 - diff --git a/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch deleted file mode 100644 index d85022f754f..00000000000 --- a/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch +++ /dev/null @@ -1,146 +0,0 @@ -fix from upstream gnulib (fudged to apply to sed-4.3) - -From 7c345c68cdf62737ccc4a9d0ba2cd921fae850fa Mon Sep 17 00:00:00 2001 -From: Norihiro Tanaka <[email protected]> -Date: Mon, 9 Jan 2017 08:21:21 +0900 -Subject: [PATCH] dfa: melt down dfastate into build_state - -* src/dfa.c (dfastate): Remove it. -(build_state): Insert content of dfastate() to bottom. ---- - lib/dfa.c | 97 +++++++++++++++++++++++++++++---------------------------------- - 1 file changed, 45 insertions(+), 52 deletions(-) - -diff --git a/lib/dfa.c b/lib/dfa.c -index bda4602b1094..6896ed320a7b 100644 ---- a/lib/dfa.c -+++ b/lib/dfa.c -@@ -2609,8 +2609,10 @@ realloc_trans_if_necessary (struct dfa *d) - } - } - --/* Return the transition out of state s of d for the input character uc, -- updating the slots in trans accordingly. -+/* -+ Calculate the transition table for a new state derived from state s -+ for a compiled dfa d after input character uc, and return the new -+ state number. - - Do not worry about all possible input characters; calculate just the group - of positions that match uc. Label it with the set of characters that -@@ -2639,8 +2641,9 @@ realloc_trans_if_necessary (struct dfa *d) - If after comparing with every group there are characters remaining in C, - create a new group labeled with the characters of C and insert this - position in that group. */ -+ - static state_num --dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) -+build_state (state_num s, struct dfa *d, unsigned char uc) - { - leaf_set group; /* Positions that match the input char. */ - charclass label; /* The group's label. */ -@@ -2652,6 +2655,45 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - fprintf (stderr, "build state %td\n", s); - #endif - -+ /* A pointer to the new transition table, and the table itself. */ -+ state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s; -+ state_num *trans = *ptrans; -+ -+ if (!trans) -+ { -+ /* MAX_TRCOUNT is an arbitrary upper limit on the number of -+ transition tables that can exist at once, other than for -+ initial states. Often-used transition tables are quickly -+ rebuilt, whereas rarely-used ones are cleared away. */ -+ if (MAX_TRCOUNT <= d->trcount) -+ { -+ for (state_num i = d->min_trcount; i < d->tralloc; i++) -+ { -+ free (d->trans[i]); -+ free (d->fails[i]); -+ d->trans[i] = d->fails[i] = NULL; -+ } -+ d->trcount = 0; -+ } -+ -+ d->trcount++; -+ *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans); -+ -+ /* Fill transition table with a default value which means that the -+ transited state has not been calculated yet. */ -+ for (int i = 0; i < NOTCHAR; i++) -+ trans[i] = -2; -+ } -+ -+ /* Set up the success bits for this state. */ -+ d->success[s] = 0; -+ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d)) -+ d->success[s] |= CTX_NEWLINE; -+ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d)) -+ d->success[s] |= CTX_LETTER; -+ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) -+ d->success[s] |= CTX_NONE; -+ - group.elems = xnmalloc (d->nleaves, sizeof *group.elems); - group.nelem = 0; - -@@ -2889,55 +2931,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) - return trans[uc]; - } - --/* Calculate the transition table for a new state derived from state s -- for a compiled dfa d after input character uc, and return the new -- state number. */ -- --static state_num --build_state (state_num s, struct dfa *d, unsigned char uc) --{ -- /* A pointer to the new transition table, and the table itself. */ -- state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s; -- state_num *trans = *ptrans; -- -- if (!trans) -- { -- /* MAX_TRCOUNT is an arbitrary upper limit on the number of -- transition tables that can exist at once, other than for -- initial states. Often-used transition tables are quickly -- rebuilt, whereas rarely-used ones are cleared away. */ -- if (MAX_TRCOUNT <= d->trcount) -- { -- for (state_num i = d->min_trcount; i < d->tralloc; i++) -- { -- free (d->trans[i]); -- free (d->fails[i]); -- d->trans[i] = d->fails[i] = NULL; -- } -- d->trcount = 0; -- } -- -- d->trcount++; -- *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans); -- -- /* Fill transition table with a default value which means that the -- transited state has not been calculated yet. */ -- for (int i = 0; i < NOTCHAR; i++) -- trans[i] = -2; -- } -- -- /* Set up the success bits for this state. */ -- d->success[s] = 0; -- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d)) -- d->success[s] |= CTX_NEWLINE; -- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d)) -- d->success[s] |= CTX_LETTER; -- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) -- d->success[s] |= CTX_NONE; -- -- return dfastate (s, d, uc, trans); --} -- - /* Multibyte character handling sub-routines for dfaexec. */ - - /* Consume a single byte and transit state from 's' to '*next_state'. --- -2.11.0 - diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild deleted file mode 100644 index e70a4518792..00000000000 --- a/sys-apps/sed/sed-4.3-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Super-useful stream editor" -HOMEPAGE="http://sed.sourceforge.net/"; -SRC_URI="mirror://gnu/sed/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="acl nls selinux static" - -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${P}-dfa-segv-{1,2,3}.patch -) - -src_bootstrap_sed() { - # make sure system-sed works #40786 - if ! type -p sed > /dev/null ; 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() { - epatch "${PATCHES[@]}" - - # don't use sed before bootstrap if we have to recover a broken host sed - src_bootstrap_sed -} - -src_configure() { - local myconf=() - if use userland_GNU; then - myconf+=( --exec-prefix="${EPREFIX}" ) - else - myconf+=( --program-prefix=g ) - fi - - export ac_cv_search_setfilecon=$(usex selinux -lselinux) - export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) - use static && append-ldflags -static - myconf+=( - $(use_enable acl) - $(use_enable nls) - ) - econf "${myconf[@]}" -} diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild deleted file mode 100644 index 39c3d130eac..00000000000 --- a/sys-apps/sed/sed-4.4-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Super-useful stream editor" -HOMEPAGE="http://sed.sourceforge.net/"; -SRC_URI="mirror://gnu/sed/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="acl forced-sandbox nls selinux static" - -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" -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 - - 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 - myconf+=( --exec-prefix="${EPREFIX}" ) - else - myconf+=( --program-prefix=g ) - fi - - export ac_cv_search_setfilecon=$(usex selinux -lselinux) - export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) - use static && append-ldflags -static - myconf+=( - $(use_enable acl) - $(use_enable nls) - ) - econf "${myconf[@]}" -}
