diff --git a/grep-2.5.3-mem-exhausted.patch b/grep-2.5.3-mem-exhausted.patch deleted file mode 100644 index be2fd88..0000000 --- a/grep-2.5.3-mem-exhausted.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3e85874b1ea00d395a2add6b1cf38eef34bc2c38 Mon Sep 17 00:00:00 2001 -From: Tim Waugh -Date: Sun, 23 Nov 2008 17:54:33 +0100 -Subject: [PATCH] Limit in-memory buffer size - -Limit the amount of saved data to 200Mb so we don't fail on -large files. - -Original ticket: https://bugzilla.redhat.com/show_bug.cgi?id=198165 ---- - src/grep.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/src/grep.c b/src/grep.c -index 4363b4a..46ce140 100644 ---- a/src/grep.c -+++ b/src/grep.c -@@ -492,6 +492,12 @@ fillbuf (size_t save, struct stats const *stats) - int cc = 1; - char *readbuf; - size_t readsize; -+ const size_t max_save = 200 * 1024 * 1024; -+ -+ /* Limit the amount of saved data to 200Mb so we don't fail on -+ * large files. */ -+ if (save > max_save) -+ save = max_save; - - /* Offset from start of buffer to start of old stuff - that we want to save. */ --- -1.5.5.1 - diff --git a/grep.spec b/grep.spec index ad10a6d..1a7ddf2 100644 --- a/grep.spec +++ b/grep.spec @@ -3,12 +3,11 @@ Summary: Pattern matching utilities Name: grep Version: 2.5.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Group: Applications/Text Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2 Patch0: grep-2.5.3-fedora-tests.patch -Patch1: grep-2.5.3-mem-exhausted.patch Patch2: grep-2.5.3-pcrewrap.patch Patch3: grep-2.5.3-case.patch Patch4: grep-2.5.3-egf-speedup.patch @@ -32,7 +31,6 @@ GNU grep is needed by many scripts, so it shall be installed on every system. %prep %setup -q %patch0 -p1 -b .fedora-tests -%patch1 -p1 -b .mem-exhausted %patch2 -p1 -b .pcrewrap %patch3 -p1 -b .case %patch4 -p1 -b .egf-speedup @@ -76,6 +74,9 @@ fi %{_mandir}/*/* %changelog +* Tue Jan 27 2009 Stepan Kasal 2.5.3-3 +- remove grep-mem-exhausted.patch (#481765, #198165) + * Thu Jan 8 2009 Stepan Kasal 2.5.3-2 - fix bug #460641 (a.k.a. 479152)