From 05b687b109e714d371fe640d015e04121ea58a0a Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Apr 26 2010 14:24:52 +0000 Subject: 1.4.2, updated README. --- diff --git a/gitolite-1.4.2-conf.patch b/gitolite-1.4.2-conf.patch new file mode 100644 index 0000000..1bbff06 --- /dev/null +++ b/gitolite-1.4.2-conf.patch @@ -0,0 +1,10 @@ +--- sitaramc-gitolite-v1.4.2-0-g820d3f5/conf/example.conf~ 2010-04-21 21:27:25.000000000 -0500 ++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/conf/example.conf 2010-04-23 16:25:56.963675820 -0500 +@@ -59,6 +59,7 @@ + @interns = han + # "@interns" now has 3 names in it, but note that this does + # not change @staff ++@others = janusz mariusz + + # REPO AND BRANCH PERMISSIONS + # --------------------------- diff --git a/gitolite-1.4.2-rpm.patch b/gitolite-1.4.2-rpm.patch new file mode 100644 index 0000000..a4b91b6 --- /dev/null +++ b/gitolite-1.4.2-rpm.patch @@ -0,0 +1,187 @@ +diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/hooks/common/update sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/common/update +--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/hooks/common/update 2010-04-21 21:27:25.000000000 -0500 ++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/common/update 2010-04-23 16:20:24.419679341 -0500 +@@ -53,7 +53,7 @@ + + # we've started to need some common subs in what used to be a small, cute, + # little script that barely spanned a few lines :( +-require "$ENV{GL_BINDIR}/gitolite.pm"; ++require gitolite; + + # ---------------------------------------------------------------------------- + # start... +diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/hooks/gitolite-admin/post-update sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/gitolite-admin/post-update +--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/hooks/gitolite-admin/post-update 2010-04-21 21:27:25.000000000 -0500 ++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/gitolite-admin/post-update 2010-04-23 16:09:46.107694728 -0500 +@@ -15,7 +15,7 @@ + + od=$PWD + cd $GL_ADMINDIR +-$GL_BINDIR/gl-compile-conf ++gl-compile-conf + + cd $od + +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-04-21 21:27:25.000000000 -0500 ++++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm 2010-04-23 16:10:26.674695513 -0500 +@@ -280,7 +280,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'); + } + + # basic means wildcards will be shown as wildcards; this is pretty much what +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(); +@@ -178,7 +178,7 @@ + # auto-vivify new repo if you have C access (and wildrepos is on) + if ( $GL_WILDREPOS and $repos{$repo}{C}{$user} || $repos{$repo}{C}{'@all'} ) { + wrap_chdir("$repo_base_abs"); +- new_repo($repo, "$GL_ADMINDIR/hooks/common", $user); ++ new_repo($repo, "/usr/share/gitolite/hooks/common", $user); + wrap_chdir($ENV{HOME}); + } else { + # repo didn't exist, and you didn't have perms to create it. Delete +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(); +@@ -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. +@@ -397,7 +397,7 @@ + next if $repo eq '@all'; + 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("$repo_base_abs"); + } +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; +@@ -52,18 +48,18 @@ + wrap_mkdir($repo_base_abs); + wrap_mkdir($GL_ADMINDIR); + # 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"); + } + + # "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 <:gitolite-admin" to + start adding users and repos. + +Quick Notes for admin operations +-------------------------------- + +To administer gitolite, make changes to the config file +(conf/gitolite.conf) and/or the pubkeys (in subdirectory +'keydir') in any clone, then git add, git commit, and git +push. + +ADDING REPOS: Do NOT add repos manually on the server. Edit +the config file to give *some* user access to the repo. +When you push, an empty repo will be created on the server. + +ADDING USERS: copy their pubkey as keydir/.pub, +add it, commit and push. + +CONFIG FILE FORMAT: see comments in conf/example.conf in the +gitolite source. diff --git a/gitolite.spec b/gitolite.spec index f84e96c..eebf274 100644 --- a/gitolite.spec +++ b/gitolite.spec @@ -7,7 +7,7 @@ %endif Name: gitolite -Version: 1.3 +Version: 1.4.2 Release: 1%{?dist} Summary: Highly flexible server for git directory version tracker @@ -20,11 +20,11 @@ URL: http://github.com/sitaramc/gitolite # $ cd gitolite # $ git archive ed2bf5 |gzip >gitolite-ed2bf5.tar.gz #Source0: gitolite-ed2bf5.tar.gz -Source0: sitaramc-gitolite-367e8f8.tar.gz -Source1: README +Source0: sitaramc-gitolite-v1.4.2-0-g820d3f5.tar.gz +Source1: gitolite-README-fedora # Far from being upstreamable -Patch0: gitolite-1.3-rpm.patch -Patch1: gitolite-1.3-conf.patch +Patch0: gitolite-1.4.2-rpm.patch +Patch1: gitolite-1.4.2-conf.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -51,7 +51,7 @@ elsewhere in the doc/ directory. %prep -%setup -qn sitaramc-gitolite-367e8f8 +%setup -qn sitaramc-gitolite-v1.4.2-0-g820d3f5 # Don't create backups; would mess with %%install %patch0 -p1 %patch1 -p1 @@ -59,6 +59,8 @@ cp %{SOURCE1} . %build +#Drop gl-easy-install per upstream. +rm -f src/gl-easy-install # Format documentation for F in doc/*.mkd do @@ -108,10 +110,14 @@ exit 0 %attr(750,%{name},%{name}) %{gitolite_homedir} %attr(750,%{name},%{name}) %{gitolite_homedir}/.ssh %config(noreplace) %attr(640,%{name},%{name}) %{gitolite_homedir}/.ssh/authorized_keys -%doc doc/COPYING doc/*.html README +%doc doc/COPYING doc/*.html gitolite-README-fedora %changelog +* Fri Apr 23 2010 Jon Ciesla - 1.4.2-1 +- Update to 1.4.2. +- Replaced README and removed gl-easy-install per upstream. + * Tue Mar 23 2010 Jon Ciesla - 1.3-1 - Update to 1.3, BZ 576233. - Updated rpm and conf patches accordingly. diff --git a/sources b/sources index 9e49564..13c295d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1ce89f161082447a0bdfbd90378d740 sitaramc-gitolite-367e8f8.tar.gz +4b640d0410499e191a8ecebfafc82113 sitaramc-gitolite-v1.4.2-0-g820d3f5.tar.gz