From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4381138334 for ; Fri, 28 Sep 2018 14:26:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98156E07DB; Fri, 28 Sep 2018 14:26:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57168E07DB for ; Fri, 28 Sep 2018 14:26:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6492C335C94 for ; Fri, 28 Sep 2018 14:26:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C45D43CB for ; Fri, 28 Sep 2018 14:26:27 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1538144771.7a182b78abf97a3b936aff9fb4facf13b7ed8b4e.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/grep/, sys-apps/grep/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/grep/Manifest sys-apps/grep/files/grep-2.27-splice.patch sys-apps/grep/grep-2.27-r1.ebuild X-VCS-Directories: sys-apps/grep/ sys-apps/grep/files/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 7a182b78abf97a3b936aff9fb4facf13b7ed8b4e X-VCS-Branch: master Date: Fri, 28 Sep 2018 14:26:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6b88f8db-eabd-462b-b6a9-cc3ce0cf0652 X-Archives-Hash: bd8f531d75b03c95c551c6f5b73765ec commit: 7a182b78abf97a3b936aff9fb4facf13b7ed8b4e Author: Mikle Kolyada gentoo org> AuthorDate: Fri Sep 28 14:26:11 2018 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Fri Sep 28 14:26:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a182b78 sys-apps/grep: Drop old Package-Manager: Portage-2.3.49, Repoman-2.3.10 sys-apps/grep/Manifest | 1 - sys-apps/grep/files/grep-2.27-splice.patch | 60 ------------------------------ sys-apps/grep/grep-2.27-r1.ebuild | 46 ----------------------- 3 files changed, 107 deletions(-) diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index a90650adb75..d9491ea9585 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,3 +1,2 @@ -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 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 6c36fe07fd2..00000000000 --- 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 -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 || 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 b2e9b385835..00000000000 --- 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) -}