Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9163ad7fe63ec8e57bae9a793352c2d3ff747a16
commit 9163ad7fe63ec8e57bae9a793352c2d3ff747a16 Author: Miklos Vajna <[email protected]> Date: Thu Oct 24 09:23:54 2013 +0200 git-1.8.4.1-1-x86_64 - 1.8.4 -> 1.8.4.1 (bugfixes only) diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index b47c4e6..bfd7a2e 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -8,7 +8,7 @@ options+=('asneeded') USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git -pkgver=1.8.4 +pkgver=1.8.4.1 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." _F_googlecode_dirname="git-core" @@ -25,14 +25,13 @@ groups=('devel-extra') replaces=('cogito' 'bk-client') archs=('i686' 'x86_64' 'arm') source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware \ - $pkgname.service $pkgname.sysconfig svn-serf-fix.patch) -sha1sums=('2a361a2d185b8bc604f7f2ce2f502d0dea9d3279' \ + $pkgname.service $pkgname.sysconfig) +sha1sums=('49004a8dfcbb7c0848147737d9877fd7313a42ec' \ 'c60be6e086241b85b1f0d89db22c24fc21dc6432' \ '58698ef6cf0dad734e1a1ee5689c0c4d83bf27b5' \ '92b64c9b49242935ca6ae35b3a9cad728a0c2d55' \ 'fb98eb788f2d81f6795d9d83755197f41430ee62' \ - '66caca0485216bed4814389b8219258f3992601b' \ - '060122e9f4df12b5cba3c3bae05223ed8f778035') + '66caca0485216bed4814389b8219258f3992601b') options=('scriptlet') diff --git a/source/devel-extra/git/svn-serf-fix.patch b/source/devel-extra/git/svn-serf-fix.patch deleted file mode 100644 index fecee46..0000000 --- a/source/devel-extra/git/svn-serf-fix.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/perl/Git.pm b/perl/Git.pm -index 7a252ef..204fdc6 100644 ---- a/perl/Git.pm -+++ b/perl/Git.pm -@@ -61,7 +61,7 @@ require Exporter; - remote_refs prompt - get_tz_offset - credential credential_read credential_write -- temp_acquire temp_release temp_reset temp_path); -+ temp_acquire temp_is_locked temp_release temp_reset temp_path); - - - =head1 DESCRIPTION -@@ -1206,6 +1206,35 @@ sub temp_acquire { - $temp_fd; - } - -+=item temp_is_locked ( NAME ) -+ -+Returns true if the internal lock created by a previous C<temp_acquire()> -+call with C<NAME> is still in effect. -+ -+When temp_acquire is called on a C<NAME>, it internally locks the temporary -+file mapped to C<NAME>. That lock will not be released until C<temp_release()> -+is called with either the original C<NAME> or the L<File::Handle> that was -+returned from the original call to temp_acquire. -+ -+Subsequent attempts to call C<temp_acquire()> with the same C<NAME> will fail -+unless there has been an intervening C<temp_release()> call for that C<NAME> -+(or its corresponding L<File::Handle> that was returned by the original -+C<temp_acquire()> call). -+ -+If true is returned by C<temp_is_locked()> for a C<NAME>, an attempt to -+C<temp_acquire()> the same C<NAME> will cause an error unless -+C<temp_release> is first called on that C<NAME> (or its corresponding -+L<File::Handle> that was returned by the original C<temp_acquire()> call). -+ -+=cut -+ -+sub temp_is_locked { -+ my ($self, $name) = _maybe_self(@_); -+ my $temp_fd = \$TEMP_FILEMAP{$name}; -+ -+ defined $$temp_fd && $$temp_fd->opened && $TEMP_FILES{$$temp_fd}{locked}; -+} -+ - =item temp_release ( NAME ) - - =item temp_release ( FILEHANDLE ) -diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm -index bd17418..10edb27 100644 ---- a/perl/Git/SVN/Fetcher.pm -+++ b/perl/Git/SVN/Fetcher.pm -@@ -315,11 +315,13 @@ sub change_file_prop { - sub apply_textdelta { - my ($self, $fb, $exp) = @_; - return undef if $self->is_path_ignored($fb->{path}); -- my $fh = $::_repository->temp_acquire('svn_delta'); -+ my $suffix = 0; -+ ++$suffix while $::_repository->temp_is_locked("svn_delta_${$}_$suffix"); -+ my $fh = $::_repository->temp_acquire("svn_delta_${$}_$suffix"); - # $fh gets auto-closed() by SVN::TxDelta::apply(), - # (but $base does not,) so dup() it for reading in close_file - open my $dup, '<&', $fh or croak $!; -- my $base = $::_repository->temp_acquire('git_blob'); -+ my $base = $::_repository->temp_acquire("git_blob_${$}_$suffix"); - - if ($fb->{blob}) { - my ($base_is_link, $size); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
