[gitolite] New upstream.
Jon Ciesla
limb at fedoraproject.org
Fri Mar 11 18:24:13 UTC 2011
commit e84ca009f47208e7294ffd68cd6d17613cc1ea09
Author: Jon Ciesla <limb at jcomserv.net>
Date: Fri Mar 11 12:19:00 2011 -0600
New upstream.
.gitignore | 1 +
gitolite-2.0-rpm.patch | 174 ++++++++++++++++++++++++++++++++++++++++++++++++
gitolite.spec | 11 ++-
sources | 2 +-
4 files changed, 183 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ddfa16..e6a5eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ sitaramc-gitolite-v1.5.4-0-g0d0e7e5.tar.gz
/sitaramc-gitolite-v1.5.8-1-g5b9bf70.tar.gz
/sitaramc-gitolite-v1.5.9-25-ga10287a.tar.gz
/sitaramc-gitolite-v1.5.9.1-27-gb97115f.tar.gz
+/sitaramc-gitolite-v2.0-5-gb7944ed.tar.gz
diff --git a/gitolite-2.0-rpm.patch b/gitolite-2.0-rpm.patch
new file mode 100644
index 0000000..8a9ec86
--- /dev/null
+++ b/gitolite-2.0-rpm.patch
@@ -0,0 +1,174 @@
+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
+@@ -73,7 +69,7 @@
+ RW+ = yourname
+ 2. copy "yourname.pub" to $GL_ADMINDIR/keydir
+ 3. run this command
+- $GL_ADMINDIR/src/gl-compile-conf
++ gl-compile-conf
+ EOF
+ }
+
+@@ -93,7 +89,7 @@
+ if ( -d "gitolite-admin.git/hooks" ) {
+ print "copying post-update hook to gitolite-admin repo...\n";
+ unlink "gitolite-admin.git/hooks/post-update";
+- symlink "$GL_ADMINDIR/hooks/gitolite-admin/post-update", "gitolite-admin.git/hooks/post-update"
++ symlink "/usr/share/gitolite/hooks/gitolite-admin/post-update", "gitolite-admin.git/hooks/post-update"
+ 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;
+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
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+
+-GL_PACKAGE_CONF=/tmp/share/gitolite/conf
++GL_PACKAGE_CONF=/usr/share/gitolite/conf
+ # must be the same as the value for the same variable in
+ # $GL_PACKAGE_CONF/example.gitolite.rc. Sorry about the catch-22 :)
+
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/hooks/gitolite-admin/post-update~ 2010-10-16 04:16:32.000000000 -0500
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/gitolite-admin/post-update 2010-10-18 21:36:25.000000000 -0500
+@@ -15,7 +15,7 @@
+
+ od=$PWD
+ cd $GL_ADMINDIR
+-$GL_BINDIR/gl-compile-conf
++gl-compile-conf
+
+ cd $od
+
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-install~ 2011-02-14 09:58:17.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-install 2011-02-14 10:33:25.220797001 -0600
+@@ -43,11 +43,7 @@
+ unless ($ENV{GL_RC}) {
+ # doesn't exist. Copy it across, tell user to edit it and come back
+ my $glrc = $ENV{HOME} . "/.gitolite.rc";
+- if ($GL_PACKAGE_CONF) {
+- system("cp $GL_PACKAGE_CONF/example.gitolite.rc $glrc");
+- } else {
+- system("cp $ENV{GL_BINDIR}/../conf/example.gitolite.rc $glrc");
+- }
++ system("cp /usr/share/gitolite/conf/example.gitolite.rc $glrc");
+ print "created $glrc\n";
+ print "please edit it, change the paths if you wish to, and RERUN THIS SCRIPT\n";
+ exit;
+@@ -67,18 +63,18 @@
+ wrap_mkdir($ENV{GL_REPO_BASE_ABS});
+ wrap_mkdir($GL_ADMINDIR, 0700);
+ # mkdir $GL_ADMINDIR's subdirs
+-for my $dir qw(conf doc keydir logs src hooks hooks/common hooks/gitolite-admin) {
++for my $dir qw(conf keydir logs hooks hooks/common hooks/gitolite-admin) {
+ # some of them will stay empty; too lazy to fix right now ;-)
+ wrap_mkdir("$GL_ADMINDIR/$dir", 0700);
+ }
+
+ # "src" and "doc" will be overwritten on each install, but not conf
+-if ($GL_PACKAGE_HOOKS) {
+- system("cp -R -p $GL_PACKAGE_HOOKS $GL_ADMINDIR");
+-} else {
+- system("cp -R -p $ENV{GL_BINDIR}/../src $ENV{GL_BINDIR}/../doc $ENV{GL_BINDIR}/../hooks $GL_ADMINDIR");
+- system("cp $ENV{GL_BINDIR}/../conf/VERSION $GL_ADMINDIR/conf");
+-}
++#if ($GL_PACKAGE_HOOKS) {
++# system("cp -R -p $GL_PACKAGE_HOOKS $GL_ADMINDIR");
++#} else {
++# system("cp -R -p $ENV{GL_BINDIR}/../src $ENV{GL_BINDIR}/../doc $ENV{GL_BINDIR}/../hooks $GL_ADMINDIR");
++# system("cp $ENV{GL_BINDIR}/../conf/VERSION $GL_ADMINDIR/conf");
++#}
+
+ unless (-f $GL_CONF or $GL_PACKAGE_CONF) {
+ print <<EOF;
+@@ -97,7 +93,7 @@
+ for my $repo (`find . -type d -name "*.git" -prune`) {
+ chomp ($repo);
+ # propagate our own, plus any local admin-defined, hooks
+- ln_sf("$GL_ADMINDIR/hooks/common", "*", "$repo/hooks");
++ ln_sf("/usr/share/gitolite/hooks/common", "*", "$repo/hooks");
+ # 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;
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gitolite.pm~ 2011-02-12 09:25:34.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm 2011-02-14 10:40:29.791797001 -0600
+@@ -876,7 +876,7 @@
+ # LOCAL CONSTANTS
+
+ # command and options for authorized_keys
+- my $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-auth-command";
++ my $AUTH_COMMAND="/usr/bin/gl-auth-command";
+ $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-time $ENV{GL_BINDIR}/gl-auth-command" if $GL_PERFLOGT;
+ my $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
+
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-compile-conf~ 2011-02-12 09:25:34.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-compile-conf 2011-02-14 10:45:20.334797000 -0600
+@@ -417,7 +417,7 @@
+ unless ($GL_NO_CREATE_REPOS) {
+ unless (-d "$repo.git") {
+ print STDERR "creating $repo...\n";
+- new_repo($repo, "$GL_ADMINDIR/hooks/common");
++ new_repo($repo, "/usr/share/gitolite/hooks/common");
+ # new_repo would have chdir'd us away; come back
+ wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
+ }
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-dont-panic~ 2011-02-12 09:25:34.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-dont-panic 2011-02-14 10:53:02.894797004 -0600
+@@ -71,9 +71,9 @@
+ # have to manually set GL_BINDIR externally before running this program
+ [ -z "$GL_BINDIR" ] &&
+ GL_BINDIR=$( perl -ne 'print($1), exit if /^command="(.+?)\/gl-(time|auth-command) /' < $HOME/.ssh/authorized_keys)
+-GL_RC=$( $GL_BINDIR/gl-query-rc GL_RC)
+-REPO_BASE=$( $GL_BINDIR/gl-query-rc REPO_BASE)
+-GL_ADMINDIR=$($GL_BINDIR/gl-query-rc GL_ADMINDIR)
++GL_RC=$( /usr/bin/gl-query-rc GL_RC)
++REPO_BASE=$( /usr/bin/gl-query-rc REPO_BASE)
++GL_ADMINDIR=$(/usr/bin/gl-query-rc GL_ADMINDIR)
+ export GL_RC
+ export REPO_BASE
+ export GL_BINDIR
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-mirror-shell~ 2011-02-12 09:25:34.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-mirror-shell 2011-02-14 10:54:37.082797085 -0600
+@@ -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)
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-mirror-sync~ 2011-02-12 09:25:34.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-mirror-sync 2011-02-14 10:55:23.996796869 -0600
+@@ -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 || {
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-setup~ 2011-02-14 10:48:00.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-setup 2011-02-14 10:56:32.283797007 -0600
+@@ -21,7 +21,7 @@
+ die() { echo "$@"; exit 1; } >&2
+
+ get_rc_val() {
+- ${0%/*}/gl-query-rc $1
++ /usr/bin/gl-query-rc $1
+ }
+
+ TEMPDIR=$(mktemp -d -t tmp.XXXXXXXXXX)
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-tool~ 2011-02-12 09:25:34.000000000 -0600
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-tool 2011-02-14 10:57:32.041797000 -0600
+@@ -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`
+
+ pubkey_file=$2
+ user=`basename $pubkey_file .pub`
diff --git a/gitolite.spec b/gitolite.spec
index cc8e326..9c437f8 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -7,7 +7,7 @@
%endif
Name: gitolite
-Version: 1.5.9.1
+Version: 2.0
Release: 1%{?dist}
Summary: Highly flexible server for git directory version tracker
@@ -20,10 +20,10 @@ 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.9.1-27-gb97115f.tar.gz
+Source0: sitaramc-gitolite-v2.0-5-gb7944ed.tar.gz
Source1: gitolite-README-fedora
# Far from being upstreamable
-Patch0: gitolite-1.5.9-rpm.patch
+Patch0: gitolite-2.0-rpm.patch
#Patch1: gitolite-1.4.2-conf.patch
#Patch2: adcfix.post-v2.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -52,7 +52,7 @@ elsewhere in the doc/ directory.
%prep
-%setup -qn sitaramc-gitolite-b97115f
+%setup -qn sitaramc-gitolite-b7944ed
# Don't create backups; would mess with %%install
%patch0 -p1
#%patch1 -p1
@@ -116,6 +116,9 @@ exit 0
%changelog
+* Fri Mar 11 2011 Jon Ciesla <limb at jcomserv.net> - 2.0-1
+- New upstream.
+
* Thu Feb 17 2011 Jon Ciesla <limb at jcomserv.net> - 1.5.9.1-1
- New upstream.
- ADC patch upstreamed.
diff --git a/sources b/sources
index 9fa6c45..293e474 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c539f4c6ed2ac588e3ca1777d5925912 sitaramc-gitolite-v1.5.9.1-27-gb97115f.tar.gz
+370613960e90f3660c607fadabe8ea83 sitaramc-gitolite-v2.0-5-gb7944ed.tar.gz
More information about the scm-commits
mailing list