[csw-devel] SF.net SVN: gar:[18006] csw/mgar/pkg/git/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Sat May 12 18:52:20 CEST 2012 

Revision: 18006
          http://gar.svn.sourceforge.net/gar/?rev=18006&view=rev
Author:   bdwalton
Date:     2012-05-12 16:52:20 +0000 (Sat, 12 May 2012)
Log Message:
-----------
git/trunk: drop some merged patches

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch
    csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch
    csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2012-05-12 13:19:43 UTC (rev 18005)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-05-12 16:52:20 UTC (rev 18006)
@@ -116,10 +116,7 @@
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch
 PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
-PATCHFILES += 0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch
 PATCHFILES += 0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch
-PATCHFILES += 0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch
-PATCHFILES += 0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Deleted: csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch	2012-05-12 13:19:43 UTC (rev 18005)
+++ csw/mgar/pkg/git/trunk/files/0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch	2012-05-12 16:52:20 UTC (rev 18006)
@@ -1,48 +0,0 @@
-From 22b0d13eb6983c26f4322d158cb339dc4d907844 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 24 Mar 2012 22:12:43 -0400
-Subject: [PATCH 1/2] run-command.c: Define SHELL_PATH macro for use in
- prepare_shell_cmd
-
-The shell spawned in run-command.c:prepare_shell_cmd was hard coded to
-'sh'.  Instead, make this a macro named SHELL_PATH so that it can be
-overridden by the build system.  Use 'sh' as the default to preserve
-original behaviour and ensure that a value is always set.
-
-This avoids a situation where some commands were spawned using a
-different shell than the one configured at build time.  Previously, it
-was possible for things to be executed by a non-POSIX shell depending
-on the user's PATH.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- run-command.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/run-command.c b/run-command.c
-index 1db8abf..f005a31 100644
---- a/run-command.c
-+++ b/run-command.c
-@@ -4,6 +4,10 @@
- #include "sigchain.h"
- #include "argv-array.h"
- 
-+#ifndef SHELL_PATH
-+# define SHELL_PATH "sh"
-+#endif
-+
- struct child_to_clean {
- 	pid_t pid;
- 	struct child_to_clean *next;
-@@ -90,7 +94,7 @@ static const char **prepare_shell_cmd(const char **argv)
- 		die("BUG: shell command is empty");
- 
- 	if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {
--		nargv[nargc++] = "sh";
-+		nargv[nargc++] = SHELL_PATH;
- 		nargv[nargc++] = "-c";
- 
- 		if (argc < 2)
--- 
-1.7.5.4
-

Deleted: csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch	2012-05-12 13:19:43 UTC (rev 18005)
+++ csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch	2012-05-12 16:52:20 UTC (rev 18006)
@@ -1,57 +0,0 @@
-From 7f273d2cfb16def4be2eb4110bfa9f30973c38da Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Wed, 11 Apr 2012 22:22:24 +0200
-Subject: [PATCH] Avoid bug in Solaris xpg4/sed as used in submodule
-
-The sed provided by Solaris in /usr/xpg4/bin has a bug whereby an
-unanchored regex using * for zero or more repetitions sees two
-separate matches fed to the substitution engine in some cases.
-
-This is evidenced by:
-
-$ for sed in /usr/xpg4/bin/sed /usr/bin/sed /opt/csw/gnu/sed; do \
-echo 'ab' | $sed -e 's|[a]*|X|g'; \
-done
-XXbX
-XbX
-XbX
-
-This bug was triggered during a git submodule clone operation as
-exercised in the setup stage of t5526-fetch-submodules when using the
-default SANE_TOOL_PATH for Solaris.  It led to paths such as
-..../.. being used in the submodule .git gitdir reference.
-
-As we do not need to handle fully qualfied paths we can make the regex
-match 1 or more instead of 0 or more non-/ characters so use
-'s|[^/][^/]*|..|g' instead, which is correctly handled by all tested
-sed implementations.  This expression is semantically different than
-the original one.  It will not place leading '..' on a fully qualified
-path as the original expression did.  None of the paths passed to the
-regex relied on this behaviour so changing it shouldn't have negative
-impact.
-
-Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
----
- git-submodule.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index efc86ad..7aa9e95 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -167,10 +167,10 @@ module_clone()
- 	a=${a%/}
- 	b=${b%/}
- 
--	rel=$(echo $b | sed -e 's|[^/]*|..|g')
-+	rel=$(echo $b | sed -e 's|[^/][^/]*|..|g')
- 	echo "gitdir: $rel/$a" >"$path/.git"
- 
--	rel=$(echo $a | sed -e 's|[^/]*|..|g')
-+	rel=$(echo $a | sed -e 's|[^/][^/]*|..|g')
- 	(clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b")
- }
- 
--- 
-1.7.9
-

Deleted: csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch	2012-05-12 13:19:43 UTC (rev 18005)
+++ csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch	2012-05-12 16:52:20 UTC (rev 18006)
@@ -1,37 +0,0 @@
-From 7b0ec3913cca1607e6777ef527c39773c908ed4d Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Mon, 9 Apr 2012 03:43:40 +0200
-Subject: [PATCH] Avoid grep gnuism in t9400
-
-The grep in Solaris' /usr/xpg4/bin as found by the default
-SANE_TOOL_PATH was not properly handling the 'cvs co -c (shows module
-database)' test.  The \+ gnuism was breaking the pattern match when
-comparing the output against the expected output causing the test to
-fail.
-
-Instead of working around this issue, switch to using the standard
-test_cmp() shell function to perform the comparison instead.
-
-Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
----
- t/t9400-git-cvsserver-server.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
-index 9199550..df1405f 100755
---- a/t/t9400-git-cvsserver-server.sh
-+++ b/t/t9400-git-cvsserver-server.sh
-@@ -500,8 +500,8 @@ test_expect_success 'cvs status (no subdirs in header)' '
- cd "$WORKDIR"
- test_expect_success 'cvs co -c (shows module database)' '
-     GIT_CONFIG="$git_config" cvs co -c > out &&
--    grep "^master[	 ]\+master$" < out &&
--    ! grep -v "^master[	 ]\+master$" < out
-+    echo "master	master" > out.expected &&
-+    test_cmp out out.expected
- '
- 
- #------------
--- 
-1.7.9
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list