Skip to contentSkip to conversation

grep: bump to version 2.22

PATCH New Gustavo Zacarias 2 participants 2 messages Nov 3, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/1 grep: bump to version 2.22

Drop security patch since it's upstream.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/grep/0001-fix-CVE-2015-1345.patch | 20 --------------------
 package/grep/grep.hash                    |  2 +-
 package/grep/grep.mk                      |  2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 package/grep/0001-fix-CVE-2015-1345.patch
package/grep/0001-fix-CVE-2015-1345.patch deleted +0 -20
deleted file mode 100644
index f7701aa..0000000
@@ -1,20 +0,0 @@
-Simplified patch from upstream to avoid autoreconf. Source:
-http://git.savannah.gnu.org/cgit/grep.git/commit/?id=83a95bd8c8561875b948cadd417c653dbe7ef2e2
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
----
-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
index d27a26a..4019db1 100644
@@ -1,2 +1,2 @@
 # 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
index 80f6e71..447ed65 100644
@@ -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+
Signature · 1 line
2.4.10
Applied
#1 lore raw

PATCH 1/1 grep: bump to version 2.22

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias

Drop security patch since it's upstream.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/grep/0001-fix-CVE-2015-1345.patch | 20 --------------------
 package/grep/grep.hash                    |  2 +-
 package/grep/grep.mk                      |  2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 package/grep/0001-fix-CVE-2015-1345.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com