[gitolite] 2.1. Admins, please see README for corrections that may be needed to your .gitolite.rc files!!!!!!!
Jon Ciesla
limb at fedoraproject.org
Fri Oct 21 12:31:35 UTC 2011
commit a9e9954715139b35221199b276338f80f03b3d3d
Author: Jon Ciesla <limb at jcomserv.net>
Date: Fri Oct 21 07:30:51 2011 -0500
2.1.
Admins, please see README for corrections that may be needed to your .gitolite.rc files!!!!!!!
.gitignore | 1 +
gitolite-2.0-rpm.patch | 60 ++++++++++-------------------------------------
gitolite-README-fedora | 7 +++++
gitolite.spec | 14 ++++++++---
sources | 2 +-
5 files changed, 32 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0bed0a..abc0c57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ sitaramc-gitolite-v1.5.4-0-g0d0e7e5.tar.gz
/sitaramc-gitolite-v2.0.1-0-g59f3c4a.tar.gz
/sitaramc-gitolite-v2.0.2-0-g436662f.tar.gz
/sitaramc-gitolite-v2.0.3-0-g4c1e4b2.tar.gz
+/sitaramc-gitolite-v2.1-0-g871ed28.tar.gz
diff --git a/gitolite-2.0-rpm.patch b/gitolite-2.0-rpm.patch
index 0417898..573fda9 100644
--- a/gitolite-2.0-rpm.patch
+++ b/gitolite-2.0-rpm.patch
@@ -12,18 +12,6 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/conf/example.gitolite.rc sitaramc-gitoli
# ------------------------------------------------------------------------------
# most often used/changed variables
-diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gitolite.pm sitaramc-gitolite-4c1e4b2/src/gitolite.pm
---- sitaramc-gitolite-4c1e4b2.orig/src/gitolite.pm 2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/src/gitolite.pm 2011-08-08 14:10:35.330500567 -0400
-@@ -493,7 +493,7 @@
- sub report_version {
- my($user) = @_;
- print "hello $user, the gitolite version here is ";
-- print slurp( ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION" );
-+ system("rpm", "-q", "--qf", '%{version}-%{release}', 'gitolite');
- }
-
- sub perm_code {
diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-install sitaramc-gitolite-4c1e4b2/src/gl-install
--- sitaramc-gitolite-4c1e4b2.orig/src/gl-install 2011-08-08 00:17:56.000000000 -0400
+++ sitaramc-gitolite-4c1e4b2/src/gl-install 2011-08-08 14:12:09.177505993 -0400
@@ -45,30 +33,6 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-install sitaramc-gitolite-4c1e4b2
EOF
}
-diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-mirror-shell sitaramc-gitolite-4c1e4b2/src/gl-mirror-shell
---- sitaramc-gitolite-4c1e4b2.orig/src/gl-mirror-shell 2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/src/gl-mirror-shell 2011-08-08 14:01:59.718499902 -0400
-@@ -4,7 +4,7 @@
- GL_BYPASS_UPDATE_HOOK=1
-
- get_rc_val() {
-- ${0%/*}/gl-query-rc $1
-+ /usr/bin/gl-query-rc $1
- }
-
- REPO_BASE=$( get_rc_val REPO_BASE)
-diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-mirror-sync sitaramc-gitolite-4c1e4b2/src/gl-mirror-sync
---- sitaramc-gitolite-4c1e4b2.orig/src/gl-mirror-sync 2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/src/gl-mirror-sync 2011-08-08 14:02:28.086500313 -0400
-@@ -6,7 +6,7 @@
- { echo I cant ssh to $mirror; exit 1; }
-
- cd $HOME
--REPO_BASE=`${0%/*}/gl-query-rc REPO_BASE`
-+REPO_BASE=`/usr/bin/gl-query-rc REPO_BASE`
- cd $REPO_BASE
-
- ssh $mirror cat \$HOME/.gitolite.rc | expand | egrep '^ *\$GL_SLAVE_MODE *= *1; *$' >/dev/null || {
diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-setup sitaramc-gitolite-4c1e4b2/src/gl-setup
--- sitaramc-gitolite-4c1e4b2.orig/src/gl-setup 2011-08-08 00:17:56.000000000 -0400
+++ sitaramc-gitolite-4c1e4b2/src/gl-setup 2011-08-08 14:02:56.240514168 -0400
@@ -89,15 +53,17 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-setup sitaramc-gitolite-4c1e4b2/s
}
TEMPDIR=$(mktemp -d -t tmp.XXXXXXXXXX)
-diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-tool sitaramc-gitolite-4c1e4b2/src/gl-tool
---- sitaramc-gitolite-4c1e4b2.orig/src/gl-tool 2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/src/gl-tool 2011-08-08 14:03:17.720499044 -0400
-@@ -46,7 +46,7 @@
- # side, it's not likely to change anytime soon!
- AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding"
-
-- GL_BINDIR=`${0%/*}/gl-query-rc GL_BINDIR`
-+ GL_BINDIR=`/usr/bin/gl-query-rc GL_BINDIR`
+--- sitaramc-gitolite-4c1e4b2/src/gitolite.pm~ 2011-09-28 21:03:53.000000000 -0500
++++ sitaramc-gitolite-4c1e4b2/src/gitolite.pm 2011-10-01 11:46:53.000000000 -0500
+@@ -516,7 +516,10 @@
+ chomp($gl_version);
+ my $git_version = `git --version`;
+ $git_version =~ s/^git version //;
+- print "hello $user, this is gitolite $gl_version running on git $git_version";
++ print "hello $user, this is gitolite ";
++ system("rpm", "-q", "--qf", '%{version}-%{release}', 'gitolite');
++ print " running on git ";
++ system("rpm", "-q", "--qf", '%{version}-%{release}', 'git');
+ }
- pubkey_file=$2
- user=`basename $pubkey_file .pub`
+ sub perm_code {
diff --git a/gitolite-README-fedora b/gitolite-README-fedora
index 405ec4e..e76f7b0 100644
--- a/gitolite-README-fedora
+++ b/gitolite-README-fedora
@@ -35,3 +35,10 @@ add it, commit and push.
CONFIG FILE FORMAT: see comments in conf/example.conf in the
gitolite source.
+
+
+IMPORTANT: For users from older installs, please make sure that in your .gitolite.rc;
+$GL_PACKAGE_CONF="/usr/share/gitolite/conf"
+$GL_PACKAGE_HOOKS="/usr/share/gitolite/hooks"
+
+before re-running gl-setup.
diff --git a/gitolite.spec b/gitolite.spec
index e84a770..4fc278e 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -7,8 +7,8 @@
%endif
Name: gitolite
-Version: 2.0.3
-Release: 2%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: Highly flexible server for git directory version tracker
Group: Applications/System
@@ -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-v2.0.3-0-g4c1e4b2.tar.gz
+Source0: sitaramc-gitolite-v2.1-0-g871ed28.tar.gz
Source1: gitolite-README-fedora
# Far from being upstreamable
Patch0: gitolite-2.0-rpm.patch
@@ -52,7 +52,7 @@ elsewhere in the doc/ directory.
%prep
-%setup -qn sitaramc-gitolite-4c1e4b2
+%setup -qn sitaramc-gitolite-871ed28
# Don't create backups; would mess with %%install
%patch0 -p1
#%patch1 -p1
@@ -116,6 +116,12 @@ exit 0
%changelog
+* Fri Sep 30 2011 Jon Ciesla <limb at jcomserv.net> - 2.1-1
+- 2.1.
+- Updated README to warn admins about variables that
+- need to be set in .gitolite.rc and may not be from
+- older installs.
+
* Mon Aug 08 2011 Jon Ciesla <limb at jcomserv.net> - 2.0.3-2
- Updated rpm patch to fix hooks, BZ 713020.
diff --git a/sources b/sources
index 56eb6b9..566abb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-404c19bf701fac00188ed163c4416a78 sitaramc-gitolite-v2.0.3-0-g4c1e4b2.tar.gz
+33e0f6f384cf0596aed974fa563b50c3 sitaramc-gitolite-v2.1-0-g871ed28.tar.gz
More information about the scm-commits
mailing list