diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sys-apps/grep |
reinit the tree, so we can have metadata
Diffstat (limited to 'sys-apps/grep')
-rw-r--r-- | sys-apps/grep/Manifest | 10 | ||||
-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 | ||||
-rw-r--r-- | sys-apps/grep/grep-3.0.ebuild | 45 | ||||
-rw-r--r-- | sys-apps/grep/grep-3.1.ebuild | 45 | ||||
-rw-r--r-- | sys-apps/grep/metadata.xml | 11 |
6 files changed, 217 insertions, 0 deletions
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest new file mode 100644 index 000000000000..eaf38d9b718b --- /dev/null +++ b/sys-apps/grep/Manifest @@ -0,0 +1,10 @@ +AUX grep-2.27-splice.patch 2056 SHA256 86522748127f671235867bc84f9dd03347dd0e816b09ce4b168d4662857f082e SHA512 cc3da88a206af1550ed00d8d08f8619853d72b0f4e5066ea56c402104b23c5e46ef7e984b3f879fe33b32392506133622c0ca086394f03247c4274956af52473 WHIRLPOOL 199811a2fe591bba08467a17a4e3cdf7992b2c80e9b48a9a96cfe423b8f2f9a129598612576785e3d01e3a489647c69b65e967f344f61725a2c4ba86970fb2bc +DIST grep-2.27.tar.xz 1360388 SHA256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb SHA512 d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781 WHIRLPOOL f1bd591f60998a5515f661ddd576593a3f24f8ea2e7c2ae5a94699da53cf98ba3bc422c3577ea6c05be48544ac6c2382d3da000e52aeb2affa05d75ef0617af9 +DIST grep-3.0.tar.xz 1375156 SHA256 e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 WHIRLPOOL 656271228bbbc3550560d2f4ec80031a8b0d9c662447afeea6e3c65c859dadde244af8c32ce03681495b3e86913468344fc29a5a52a53aa04eb5963b3a8a9529 +DIST grep-3.1.tar.xz 1370880 SHA256 db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26 WHIRLPOOL 2c321b4936f4f0268f1b3c522cd86f828cee395a5712a4a3024c6f5359389734f1b6fa2ca1fb5d17c968af0b3c00fcc5c475e05798578d15442677bb82ec9e39 +EBUILD grep-2.27-r1.ebuild 1402 SHA256 e58312b453c8b8aa8d4118b3b136b3bf3a983b30fbd04a55a6b9881557b44532 SHA512 4f36b61dcf73306d8d49fdb94168c6312d46f0995dbeec288c95da193276dcfce3dc85c10aa539a8e68abe052395012d0004de1ed643f19fc7641afe7eed6fab WHIRLPOOL c4c5a5e545b56ffe0f89ad4f3cbff80a2e62d99895a0b5639952c4b43a1a25fad05af3ecdc6e03d601eea4c14589464fd70976adf21ad1cab648d84ed6c55d3a +EBUILD grep-3.0.ebuild 1373 SHA256 7e32968aa24c852009accdc5ec879a49aba5090e8c6436cbcf9547e543d00a4f SHA512 c54c667fe9658d3912804b69a9695d60c497dd5f71976cfc3ca7fc6d33a11b4c4d7c2c29730a5e21b824e7eb58e76d698ac0d569805f437f2aa09316fc525c2c WHIRLPOOL 49e6d1e5bf0e0e729a9995ed311abff627eeedd2842b11d223aa66587e490bb643c9f7ff6a1cbae010bee04801dbc71c0fa37b70ad0d0eb5cc613a3dbc6ed04d +EBUILD grep-3.1.ebuild 1383 SHA256 315e2ef2a5e15be81eb65094e79fb4ad0c382bb8b38846e07d0ed5c22d48d42a SHA512 181beb8c30a3bb7b0375682c6f68c081b5bd8b4eb41247dc860c59f0ebd07fb19e7efa6ec32e4a584af09ab777a4c72e1ecbcf92d38b15167a65c86ee47daec6 WHIRLPOOL 218dc97f34c842cdac4ddcb943bbeae2ee65e837297fc74471b031050ce8d8abbc1c7295c226d76eedb25f548f4779402645b0ae13ee85810e97ad4f23d03061 +MISC ChangeLog 6381 SHA256 8419b87ff2f197a983e46458dffc7c05530bd9f30d320fc7e21dfb0145240bd9 SHA512 ce46a115df1931ed1ff2789ebcfc9a5dc85051e16293e42fb373974914ea5399c6047eec4d1ee1e19ade88bcf4915ddd14bed3d9d256ed50c64215bfc41d1152 WHIRLPOOL 54b61442f2f99a476bb4a646ddf8222b97362386721bfecff70345bb7fb08e99389e7c81559826028b6de027ba6c60094623397dd1810ccb26ae13fb4cfeb9c1 +MISC ChangeLog-2015 21767 SHA256 f7633e3e3efd1c1bc7ec8f4afc61e1703a140747c99ecb111658f143b0f3fe77 SHA512 febec50749ad8b8743e397ac1e2b8110beabf1ad518c20542461029ac61b4269170216a3c1b95eaedd31511b8ddeae1607841ae569ed41ecc1092b02a7ce8595 WHIRLPOOL 5a388c1d69707638430ca7c7b624a8e2498a260052d7534543a52c625b4915b999a1a6648b7cf7c6032101919bccf938f52c092c1420db290e0f7671eabcae8d +MISC metadata.xml 327 SHA256 19dd79e00bf9844243981eff5d7678d4da7d5e66e6bd3d3609858f724f695bb1 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f WHIRLPOOL 86663699cf49da5d02fc9a780ea79055cc93dd6b39e40c13fe9d506dbc69154514e600fcb2f008933ca96284e69a42ac6dffaff8219a42318c7b4cd5cd4993ab diff --git a/sys-apps/grep/files/grep-2.27-splice.patch b/sys-apps/grep/files/grep-2.27-splice.patch new file mode 100644 index 000000000000..6c36fe07fd20 --- /dev/null +++ b/sys-apps/grep/files/grep-2.27-splice.patch @@ -0,0 +1,60 @@ +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 new file mode 100644 index 000000000000..30072ddf8869 --- /dev/null +++ b/sys-apps/grep/grep-2.27-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2017 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 ~sparc-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) +} diff --git a/sys-apps/grep/grep-3.0.ebuild b/sys-apps/grep/grep-3.0.ebuild new file mode 100644 index 000000000000..26fb14cd91a9 --- /dev/null +++ b/sys-apps/grep/grep-3.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 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 ~x64-cygwin ~amd64-fbsd ~sparc-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() { + 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) +} diff --git a/sys-apps/grep/grep-3.1.ebuild b/sys-apps/grep/grep-3.1.ebuild new file mode 100644 index 000000000000..165ffbce3706 --- /dev/null +++ b/sys-apps/grep/grep-3.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 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 ~x64-cygwin ~amd64-fbsd ~sparc-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() { + 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) +} diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml new file mode 100644 index 000000000000..f4a75bc8b992 --- /dev/null +++ b/sys-apps/grep/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="cpe">cpe:/a:gnu:grep</remote-id> +</upstream> +</pkgmetadata> |