diff options
Diffstat (limited to 'sys-apps/grep')
-rw-r--r-- | sys-apps/grep/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/grep/files/grep-2.27-splice.patch | 60 | ||||
-rw-r--r-- | sys-apps/grep/grep-2.27-r1.ebuild | 46 |
3 files changed, 0 insertions, 109 deletions
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index a1dbd238452b..b6259c4a0342 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,8 +1,5 @@ -AUX grep-2.27-splice.patch 2056 BLAKE2B bcaa98b6c7b009194def6d0b3bba81bfcad6fab6eb72a4a071d04efd4564ea0f8bc601c93d5f9afde3c5ef740736bea8f4da15fcdce93a36ab810f70855c46f5 SHA512 cc3da88a206af1550ed00d8d08f8619853d72b0f4e5066ea56c402104b23c5e46ef7e984b3f879fe33b32392506133622c0ca086394f03247c4274956af52473 -DIST grep-2.27.tar.xz 1360388 BLAKE2B ed750fa7a6aea389c8f096acc9ac9cdebc9561c4b0cedfd5415ef033dd90076d5b9a42fa97c97207474b250ac0c4e4ed3c2ff216fe4462ac80baa6e47a2b90eb SHA512 d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781 DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26 -EBUILD grep-2.27-r1.ebuild 1390 BLAKE2B 007ddfe84acb25c755f6ed9ff9b31f0273196f7186679b0f69713713207a3b7cb04ab166dbfeae42cfaa1cfeb0fcbc68486ee991f3e62ca2f718f979eafe692b SHA512 e92f35dce7ac3790c79a155d9c2b6323dfdabe63d6ba35c7b7207ac7fa00cd2f18316241dc9038ddb120db5a7b6472309266e6d5658dcd57cd1ec1428d7642a2 EBUILD grep-3.0.ebuild 1358 BLAKE2B d3dd5e78bf8763f54b30e1447b61248673d0da1151458c6bcd0bfd4dcd4784e45aac6adb71b2cb26cab95762e0c7ec5d54c0ea85ea01df174bc2e0367ba3499e SHA512 3778bc0473f795069196d67b7b806f368994396454d0255c9d37a68b33e35e1b8415c8760373819aa59c12ab2533faf30fb27dad032da40007781ac05fe8cb09 EBUILD grep-3.1.ebuild 1410 BLAKE2B c0c968993b0ddb07195b90ffa8a64e1a03b291ba2aa9b369209706868bf3583796e3e54223f95d7b1fb2170e824c9ec59ef9e0ae7eeaea7f4715ee9cede07411 SHA512 d143f8353bc8f7789098d4240736d764a337d77565455306390924c8c6b6a25b92c27f1fdbbdc60740e177b9cccd4f173796430e30a7e06d5abc6c653ff9c5d4 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f diff --git a/sys-apps/grep/files/grep-2.27-splice.patch b/sys-apps/grep/files/grep-2.27-splice.patch deleted file mode 100644 index 6c36fe07fd20..000000000000 --- a/sys-apps/grep/files/grep-2.27-splice.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://lists.gnu.org/archive/html/bug-grep/2016-12/msg00036.html - -From 7ad47abbcb070946000771a829b51224720b8cef Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Tue, 27 Dec 2016 11:16:32 -0800 -Subject: [PATCH] grep: fix bug with '... | grep pat >> /dev/null' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Benno Fünfstück (Bug#25283). -* NEWS: Document this. -* src/grep.c (drain_input) [SPLICE_F_MOVE]: -Don't assume /dev/null is always acceptable output to splice. -* tests/grep-dev-null-out: Test for the bug. ---- - NEWS | 7 ++++--- - src/grep.c | 14 +++++++++----- - tests/grep-dev-null-out | 2 ++ - 3 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/grep.c b/src/grep.c -index f28f3c287609..aebab2060308 100644 ---- a/src/grep.c -+++ b/src/grep.c -@@ -1728,11 +1728,15 @@ drain_input (int fd, struct stat const *st) - { - #ifdef SPLICE_F_MOVE - /* Should be faster, since it need not copy data to user space. */ -- while ((nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, -- INITIAL_BUFSIZE, SPLICE_F_MOVE))) -- if (nbytes < 0) -- return false; -- return true; -+ nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, -+ INITIAL_BUFSIZE, SPLICE_F_MOVE); -+ if (0 <= nbytes || errno != EINVAL) -+ { -+ while (0 < nbytes) -+ nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, -+ INITIAL_BUFSIZE, SPLICE_F_MOVE); -+ return nbytes == 0; -+ } - #endif - } - while ((nbytes = safe_read (fd, buffer, bufalloc))) -diff --git a/tests/grep-dev-null-out b/tests/grep-dev-null-out -index 13a4843957a6..c8128d5cc6a4 100755 ---- a/tests/grep-dev-null-out -+++ b/tests/grep-dev-null-out -@@ -8,4 +8,6 @@ require_timeout_ - ${AWK-awk} 'BEGIN {while (1) print "x"}' </dev/null | - returns_ 124 timeout 1 grep x >/dev/null || fail=1 - -+echo abc | grep b >>/dev/null || fail=1 -+ - Exit $fail --- -2.11.0 - diff --git a/sys-apps/grep/grep-2.27-r1.ebuild b/sys-apps/grep/grep-2.27-r1.ebuild deleted file mode 100644 index b2e9b3858350..000000000000 --- a/sys-apps/grep/grep-2.27-r1.ebuild +++ /dev/null @@ -1,46 +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="GNU regular expression matcher" -HOMEPAGE="https://www.gnu.org/software/grep/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls pcre static" - -LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - nls? ( virtual/libintl ) - virtual/libiconv" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - static? ( ${LIB_DEPEND} )" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-splice.patch - sed -i \ - -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ - src/egrep.sh || die #523898 -} - -src_configure() { - use static && append-ldflags -static - # Always use pkg-config to get lib info for pcre. - export ac_cv_search_pcre_compile=$( - usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' - ) - econf \ - --bindir="${EPREFIX}"/bin \ - $(use_enable nls) \ - $(use_enable pcre perl-regexp) -} |