@@ -1,20 +1,18 @@

 Summary:	Programs for searching through files

 Name:		grep

-Version:	2.21

-Release:	3%{?dist}

+Version:	3.0

+Release:	1%{?dist}

 License:	GPLv3+

 URL:		http://www.gnu.org/software/grep

 Group:		Applications/File

 Vendor:		VMware, Inc.

 Distribution: Photon

-Source0:		http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz

-%define sha1 grep=c7e6525c5c5aaa1bc3c1774db1697f42b11c2d85

-Patch0:     out-of-bound-heap-read-CVE-2015-1345.patch

+Source0:	http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz

+%define sha1 grep=7b742a6278f28ff056da799c62c1b9e417fe86ba

 %description

 The Grep package contains programs for searching through files.

 %prep

 %setup -q

-%patch0 -p1

 %build

 ./configure \

 	--prefix=%{_prefix} \

@@ -32,6 +30,8 @@ make  %{?_smp_mflags} check

 /bin/*

 %{_mandir}/*/*

 %changelog

+*       Fri Mar 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.0-1

+-       Upgrading grep to 3.0 version

 *       Thu Oct 06 2016 ChangLee <changlee@vmware.com> 2.21-3

 -       Modified %check

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.21-2

deleted file mode 100644

@@ -1,65 +0,0 @@

-From 83a95bd8c8561875b948cadd417c653dbe7ef2e2 Mon Sep 17 00:00:00 2001

-From: Yuliy Pisetsky <ypisetsky@fb.com>

-Date: Thu, 01 Jan 2015 23:36:55 +0000

-Subject: grep -F: fix a heap buffer (read) overrun

-

-grep's read buffer is often filled to its full size, except when

-reading the final buffer of a file.  In that case, the number of

-bytes read may be far less than the size of the buffer.  However, for

-certain unusual pattern/text combinations, grep -F would mistakenly

-examine bytes in that uninitialized region of memory when searching

-for a match.  With carefully chosen inputs, one can cause grep -F to

-read beyond the end of that buffer altogether.  This problem arose via

-commit v2.18-90-g73893ff with the introduction of a more efficient

-heuristic using what is now the memchr_kwset function. The use of

-that function in bmexec_trans could leave TP much larger than EP,

-and the subsequent call to bm_delta2_search would mistakenly access

-beyond end of the main input read buffer.

-

-* src/kwset.c (bmexec_trans): When TP reaches or exceeds EP,

-do not call bm_delta2_search.

-* THANKS.in: Update.

-

-Prior to this patch, this command would trigger a UMR:

-

-  printf %0360db 0 | valgrind src/grep -F $(printf %019dXb 0)

-

-  Use of uninitialised value of size 8

-     at 0x4142BE: bmexec_trans (kwset.c:657)

-     by 0x4143CA: bmexec (kwset.c:678)

-     by 0x414973: kwsexec (kwset.c:848)

-     by 0x414DC4: Fexecute (kwsearch.c:128)

-     by 0x404E2E: grepbuf (grep.c:1238)

-     by 0x4054BF: grep (grep.c:1417)

-     by 0x405CEB: grepdesc (grep.c:1645)

-     by 0x405EC1: grep_command_line_arg (grep.c:1692)

-     by 0x4077D4: main (grep.c:2570)

-

-Thanks to Nima Aghdaii for testing and finding numerous

-ways to break early iterations of this patch.

-diff --git a/THANKS.in b/THANKS.in

-index aeaf516..624478d 100644

-+++ b/THANKS.in

-@@ -62,6 +62,7 @@ Michael Aichlmayr                   mikla@nx.com

- Miles Bader                         miles@ccs.mt.nec.co.jp

- Mirraz Mirraz                       mirraz1@rambler.ru

- Nelson H. F. Beebe                  beebe@math.utah.edu

-+Nima Aghdaii                        naghdaii@fb.com

- Olaf Kirch                          okir@ns.lst.de

- Paul Kimoto                         kimoto@spacenet.tn.cornell.edu

- Péter Radics                        mitchnull@gmail.com

-diff --git a/src/kwset.c b/src/kwset.c

-index 4003c8d..376f7c3 100644

-+++ b/src/kwset.c

-@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)

-                     if (! tp)

-                       return -1;

-                     tp++;

-+                    if (ep <= tp)

-+                      break;

-                   }

-               }

-           }