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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Fri Feb 22 21:47:33 CET 2013


Revision: 20333
          http://gar.svn.sourceforge.net/gar/?rev=20333&view=rev
Author:   bdwalton
Date:     2013-02-22 20:47:33 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
git/trunk: version bump; patch updates

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0007-Avoid-using-non-POSIX-cp-options.patch
    csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
    csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch
    csw/mgar/pkg/git/trunk/files/0008-work-around-gnu-strftime-option-use.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2013-02-22 12:36:01 UTC (rev 20332)
+++ csw/mgar/pkg/git/trunk/Makefile	2013-02-22 20:47:33 UTC (rev 20333)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 1.8.1.3
+VERSION = 1.8.1.4
 #PATCHLEVEL = rc4
 DISTNAME = $(NAME)-$(VERSION)
 GARTYPE = v2
@@ -117,8 +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-Avoid-using-non-POSIX-cp-options.patch
-PATCHFILES += 0008-work-around-gnu-strftime-option-use.patch
+PATCHFILES += 0006-Fix-use-of-non-portable-strftime-format-string.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2013-02-22 12:36:01 UTC (rev 20332)
+++ csw/mgar/pkg/git/trunk/checksums	2013-02-22 20:47:33 UTC (rev 20333)
@@ -1 +1 @@
-05fb5ea3792a51cef2becc8d06ea9b87  git-1.8.1.3.tar.gz
+60f32ef4a6b3fa2143b81a28704333ed  git-1.8.1.4.tar.gz

Added: csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch	2013-02-22 20:47:33 UTC (rev 20333)
@@ -0,0 +1,29 @@
+From 4e13b01e8678d73f4bc68189ea278eef6b38fd4d Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 22 Feb 2013 00:22:15 +0100
+Subject: [PATCH] Fix use of non-portable strftime format string.
+
+This is merged in a more proper manner upstream, but until that lands
+in a release, this quick hack should work for us.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ git-cvsimport.perl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git-cvsimport.perl b/git-cvsimport.perl
+index 0a31ebd..dda0966 100755
+--- a/git-cvsimport.perl
++++ b/git-cvsimport.perl
+@@ -864,7 +864,7 @@ sub commit {
+ 	}
+ 
+ 	set_timezone($author_tz);
+-	my $commit_date = strftime("%s %z", localtime($date));
++	my $commit_date = strftime("$date %z", localtime($date));
+ 	set_timezone('UTC');
+ 	$ENV{GIT_AUTHOR_NAME} = $author_name;
+ 	$ENV{GIT_AUTHOR_EMAIL} = $author_email;
+-- 
+1.8.1
+

Deleted: csw/mgar/pkg/git/trunk/files/0007-Avoid-using-non-POSIX-cp-options.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Avoid-using-non-POSIX-cp-options.patch	2013-02-22 12:36:01 UTC (rev 20332)
+++ csw/mgar/pkg/git/trunk/files/0007-Avoid-using-non-POSIX-cp-options.patch	2013-02-22 20:47:33 UTC (rev 20333)
@@ -1,47 +0,0 @@
-From bd186c88ce075ac4aa95151e722e11695c86d564 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bdwalton at gmail.com>
-Date: Tue, 1 Jan 2013 17:09:28 +0000
-Subject: [PATCH] Avoid using non-POSIX cp options
-
-The -a option to cp is a GNU extention and not portable.  Instead, use
-just -R (no -p necessary).
-
-Signed-off-by: Ben Walton <bdwalton at gmail.com>
----
- t/t3600-rm.sh |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
-index 06f6384..37bf5f1 100755
---- a/t/t3600-rm.sh
-+++ b/t/t3600-rm.sh
-@@ -474,7 +474,7 @@ test_expect_success 'rm of a conflicted populated submodule with a .git director
- 	git submodule update &&
- 	(cd submod &&
- 		rm .git &&
--		cp -a ../.git/modules/sub .git &&
-+		cp -R ../.git/modules/sub .git &&
- 		GIT_WORK_TREE=. git config --unset core.worktree
- 	) &&
- 	test_must_fail git merge conflict2 &&
-@@ -508,7 +508,7 @@ test_expect_success 'rm of a populated submodule with a .git directory fails eve
- 	git submodule update &&
- 	(cd submod &&
- 		rm .git &&
--		cp -a ../.git/modules/sub .git &&
-+		cp -R ../.git/modules/sub .git &&
- 		GIT_WORK_TREE=. git config --unset core.worktree
- 	) &&
- 	test_must_fail git rm submod &&
-@@ -606,7 +606,7 @@ test_expect_success 'rm of a populated nested submodule with a nested .git direc
- 	git submodule update --recursive &&
- 	(cd submod/subsubmod &&
- 		rm .git &&
--		cp -a ../../.git/modules/sub/modules/sub .git &&
-+		cp -R ../../.git/modules/sub/modules/sub .git &&
- 		GIT_WORK_TREE=. git config --unset core.worktree
- 	) &&
- 	test_must_fail git rm submod &&
--- 
-1.7.10.4
-

