[gitolite] 1.5.5.

[Jon Ciesla]

commit d832f762722d26d47224a2e674ebd0849dd04f9d
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Aug 30 07:59:02 2010 -0500

    1.5.5.

 .gitignore             |    1 +
 gitolite-1.5-rpm.patch |   48 +++++++++++++++++++++++++++---------------------
 gitolite.spec          |    9 ++++++---
 sources                |    2 +-
 4 files changed, 35 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f56495..2625bbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 sitaramc-gitolite-v1.5.3-0-g0f5f82e.tar.gz
 sitaramc-gitolite-v1.5.4-0-g0d0e7e5.tar.gz
+/sitaramc-gitolite-v1.5.5-0-gfda10c2.tar.gz
diff --git a/gitolite-1.5-rpm.patch b/gitolite-1.5-rpm.patch
index 9b1254a..3f0f9c5 100644
--- a/gitolite-1.5-rpm.patch
+++ b/gitolite-1.5-rpm.patch
@@ -46,15 +46,6 @@ diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-compile-conf sitaram
  
  # ask where the rc file is, get it, and "do" it
  &where_is_rc();
-@@ -74,7 +74,7 @@
- # ----------------------------------------------------------------------------
- 
- # command and options for authorized_keys
--$AUTH_COMMAND="$bindir/gl-auth-command";
-+$AUTH_COMMAND="/usr/bin/gl-auth-command";
- $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
- 
- # groups can now represent user groups or repo groups.
 diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-install sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-install
 --- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-install	2010-04-21 21:27:25.000000000 -0500
 +++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-install	2010-04-23 16:19:15.030679332 -0500
@@ -132,18 +123,6 @@ diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-install sitaramc-git
          or die "could not symlink post-update hook\n";
      # ditto... (see previous block)
      ln_sf("$GL_PACKAGE_HOOKS/gitolite-admin", "post-update", "gitolite-admin.git/hooks") if $GL_PACKAGE_HOOKS;
-@@ -101,7 +97,7 @@
- }
- 
- # fixup program renames
--for my $oldname qw(pta-hook.sh conf-convert.pl 00-easy-install.sh 99-emergency-addkey.sh install.pl update-hook.pl hooks/update ga-post-update-hook VERSION) {
--    unlink "$GL_ADMINDIR/src/$oldname";
--    unlink "$ENV{HOME}/gitolite-install/src/$oldname";
--}
-+#for my $oldname qw(pta-hook.sh conf-convert.pl 00-easy-install.sh 99-emergency-addkey.sh install.pl update-hook.pl hooks/update ga-post-update-hook VERSION) {
-+#    unlink "$GL_ADMINDIR/src/$oldname";
-+#    unlink "$ENV{HOME}/gitolite-install/src/$oldname";
-+#}
 diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-setup sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-setup
 --- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-setup	2010-04-21 21:27:25.000000000 -0500
 +++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-setup	2010-04-23 16:19:53.849932100 -0500
@@ -199,3 +178,30 @@ diff -r -U3 sitaramc-gitolite-3ddc8aa.orig/src/gl-compile-conf sitaramc-gitolite
 Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-compile-conf.orig
 Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-compile-conf.rej
 Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-install.orig
+--- sitaramc-gitolite-fda10c2/src/gl-install~	2010-08-30 07:02:06.000000000 -0500
++++ sitaramc-gitolite-fda10c2/src/gl-install	2010-08-30 07:36:51.342623936 -0500
+@@ -98,8 +98,8 @@
+     chmod 0755, "gitolite-admin.git/hooks/post-update";
+ }
+ 
+-# fixup program renames
+-for my $oldname qw(pta-hook.sh conf-convert.pl 00-easy-install.sh 99-emergency-addkey.sh gl-emergency-addkey install.pl update-hook.pl hooks/update ga-post-update-hook VERSION) {
+-    unlink "$GL_ADMINDIR/src/$oldname";
+-    unlink "$ENV{HOME}/gitolite-install/src/$oldname";
+-}
++## fixup program renames
++#for my $oldname qw(pta-hook.sh conf-convert.pl 00-easy-install.sh 99-emergency-addkey.sh gl-emergency-addkey install.pl update-hook.pl hooks/update ga-post-update-hook VERSION) {
++#    unlink "$GL_ADMINDIR/src/$oldname";
++#    unlink "$ENV{HOME}/gitolite-install/src/$oldname";
++#}
+--- sitaramc-gitolite-fda10c2/src/gitolite.pm~	2010-08-30 07:02:06.000000000 -0500
++++ sitaramc-gitolite-fda10c2/src/gitolite.pm	2010-08-30 07:38:33.425872207 -0500
+@@ -488,7 +488,7 @@
+     # CONSTANTS
+ 
+     # command and options for authorized_keys
+-    my $AUTH_COMMAND="$bindir/gl-auth-command";
++    my $AUTH_COMMAND="/usr/bin/gl-auth-command";
+     my $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
+ 
+     # START
diff --git a/gitolite.spec b/gitolite.spec
index 92fd5af..8459ec7 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           gitolite
-Version:        1.5.4
+Version:        1.5.5
 Release:        1%{?dist}
 Summary:        Highly flexible server for git directory version tracker
 
@@ -20,7 +20,7 @@ URL:            http://github.com/sitaramc/gitolite
 # $ cd gitolite
 # $ git archive ed2bf5 |gzip >gitolite-ed2bf5.tar.gz
 #Source0:        gitolite-ed2bf5.tar.gz
-Source0:        sitaramc-gitolite-v1.5.4-0-g0d0e7e5.tar.gz
+Source0:        sitaramc-gitolite-v1.5.5-0-gfda10c2.tar.gz
 Source1:        gitolite-README-fedora
 # Far from being upstreamable
 Patch0:         gitolite-1.5-rpm.patch
@@ -51,7 +51,7 @@ elsewhere in the doc/ directory.
 
 
 %prep
-%setup -qn sitaramc-gitolite-0d0e7e5
+%setup -qn sitaramc-gitolite-fda10c2
 # Don't create backups; would mess with %%install
 %patch0 -p1
 %patch1 -p1
@@ -114,6 +114,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 27 2010 Jon Ciesla <limb at jcomserv.net> - 1.5.5-1
+- New upstream.
+
 * Fri Jul 30 2010 Jon Ciesla <limb at jcomserv.net> - 1.5.4-1
 - New upstream.
 
diff --git a/sources b/sources
index d35dcbf..637c38a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-537921877b1ba351e1ba3e8c5b1e2b23  sitaramc-gitolite-v1.5.4-0-g0d0e7e5.tar.gz
+9ac2782bade3bc18dd3a7f2586f29743  sitaramc-gitolite-v1.5.5-0-gfda10c2.tar.gz