rpms/gitolite/devel gitolite-1.4.2-conf.patch, NONE, 1.1 gitolite-1.4.2-rpm.patch, NONE, 1.1 gitolite-README-fedora, NONE, 1.1 .cvsignore, 1.3, 1.4 gitolite.spec, 1.4, 1.5 sources, 1.3, 1.4

Jon Ciesla limb at fedoraproject.org
Mon Apr 26 14:11:48 UTC 2010 

Author: limb

Update of /cvs/pkgs/rpms/gitolite/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20419

Modified Files:
	.cvsignore gitolite.spec sources 
Added Files:
	gitolite-1.4.2-conf.patch gitolite-1.4.2-rpm.patch 
	gitolite-README-fedora 
Log Message:
1.4.2, new readme.


gitolite-1.4.2-conf.patch:
 example.conf |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gitolite-1.4.2-conf.patch ---
--- 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
+ at others     =   janusz mariusz
 
 # REPO AND BRANCH PERMISSIONS
 # ---------------------------

gitolite-1.4.2-rpm.patch:
 hooks/common/update              |    2 +-
 hooks/gitolite-admin/post-update |    2 +-
 src/gitolite.pm                  |    2 +-
 src/gl-auth-command              |    4 ++--
 src/gl-compile-conf              |    6 +++---
 src/gl-install                   |   36 ++++++++++++++++--------------------
 src/gl-setup                     |    2 +-
 7 files changed, 25 insertions(+), 29 deletions(-)

--- NEW FILE gitolite-1.4.2-rpm.patch ---
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 <<EOF;
@@ -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;
@@ -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
@@ -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 :)
 


--- NEW FILE gitolite-README-fedora ---
Setting up
----------

Setting up gitolite after rpm-install can be done as
follows.

On the server:

1)  Copy your public key to some easily accessible location,
    say /tmp/yourname.pub
2)  run "su - gitolite" to get a login shell on the gitolite
    user
3)  run "gl-setup /tmp/yourname.pub"

On whatever machine your key came from (maybe your
workstation or another account on the same server):

4)  run "git clone gitolite@<name.or.ip>: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/<username>.pub,
add it, commit and push.

CONFIG FILE FORMAT: see comments in conf/example.conf in the
gitolite source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gitolite/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Mar 2010 12:48:43 -0000	1.3
+++ .cvsignore	26 Apr 2010 14:11:48 -0000	1.4
@@ -1 +1 @@
-sitaramc-gitolite-367e8f8.tar.gz
+sitaramc-gitolite-v1.4.2-0-g820d3f5.tar.gz


Index: gitolite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gitolite/devel/gitolite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gitolite.spec	26 Mar 2010 12:48:43 -0000	1.4
+++ gitolite.spec	26 Apr 2010 14:11:48 -0000	1.5
@@ -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/sitara
 # $ 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 <limb at jcomserv.net> - 1.4.2-1
+- Update to 1.4.2.
+- Replaced README and removed gl-easy-install per upstream.
+
 * Tue Mar 23 2010 Jon Ciesla <limb at jcomserv.net> - 1.3-1
 - Update to 1.3, BZ 576233.
 - Updated rpm and conf patches accordingly.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gitolite/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Mar 2010 12:48:43 -0000	1.3
+++ sources	26 Apr 2010 14:11:48 -0000	1.4
@@ -1 +1 @@
-a1ce89f161082447a0bdfbd90378d740  sitaramc-gitolite-367e8f8.tar.gz
+4b640d0410499e191a8ecebfafc82113  sitaramc-gitolite-v1.4.2-0-g820d3f5.tar.gz

More information about the scm-commits mailing list