From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 20 Jan 2015 13:14:16 +0000 (+0000)
Subject: Security bump (bug #537046).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3bcc26408a304bdc476c99a62ef6fc73c73e96c;p=gentoo.git

Security bump (bug #537046).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
---

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 3ae5871f3474..a868d6c4d17a 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/grep
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.149 2014/11/24 04:51:36 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.150 2015/01/20 13:14:15 polynomial-c Exp $
+
+*grep-2.21-r1 (20 Jan 2015)
+
+  20 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> +grep-2.21-r1.ebuild:
+  Security bump (bug #537046). Upstream fix added without test suite because it
+  causes error in another test.
 
 *grep-2.21 (24 Nov 2014)
 
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 055303d1d914..bfbd90d61141 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -3,21 +3,29 @@ Hash: SHA256
 
 DIST grep-2.16.tar.xz 1210192 SHA256 16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162 SHA512 6b56aca3c859c28d463e1aa755f4f004087985573a8e012a8371780d6b7cbfa8587d5b0bfd2d37b1ddf6c3a49b9126d1e1408d2cc9255558f6cd5754b395b9f9 WHIRLPOOL 008f8338335fd50867fe08306330b679ba5809ecd64837901651bc90f31ed620be2377da0aba90fd57f099fa89bd2cbaf9fc08c8d18cd9aba229c613671c358f
 DIST grep-2.20.tar.xz 1237196 SHA256 f0af452bc0d09464b6d089b6d56a0a3c16672e9ed9118fbe37b0b6aeaf069a65 SHA512 97e0a92a84727eb590099ffdd44f296eff2232d1f3d508a9391e8a9976993da2b49ea80381d9b711609cb86d889a2d5903aaf2f14d79ad10b2bea1027a8a498e WHIRLPOOL 79cd992bf1c631442186cf19d1f7770fd986fef9c4d852c756f95c93639c82c1aff79a43cf37febf29152b07bf1c0c0bcffa7d9ad66442edc2cbd252c8540a1e
+DIST grep-2.21-heap_buffer_overrun.patch 3302 SHA256 4bc7e744fd34b268a798daf6a5aa85f55c141747149fa7b015eefbf9318ed478 SHA512 eaea33238f179b17dd152ed27a07c211646d9572be250eb7997c25ea0c8de232d21d8bc1b1e865b26545e6817e5c116e18d9115fb497d39426ac8212839f0f82 WHIRLPOOL 5ead7c22c8fe98289322a03685e9fc04e834a01144c55c9ea3b1970fa61b400ce669e6947cb3564fbbba5c7ddf079fd30e66352e4f6eed888e8fe883e369e601
 DIST grep-2.21.tar.xz 1261548 SHA256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de SHA512 bc894325f89d37413c773d4812cb24180560037ccc8d72c015462043ef3479ea7eefd62557e3a9d191d6d94c68262563d3c68e634acd4e77ba56e96c92805dfd WHIRLPOOL 2272286c10695a51eecafcc5ca8986adb5486d4494b284904f588717c6fb06de37933faa5f62eabf0ecc856334b3a1179b864dedc06f223047471168d2d86bb0
 EBUILD grep-2.16.ebuild 1430 SHA256 ea8ff2e9633f76015b4a9cafedfefdd9712ab04745685b1f177065aa0e434ce6 SHA512 33f8982aa2d607aa5309c24688beda0c5b1e4baf9c2d61739e8367f61c10ab910d4992175b82d0a19924099bd3350991fb0dac5ab8095b0b8763750891a30898 WHIRLPOOL a53df626b3ca0b79764231b1dc59ec8194cf564e76f0b8a526c02691b718897c3f69711675515d7d632e16f3ba17d54a2766893eae72fc7d4569054716dddfe4
 EBUILD grep-2.20-r1.ebuild 1546 SHA256 d8a2ef753972c851cc4a4bead9879023f05b26279b576fea631a146a425950bb SHA512 028dde99d80edb972e4e58588fc66d6f6b0f810ba53314f2917b8148bb77981ae808cfff850fb3cd48627729c183167bd4291e6eb0f950d9a4301ea919512392 WHIRLPOOL a92844a5ab584a4308109970b6f2ef0cbbd74bffe3fee109903c67e4e6bed8d705f9416afa6a6ee7ceabd4ee87b4a32a31760f912352f5b4ae340878e9e8da78
 EBUILD grep-2.20.ebuild 1448 SHA256 bd87b842fc0e6612602e231eed6f5cb24eedefd990a68720d1a9df3b8248df51 SHA512 1f3046f133ea84d990112034618fba3e2ef3540e6cc3e3f89cfdaa210bd7a233fc8879e5cfbe3900c294afd31b2b7f38c8a1f64f62c0ff1e803400e5431f2bd8 WHIRLPOOL 98284ccd0ce6a651a935dfa81bd45eb60c9b1582c52ab3d48537f8e90e482fb54389b206dfa60cd4884a9c8a7ec171a4d9bc8940fb212c96c5d9c52b1bc83d3f
+EBUILD grep-2.21-r1.ebuild 1680 SHA256 41ddf5af688914cb074ea22b6c1736e8f21dfc069cb9668f23b029e20a23f166 SHA512 f8c3b2342bf3a2025f38597b8becc19ed15b5d1ebea629897d7ba7e9f24a4365855ba0e028d68e197ee2749487fa08d4487bfcfdeba22df30611333394289f69 WHIRLPOOL 7115c3d2d8caf56980d10b512a67430fdd85bb1f0e46c6154da7bea3e79d5a9ede1c9cccd094755074339d051fb18c2f3727f80bb8ca0649ce3258d7352262b3
 EBUILD grep-2.21.ebuild 1546 SHA256 ca1ed78d6146af15110fa7425bcda570890766fdf8eab30a5800434ac003a31f SHA512 6499425d1ad1534f6a2e0d0149d10e3768fbaaf2fcba4adf0ed9ba36053bae040db89c9a60971ed9d0131199e7afcf316685868c22fb8fbf659cb5e4a443f796 WHIRLPOOL b0657490c09ae42859d7f686bc18a096e21d12187d6e0a2afec70ba45c024886bed0f217c773145cbad617c4a5a36de67bc6dbf01b327877db0aacbd0211c4fe
-MISC ChangeLog 20297 SHA256 609aef2dbb518ae1dbbf081e03c373f05920e152aeb704654cd4878a75395211 SHA512 57736e6077eb8e98ddc3d7d17b6650aaa4730732fa89f625845f1eab9bde01d95e97ab2edc3b951d3dd9013f1200ffaecaf1232de524fd6d9a1f9e471eb3aaaa WHIRLPOOL 3baab81483db757de7bd7912aff3bdd9844643eaf4c356d09674db10be52d019de767625bfc3381bc7712b500378790d8d21091cbf348569e5e26497c1032c81
+MISC ChangeLog 20518 SHA256 b72afaad213c682f87d51d668cb27280af80b930427c671380bfbd83fbc92f20 SHA512 83bdc660512a4278fc3d9555e9990a7808f97125bff6af0454dcb9112092e4412af9bae0750fe8996a16aed52cc9d8e710b2711d4d323c22074aa08c1d1c132c WHIRLPOOL 8b2b91b9475c1b9b7dfb7106f283fe2074eabec1eb7d4a61633a5d9926dd6d3fda2196434b9e18febd5b6680cbfc6f7897af43084f0bc4f2abbe7af8e9f44305
 MISC metadata.xml 239 SHA256 81e2263e85947bfea9b25bba8e5e5ee4c8926035903d4a603b0b89a9727eb754 SHA512 63460f39b4c7c948542e78143e0a2965b0915d4e6312a18799a6c8120c97625ee926f18f62e70caf2748a2136ce5848de387b537a12ed882fdca1aab326f0111 WHIRLPOOL 2e280afad5417d07550f36f74114cee1a02df44540ee65d7bfd1028d571dd35d5d6358f792ffc79f172f161ac4f17f38093963e5148c315b35b49bec0bc8397d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUcrlgAAoJEEqz6FtPBkyjgu0IAIdWMB92iKrnDMj0v3D14rhA
-LNlkIhDofzbN/0PYNg622/kP/jkHaqX7cbW6Vy1GNrNUdyp5fxN/vg2ZVnHb3LI9
-M76EnUQZE4R9TIUyVRN3GNJYTi7tWUajRZGqkE5iP6HdGNrSprRMAfuvutuCJYKd
-YjUCt9pvDaIhNgnBECNKTqPCu6ZD83Fh7URUQk6gmkqtMjBJ/82mGcD7+r+y7kCl
-TdwyH38lN6GiU6c2QHWP2P42CJuGCbGvpQMR0WPRH93y82VUacxeNEdqxGwdTU6G
-/1S7c2w6n/7Bs56mfguVsMCrEv+TsTegyahb+toNUu2TLlhgSoajIRIdr3giNMM=
-=PuDr
+iQIcBAEBCAAGBQJUvlSoAAoJEPiazRVxLXTFrskP/iYvL9s/1w7EMt2fC8ayBvtI
+x2oa54g5ebBUb1OjdhcHNH/m4Goq5GWpfMIBkKpJIEKo61apKZC3719veJd835wX
+pTM700/BzqRaJUMHNr4jpzKVuSiEDvBmDSoqxIUiDL3QXKLxYNadaiRzNr/IUCsw
+Yvz6C5J9F2eA/l2wE9Uf74jGdbDyAk2zixr1CA/FqggXm5umnOu5mcpXjV5X2408
+Nz7VLijAcNp3HF3dQiptHfM5lnP4ERaldgXrqAZUKmLPO8XbzPNeucpEhS78PfHy
+zlWTsdkD18NME5lTtdVdGnMm3G3qUo132qR1OIgVri0kaEQ30ty8UdBMRH/49DZ9
+A2qno+pGc3TTbf3sANDzvLmwX8jfKWreNNpPEJ8mumKUTZA0KjMWdSavKtEnEh5x
+49bW6j3EgW9OemaLM/WzgLrSXtpybhd7DAeUiYTEXmzBiM5bO9eLoITRQcAsIrob
+LpWHh9SgE1e8CqWv9Ei71Al7IhSWtzFVFmqYOt45HCi/rZUXiqArKldiVcmvqiCx
+dhQdPZV1AM4AyF9CVn+RZTsrgwQdwTxQnngftF2tEZGlUC6VSHWpIZsP2LJiaPKJ
+M8hpd3vVu3cXsWydoPt26xW10LBQ37huiuHTbbekmNPCsi4ao1R+NUrHigmw0r3G
+aIol7qRjOLlCiyXY+Vzi
+=Jm8f
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.21-r1.ebuild b/sys-apps/grep/grep-2.21-r1.ebuild
new file mode 100644
index 000000000000..b57cfbc2968b
--- /dev/null
+++ b/sys-apps/grep/grep-2.21-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.21-r1.ebuild,v 1.1 2015/01/20 13:14:15 polynomial-c Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/${P}-heap_buffer_overrun.patch"
+
+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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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
+
+	epatch "${DISTDIR}/${P}-heap_buffer_overrun.patch"
+}
+
+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)
+}