From patchwork Tue Nov 3 10:52:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 539299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id BCE2C1402D5 for ; Tue, 3 Nov 2015 21:52:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b=uxo0oVDk; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 15E1B8783C; Tue, 3 Nov 2015 10:52:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UCpHUNz5ajEC; Tue, 3 Nov 2015 10:52:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 220CE877B9; Tue, 3 Nov 2015 10:52:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6FEAE1C15F3 for ; Tue, 3 Nov 2015 10:52:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6BF2A884DD for ; Tue, 3 Nov 2015 10:52:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HqRdo+CsSh92 for ; Tue, 3 Nov 2015 10:52:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9B88188507 for ; Tue, 3 Nov 2015 10:52:15 +0000 (UTC) Received: from asgard (cpe-186-22-136-136.telecentro-reversos.com.ar [186.22.136.136] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.1/8.15.1) with ESMTPSA id tA3Aq87T012979 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 3 Nov 2015 10:52:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1446547933; bh=Rt338hYnVXqBr3NsKPuobtRfZxPWWPy6hbd/Wx03Tps=; h=From:To:Cc:Subject:Date; b=uxo0oVDkVf6ue9Fmu6hY/p28pHlzky57MVipQUnk2TITzYAYcErRlMz5cJvIc8Cry KJ7q+/lct3UVE0IQoAk1FXlvyM6JOF282v/OuGTYAM1vCG+e7WkqV6AN41K/iKGZK7 D6KDAwZa1sNUFbZ/gOXrJtF400WxzVxtvyaL2oHQ= Received: by asgard (sSMTP sendmail emulation); Tue, 03 Nov 2015 07:52:03 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 3 Nov 2015 07:52:03 -0300 Message-Id: <1446547923-23592-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.4.10 X-Virus-Scanned: clamav-milter 0.98.7 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] grep: bump to version 2.22 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop security patch since it's upstream. Signed-off-by: Gustavo Zacarias --- 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 diff --git a/package/grep/0001-fix-CVE-2015-1345.patch b/package/grep/0001-fix-CVE-2015-1345.patch deleted file mode 100644 index f7701aa..0000000 --- a/package/grep/0001-fix-CVE-2015-1345.patch +++ /dev/null @@ -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 ---- -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 diff --git a/package/grep/grep.hash b/package/grep/grep.hash index d27a26a..4019db1 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,2 +1,2 @@ # Locally calculated after checking signature -sha256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de grep-2.21.tar.xz +sha256 ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb grep-2.22.tar.xz diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 80f6e71..447ed65 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -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+