Deleted: csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch	2013-02-22 12:36:01 UTC (rev 20332)
+++ csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch	2013-02-22 20:47:33 UTC (rev 20333)
@@ -1,26 +0,0 @@
-From a62835b110e5111939d599108ee887c1ddf3e40f Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 31 Jan 2012 01:46:04 +0100
-Subject: [PATCH] on solaris, we need to use -lintl to allow the new i18n work
- to build
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- Makefile |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a782409..3a2662e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -939,6 +939,7 @@ ifeq ($(uname_S),SunOS)
- 	NO_REGEX = YesPlease
- 	NO_FNMATCH_CASEFOLD = YesPlease
- 	NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
-+	EXTLIBS += -lintl
- 	ifeq ($(uname_R),5.6)
- 		SOCKLEN_T = int
- 		NO_HSTRERROR = YesPlease
--- 
-1.7.8.3
-

Deleted: csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch	2013-02-22 12:36:01 UTC (rev 20332)
+++ csw/mgar/pkg/git/trunk/files/0008-t0300-credentials-Word-around-a-solaris-bin-sh-bug.patch	2013-02-22 20:47:33 UTC (rev 20333)
@@ -1,38 +0,0 @@
-From a00449982532825591137ab59a25456e9b1d6d87 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Thu, 2 Feb 2012 15:40:36 +0100
-Subject: [PATCH] t0300-credentials: Word around a solaris /bin/sh bug
-
-Solaris' /bin/sh was making the IFS setting permanent instead of
-temporary when using it to slurp in credentials in the generated
-'dump' script of the 'setup helper scripts' test in t0300-credentials.
-
-To avoid this bug, capture the original IFS and force it to be reset
-after its use is no longer required.  For now, this is lighter weight
-than altering which shell these scripts use as their shebang.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/t0300-credentials.sh |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
-index 885af8f..1be3fe2 100755
---- a/t/t0300-credentials.sh
-+++ b/t/t0300-credentials.sh
-@@ -8,10 +8,12 @@ test_expect_success 'setup helper scripts' '
- 	cat >dump <<-\EOF &&
- 	whoami=`echo $0 | sed s/.*git-credential-//`
- 	echo >&2 "$whoami: $*"
-+	OIFS=$IFS
- 	while IFS== read key value; do
- 		echo >&2 "$whoami: $key=$value"
- 		eval "$key=$value"
- 	done
-+	IFS=$OIFS
- 	EOF
- 
- 	cat >git-credential-useless <<-\EOF &&
--- 
-1.7.8.3
-

