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

[bdwalton at users.sourceforge.net]

Revision: 21346
          http://gar.svn.sourceforge.net/gar/?rev=21346&view=rev
Author:   bdwalton
Date:     2013-06-15 23:00:18 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
git/trunk: add a patch to work around broken tr

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2013-06-15 16:33:15 UTC (rev 21345)
+++ csw/mgar/pkg/git/trunk/Makefile	2013-06-15 23:00:18 UTC (rev 21346)
@@ -117,6 +117,7 @@
 # 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-t0008-ignores-Work-around-broken-solaris-tr.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Added: csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch	2013-06-15 23:00:18 UTC (rev 21346)
@@ -0,0 +1,39 @@
+From 4e0185d4697173873aa407ae318fa484e2f206ac Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 16 Jun 2013 00:53:50 +0200
+Subject: [PATCH] t0008-ignores: Work around broken solaris tr
+
+The tr provided by solaris (both /usr/bin/ and /usr/xpg4/bin) fails
+to handle the \0 as the substitution. Replace tr with an
+equivalent perl invocation.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t0008-ignores.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
+index 9c1bde1..bd6817b 100755
+--- a/t/t0008-ignores.sh
++++ b/t/t0008-ignores.sh
+@@ -522,7 +522,7 @@ sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
+ 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
++	perl -pne 's/[:\t\n]/\0/g' >expected-verbose0
+ 
+ test_expect_success '--stdin' '
+ 	expect_from_stdin <expected-default &&
+@@ -611,7 +611,7 @@ sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
+ 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
++	perl -pne 's/[:\t\n]/\0/g' >expected-verbose0
+ 
+ test_expect_success '--stdin from subdirectory' '
+ 	expect_from_stdin <expected-default &&
+-- 
+1.8.1.4
+

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