[packages/gitolite3] removing all g2 patches
jajcus
jajcus at pld-linux.org
Thu Sep 12 10:13:58 CEST 2013
commit 696e2a4af9293952156726097e003271f88438f5
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Thu Sep 12 09:33:02 2013 +0200
removing all g2 patches
gitolite-BIG_INFO_CAP.patch | 50 ---------------------------
gitolite-broken_links.patch | 26 --------------
gitolite-env.patch | 30 ----------------
gitolite-gl_setup.patch | 80 -------------------------------------------
gitolite-mkdir.patch | 26 --------------
gitolite-timezone.patch | 22 ------------
gitolite-wildcard_repos.patch | 40 ----------------------
gitolite3.spec | 15 --------
8 files changed, 289 deletions(-)
---
diff --git a/gitolite3.spec b/gitolite3.spec
index 9c4891d..8757a37 100644
--- a/gitolite3.spec
+++ b/gitolite3.spec
@@ -11,13 +11,6 @@ License: GPL v2
Group: Development/Tools
Source0: http://github.com/sitaramc/gitolite/tarball/v%{version}/gitolite-%{version}.tar.gz
# Source0-md5: fe962443eab63cb7e4735c021950d895
-Patch0: %{name}-mkdir.patch
-Patch1: %{name}-env.patch
-Patch2: %{name}-BIG_INFO_CAP.patch
-Patch3: %{name}-broken_links.patch
-Patch4: %{name}-gl_setup.patch
-Patch5: %{name}-wildcard_repos.patch
-Patch6: %{name}-timezone.patch
URL: http://github.com/sitaramc/gitolite
BuildRequires: perl-Text-Markdown
BuildRequires: rpm-perlprov
@@ -91,14 +84,6 @@ Dokumentacja do Gitolite.
mv sitaramc-gitolite-*/* .
%{__rm} -r sitaramc-gitolite-*
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-
%{__rm} src/gl-system-install
echo v%{version} > conf/VERSION
diff --git a/gitolite-BIG_INFO_CAP.patch b/gitolite-BIG_INFO_CAP.patch
deleted file mode 100644
index 64c76a7..0000000
--- a/gitolite-BIG_INFO_CAP.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 886b2294df8c5f3b47f24f9fe9761c45bbd8428b Mon Sep 17 00:00:00 2001
-From: Kacper Kornet <draenog at pld-linux.org>
-Date: Thu, 23 Jun 2011 16:27:59 +0100
-Subject: [PATCH 1/6] Allow for unlimited output with $BIG_INFO_CAP=0
-
----
- src/gitolite.pm | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/gitolite.pm b/src/gitolite.pm
-index fcbda13..a6edf7e 100644
---- a/src/gitolite.pm
-+++ b/src/gitolite.pm
-@@ -599,7 +599,7 @@ sub report_basic
- for my $r (sort keys %repos) {
- next unless $r =~ /$repo/i;
- # if $GL_BIG_CONFIG is on, limit the number of output lines
-- next if $GL_BIG_CONFIG and $count++ >= $BIG_INFO_CAP;
-+ next if $GL_BIG_CONFIG and $BIG_INFO_CAP and $count++ >= $BIG_INFO_CAP;
- if ($r =~ $REPONAME_PATT and $r !~ /\bCREAT[EO]R\b/) {
- parse_acl($r, "NOBODY");
- } else {
-@@ -617,7 +617,7 @@ sub report_basic
- $perm .= perm_code( $repos{$r}{W}{'@all'} || $repos{'@all'}{W}{'@all'}, $repos{'@all'}{W}{$user}, $repos{$r}{W}{$user}, 'W');
- print "$perm\t$r\r\n" if $perm =~ /\S/ and not check_deny_repo($r);
- }
-- print "only $BIG_INFO_CAP out of $count candidate repos examined\r\nplease use a partial reponame or regex pattern to limit output\r\n" if $GL_BIG_CONFIG and $count > $BIG_INFO_CAP;
-+ print "only $BIG_INFO_CAP out of $count candidate repos examined\r\nplease use a partial reponame or regex pattern to limit output\r\n" if $GL_BIG_CONFIG and $BIG_INFO_CAP and $count > $BIG_INFO_CAP;
- print "$GL_SITE_INFO\n" if $GL_SITE_INFO;
- }
-
-@@ -646,13 +646,13 @@ sub expand_wild
- $actual_repo =~ s/\.git$//;
- # actual_repo has to match the pattern being expanded
- next unless $actual_repo =~ /$repo/i;
-- next if $GL_BIG_CONFIG and $count++ >= $BIG_INFO_CAP;
-+ next if $GL_BIG_CONFIG and $BIG_INFO_CAP and $count++ >= $BIG_INFO_CAP;
-
- my($perm, $creator, $wild) = repo_rights($actual_repo);
- next unless $perm =~ /\S/;
- print "$perm\t$creator\t$actual_repo\n";
- }
-- print "only $BIG_INFO_CAP out of $count candidate repos examined\nplease use a partial reponame or regex pattern to limit output\n" if $GL_BIG_CONFIG and $count > $BIG_INFO_CAP;
-+ print "only $BIG_INFO_CAP out of $count candidate repos examined\nplease use a partial reponame or regex pattern to limit output\n" if $GL_BIG_CONFIG and $BIG_INFO_CAP and $count > $BIG_INFO_CAP;
- print "$GL_SITE_INFO\n" if $GL_SITE_INFO;
- }
-
---
-1.7.8
-
diff --git a/gitolite-broken_links.patch b/gitolite-broken_links.patch
deleted file mode 100644
index 7fca6b8..0000000
--- a/gitolite-broken_links.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1fa1177a43a322ec43aaf2b5ee5259dfdd05035d Mon Sep 17 00:00:00 2001
-From: Kacper Kornet <draenog at pld-linux.org>
-Date: Tue, 21 Jun 2011 14:34:52 +0200
-Subject: [PATCH] Remove broken links
-
-When some hook files were removed it resulted in broken links to them.
-This commit fixes it.
----
- src/gl-install | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gl-install b/src/gl-install
-index ac9e84e..6619e16 100755
---- a/src/gl-install
-+++ b/src/gl-install
-@@ -46,6 +46,7 @@ for my $repo (`find . -type d -name "*.git" -prune`) {
- ln_sf( "$GL_ADMINDIR/hooks/common", "*", "$repo/hooks" );
- # propagate package hooks, overriding user hooks
- ln_sf( "$GL_PACKAGE_HOOKS/common", "*", "$repo/hooks" );
-+ foreach(glob "$repo/hooks/*") { -l && ! -e && unlink};
- chmod 0755, "$repo/hooks/update";
- }
-
---
-1.7.11.rc0
-
diff --git a/gitolite-env.patch b/gitolite-env.patch
deleted file mode 100644
index 1224a3d..0000000
--- a/gitolite-env.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 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
-
diff --git a/gitolite-gl_setup.patch b/gitolite-gl_setup.patch
deleted file mode 100644
index 733306b..0000000
--- a/gitolite-gl_setup.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 91808f793f1527a86c546ec974505dd3d5d80fee Mon Sep 17 00:00:00 2001
-From: Kacper Kornet <draenog at pld-linux.org>
-Date: Fri, 10 Jun 2011 16:31:36 +0200
-Subject: [PATCH] Run gl-install in gl-setup for only when admin repo was
- created
-
-With large number of repos gl-install is expensive to run. So it should
-be run for the second time in gl-setupe only when necessary.
----
- src/gl-setup | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/gl-setup b/src/gl-setup
-index 1970d93..0395631 100755
---- a/src/gl-setup
-+++ b/src/gl-setup
-@@ -168,6 +168,7 @@ gl-install -q
- repo testing
- RW+ = @all
- " | cut -c9- > $GL_ADMINDIR/conf/gitolite.conf
-+ RERUN_GL_INSTALL=1
- }
- [ -n "$pubkey_file" ] && cp $pubkey_file $GL_ADMINDIR/keydir
-
-@@ -175,7 +176,7 @@ touch $HOME/.ssh/authorized_keys
- gl-compile-conf -q
-
- # setup the admin repo
--[ -n "$pubkey_file" ] || [ -n "$GITOLITE_HTTP_HOME" ] && (
-+[ -n "$pubkey_file" ] || [ -n "$GITOLITE_HTTP_HOME" ] && { RERUN_GL_INSTALL=1; (
- cd $HOME; cd $REPO_BASE/gitolite-admin.git
- GIT_WORK_TREE=$GL_ADMINDIR; export GIT_WORK_TREE
- git add conf/gitolite.conf keydir
-@@ -183,10 +184,11 @@ gl-compile-conf -q
- git config --get user.name >/dev/null || git config user.name "$USER on `hostname`"
- git diff --cached --quiet 2>/dev/null || git commit -am "gl-setup $args"
- )
-+}
-
- # now that the admin repo is created, you have to set the hooks properly; best
- # do it by running install again
--gl-install -q
-+[ "$RERUN_GL_INSTALL" = 1 ] && gl-install -q
-
- # ----------------------------------------------------------------------
- # lint check on ssh keys
---
-1.7.11.rc2
-
-From 3a3761530bf059923ca3e04725dc70dea24c2d0a Mon Sep 17 00:00:00 2001
-From: Kacper Kornet <draenog at pld-linux.org>
-Date: Thu, 14 Jun 2012 13:20:04 +0100
-Subject: [PATCH] Commit all content of conf directory during initial setup
-
-So far only conf/gitolite.conf was committed to gitolie-admin repository
-during an initial setup. When initial gitolite.conf contained include
-directives it resulted in incomplete setup. However
-conf/gitolite.conf-compiled.pm should not be tracked so it has to be
-excluded explicitly.
----
- src/gl-setup | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/gl-setup b/src/gl-setup
-index 0395631..d4ffeaf 100755
---- a/src/gl-setup
-+++ b/src/gl-setup
-@@ -179,7 +179,8 @@ gl-compile-conf -q
- [ -n "$pubkey_file" ] || [ -n "$GITOLITE_HTTP_HOME" ] && { RERUN_GL_INSTALL=1; (
- cd $HOME; cd $REPO_BASE/gitolite-admin.git
- GIT_WORK_TREE=$GL_ADMINDIR; export GIT_WORK_TREE
-- git add conf/gitolite.conf keydir
-+ git add conf keydir
-+ git rm --cached conf/gitolite.conf-compiled.pm
- git config --get user.email >/dev/null || git config user.email $USER@`hostname`
- git config --get user.name >/dev/null || git config user.name "$USER on `hostname`"
- git diff --cached --quiet 2>/dev/null || git commit -am "gl-setup $args"
---
-1.7.11.rc3
-
diff --git a/gitolite-mkdir.patch b/gitolite-mkdir.patch
deleted file mode 100644
index bc40e55..0000000
--- a/gitolite-mkdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9217aafa0b50d3d9a1759df0f8bb605cbafd3f33 Mon Sep 17 00:00:00 2001
-From: Kacper Kornet <draenog at pld-linux.org>
-Date: Wed, 27 Apr 2011 21:29:21 +0100
-Subject: [PATCH 1/1] Create hooks directory if it is not created by git init
-
-If git hooks directory in template is empty, the .git/hooks is not
-created by git init. In this case it has to be created by gitolite.
----
- src/gitolite.pm | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/gitolite.pm b/src/gitolite.pm
-index c0581c8..b4602a2 100644
---- a/src/gitolite.pm
-+++ b/src/gitolite.pm
-@@ -135,6 +135,7 @@ sub log_it {
- sub ln_sf
- {
- my($srcdir, $glob, $dstdir) = @_;
-+ mkdir $dstdir unless (-d $dstdir);
- for my $hook ( glob("$srcdir/$glob") ) {
- $hook =~ s/$srcdir\///;
- unlink "$dstdir/$hook";
---
-1.7.5
-
diff --git a/gitolite-timezone.patch b/gitolite-timezone.patch
deleted file mode 100644
index 8182dc0..0000000
--- a/gitolite-timezone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit a7ba5f22c272d061f2679ac621f67bfebccff416
-Author: Kacper Kornet <draenog at pld-linux.org>
-Date: Mon Jan 14 12:29:33 2013 +0000
-
- Use GMT not localtime for logging purposes
-
- localtime is influenced by TZ variable. Therefore the logs could
- appear to be no monotonic if sshd accepted sending the TZ variable.
-
-diff --git a/src/gitolite_env.pm b/src/gitolite_env.pm
-index 5dffd41..0bcf660 100644
---- a/src/gitolite_env.pm
-+++ b/src/gitolite_env.pm
-@@ -141,7 +141,7 @@ sub get_logfilename {
- # this sub has a wee little side-effect; it sets $ENV{GL_TS}
- my($template) = shift;
-
-- my ($s, $min, $h, $d, $m, $y) = (localtime)[0..5];
-+ my ($s, $min, $h, $d, $m, $y) = (gmtime)[0..5];
- $y += 1900; $m++; # usual adjustments
- for ($s, $min, $h, $d, $m) {
- $_ = "0$_" if $_ < 10;
diff --git a/gitolite-wildcard_repos.patch b/gitolite-wildcard_repos.patch
deleted file mode 100644
index 25a9f0e..0000000
--- a/gitolite-wildcard_repos.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c5f5a5ac2c24abb9787a14f1904ca487e5672757 Mon Sep 17 00:00:00 2001
-From: Kacper Kornet <draenog at pld-linux.org>
-Date: Mon, 16 May 2011 20:21:52 +0100
-Subject: [PATCH] Option to disable creation of wildcard repos
-
----
- src/gitolite_rc.pm | 2 +-
- src/gl-auth-command | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/gitolite_rc.pm b/src/gitolite_rc.pm
-index 9f65a7d..cf74b65 100644
---- a/src/gitolite_rc.pm
-+++ b/src/gitolite_rc.pm
-@@ -18,7 +18,7 @@ use Exporter 'import';
- $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
- $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
- $GL_GITCONFIG_KEYS $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
-- $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
-+ $GL_NO_CREATE_REPOS $GL_NO_CREATE_WILDCARD_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
- $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
- $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
- $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $WEB_INTERFACE
-diff --git a/src/gl-auth-command b/src/gl-auth-command
-index 851f614..c10b327 100755
---- a/src/gl-auth-command
-+++ b/src/gl-auth-command
-@@ -160,7 +160,8 @@ if ( $GL_ALL_READ_ALL and $verb =~ $R_COMMANDS and -d "$REPO_BASE/$repo.git") {
- ($perm, $creator, $wild) = repo_rights($repo);
- }
- # it was missing, and you have create perms, so create it
--new_wild_repo($repo, $user) if ($perm =~ /C/);
-+new_wild_repo($repo, $user) if ($perm =~ /C/ && !$GL_NO_CREATE_WILDCARD_REPOS);
-+die "$repo does not exists\n" unless( -d "$REPO_BASE/$repo.git");
-
- die "$aa access for $repo DENIED to $user
- (Or there may be no repository at the given path. Did you spell it correctly?)\n" unless $perm =~ /$aa/;
---
-1.7.11.rc0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitolite3.git/commitdiff/fe36b7303e9e77efa95608e244f0917361158d4b
More information about the pld-cvs-commit
mailing list