Deleted: csw/mgar/pkg/git/trunk/files/0008-work-around-gnu-strftime-option-use.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0008-work-around-gnu-strftime-option-use.patch	2013-02-22 12:36:01 UTC (rev 20332)
+++ csw/mgar/pkg/git/trunk/files/0008-work-around-gnu-strftime-option-use.patch	2013-02-22 20:47:33 UTC (rev 20333)
@@ -1,175 +0,0 @@
-From 9c43d26edd1bf30da5ba0f145077155d64f1cdb1 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Mon, 14 Jan 2013 00:00:13 +0100
-Subject: [PATCH] work around missing strftime format specifiers
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- git-cvsimport.perl  |  5 ++++-
- perl/Git.pm         | 41 +++++++++++++++++++++++++++++++++++++++++
- perl/Git/SVN.pm     | 12 ++----------
- perl/Git/SVN/Log.pm |  8 ++++++--
- 4 files changed, 53 insertions(+), 13 deletions(-)
-
-diff --git a/git-cvsimport.perl b/git-cvsimport.perl
-index 0a31ebd..d8aa7e2 100755
---- a/git-cvsimport.perl
-+++ b/git-cvsimport.perl
-@@ -26,6 +26,7 @@ use IO::Socket;
- use IO::Pipe;
- use POSIX qw(strftime tzset dup2 ENOENT);
- use IPC::Open2;
-+use Git qw(get_tz_offset);
- 
- $SIG{'PIPE'}="IGNORE";
- set_timezone('UTC');
-@@ -864,7 +865,9 @@ sub commit {
- 	}
- 
- 	set_timezone($author_tz);
--	my $commit_date = strftime("%s %z", localtime($date));
-+	# $date is in the seconds since epoch format
-+	my $tz_offset = Git::get_tz_offset($date);
-+	my $commit_date = "$date $tz_offset";
- 	set_timezone('UTC');
- 	$ENV{GIT_AUTHOR_NAME} = $author_name;
- 	$ENV{GIT_AUTHOR_EMAIL} = $author_email;
-diff --git a/perl/Git.pm b/perl/Git.pm
-index 497f420..c47ea95 100644
---- a/perl/Git.pm
-+++ b/perl/Git.pm
-@@ -59,6 +59,7 @@ require Exporter;
-                 command_bidi_pipe command_close_bidi_pipe
-                 version exec_path html_path hash_object git_cmd_try
-                 remote_refs
-+		get_tz_offset
-                 temp_acquire temp_release temp_reset temp_path);
- 
- 
-@@ -102,6 +103,7 @@ use Error qw(:try);
- use Cwd qw(abs_path cwd);
- use IPC::Open2 qw(open2);
- use Fcntl qw(SEEK_SET SEEK_CUR);
-+use Time::Local qw(timelocal);
- }
- 
- 
-@@ -511,6 +513,45 @@ C<git --html-path>). Useful mostly only internally.
- 
- sub html_path { command_oneline('--html-path') }
- 
-+=item get_tz_offset ( TIME )
-+
-+Return the time zone offset from GMT in the form +/-HHMM where HH is
-+the number of hours from GMT and MM is the number of minutes.  This is
-+the equivalent of what strftime("%z", ...) would provide on a GNU
-+platform.
-+
-+If TIME is not supplied, the current local time is used.
-+
-+=cut
-+
-+sub get_tz_offset {
-+	# some systmes don't handle or mishandle %z, so be creative.
-+	my $t = shift || time;
-+	# timelocal() has a problem when it comes to DST ambiguity so
-+	# times that are on a DST boundary cannot be properly converted
-+	# using it.  we will possibly adjust its result depending on whehter
-+	# pre and post conversions agree on DST
-+	my $gm = timelocal(gmtime($t));
-+
-+	# we need to know whether we were originally in DST or not
-+	my $orig_dst = (localtime($t))[8];
-+	# and also whether timelocal thinks we're in DST
-+	my $conv_dst = (localtime($gm))[8];
-+
-+	# re-adjust $gm based on the DST value for the two times we're
-+	# handling.
-+	if ($orig_dst != $conv_dst) {
-+		if ($orig_dst == 1) {
-+			$gm -= 3600;
-+		} else {
-+			$gm += 3600;
-+		}
-+	}
-+
-+	my $sign = qw( + + - )[ $t <=> $gm ];
-+	return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
-+}
-+
- 
- =item repo_path ()
- 
-diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
-index 59215fa..17d10b8 100644
---- a/perl/Git/SVN.pm
-+++ b/perl/Git/SVN.pm
-@@ -11,7 +11,6 @@ use Carp qw/croak/;
- use File::Path qw/mkpath/;
- use File::Copy qw/copy/;
- use IPC::Open3;
--use Time::Local;
- use Memoize;  # core since 5.8.0, Jul 2002
- use Memoize::Storable;
- use POSIX qw(:signal_h);
-@@ -22,6 +21,7 @@ use Git qw(
-     command_noisy
-     command_output_pipe
-     command_close_pipe
-+    get_tz_offset
- );
- use Git::SVN::Utils qw(
- 	fatal
-@@ -1311,14 +1311,6 @@ sub get_untracked {
- 	\@out;
- }
- 
--sub get_tz {
--	# some systmes don't handle or mishandle %z, so be creative.
--	my $t = shift || time;
--	my $gm = timelocal(gmtime($t));
--	my $sign = qw( + + - )[ $t <=> $gm ];
--	return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
--}
--
- # parse_svn_date(DATE)
- # --------------------
- # Given a date (in UTC) from Subversion, return a string in the format
-@@ -1351,7 +1343,7 @@ sub parse_svn_date {
- 			delete $ENV{TZ};
- 		}
- 
--		my $our_TZ = get_tz();
-+		my $our_TZ = Git::get_tz_offset();
- 
- 		# This converts $epoch_in_UTC into our local timezone.
- 		my ($sec, $min, $hour, $mday, $mon, $year,
-diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm
-index 3cc1c6f..f06d344 100644
---- a/perl/Git/SVN/Log.pm
-+++ b/perl/Git/SVN/Log.pm
-@@ -2,7 +2,11 @@ package Git::SVN::Log;
- use strict;
- use warnings;
- use Git::SVN::Utils qw(fatal);
--use Git qw(command command_oneline command_output_pipe command_close_pipe);
-+use Git qw(command
-+           command_oneline
-+           command_output_pipe
-+           command_close_pipe
-+           get_tz_offset);
- use POSIX qw/strftime/;
- use constant commit_log_separator => ('-' x 72) . "\n";
- use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
-@@ -119,7 +123,7 @@ sub run_pager {
- sub format_svn_date {
- 	my $t = shift || time;
- 	require Git::SVN;
--	my $gmoff = Git::SVN::get_tz($t);
-+	my $gmoff = Git::SVN::get_tz_offset($t);
- 	return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
- }
- 
--- 
-1.8.0
-

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