packages: gitolite/gitolite-broken_links.patch, gitolite/gitolite-gl_setup....

draenog draenog at pld-linux.org
Wed May 30 22:52:17 CEST 2012 

Author: draenog                      Date: Wed May 30 20:52:17 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.3.1

---- Files affected:
packages/gitolite:
   gitolite-broken_links.patch (1.1 -> 1.2) , gitolite-gl_setup.patch (1.1 -> 1.2) , gitolite-wildcard_repos.patch (1.1 -> 1.2) , gitolite.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/gitolite/gitolite-broken_links.patch
diff -u packages/gitolite/gitolite-broken_links.patch:1.1 packages/gitolite/gitolite-broken_links.patch:1.2
--- packages/gitolite/gitolite-broken_links.patch:1.1	Thu Dec  8 18:22:04 2011
+++ packages/gitolite/gitolite-broken_links.patch	Wed May 30 22:52:12 2012
@@ -1,26 +1,26 @@
-From 192ff2030173bc3b433b0ece9d1fe9e25d43b2c1 Mon Sep 17 00:00:00 2001
+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 2/6] Remove broken links
+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 files changed, 1 insertions(+), 0 deletions(-)
+ src/gl-install | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/src/gl-install b/src/gl-install
-index de7aefd..2f73869 100755
+index ac9e84e..6619e16 100755
 --- a/src/gl-install
 +++ b/src/gl-install
-@@ -97,6 +97,7 @@ for my $repo (`find . -type d -name "*.git" -prune`) {
-     # in case of package install, GL_ADMINDIR is no longer the top cop;
-     # override with the package hooks
-     ln_sf("$GL_PACKAGE_HOOKS/common", "*", "$repo/hooks") if $GL_PACKAGE_HOOKS;
+@@ -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.8
+1.7.11.rc0
 

================================================================
Index: packages/gitolite/gitolite-gl_setup.patch
diff -u packages/gitolite/gitolite-gl_setup.patch:1.1 packages/gitolite/gitolite-gl_setup.patch:1.2
--- packages/gitolite/gitolite-gl_setup.patch:1.1	Thu Dec  8 18:22:04 2011
+++ packages/gitolite/gitolite-gl_setup.patch	Wed May 30 22:52:12 2012
@@ -1,36 +1,36 @@
-From c3224124b55ac74e6817a54dc52adc1c77757d6c Mon Sep 17 00:00:00 2001
+From 75ed5cd525be9a749c0a170d6e78fbffc8ebc93d 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 3/6] Run gl-install in gl-setup only when admin repo was
+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 |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ src/gl-setup | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gl-setup b/src/gl-setup
-index 3a6c04b..f451bcc 100755
+index 1970d93..c7ae927 100755
 --- a/src/gl-setup
 +++ b/src/gl-setup
-@@ -117,6 +117,7 @@ gl-install -q
+@@ -168,6 +168,7 @@ gl-install -q
          repo    testing
                  RW+     =   @all
- EOF
-+   RERUN_GL_INSTALL=1
+     " | cut -c9- > $GL_ADMINDIR/conf/gitolite.conf
++   RERUN_GL_INSTALL = 1
  }
  [ -n "$pubkey_file" ] && cp $pubkey_file $GL_ADMINDIR/keydir
  
-@@ -135,7 +136,7 @@ gl-compile-conf -q
+@@ -186,7 +187,7 @@ gl-compile-conf -q
  
  # 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.8
+1.7.11.rc0
 

================================================================
Index: packages/gitolite/gitolite-wildcard_repos.patch
diff -u packages/gitolite/gitolite-wildcard_repos.patch:1.1 packages/gitolite/gitolite-wildcard_repos.patch:1.2
--- packages/gitolite/gitolite-wildcard_repos.patch:1.1	Thu Dec  8 18:22:04 2011
+++ packages/gitolite/gitolite-wildcard_repos.patch	Wed May 30 22:52:12 2012
@@ -1,11 +1,11 @@
-From b6bdf6ddb4faf2356e0e4642ea0180e27675c9fc Mon Sep 17 00:00:00 2001
+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 6/6] Option to disable creation of wildcard repos
+Subject: [PATCH] Option to disable creation of wildcard repos
 
 ---
