diff options
| author | Vlad Glagolev | 2012-06-14 18:32:00 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2012-06-14 18:34:29 +0400 |
| commit | 9ae5880ce52b55629b18f4d625bf71e72a8935c0 (patch) | |
| tree | 68e7020d365c080038f7d092ced93dcdc948726b | |
| parent | dbf12fda25804387f9f3f7ef8c332b325f38c5f0 (diff) | |
Revert "grep 2.11"
This reverts commit e9e64a190f6c30ead14a38945f76b290e6f88be9.
Everything above 2.10 doesn't work well enough with our current
stable sorcery while selecting archspec in menu.
(cherry picked from commit 7bf55d385ef6e164122123065cbda9c3e43257a0)
| -rwxr-xr-x | utils/grep/DETAILS | 2 | ||||
| -rw-r--r-- | utils/grep/HISTORY | 4 | ||||
| -rwxr-xr-x | utils/grep/PRE_BUILD | 9 | ||||
| -rw-r--r-- | utils/grep/grep-2.11.patch | 39 |
4 files changed, 6 insertions, 48 deletions
diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS index 5c3ba5e6f4..f2d1c58443 100755 --- a/utils/grep/DETAILS +++ b/utils/grep/DETAILS @@ -1,5 +1,5 @@ SPELL=grep - VERSION=2.11 + VERSION=2.10 SOURCE=$SPELL-$VERSION.tar.xz SOURCE2=$SOURCE.sig SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY index 14142f8f17..07a9302cd6 100644 --- a/utils/grep/HISTORY +++ b/utils/grep/HISTORY @@ -1,7 +1,3 @@ -2012-03-12 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 2.11 - * PRE_BUILD, grep-2.11.patch: official patch added - 2011-11-18 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.10, tar.gz -> tar.xz * DEPENDS, PRE_BUILD: updated to process xz tarball diff --git a/utils/grep/PRE_BUILD b/utils/grep/PRE_BUILD index b53ca9ce0e..6f545045d8 100755 --- a/utils/grep/PRE_BUILD +++ b/utils/grep/PRE_BUILD @@ -1,4 +1,5 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && - -patch -p1 < "$SPELL_DIRECTORY/grep-2.11.patch" +mk_source_dir $SOURCE_DIRECTORY && +cd $BUILD_DIRECTORY && +verify_file '' && +xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - +cd $SOURCE_DIRECTORY diff --git a/utils/grep/grep-2.11.patch b/utils/grep/grep-2.11.patch deleted file mode 100644 index d0c5f903aa..0000000000 --- a/utils/grep/grep-2.11.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@archlinux.org> -Date: Mon, 12 Mar 2012 08:28:01 +0000 -Subject: grep: fix segfault with -r --exclude-dir and no file operand - -* src/main.c (grepdir): Don't invoke excluded_file_name on NULL. -* NEWS (Bug fixes): Mention it. ---- -diff --git a/NEWS b/NEWS -index d0a63d5..d4d70f5 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- - - * Noteworthy changes in release ?.? (????-??-??) [?] - -+** Bug fixes -+ -+ grep no longer segfaults with -r --exclude-dir and no file operand. -+ I.e., ":|grep -r --exclude-dir=D PAT" would segfault. -+ - - * Noteworthy changes in release 2.11 (2012-03-02) [stable] - -diff --git a/src/main.c b/src/main.c -index 2f6c761..f4f1235 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats) - struct stats const *ancestor; - char *name_space; - int status = 1; -- if (excluded_directory_patterns -+ if (dir && excluded_directory_patterns - && excluded_file_name (excluded_directory_patterns, dir)) - return 1; - --- -cgit v0.9.0.2 |