commit ce92fd4147de425655d7cccf932c1b1adaf22754
parent fea49cba00d6ea46e610166c1dd02b1cf88ed0d1
Author: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Mon, 9 Nov 2015 07:00:28 +0100
Merge pull request #1929 from Zokormazo/grep
grep: update to 2.22
Diffstat:
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git 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
@@ -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