Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (31424fbd0984fae9e9e2a5e7db3dd46358557222)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (31424fbd0984fae9e9e2a5e7db3dd46358557222)
  • Date: Thu, 26 Apr 2012 02:06:21 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

utils/grep/DETAILS | 2 +-
utils/grep/HISTORY | 4 ++++
utils/grep/PRE_BUILD | 4 ----
utils/grep/grep-2.11.patch | 39 ---------------------------------------
4 files changed, 5 insertions(+), 44 deletions(-)

New commits:
commit 31424fbd0984fae9e9e2a5e7db3dd46358557222
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

grep: => 2.12

diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index 5c3ba5e..a441b3c 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,5 +1,5 @@
SPELL=grep
- VERSION=2.11
+ VERSION=2.12
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 14142f8..4048f61 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,7 @@
+2012-04-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.12
+ * PRE_BUILD, grep-2.11.patch: deleted
+
2012-03-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.11
* PRE_BUILD, grep-2.11.patch: official patch added
diff --git a/utils/grep/PRE_BUILD b/utils/grep/PRE_BUILD
deleted file mode 100755
index b53ca9c..0000000
--- a/utils/grep/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/grep-2.11.patch"
diff --git a/utils/grep/grep-2.11.patch b/utils/grep/grep-2.11.patch
deleted file mode 100644
index d0c5f90..0000000
--- 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 AT 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



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (31424fbd0984fae9e9e2a5e7db3dd46358557222), Treeve Jelbert, 04/26/2012

Archive powered by MHonArc 2.6.24.

Top of Page