- src/gitolite_rc.pm  |    2 +-
- src/gl-auth-command |    3 ++-
+ 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
@@ -22,18 +22,19 @@
      $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..71596a4 100755
+index 851f614..c10b327 100755
 --- a/src/gl-auth-command
 +++ b/src/gl-auth-command
-@@ -160,7 +160,7 @@ if ( $GL_ALL_READ_ALL and $verb =~ $R_COMMANDS and -d "$REPO_BASE/$repo.git") {
+@@ -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.8
+1.7.11.rc0
 

================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.33 packages/gitolite/gitolite.spec:1.34
--- packages/gitolite/gitolite.spec:1.33	Wed Feb 15 15:29:51 2012
+++ packages/gitolite/gitolite.spec	Wed May 30 22:52:12 2012
@@ -6,12 +6,12 @@
 Summary:	Software for hosting git repositories
 Summary(pl.UTF-8):	Narzędzie do hostowania repozytoriów git
 Name:		gitolite
-Version:	2.3
+Version:	2.3.1
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	9d213f1c0d73e33be779b2735d7b9552
+# Source0-md5:	096e80901404832445040aef7d733550
 Patch0:		%{name}-mkdir.patch
 Patch1:		%{name}-env.patch
 Patch2:		%{name}-BIG_INFO_CAP.patch
@@ -75,12 +75,11 @@
 rm src/gl-system-install
 
 echo v%{version} > conf/VERSION
-sed -i 's,^# $GL_PACKAGE_CONF =.*,$GL_PACKAGE_CONF = "%{_sysconfdir}/gitolite";,g' conf/example.gitolite.rc
-sed -i 's,^# $GL_PACKAGE_HOOKS =.*,$GL_PACKAGE_HOOKS = "%{_datadir}/gitolite/hooks";,g' conf/example.gitolite.rc
+sed -i 's,^$GL_PACKAGE_CONF =.*,$GL_PACKAGE_CONF = "%{_sysconfdir}/gitolite";,g' conf/example.gitolite.rc
+sed -i 's,^$GL_PACKAGE_HOOKS =.*,$GL_PACKAGE_HOOKS = "%{_datadir}/gitolite/hooks";,g' conf/example.gitolite.rc
 
 # Some ugly hacks. Life without ugly hacks would be so booring.
 sed -i 's,^GL_PACKAGE_CONF=.*,GL_PACKAGE_CONF=%{_sysconfdir}/gitolite,g' src/gl-setup
-sed -i '2a\GL_ADMIN=$HOME/.gitolite\nGL_BINDIR=%{_bindir}\n' hooks/gitolite-admin/post-update
 
 %build
 # Format documentation
@@ -98,14 +97,14 @@
 cp -p conf/{example.gitolite.rc,VERSION} $RPM_BUILD_ROOT%{_sysconfdir}/gitolite
 cp -a hooks/* $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks/common/{gl-pre-git.hub-sample,update.secondary.sample,post-receive.mirrorpush}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks/common/{gl-pre-git.hub-sample,post-receive.mirrorpush}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.mkd conf/example.conf hooks/common/{gl-pre-git.hub-sample,update.secondary.sample,post-receive.mirrorpush}
+%doc README.mkd conf/example.conf hooks/common/{gl-pre-git.hub-sample,post-receive.mirrorpush}
 
 %dir %{_sysconfdir}/gitolite
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitolite/example.gitolite.rc
@@ -131,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2012/05/30 20:52:12  draenog
+- up to 2.3.1
+
 Revision 1.33  2012/02/15 14:29:51  draenog
 - up to 2.3
 - nogitweb.patch included upstream
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gitolite/gitolite-broken_links.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/gitolite/gitolite-gl_setup.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/gitolite/gitolite-wildcard_repos.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/gitolite/gitolite.spec?r1=1.33&r2=1.34

More information about the pld-cvs-commit mailing list