packages: gitolite/gitolite.spec, gitolite/gitolite-env.patch (NEW) - remov...
draenog
draenog at pld-linux.org
Wed May 4 14:58:34 CEST 2011
Author: draenog Date: Wed May 4 12:58:34 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- remove GIT_* variables from remote environment
---- Files affected:
packages/gitolite:
gitolite.spec (1.22 -> 1.23) , gitolite-env.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.22 packages/gitolite/gitolite.spec:1.23
--- packages/gitolite/gitolite.spec:1.22 Mon May 2 15:52:16 2011
+++ packages/gitolite/gitolite.spec Wed May 4 14:58:29 2011
@@ -13,6 +13,7 @@
Source0: http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 6a5b0ba784f190ff2d94a7e0ad46fe3f
Patch0: %{name}-mkdir.patch
+Patch1: %{name}-env.patch
URL: http://github.com/sitaramc/gitolite
BuildRequires: perl-Text-Markdown
BuildRequires: rpm-perlprov
@@ -61,6 +62,7 @@
rm -rf sitaramc-gitolite-*
%patch0 -p1
+%patch1 -p1
rm src/gl-system-install
@@ -121,6 +123,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2011/05/04 12:58:29 draenog
+- remove GIT_* variables from remote environment
+
Revision 1.22 2011/05/02 13:52:16 draenog
- fix for template directory without hooks subdirectory
================================================================
Index: packages/gitolite/gitolite-env.patch
diff -u /dev/null packages/gitolite/gitolite-env.patch:1.1
--- /dev/null Wed May 4 14:58:34 2011
+++ packages/gitolite/gitolite-env.patch Wed May 4 14:58:29 2011
@@ -0,0 +1,30 @@
+From a3e4be5689a59a695d072afb5e174efa775cd9a5 Mon Sep 17 00:00:00 2001
+From: Kacper Kornet <draenog at pld-linux.org>
+Date: Tue, 3 May 2011 16:59:05 +0100
+Subject: [PATCH] Remove GIT_* variables from environment
+
+Some ssh servers are configured to copy GIT_* variables from client to
+session's environment. However some git clone sets GIT_DIR variable.
+Therefore remote git init fails during creation of wildcard repository
+in this case.
+---
+ src/gitolite_env.pm | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gitolite_env.pm b/src/gitolite_env.pm
+index 81b8168..5dffd41 100644
+--- a/src/gitolite_env.pm
++++ b/src/gitolite_env.pm
+@@ -46,6 +46,9 @@ use gitolite;
+
+ # think of it OS-supported memo-ization :-)
+ sub setup_environment {
++ foreach my $variable (keys %ENV) {
++ delete $ENV{$variable} if $variable=~m/^GIT_/;
++ }
+ $ENV{GL_ADMINDIR} = $GL_ADMINDIR;
+ $ENV{GL_LOG} = get_logfilename($GL_LOGT);
+ $ENV{PATH} = "$GIT_PATH:$ENV{PATH}" if $GIT_PATH;
+--
+1.7.5
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.22&r2=1.23&f=u
More information about the pld-cvs-commit
mailing list