From 91f81c65e98dcd17ba3b02efae4a7a7b52e069a5 Mon Sep 17 00:00:00 2001 From: Julen Landa Alustiza Date: Sun, 8 Nov 2015 19:35:31 +0100 Subject: [PATCH] grep: update to 2.22 Signed-off-by: Julen Landa Alustiza --- utils/grep/Makefile | 8 ++++---- ...01-grep-F-fix-a-heap-buffer-read-overrun.patch | 15 --------------- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 utils/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch diff --git a/utils/grep/Makefile b/utils/grep/Makefile index c4703bc569..7b373bbf66 100644 --- a/utils/grep/Makefile +++ b/utils/grep/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2012 OpenWrt.org +# Copyright (C) 2010-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=grep -PKG_VERSION:=2.21 -PKG_RELEASE:=2 +PKG_VERSION:=2.22 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/grep -PKG_MD5SUM:=43c48064d6409862b8a850db83c8038a +PKG_MD5SUM:=e1015e951a49a82b02e38891026ef5df PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING diff --git a/utils/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch b/utils/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch deleted file mode 100644 index df70359a66..0000000000 --- a/utils/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch +++ /dev/null @@ -1,15 +0,0 @@ -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