[grep] New version: grep-2.9 Removed dfa-buffer-overrun-fix patch

Jaroslav Škarvada jskarvad at fedoraproject.org
Wed Jun 22 07:37:46 UTC 2011


commit b4225d5b70986a0a07907e5c3a2d30a3d15c8daa
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Jun 22 09:37:34 2011 +0200

    New version: grep-2.9
    Removed dfa-buffer-overrun-fix patch

 .gitignore                            |    4 +-
 grep-2.8-dfa-buffer-overrun-fix.patch |  107 ---------------------------------
 grep.spec                             |   12 ++--
 sources                               |    2 +-
 4 files changed, 8 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c8d99e9..88c6af3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-grep-2.6.3.tar.xz
-/grep-2.7.tar.xz
-/grep-2.8.tar.xz
+/grep-2.9.tar.xz
diff --git a/grep.spec b/grep.spec
index 34a324b..36be668 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,8 +2,8 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.8
-Release: 4%{?dist}
+Version: 2.9
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
@@ -16,8 +16,6 @@ Requires(preun): /sbin/install-info
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
 BuildRequires: autoconf automake
-# dfa: don't overrun a malloc'd buffer for certain regexps (#713328)
-Patch0: grep-2.8-dfa-buffer-overrun-fix.patch
 
 %description
 The GNU versions of commonly used grep utilities. Grep searches through
@@ -29,8 +27,6 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
 %prep
 %setup -q
 
-%patch0 -p1 -b .dfa-buffer-overrun-fix
-
 %build
 %configure --without-included-regex CPPFLAGS="-I%{_includedir}/pcre"
 make %{?_smp_mflags}
@@ -71,6 +67,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Wed Jun 22 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 2.9-1
+- New version: grep-2.9
+- Removed dfa-buffer-overrun-fix patch
+
 * Mon Jun 20 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 2.8-4
 - dfa: don't overrun a malloc'd buffer for certain regexps
   (patch dfa-buffer-overrun-fix)
diff --git a/sources b/sources
index 1a1cc07..ee66c1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b59003c42b330bdabd417e00d07102da  grep-2.8.tar.xz
+25e41b2aa201104354740961ef36005a  grep-2.9.tar.xz


More information about the scm-commits mailing list