Commit 920d75d0 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

grep: bump to version 2.22 



Drop security patch since it's upstream.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent a82e0019

package/grep/0001-fix-CVE-2015-1345.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
Simplified patch from upstream to avoid autoreconf. Source:

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=83a95bd8c8561875b948cadd417c653dbe7ef2e2



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

---

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

index 4003c8d..376f7c3 100644

--- a/src/kwset.c

+++ 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;

                   }

               }

           }

--

cgit v0.9.0.2

package/grep/grep.hash

+1 −1
Original line number Diff line number Diff line 
# Locally calculated after checking signature

sha256	5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de	grep-2.21.tar.xz
 
sha256	ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb	grep-2.22.tar.xz

package/grep/grep.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



GREP_VERSION = 2.21

GREP_VERSION = 2.22

GREP_SITE = $(BR2_GNU_MIRROR)/grep

GREP_SOURCE = grep-$(GREP_VERSION).tar.xz

GREP_LICENSE = GPLv3+