From 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Mar 2018 16:55:35 +0000 Subject: gentoo resync : 13.03.2018 --- sys-apps/sed/Manifest | 10 +++++----- sys-apps/sed/metadata.xml | 6 +++++- sys-apps/sed/sed-4.2.2.ebuild | 10 ++++------ sys-apps/sed/sed-4.3-r1.ebuild | 10 ++++------ sys-apps/sed/sed-4.4-r1.ebuild | 14 ++++++-------- sys-apps/sed/sed-4.4.ebuild | 10 ++++------ 6 files changed, 28 insertions(+), 32 deletions(-) (limited to 'sys-apps/sed') diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index ee083e215e16..1a22542bd881 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -5,8 +5,8 @@ AUX sed-4.3-dfa-segv-3.patch 5334 BLAKE2B 44cd0e56f46e0ed458ff6e157f28bf2e0f7c5a 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 -EBUILD sed-4.2.2.ebuild 1703 BLAKE2B 85de6422cc772bb64b6e4ccb3a8e385e21314f266497a30753dd37f193c95ec57f0522488efb6e956f582e34182ae38d13492b01cb3fe90d504b6af4f9ca25ef SHA512 83ad39ac0a61046ddfb1ceab35284b776bf1bac6656f7a60d3e4eee8070febec7bdbfe23138934d0b6fb688142759825deab25eb6988c90b54d269b553cc274b -EBUILD sed-4.3-r1.ebuild 1471 BLAKE2B ccfc211be1e8ee18580188db738958243c13af4ed0a42934386628a086199bb48ce1edac9609098545f599b352824fd3bbf1e984fbc02dc928676150f010c16f SHA512 a87cb60ca1b125d0db8b90f5cd4211b5f90316cee63d5543ab92e089a1c6782599d66b9fcea2431523126a1e7b1b1230d14c396fdf2c6de1d2704aacee08ea87 -EBUILD sed-4.4-r1.ebuild 1731 BLAKE2B 0023f4b656ec18b2b4ee250e387ee978fe377840e130b9a9d1b72255ead62ee3b799b5c1dd55c56cf29a277460f0abe7b7ac1c2646377e62692e501ede065345 SHA512 0c75b2e7d8c33c4fcd87199b7e76c44baf1e7c84f616c60f6d8a1d3667c41a443397fbf270033e585d739c78d40fc67ea3c8ae3e543feda3bb63c45d173ed37d -EBUILD sed-4.4.ebuild 1431 BLAKE2B 81ed2cb028f7f748629b8c9b73a2786ed48bab298e92ad10c1b6b5436ac03d515766ad1223d1cff4c8157714abaca950e9791b498fbb1558dbbe8f2609039dda SHA512 d1cc340b33bb8d5ac0565136d9dabf84d261f5496fb0ebfe27f69a2d37dc8031bedb43e610e744d7bd60de0b672afde5e6fbdb4862d556ed960de832f2f7b94a -MISC metadata.xml 454 BLAKE2B 3bb53d0a0a1d85cb0415e9c81db669e048c980923b6aad172ab2e666a995ff7e88dbcc4290f479613a60b83aeb62d1b7d9bf9b5d4ea9ee8a190bea6a87dff7e4 SHA512 4c30d1ec7669e56902672117382e8617718858e9aaad078a6ed298428f55396a81d336963560d3f4679499a0f1e291f99462601ab0c76768359086fa9bcb9b55 +EBUILD sed-4.2.2.ebuild 1680 BLAKE2B 5091750a04cdaa6b5c340cfe27c74a3b620d21b3be451755104d93774f73060d92a70c367ce4107407dbfc3a4edb8fefbcbeef3876e3bc9707e481f5b20cb3eb SHA512 331c709e673cd26b2c3b5a48094ce5e2cb4d486b5eca2ac6733fc8e39fd525342be2494384922da920075f94fe2ab81a625795ea094769ab71548acb93089d99 +EBUILD sed-4.3-r1.ebuild 1448 BLAKE2B 8d3099ed84f4a936f2cd4f6f176220b1f6a316e28ff833010ceb6f5b66d8220d4c8834b65b99b62a474cf0be7e9830d7461f0cc14ddc382b00f69a0046137f4e SHA512 7e21eecbc7dba0c69f0f03966c9eb0fc62fc2c5504d8c49714edde437909cb9c823c59c0c2ab956bce38121d0ddc7a8bbd7be52f6bd2a87579dbf042b32de98b +EBUILD sed-4.4-r1.ebuild 1784 BLAKE2B ba803b69441a45db55fb1dbd392234379203984af141310d42a2eb580e8dc98dce2315b8413b892a7279418317d2f58f168eb126bc759969cde5641a0b86424a SHA512 bb7e23c0467e298cdfb5b292efda9d057617db74cf43b7796e890aab5dd5045fc86ffd310ce015ec1d71e71839cbce9082740efee7fecbcb91e6e0a537f27e01 +EBUILD sed-4.4.ebuild 1408 BLAKE2B 5b8e91c2459c0fff944b1f320069d6b2975fe627fbc5d65f149e1f1c34c6c19871f198cfee928cece9fdfa3d2f62324af37f3ad86eb13fa75d89d6296f456008 SHA512 eaa3ea74e58db3499f05f45f8c4f16552e36d9fc72b75fe3c7b19a59fc6a0c073184d3e2cdd168aa297d9253cf9b698ea281af557e6f413d40338e97098e68aa +MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5 diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml index ea2a7bdbf75c..504b6a5e4649 100644 --- a/sys-apps/sed/metadata.xml +++ b/sys-apps/sed/metadata.xml @@ -9,6 +9,10 @@ sed - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands) + + 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). + diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild index ad3f071a2b1b..b6da5a256ce2 100644 --- a/sys-apps/sed/sed-4.2.2.ebuild +++ b/sys-apps/sed/sed-4.2.2.ebuild @@ -22,13 +22,11 @@ DEPEND="${RDEPEND} src_bootstrap_sed() { # make sure system-sed works #40786 - export NO_SYS_SED="" if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" + 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 } diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild index b0be9297fb01..e70a45187922 100644 --- a/sys-apps/sed/sed-4.3-r1.ebuild +++ b/sys-apps/sed/sed-4.3-r1.ebuild @@ -26,13 +26,11 @@ PATCHES=( src_bootstrap_sed() { # make sure system-sed works #40786 - export NO_SYS_SED="" if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" + 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 } diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild index 26c3858da53b..39c3d130eacf 100644 --- a/sys-apps/sed/sed-4.4-r1.ebuild +++ b/sys-apps/sed/sed-4.4-r1.ebuild @@ -21,14 +21,12 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_bootstrap_sed() { - # make sure system-sed works #40786 - export NO_SYS_SED="" - if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - emake clean + # 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 } diff --git a/sys-apps/sed/sed-4.4.ebuild b/sys-apps/sed/sed-4.4.ebuild index aa52e2921cdc..3bdb8e28ac20 100644 --- a/sys-apps/sed/sed-4.4.ebuild +++ b/sys-apps/sed/sed-4.4.ebuild @@ -25,13 +25,11 @@ DEPEND="${RDEPEND} src_bootstrap_sed() { # make sure system-sed works #40786 - export NO_SYS_SED="" if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" + 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 } -- cgit v1.2.3