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

[bdwalton at users.sourceforge.net]

Revision: 3276
          http://gar.svn.sourceforge.net/gar/?rev=3276&view=rev
Author:   bdwalton
Date:     2009-02-20 00:46:48 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
Created patch to handle missing %z in the time handling routines.
-Tests now pass again.

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/git-svn-strftime.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2009-02-19 21:07:31 UTC (rev 3275)
+++ csw/mgar/pkg/git/trunk/Makefile	2009-02-20 00:46:48 UTC (rev 3276)
@@ -47,7 +47,7 @@
 MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 
-PATCHFILES = doc-makefile.patch
+PATCHFILES = doc-makefile.patch git-svn-strftime.patch
 
 PKGFILES_CSWgitsvn = .*svn.*
 PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.*

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2009-02-19 21:07:31 UTC (rev 3275)
+++ csw/mgar/pkg/git/trunk/checksums	2009-02-20 00:46:48 UTC (rev 3276)
@@ -1,2 +1,3 @@
 e31ea5ce9b076f5745056f01465e9602  download/git-1.6.1.3.tar.bz2
 075441ea2a95cfa5fd7aaebb888a93f3  download/doc-makefile.patch
+e8b5e89c38958bbcd5a5dbc29124ebc2  download/git-svn-strftime.patch

Added: csw/mgar/pkg/git/trunk/files/git-svn-strftime.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/git-svn-strftime.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/git-svn-strftime.patch	2009-02-20 00:46:48 UTC (rev 3276)
@@ -0,0 +1,31 @@
+--- git-1.6.1.3/git-svn.perl.orig	2009-02-19 22:03:27.303694837 +0100
++++ git-1.6.1.3/git-svn.perl	2009-02-19 22:05:09.370651606 +0100
+@@ -41,6 +41,8 @@
+ use File::Path qw/mkpath/;
+ use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
+ use IPC::Open3;
++use POSIX;
++use Time::Local;
+ use Git;
+ 
+ BEGIN {
+@@ -4525,7 +4527,18 @@
+ }
+ 
+ sub format_svn_date {
+-	return strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
++        my $timestr = strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
++
++	# for systems without %z (solaris 8, 9, etc)
++	if ($timestr =~ /%z/) {
++	    my $localt = time;
++	    my $gm = Time::Local::timelocal( gmtime $localt );
++	    my $sign = qw( + + - )[ $localt <=> $gm ];
++	    my $calc = sprintf "%s%02d%02d", $sign, (gmtime abs( $localt - $gm ))[2,1];
++	    $timestr =~ s/%z/$calc/;
++	}
++
++	return $timestr;
+ }
+ 
+ sub parse_git_date {


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