[gitolite] 1.5.6.
Jon Ciesla
limb at fedoraproject.org
Tue Oct 19 12:24:35 UTC 2010
commit 9ce33bd5e6adf3489db67795236cdf06c3983675
Author: Jon Ciesla <limb at jcomserv.net>
Date: Tue Oct 19 07:24:25 2010 -0500
1.5.6.
.gitignore | 1 +
gitolite-1.5.6-rpm.patch | 180 ++++++++++++++++++++++++++++++++++++++++++++++
gitolite.spec | 11 ++-
sources | 2 +-
4 files changed, 189 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2625bbf..3a67fe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
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
+/sitaramc-gitolite-v1.5.6-0-gd1515ea.tar.gz
diff --git a/gitolite-1.5.6-rpm.patch b/gitolite-1.5.6-rpm.patch
new file mode 100644
index 0000000..62e84e4
--- /dev/null
+++ b/gitolite-1.5.6-rpm.patch
@@ -0,0 +1,180 @@
+diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-auth-command sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-auth-command
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-auth-command 2010-04-21 21:27:25.000000000 -0500
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-auth-command 2010-04-23 16:12:50.316931744 -0500
+@@ -33,7 +33,7 @@
+ my $bindir = $0;
+ $bindir =~ s/\/[^\/]+$//;
+ $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
+-require "$bindir/gitolite.pm";
++require gitolite;
+
+ # ask where the rc file is, get it, and "do" it
+ &where_is_rc();
+diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-compile-conf sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-compile-conf
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-compile-conf 2010-04-21 21:27:25.000000000 -0500
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-compile-conf 2010-04-23 16:13:50.649928701 -0500
+@@ -60,7 +60,7 @@
+ my $bindir = $0;
+ $bindir =~ s/\/[^\/]+$//;
+ $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
+-require "$bindir/gitolite.pm";
++require gitolite;
+
+ # ask where the rc file is, get it, and "do" it
+ &where_is_rc();
+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
+@@ -24,18 +24,14 @@
+ # the common setup module is in the same directory as this running program is
+ my $bindir = $0;
+ $bindir =~ s/\/[^\/]+$//;
+-require "$bindir/gitolite.pm";
++require gitolite;
+
+ # ask where the rc file is, get it, and "do" it
+ &where_is_rc();
+ 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 $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;
+@@ -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
+ }
+
+@@ -82,7 +78,7 @@
+ for my $repo (`find . -type d -name "*.git"`) {
+ 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;
+@@ -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 :)
+
+diff -r -U3 sitaramc-gitolite-3ddc8aa.orig/hooks/common/update sitaramc-gitolite-3ddc8aa/hooks/common/update
+--- sitaramc-gitolite-3ddc8aa.orig/hooks/common/update 2010-05-19 04:03:35.000000000 -0500
++++ sitaramc-gitolite-3ddc8aa/hooks/common/update 2010-05-20 16:08:35.094177610 -0500
+@@ -35,7 +35,7 @@
+ # we should already have the GL_RC env var set when we enter this hook
+ die "parse $ENV{GL_RC} failed: " . ($! or $@) unless do $ENV{GL_RC};
+
+-require "$ENV{GL_BINDIR}/gitolite.pm";
++require gitolite;
+
+ my ($perm, $creator, $wild) = &repo_rights($ENV{GL_REPO});
+ my $reported_repo = $ENV{GL_REPO} . ( $ENV{GL_REPOPATT} ? " ($ENV{GL_REPOPATT})" : "" );
+diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gitolite.pm sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gitolite.pm~ 2010-10-16 04:16:32.000000000 -0500
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm 2010-10-18 21:24:24.000000000 -0500
+@@ -570,7 +570,7 @@
+ sub report_version {
+ my($GL_ADMINDIR, $user) = @_;
+ print "hello $user, the gitolite version here is ";
+- system("cat", ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION");
++ system("rpm", "-q", "--qf", '%{version}-%{release}', 'gitolite');
+ }
+
+ sub perm_code {
+@@ -763,7 +763,7 @@
+ # CONSTANTS
+
+ # command and options for authorized_keys
+- my $AUTH_COMMAND="$bindir/gl-auth-command";
++ my $AUTH_COMMAND="/usr/bin/gl-auth-command";
+ $AUTH_COMMAND="$bindir/gl-time $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-auth-command~ 2010-10-18 21:20:44.000000000 -0500
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-auth-command 2010-10-18 21:27:34.000000000 -0500
+@@ -230,7 +230,7 @@
+ if ($perm =~ /C/) {
+ # it was missing, and you have create perms
+ wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
+- new_repo($repo, "$GL_ADMINDIR/hooks/common", $user);
++ new_repo($repo, "/usr/share/gitolite/hooks/common", $user);
+ # note pwd is now the bare "repo.git"; new_repo does that...
+ wrap_print("gl-perms", "$GL_WILDREPOS_DEFPERMS\n") if $GL_WILDREPOS_DEFPERMS;
+ &setup_repo_configs($repo, \%repo_config);
+--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-compile-conf~ 2010-10-18 21:20:44.000000000 -0500
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-compile-conf 2010-10-18 21:29:11.000000000 -0500
+@@ -476,7 +476,7 @@
+ next if $repo =~ m(^\@|EXTCMD/); # these are not real 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-install~ 2010-10-18 21:20:44.000000000 -0500
++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-install 2010-10-18 21:30:55.000000000 -0500
+@@ -55,18 +55,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 $bindir/../src $bindir/../doc $bindir/../hooks $GL_ADMINDIR");
+- system("cp $bindir/../conf/VERSION $GL_ADMINDIR/conf");
+-}
++#if ($GL_PACKAGE_HOOKS) {
++# system("cp -R -p $GL_PACKAGE_HOOKS $GL_ADMINDIR");
++#} else {
++# system("cp -R -p $bindir/../src $bindir/../doc $bindir/../hooks $GL_ADMINDIR");
++# system("cp $bindir/../conf/VERSION $GL_ADMINDIR/conf");
++#}
+
+ unless (-f $GL_CONF or $GL_PACKAGE_CONF) {
+ print <<EOF;
+--- 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
+
diff --git a/gitolite.spec b/gitolite.spec
index 8459ec7..d611250 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -7,7 +7,7 @@
%endif
Name: gitolite
-Version: 1.5.5
+Version: 1.5.6
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.5-0-gfda10c2.tar.gz
+Source0: sitaramc-gitolite-v1.5.6-0-gd1515ea.tar.gz
Source1: gitolite-README-fedora
# Far from being upstreamable
-Patch0: gitolite-1.5-rpm.patch
+Patch0: gitolite-1.5.6-rpm.patch
Patch1: gitolite-1.4.2-conf.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -51,7 +51,7 @@ elsewhere in the doc/ directory.
%prep
-%setup -qn sitaramc-gitolite-fda10c2
+%setup -qn sitaramc-gitolite-d1515ea
# Don't create backups; would mess with %%install
%patch0 -p1
%patch1 -p1
@@ -114,6 +114,9 @@ exit 0
%changelog
+* Mon Oct 18 2010 Jon Ciesla <limb at jcomserv.net> - 1.5.6-1
+- New upstream.
+
* Fri Aug 27 2010 Jon Ciesla <limb at jcomserv.net> - 1.5.5-1
- New upstream.
diff --git a/sources b/sources
index 637c38a..2104807 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ac2782bade3bc18dd3a7f2586f29743 sitaramc-gitolite-v1.5.5-0-gfda10c2.tar.gz
+4b9b46e093f9a072898a961ff6279a0b sitaramc-gitolite-v1.5.6-0-gd1515ea.tar.gz
More information about the scm-commits
mailing list