SF.net SVN: gar:[22622] csw/mgar/pkg/git/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sun Dec 1 20:49:00 CET 2013
Revision: 22622
http://gar.svn.sourceforge.net/gar/?rev=22622&view=rev
Author: bdwalton
Date: 2013-12-01 19:48:59 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
git/trunk: update to 1.8.5, drop patches that were merged upstream
Modified Paths:
--------------
csw/mgar/pkg/git/trunk/Makefile
csw/mgar/pkg/git/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch
csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch
Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile 2013-11-30 17:16:59 UTC (rev 22621)
+++ csw/mgar/pkg/git/trunk/Makefile 2013-12-01 19:48:59 UTC (rev 22622)
@@ -1,5 +1,5 @@
NAME = git
-VERSION = 1.8.4.1
+VERSION = 1.8.5
#PATCHLEVEL = rc4
DISTNAME = $(NAME)-$(VERSION)
GARTYPE = v2
@@ -117,8 +117,6 @@
# to the selection of available utf8 locales.
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-Avoid-difference-in-tr-semantics-between-System-V-an.patch
-PATCHFILES += 0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch
fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
define _git_files
Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums 2013-11-30 17:16:59 UTC (rev 22621)
+++ csw/mgar/pkg/git/trunk/checksums 2013-12-01 19:48:59 UTC (rev 22622)
@@ -1 +1 @@
-5d8c89ad312ca0b0e603259c9357e6b8 git-1.8.4.1.tar.gz
+16448b1cfd62fcbe738729edc6279e14 git-1.8.5.tar.gz
Deleted: csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch 2013-11-30 17:16:59 UTC (rev 22621)
+++ csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch 2013-12-01 19:48:59 UTC (rev 22622)
@@ -1,90 +0,0 @@
-From 667867e20bbc4cdc0d0946e62cb4b8a9eca82134 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sun, 27 Oct 2013 13:30:26 +0100
-Subject: [PATCH] Avoid difference in tr semantics between System V and BSD
-
-Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V
-semantics for tr whereby string1's length is truncated to the length
-of string2 if string2 is shorter. The BSD semantics, as used by GNU tr
-see string2 padded to the length of string1 using the final character
-in string2. POSIX explicitly doesn't specify the correct behavior
-here, making both equally valid.
-
-This difference means that Solaris' native tr implementations produce
-different results for tr ":\t\n" "\0" than GNU tr. This breaks a few
-tests in t0008-ignores.sh.
-
-Possible fixes for this are to make string2 be "\0\0\0" or "[\0*]".
-
-Instead, use perl to perform these transliterations which means we
-don't need to worry about the difference at all. Since we're replacing
-tr with perl, we also use perl to replace the sed invocations used to
-transform the files.
-
-Replace four identical transforms with a function named
-broken_c_unquote. Replace the other two identical transforms with a
-fuction named broken_c_unquote_verbose.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/t0008-ignores.sh | 30 ++++++++++++++++++------------
- 1 file changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
-index c29342d..b176057 100755
---- a/t/t0008-ignores.sh
-+++ b/t/t0008-ignores.sh
-@@ -37,6 +37,14 @@ test_stderr () {
- test_cmp "$HOME/expected-stderr" "$HOME/stderr"
- }
-
-+broken_c_unquote () {
-+ perl -pe 's/^"//; s/\\//; s/"$//; tr/\n/\0/' "$@"
-+}
-+
-+broken_c_unquote_verbose () {
-+ perl -pe 's/ "/ /; s/\\//; s/"$//; tr/:\t\n/\0/' "$@"
-+}
-+
- stderr_contains () {
- regexp="$1"
- if grep "$regexp" "$HOME/stderr"
-@@ -552,12 +560,11 @@ cat <<-EOF >expected-verbose
- $global_excludes:2:!globaltwo b/globaltwo
- EOF
-
--sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
-- tr "\n" "\0" >stdin0
--sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \
-- tr "\n" "\0" >expected-default0
--sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \
-- tr ":\t\n" "\0" >expected-verbose0
-+broken_c_unquote stdin >stdin0
-+
-+broken_c_unquote expected-default >expected-default0
-+
-+broken_c_unquote_verbose expected-verbose >expected-verbose0
-
- test_expect_success '--stdin' '
- expect_from_stdin <expected-default &&
-@@ -638,12 +645,11 @@ EOF
- grep -v '^:: ' expected-all >expected-verbose
- sed -e 's/.* //' expected-verbose >expected-default
-
--sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
-- tr "\n" "\0" >stdin0
--sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \
-- tr "\n" "\0" >expected-default0
--sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \
-- tr ":\t\n" "\0" >expected-verbose0
-+broken_c_unquote stdin >stdin0
-+
-+broken_c_unquote expected-default >expected-default0
-+
-+broken_c_unquote_verbose expected-verbose >expected-verbose0
-
- test_expect_success '--stdin from subdirectory' '
- expect_from_stdin <expected-default &&
---
-1.8.3.4
-
Deleted: csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch 2013-11-30 17:16:59 UTC (rev 22621)
+++ csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch 2013-12-01 19:48:59 UTC (rev 22622)
@@ -1,42 +0,0 @@
-From f38f944c3e393c7a316bbe17f2d507f7bd422275 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sun, 27 Oct 2013 17:41:19 +0100
-Subject: [PATCH] Change sed invocation to something Solaris sed can handle
-
-Solaris' sed expects a newline after the i\ command and fails
-with a 'garbled command' message if it's not there. Modify two uses
-of sed in t4015-diff-whitespace that worked in GNU sed but not in
-Solaris'.
-
-Signed-off-by: Ben Walton <bdwalton at gmail.com>
----
- t/t4015-diff-whitespace.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
-index 3fb4b97..0126154 100755
---- a/t/t4015-diff-whitespace.sh
-+++ b/t/t4015-diff-whitespace.sh
-@@ -145,7 +145,8 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect
- test_expect_success 'ignore-blank-lines: only new lines' '
- test_seq 5 >x &&
- git update-index x &&
-- test_seq 5 | sed "/3/i \\
-+ test_seq 5 | sed "/3/i\\
-+\
- " >x &&
- git diff --ignore-blank-lines >out &&
- >expect &&
-@@ -155,7 +156,8 @@ test_expect_success 'ignore-blank-lines: only new lines' '
- test_expect_success 'ignore-blank-lines: only new lines with space' '
- test_seq 5 >x &&
- git update-index x &&
-- test_seq 5 | sed "/3/i \ " >x &&
-+ test_seq 5 | sed "/3/i\\
-+ " >x &&
- git diff -w --ignore-blank-lines >out &&
- >expect &&
- test_cmp out expect
---
-1.8.3.4
-
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