public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e5e7bb0ecaf8500ac81382c89fa66ce34f077ded
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 17:12:52 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 17:12:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=e5e7bb0e

Merge branch 't/export_key_metadata-function'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     9a7d1d69748371205ab5fe398f38aa43b40cb9f7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:06:11 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:06:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=9a7d1d69

Merge branch 't/export_key_metadata-function'

Conflicts:
	src/gitolite.pm




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     afb3cda3ff94f547b67f3ec4b99c5318b1b6fdb7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:06:55 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:06:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=afb3cda3

Merge branch 't/ssh-key-options'

Conflicts:
	src/gitolite.pm




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     3a435b0a3c586c112ea8e1b29524c6a838721984
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:05:35 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:05:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=3a435b0a

Merge branch 't/find_pubkeys-function'

Conflicts:
	src/gitolite.pm


 src/gitolite.pm |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --cc src/gitolite.pm
index 3cb87ab,b10da00..bb60cf7
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1304,76 -1261,37 +1304,119 @@@ sub find_pubkeys 
      my @tmp = ();
  
      opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
 +    foreach my $entry (readdir($dir_fh)) {
 +        next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
 +        $entry = join("/", $dir, $entry);
 +
 +        if(-f $entry and $entry =~ /\.pub$/) {
 +            if(defined($name) && length($name) > 0) {
 +                my $cmp = $entry;
 +                $cmp =~ s(.*/)();
 +                $cmp =~ s/\.pub$//;
 +                if($cmp eq $name) {
 +                    push(@files, $entry);
 +                    next;
 +                }
 +            }
 +            else {
 +                push(@files, $entry);
 +                next;
 +            }
 +        }
 +        if(-d $entry) {
 +            @tmp = find_pubkeys($entry, $name);
 +            @files = (@files, @tmp);
 +            next;
 +        }
 +    }
 +
 +    closedir($dir_fh);
 +
 +    return sort(@files);
 +}
 +
 +sub export_key_metadata {
 +    my $user = shift;
 +
 +    my @tmp = find_pubkeys($GL_KEYDIR, $user);
 +    return if $#tmp ne 0; # one pubkey only!
 +
 +    my $pubkey = $tmp[0];
 +
 +    return if ! -f $pubkey;
 +
 +    open(PUBKEY, '<', $pubkey);
 +    while(defined(my $line = <PUBKEY>)) {
 +        chomp($line);
 +        next if $line !~ m/^\s*#/;
 +        $line =~ s/^\s*#\s*//;
 +
 +        my ($variable, $value) = split(/:\s*/, $line, 2);
 +
 +        if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
 +            if(length($value) > 0) {
 +                $variable =~ s/-/_/g;
 +                $ENV{$variable} = $value;
 +            }
 +        }
 +    }
 +    close(PUBKEY);
 +}
 +
 +sub get_repo_umask {
 +    my $repo = shift;
 +
 +    return $REPO_UMASK if ! $repo;
 +
 +    do $GL_CONF_COMPILED if ! %repos;
 +
 +    return $REPO_UMASK if ! $repos{$repo};
 +    return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
 +}
 +
++# ----------------------------------------------------------------------------
++#       Gentoo specific stuff
++# ----------------------------------------------------------------------------
++
++# Find pubkeys recursive
++sub find_pubkeys {
++    my $dir = shift;
++    my $name = shift;
++    my @files = ();
++    my @tmp = ();
++
++    opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
+     foreach my $entry (readdir($dir_fh)) {
+         next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
+         $entry = join("/", $dir, $entry);
+ 
+         if(-f $entry and $entry =~ /\.pub$/) {
+             if(defined($name) && length($name) > 0) {
+                 my $cmp = $entry;
+                 $cmp =~ s(.*/)();
+                 $cmp =~ s/\.pub$//;
+                 if($cmp eq $name) {
+                     push(@files, $entry);
+                     next;
+                 }
+             }
+             else {
+                 push(@files, $entry);
+                 next;
+             }
+         }
+         if(-d $entry) {
+             @tmp = find_pubkeys($entry, $name);
+             @files = (@files, @tmp);
+             next;
+         }
+     }
+ 
+     closedir($dir_fh);
+ 
+     return sort(@files);
+ }
+ 
  # ------------------------------------------------------------------------------
  # per perl rules, this should be the last line in such a file:
  1;



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ce84a02aed20e2eeffc0fe14e29eb8b255a957da
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:07:02 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:07:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=ce84a02a

Merge branch 't/export-key-metadata'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     354f538dd3b666baf01a75656a1607e889924f15
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:00:38 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:00:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=354f538d

Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   94 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3032 insertions(+), 2034 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     7861b90f39a6fc24e94c7384fd251b8fe63bda5c
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:00:37 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:00:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=7861b90f

Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     29e54a9785234a744eec3e82d841edcf239b7722
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:04:40 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:04:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=29e54a97

Merge branch 't/per_repo_umask'

Conflicts:
	src/gitolite.pm


 src/gitolite.pm |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --cc src/gitolite.pm
index 924194f,18a820e..3cb87ab
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1297,82 -1256,15 +1296,82 @@@ sub mirror_redirectOK 
  #       Gentoo specific stuff
  # ----------------------------------------------------------------------------
  
 +# Find pubkeys recursive
 +sub find_pubkeys {
 +    my $dir = shift;
 +    my $name = shift;
 +    my @files = ();
 +    my @tmp = ();
 +
 +    opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
 +    foreach my $entry (readdir($dir_fh)) {
 +        next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
 +        $entry = join("/", $dir, $entry);
 +
 +        if(-f $entry and $entry =~ /\.pub$/) {
 +            if(defined($name) && length($name) > 0) {
 +                my $cmp = $entry;
 +                $cmp =~ s(.*/)();
 +                $cmp =~ s/\.pub$//;
 +                if($cmp eq $name) {
 +                    push(@files, $entry);
 +                    next;
 +                }
 +            }
 +            else {
 +                push(@files, $entry);
 +                next;
 +            }
 +        }
 +        if(-d $entry) {
 +            @tmp = find_pubkeys($entry, $name);
 +            @files = (@files, @tmp);
 +            next;
 +        }
 +    }
 +
 +    closedir($dir_fh);
 +
 +    return sort(@files);
 +}
 +
 +sub export_key_metadata {
 +    my $user = shift;
 +
 +    my @tmp = find_pubkeys($GL_KEYDIR, $user);
 +    return if $#tmp ne 0; # one pubkey only!
 +
 +    my $pubkey = $tmp[0];
 +
 +    return if ! -f $pubkey;
 +
 +    open(PUBKEY, '<', $pubkey);
 +    while(defined(my $line = <PUBKEY>)) {
 +        chomp($line);
 +        next if $line !~ m/^\s*#/;
 +        $line =~ s/^\s*#\s*//;
 +
 +        my ($variable, $value) = split(/:\s*/, $line, 2);
 +
 +        if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
 +            if(length($value) > 0) {
 +                $variable =~ s/-/_/g;
 +                $ENV{$variable} = $value;
 +            }
 +        }
 +    }
 +    close(PUBKEY);
 +}
 +
  sub get_repo_umask {
- 	my $repo = shift;
+     my $repo = shift;
  
- 	return $REPO_UMASK if ! $repo;
+     return $REPO_UMASK if ! $repo;
  
- 	do $GL_CONF_COMPILED if ! %repos;
+     do $GL_CONF_COMPILED if ! %repos;
  
- 	return $REPO_UMASK if ! $repos{$repo};
- 	return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
+     return $REPO_UMASK if ! $repos{$repo};
+     return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
  }
  
  # ------------------------------------------------------------------------------



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     2d88e08ba1e414d55e6337effd9a728de7214b50
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:03:35 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:03:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=2d88e08b

Merge branch 't/misc'

Conflicts:
	src/gitolite.pm
	src/gl-compile-conf


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   95 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3033 insertions(+), 2034 deletions(-)

diff --cc src/gitolite.pm
index ffbd83c,e6b0948..924194f
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -28,8 -29,9 +29,12 @@@ use Exporter 'import'
      wrap_open
      wrap_print
  
+     mirror_mode
+     mirror_listslaves
+     mirror_redirectOK
++
 +	export_key_metadata
 +	get_repo_umask
  );
  @EXPORT_OK = qw(
      %repos
@@@ -1222,88 -1208,49 +1249,132 @@@ sub ext_cmd_svnserv
      die "svnserve exec failed\n";
  }
  
++
+ # ----------------------------------------------------------------------------
+ #       MIRRORING HELPERS
+ # ----------------------------------------------------------------------------
+ 
+ sub mirror_mode {
+     my $repo = shift;
+ 
+     # 'local' is the default if the config is empty or not set
+     my $gmm = `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.master` || 'local';
+     chomp $gmm;
+     return 'local' if $gmm eq 'local';
+     return 'master' if $gmm eq ( $GL_HOSTNAME || '' );
+     return "slave of $gmm";
+ }
+ 
+ sub mirror_listslaves {
+     my $repo = shift;
+ 
+     return ( `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.slaves` || '' );
+ }
+ 
+ # is a redirect ok for this repo from this slave?
+ sub mirror_redirectOK {
+     my $repo = shift;
+     my $slave = shift || return 0;
+         # if we don't know who's asking, the answer is "no"
+ 
+     my $gmrOK = `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.redirectOK` || '';
+     chomp $gmrOK;
+     my $slavelist = mirror_listslaves($repo);
+ 
+     # if gmrOK is 'true', any valid slave can redirect
+     return 1 if $gmrOK eq 'true' and $slavelist =~ /(^|\s)$slave(\s|$)/;
+     # otherwise, gmrOK is a list of slaves who can redirect
+     return 1 if $gmrOK =~ /(^|\s)$slave(\s|$)/;
+ 
+     return 0;
+ 
+     # LATER/NEVER: include a call to an external program to override a 'true',
+     # based on, say, the time of day or network load etc.  Cons: shelling out,
+     # deciding the name of the program (yet another rc var?)
+ }
+ 
 +# ----------------------------------------------------------------------------
 +#       Gentoo specific stuff
 +# ----------------------------------------------------------------------------
 +
 +# Find pubkeys recursive
 +sub find_pubkeys {
 +    my $dir = shift;
 +    my $name = shift;
 +    my @files = ();
 +    my @tmp = ();
 +
 +    opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
 +    foreach my $entry (readdir($dir_fh)) {
 +        next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
 +        $entry = join("/", $dir, $entry);
 +
 +        if(-f $entry and $entry =~ /\.pub$/) {
 +            if(defined($name) && length($name) > 0) {
 +                my $cmp = $entry;
 +                $cmp =~ s(.*/)();
 +                $cmp =~ s/\.pub$//;
 +                if($cmp eq $name) {
 +                    push(@files, $entry);
 +                    next;
 +                }
 +            }
 +            else {
 +                push(@files, $entry);
 +                next;
 +            }
 +        }
 +        if(-d $entry) {
 +            @tmp = find_pubkeys($entry, $name);
 +            @files = (@files, @tmp);
 +            next;
 +        }
 +    }
 +
 +    closedir($dir_fh);
 +
 +    return sort(@files);
 +}
 +
 +sub export_key_metadata {
 +    my $user = shift;
 +
 +    my @tmp = find_pubkeys($GL_KEYDIR, $user);
 +    return if $#tmp ne 0; # one pubkey only!
 +
 +    my $pubkey = $tmp[0];
 +
 +    return if ! -f $pubkey;
 +
 +    open(PUBKEY, '<', $pubkey);
 +    while(defined(my $line = <PUBKEY>)) {
 +        chomp($line);
 +        next if $line !~ m/^\s*#/;
 +        $line =~ s/^\s*#\s*//;
 +
 +        my ($variable, $value) = split(/:\s*/, $line, 2);
 +
 +        if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
 +            if(length($value) > 0) {
 +                $variable =~ s/-/_/g;
 +                $ENV{$variable} = $value;
 +            }
 +        }
 +    }
 +    close(PUBKEY);
 +}
 +
 +sub get_repo_umask {
 +	my $repo = shift;
 +
 +	return $REPO_UMASK if ! $repo;
 +
 +	do $GL_CONF_COMPILED if ! %repos;
 +
 +	return $REPO_UMASK if ! $repos{$repo};
 +	return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
 +}
 +
  # ------------------------------------------------------------------------------
  # per perl rules, this should be the last line in such a file:
  1;
diff --cc src/gitolite_rc.pm
index bc57008,01bcba2..6142478
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -23,10 -23,9 +23,11 @@@ use Exporter 'import'
      $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
      $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
      $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO $AUTH_OPTIONS
+     $GL_HOSTNAME
  
      $GL_HTTP_ANON_USER
 +
 +	@GL_METADATA @GL_METADATA_REQUIRED
  );
  
  # ------------------------------------------------------------------------------
diff --cc src/gl-compile-conf
index 2c4ac82,18d85c6..395593b
--- a/src/gl-compile-conf
+++ b/src/gl-compile-conf
@@@ -244,32 -250,26 +250,33 @@@ sub parse_conf_lin
          die "$ABRT git config $key not allowed\ncheck GL_GITCONFIG_KEYS in the rc file for how to allow it\n" if (@matched < 1);
          for my $repo (@{ $repos_p })       # each repo in the current stanza
          {
-             $git_configs{$repo}{$key} = $value;
-             # no problem if it's a plain repo (non-pattern, non-groupname)
-             # OR wild configs are allowed
-             unless ( ($repo =~ $REPONAME_PATT and $repo !~ /^@/) or $GL_GITCONFIG_WILD) {
-                 my @r = ($repo);                                        # single wildpatt
-                 @r = sort keys %{ $groups{$repo} } if $groups{$repo};   # or a group; get its members
-                 do {
-                     warn "$WARN git config set for $_ but \$GL_GITCONFIG_WILD not set\n" unless $_ =~ $REPONAME_PATT
-                 } for @r;
-             }
+             $git_configs{$repo}{$config_seq++}{$key} = $value;
+ 
+             # force entry in %repos.  Without this, a repo para with just a
+             # config line and no ACLs gets ignored in the output
+             $repos{$repo}{HAS_CONFIG} = 1;
          }
      }
 +	# per repository umask
 +	elsif ($line =~ /^umask = (\d{1,4})$/) {
 +		my $umask = $1;
 +		for my $repo (@{ $repos_p }) { # each repo in the current stanza
 +			$repos{$repo}{"umask"} = oct($umask);
 +		}
 +	}
-     # include
-     elsif ($line =~ /^include "(.+)"/)
+     # include and subconf.  subconf is just a special case of "include",
+     # saying that the config parse should "switch" contexts
+     elsif ($line =~ /^(include|subconf) "(.+)"/)
      {
-         my $include_glob = $1;
-         for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) {
-             die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master';
-             die "$ABRT included file not found: '$file'\n" unless -f $file;
+         my $include_glob = $2;
+         my $subconf = ( $1 eq 'subconf' );
+         die "$ABRT subconf $fragment attempting to run 'subconf'\n" if $subconf and $fragment ne 'master';
+ 
+         # substitute HOSTNAME word if GL_HOSTNAME defined, otherwise leave as is
+         $include_glob =~ s/\bHOSTNAME\b/$GL_HOSTNAME/ if $GL_HOSTNAME;
+ 
+         for my $file (glob($include_glob =~ m(^/) ? $include_glob : "$GL_ADMINDIR/conf/$include_glob")) {
+             warn("$WARN included file not found: '$file'\n"), next unless -f $file;
  
              my $file_id = device_inode($file);
              warn("$WARN $file already included\n"), next if ($included{$file_id}++);



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     b725ef9135b9c8786d9be28389eb89a980669283
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:00:02 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:00:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b725ef91

Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata

Conflicts:
	src/gitolite.pm


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   94 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3032 insertions(+), 2034 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c4233296ae04b2733df351688e357bef07070b1a
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:46:11 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:46:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=c4233296

Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function

Conflicts:
	src/gitolite.pm


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   96 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3034 insertions(+), 2034 deletions(-)

diff --cc src/gitolite.pm
index b02a18f,85ee660..b10da00
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1178,48 -1207,48 +1207,91 @@@ sub ext_cmd_svnserv
  }
  
  # ----------------------------------------------------------------------------
+ #       MIRRORING HELPERS
+ # ----------------------------------------------------------------------------
+ 
+ sub mirror_mode {
+     my $repo = shift;
+ 
+     # 'local' is the default if the config is empty or not set
+     my $gmm = `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.master` || 'local';
+     chomp $gmm;
+     return 'local' if $gmm eq 'local';
+     return 'master' if $gmm eq ( $GL_HOSTNAME || '' );
+     return "slave of $gmm";
+ }
+ 
+ sub mirror_listslaves {
+     my $repo = shift;
+ 
+     return ( `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.slaves` || '' );
+ }
+ 
+ # is a redirect ok for this repo from this slave?
+ sub mirror_redirectOK {
+     my $repo = shift;
+     my $slave = shift || return 0;
+         # if we don't know who's asking, the answer is "no"
+ 
+     my $gmrOK = `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.redirectOK` || '';
+     chomp $gmrOK;
+     my $slavelist = mirror_listslaves($repo);
+ 
+     # if gmrOK is 'true', any valid slave can redirect
+     return 1 if $gmrOK eq 'true' and $slavelist =~ /(^|\s)$slave(\s|$)/;
+     # otherwise, gmrOK is a list of slaves who can redirect
+     return 1 if $gmrOK =~ /(^|\s)$slave(\s|$)/;
+ 
+     return 0;
+ 
+     # LATER/NEVER: include a call to an external program to override a 'true',
+     # based on, say, the time of day or network load etc.  Cons: shelling out,
+     # deciding the name of the program (yet another rc var?)
+ }
+ 
++# ----------------------------------------------------------------------------
 +#       Gentoo specific stuff
 +# ----------------------------------------------------------------------------
 +
 +# Find pubkeys recursive
 +sub find_pubkeys {
 +    my $dir = shift;
 +    my $name = shift;
 +    my @files = ();
 +    my @tmp = ();
 +
 +    opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
 +    foreach my $entry (readdir($dir_fh)) {
 +        next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
 +        $entry = join("/", $dir, $entry);
 +
 +        if(-f $entry and $entry =~ /\.pub$/) {
 +            if(defined($name) && length($name) > 0) {
 +                my $cmp = $entry;
 +                $cmp =~ s(.*/)();
 +                $cmp =~ s/\.pub$//;
 +                if($cmp eq $name) {
 +                    push(@files, $entry);
 +                    next;
 +                }
 +            }
 +            else {
 +                push(@files, $entry);
 +                next;
 +            }
 +        }
 +        if(-d $entry) {
 +            @tmp = find_pubkeys($entry, $name);
 +            @files = (@files, @tmp);
 +            next;
 +        }
 +    }
 +
 +    closedir($dir_fh);
 +
 +    return sort(@files);
 +}
 +
  # ------------------------------------------------------------------------------
  # per perl rules, this should be the last line in such a file:
  1;



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     f4f07f3b26e48d3eeabc70d614296618306c2dbf
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:46:54 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:46:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=f4f07f3b

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   96 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3034 insertions(+), 2034 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     f9cd925c851648eff30e4b0b3ed460780e2cfcc4
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:47:59 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:47:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=f9cd925c

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   96 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3034 insertions(+), 2034 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     9835108340f2edc9d3b1393c712e1228a371f07e
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:47:31 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:47:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=98351083

Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function

Conflicts:
	src/gitolite.pm


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   96 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3034 insertions(+), 2034 deletions(-)

diff --cc src/gitolite.pm
index 3764ba0,b10da00..cadc964
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -28,7 -29,9 +29,11 @@@ use Exporter 'import'
      wrap_open
      wrap_print
  
+     mirror_mode
+     mirror_listslaves
+     mirror_redirectOK
++
 +	export_key_metadata
  );
  @EXPORT_OK = qw(
      %repos
diff --cc src/gitolite_rc.pm
index 2a31abc,01bcba2..6e673f5
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -23,10 -23,9 +23,11 @@@ use Exporter 'import'
      $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
      $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
      $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO $AUTH_OPTIONS
+     $GL_HOSTNAME
  
      $GL_HTTP_ANON_USER
 +
 +	@GL_METADATA
  );
  
  # ------------------------------------------------------------------------------



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     3cebef1b32770f128f6795c580cabbc9b1ceecc1
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:58:21 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:58:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=3cebef1b

Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options

Conflicts:
	src/gitolite.pm


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   96 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3034 insertions(+), 2034 deletions(-)

diff --cc src/gitolite.pm
index 9a7b7ee,b10da00..f595adf
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -963,35 -984,27 +990,37 @@@ sub setup_authkey
          # lint check 2 -- don't print right now; just collect the messages
          push @not_in_config, "$user($pubkey)" if %$user_list_p and not $user_list_p->{$user};
          $user_list_p->{$user} = 'has pubkey'  if %$user_list_p;
 -        # apparently some pubkeys don't end in a newline...
 -        my $pubkey_content;
 -        {
 -            local $/ = undef;
 -            local @ARGV = ($pubkey);
 -            $pubkey_content = <>;
 -        }
 -        $pubkey_content =~ s/\s*$/\n/;
 -        # don't trust files with multiple lines (i.e., something after a newline)
 -        if ($pubkey_content =~ /\n./)
 -        {
 -            warn "WARNING: a pubkey file can only have one line (key); ignoring $pubkey\n" .
 -                 "         Perhaps you're using a key in a different format (like putty/plink)?\n" .
 -                 "         If so, please convert it to openssh format using 'ssh-keygen -i'.\n" .
 -                 "         If you want to add multiple public keys for a single user, use\n" .
 -                 "         \"user\@host.pub\" file names.  See the \"one user, many keys\"\n" .
 -                 "         section in doc/3-faq-tips-etc.mkd for details.\n";
 -            next;
 +
 +        # Parse the pubkey including all options etc...
 +        # Use strict mode to abort on faulty files.
 +        my $akf = Net::SSH::AuthorizedKeysFile->new( strict => 1, );
 +        $akf->read($pubkey);
 +
 +        foreach my $keyobj ($akf->keys()) {
 +            # lint check 3 -- ignore faulty keys
 +            if(!defined($keyobj)) {
 +                print STDERR "Malformed key '$pubkey', skipping...\n";
 +                next;
 +            }
 +
 +            # Preserve only options specified in AUTH_OPTIONS_PRESERVE.
 +            foreach my $option (keys(%{$keyobj->options})) {
 +                if(!grep(/^\Q${option}\E$/, @AUTH_OPTIONS_PRESERVE)) {
 +                    delete($keyobj->options->{$option});
 +                }
 +            }
 +
 +            # Add our options as well.
 +            foreach my $option (keys(%AUTH_OPTIONS)) {
 +                $keyobj->option($option, $AUTH_OPTIONS{$option});
 +            }
 +
 +            $keyobj->option("command",  "$AUTH_COMMAND $user");
 +
 +            print $newkeys_fh $keyobj->as_string()."\n";
          }
+         print $newkeys_fh "command=\"$AUTH_COMMAND $user\",$AUTH_OPTIONS ";
+         print $newkeys_fh $pubkey_content;
      }
  
      # lint check 2 -- print less noisily



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     52d84e8e8fad0429ec2ec7e291a77c8d25b08dff
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:39:55 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:39:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=52d84e8e

Merge commit 'refs/top-bases/t/misc' into t/misc


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   96 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3034 insertions(+), 2034 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     fc89029c2e321917cd2f7f3003eaf180d05c6991
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:39:55 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:39:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=fc89029c

Merge branch 'upstream' into refs/top-bases/t/misc


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   96 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3034 insertions(+), 2034 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     534eb4c264fb76139ff5fd7454be28461fda77fe
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 18:44:38 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 18:44:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=534eb4c2

Merge commit 'refs/top-bases/t/per_repo_umask' into t/per_repo_umask

Conflicts:
	src/gitolite.pm
	src/gl-compile-conf


 README.mkd                              |   99 +++--
 conf/example.gitolite.rc                |    2 +-
 contrib/adc/README.mkd                  |    2 +-
 contrib/adc/gl-reflog                   |    2 +-
 contrib/adc/help                        |   19 +
 contrib/adc/hub.mkd                     |    2 +-
 contrib/adc/repo-deletion.mkd           |    9 +-
 contrib/adc/set-head                    |   17 -
 contrib/adc/symbolic-ref                |   33 ++
 contrib/gitweb/gitweb.conf              |    2 -
 contrib/mirrorconf-helper.sh            |  182 +++++++
 contrib/mirroring-complex-example.mkd   |  344 ++++++++++++
 contrib/real-users/gl-shell             |   70 +++
 contrib/real-users/gl-shell-setup       |  105 ++++
 contrib/real-users/password-access.mkd  |  135 +++++
 doc/1-INSTALL.mkd                       |  147 +++---
 doc/2-admin.mkd                         |  225 ++++++---
 doc/3-faq-tips-etc.mkd                  |   69 ++-
 doc/CHANGELOG                           |   29 +
 doc/admin-defined-commands.mkd          |   88 ++--
 doc/big-config.mkd                      |   11 +-
 doc/delegation.mkd                      |  172 ++++---
 doc/developer-notes.mkd                 |   46 +--
 doc/gitolite-and-ssh.mkd                |    4 +-
 doc/gitolite.conf.mkd                   |   99 +++-
 doc/gitolite.rc.mkd                     |   10 +-
 doc/hook-propagation.mkd                |   36 +-
 doc/install-transcript.mkd              |  279 ----------
 doc/mirroring.mkd                       |  898 +++++++++++++++++++++++--------
 doc/packaging.mkd                       |    3 -
 doc/progit-article.mkd                  |   31 +-
 doc/report-output.mkd                   |    4 -
 doc/shell-games.mkd                     |    8 +-
 doc/ssh-troubleshooting.mkd             |  101 ++---
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |  109 +++-
 src/gitolite_rc.pm                      |   12 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |  119 +++--
 src/gl-conf-convert                     |  163 ++++---
 src/gl-dryrun                           |  118 ++++
 src/gl-easy-install                     |  655 ----------------------
 src/gl-install                          |    2 +-
 src/gl-mirror-push                      |   83 +++
 src/gl-mirror-shell                     |  182 ++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-setup-authkeys                   |   24 +-
 src/gl-system-install                   |    3 +-
 src/gl-tool                             |  135 +++--
 src/sshkeys-lint                        |   18 +-
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t05b-delegation-wild                  |    2 +-
 t/t53-check-info-expand-output          |    6 +-
 t/t55-repo-configs-wild-without-CREATOR |   42 ++-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 t/t68-include                           |   12 +-
 65 files changed, 3040 insertions(+), 2041 deletions(-)

diff --cc src/gitolite.pm
index 8cbac40,85ee660..9e24ed7
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -27,8 -28,10 +28,10 @@@ use Exporter 'import'
      wrap_chdir
      wrap_open
      wrap_print
--
- 	get_repo_umask
++    get_repo_umask
+     mirror_mode
+     mirror_listslaves
+     mirror_redirectOK
  );
  @EXPORT_OK = qw(
      %repos
@@@ -1180,20 -1207,48 +1207,64 @@@ sub ext_cmd_svnserv
  }
  
  # ----------------------------------------------------------------------------
+ #       MIRRORING HELPERS
+ # ----------------------------------------------------------------------------
+ 
+ sub mirror_mode {
+     my $repo = shift;
+ 
+     # 'local' is the default if the config is empty or not set
+     my $gmm = `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.master` || 'local';
+     chomp $gmm;
+     return 'local' if $gmm eq 'local';
+     return 'master' if $gmm eq ( $GL_HOSTNAME || '' );
+     return "slave of $gmm";
+ }
+ 
+ sub mirror_listslaves {
+     my $repo = shift;
+ 
+     return ( `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.slaves` || '' );
+ }
+ 
+ # is a redirect ok for this repo from this slave?
+ sub mirror_redirectOK {
+     my $repo = shift;
+     my $slave = shift || return 0;
+         # if we don't know who's asking, the answer is "no"
+ 
+     my $gmrOK = `git config --file $REPO_BASE/$repo.git/config --get gitolite.mirror.redirectOK` || '';
+     chomp $gmrOK;
+     my $slavelist = mirror_listslaves($repo);
+ 
+     # if gmrOK is 'true', any valid slave can redirect
+     return 1 if $gmrOK eq 'true' and $slavelist =~ /(^|\s)$slave(\s|$)/;
+     # otherwise, gmrOK is a list of slaves who can redirect
+     return 1 if $gmrOK =~ /(^|\s)$slave(\s|$)/;
+ 
+     return 0;
+ 
+     # LATER/NEVER: include a call to an external program to override a 'true',
+     # based on, say, the time of day or network load etc.  Cons: shelling out,
+     # deciding the name of the program (yet another rc var?)
+ }
+ 
++
++# ----------------------------------------------------------------------------
 +#       Gentoo specific stuff
 +# ----------------------------------------------------------------------------
 +
 +sub get_repo_umask {
- 	my $repo = shift;
++    my $repo = shift;
 +
- 	return $REPO_UMASK if ! $repo;
++    return $REPO_UMASK if ! $repo;
 +
- 	do $GL_CONF_COMPILED if ! %repos;
++    do $GL_CONF_COMPILED if ! %repos;
 +
- 	return $REPO_UMASK if ! $repos{$repo};
- 	return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
++    return $REPO_UMASK if ! $repos{$repo};
++    return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
 +}
 +
  # ------------------------------------------------------------------------------
  # per perl rules, this should be the last line in such a file:
  1;
diff --cc src/gl-compile-conf
index 2c4ac82,18d85c6..395593b
--- a/src/gl-compile-conf
+++ b/src/gl-compile-conf
@@@ -244,32 -250,26 +250,33 @@@ sub parse_conf_lin
          die "$ABRT git config $key not allowed\ncheck GL_GITCONFIG_KEYS in the rc file for how to allow it\n" if (@matched < 1);
          for my $repo (@{ $repos_p })       # each repo in the current stanza
          {
-             $git_configs{$repo}{$key} = $value;
-             # no problem if it's a plain repo (non-pattern, non-groupname)
-             # OR wild configs are allowed
-             unless ( ($repo =~ $REPONAME_PATT and $repo !~ /^@/) or $GL_GITCONFIG_WILD) {
-                 my @r = ($repo);                                        # single wildpatt
-                 @r = sort keys %{ $groups{$repo} } if $groups{$repo};   # or a group; get its members
-                 do {
-                     warn "$WARN git config set for $_ but \$GL_GITCONFIG_WILD not set\n" unless $_ =~ $REPONAME_PATT
-                 } for @r;
-             }
+             $git_configs{$repo}{$config_seq++}{$key} = $value;
+ 
+             # force entry in %repos.  Without this, a repo para with just a
+             # config line and no ACLs gets ignored in the output
+             $repos{$repo}{HAS_CONFIG} = 1;
          }
      }
 +	# per repository umask
 +	elsif ($line =~ /^umask = (\d{1,4})$/) {
 +		my $umask = $1;
 +		for my $repo (@{ $repos_p }) { # each repo in the current stanza
 +			$repos{$repo}{"umask"} = oct($umask);
 +		}
 +	}
-     # include
-     elsif ($line =~ /^include "(.+)"/)
+     # include and subconf.  subconf is just a special case of "include",
+     # saying that the config parse should "switch" contexts
+     elsif ($line =~ /^(include|subconf) "(.+)"/)
      {
-         my $include_glob = $1;
-         for my $file (glob($include_glob =~ m(^/) ? $include_glob : "conf/$include_glob")) {
-             die "$ABRT $fragment attempting to include configuration\n" if $fragment ne 'master';
-             die "$ABRT included file not found: '$file'\n" unless -f $file;
+         my $include_glob = $2;
+         my $subconf = ( $1 eq 'subconf' );
+         die "$ABRT subconf $fragment attempting to run 'subconf'\n" if $subconf and $fragment ne 'master';
+ 
+         # substitute HOSTNAME word if GL_HOSTNAME defined, otherwise leave as is
+         $include_glob =~ s/\bHOSTNAME\b/$GL_HOSTNAME/ if $GL_HOSTNAME;
+ 
+         for my $file (glob($include_glob =~ m(^/) ? $include_glob : "$GL_ADMINDIR/conf/$include_glob")) {
+             warn("$WARN included file not found: '$file'\n"), next unless -f $file;
  
              my $file_id = device_inode($file);
              warn("$WARN $file already included\n"), next if ($included{$file_id}++);



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     2eee4d627ad1d290ed63a70ca09514e9f8cca4b8
Author:     Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Mon Aug 29 08:25:21 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 08:27:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=2eee4d62

Merge 'mirroring-revamp' into pu


 conf/example.gitolite.rc                |    2 +-
 doc/gitolite.conf.mkd                   |   56 ++-
 doc/gitolite.rc.mkd                     |    6 -
 doc/mirroring.mkd                       |  760 ++++++++++++++++++++++---------
 hooks/common/post-receive.mirrorpush    |   30 +-
 src/gitolite.pm                         |   75 +++-
 src/gitolite_rc.pm                      |   10 +-
 src/gl-auth-command                     |   20 +-
 src/gl-compile-conf                     |   15 +-
 src/gl-mirror-push                      |   83 ++++
 src/gl-mirror-shell                     |  182 +++++++-
 src/gl-mirror-sync                      |   38 --
 src/gl-tool                             |  135 ++++---
 t/out/t01-repo-groups.1                 |    2 +-
 t/out/t01-repo-groups.1b                |    2 +-
 t/out/t01-repo-groups.1bs               |    2 +-
 t/out/t01-repo-groups.2                 |    2 +-
 t/out/t02-user-groups.1                 |    2 +-
 t/out/t02-user-groups.1b                |    2 +-
 t/out/t02-user-groups.1bs               |    2 +-
 t/out/t02-user-groups.2                 |    2 +-
 t/out/t02-user-groups.2bs               |    2 +-
 t/t55-repo-configs-wild-without-CREATOR |    5 +-
 t/t56-repo-configs-wild-with-CREATOR    |    5 +-
 24 files changed, 1026 insertions(+), 414 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6a3cd5d6b1a2ae9d73e2675563a50b80110cfe46
Author:     Sitaram Chamarty <sitaramc <AT> gmail <DOT> com>
AuthorDate: Fri Sep  2 12:09:06 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 12:09:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=6a3cd5d6

Merge pull request #32 from ebfe/bump_requirements

git >= 1.6.6 is required since 49f5361


 doc/1-INSTALL.mkd   |    4 ++--
 src/gl-compile-conf |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-10-17 19:29 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-10-17 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d76c83f948ca2a990bc08d02ae091ef0b4f63528
Author:     Sitaram Chamarty <sitaramc <AT> gmail <DOT> com>
AuthorDate: Thu Aug 25 11:07:49 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 11:07:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d76c83f9

Merge pull request #30 from christilden/pu

Fixes documentation typos


 doc/gitolite-and-ssh.mkd |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     951223cb4b8283d60de09b92ce90fa3a4c3383fc
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:45:22 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:45:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=951223cb

Merge branch 't/ssh-key-options'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     3eb17020653ccd21d62d04d6741c4fc2497b7602
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:45:27 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:45:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=3eb17020

Merge branch 't/export_key_metadata-function'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     35198c9ee1b2aa4577d3a22efca01286537e2e37
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:45:30 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:45:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=35198c9e

Merge branch 't/export-key-metadata'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     031bea7aa8a91bd1f26e45eea8738a7094506f10
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:45:19 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:45:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=031bea7a

Merge branch 't/find_pubkeys-function'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ec676a740d08b3c8a5241715ba46e8b7f5c2790d
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:41:52 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:41:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=ec676a74

Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   30 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2191 insertions(+), 934 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d98718c145822b8462842f9f1e112bfa91e4d464
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:45:13 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:45:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d98718c1

Merge branch 't/per_repo_umask'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     c0f52e37920ad2636c9f1cb3e1883f8d99ba912f
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:41:52 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:41:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=c0f52e37

Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     1c0210ce4a65f4217992059b83a5ad781eeb9b55
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:44:52 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:44:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1c0210ce

Merge branch 't/misc'

Conflicts:
	src/gitolite.pm


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   30 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2191 insertions(+), 934 deletions(-)

diff --cc src/gitolite_rc.pm
index a1ca9bc,45b99a2..bc57008
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -22,11 -22,9 +22,11 @@@ use Exporter 'import'
      $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
      $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
      $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
-     $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+     $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO $AUTH_OPTIONS
  
      $GL_HTTP_ANON_USER
 +
 +	@GL_METADATA @GL_METADATA_REQUIRED
  );
  
  # ------------------------------------------------------------------------------



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4ee6c610053a63cfb9b13f4a445b43b7f0e2d3dc
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:41:07 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:41:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=4ee6c610

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   33 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2193 insertions(+), 935 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f39bc49af8abd610f52e67743d81e640f7c67eec
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:39:27 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:39:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=f39bc49a

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   33 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2193 insertions(+), 935 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d00afd091cf6314e343eca474fad5e9cdd1c2a06
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:40:28 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:40:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d00afd09

Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options

Conflicts:
	src/gitolite.pm


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   30 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2191 insertions(+), 934 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     44360bb20a57de376c9085828625263a351bad36
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:41:48 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:41:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=44360bb2

Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata

Conflicts:
	src/gitolite.pm


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   30 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2191 insertions(+), 934 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     1212de5bdc5647b8647d88533722dfbeeabf6928
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:41:07 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:41:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1212de5b

Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   33 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2193 insertions(+), 935 deletions(-)

diff --cc src/gitolite_rc.pm
index fc88273,45b99a2..2a31abc
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -22,11 -22,9 +22,11 @@@ use Exporter 'import'
      $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
      $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
      $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
-     $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+     $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO $AUTH_OPTIONS
  
      $GL_HTTP_ANON_USER
 +
 +	@GL_METADATA
  );
  
  # ------------------------------------------------------------------------------



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     00efb4291b3413a1fb2132218a3167f588c01b44
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:38:49 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:38:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=00efb429

Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   33 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2193 insertions(+), 935 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e506317ceb01dc564744f565be26419fac8d94f2
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:37:13 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:37:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=e506317c

Merge commit 'refs/top-bases/t/misc' into t/misc


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   33 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2193 insertions(+), 935 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     146d96f98aa7724466a5b1348b4b59e79fd62ce7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:38:26 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:38:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=146d96f9

Merge commit 'refs/top-bases/t/per_repo_umask' into t/per_repo_umask


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   33 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2193 insertions(+), 935 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-08-30 15:46 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-08-30 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     01653e92d24e99f0e0dd36ab61b918fe98fb5203
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 15:37:13 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:37:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=01653e92

Merge branch 'upstream' into refs/top-bases/t/misc


 README.mkd                                         |   62 +--
 contrib/adc/README.mkd                             |   63 ++
 contrib/adc/adc.common-functions                   |    6 +-
 contrib/adc/delete-branch                          |   84 +++
 contrib/adc/help                                   |    2 +-
 .../{repo-deletion.README => repo-deletion.mkd}    |    9 +-
 contrib/adc/sskm                                   |  275 ++++++++
 contrib/adc/sskm.mkd                               |  288 ++++++++
 contrib/adc/su-getperms                            |   33 +
 contrib/adc/su-setperms                            |    1 +
 doc/1-INSTALL.mkd                                  |  552 +++++++++-------
 doc/2-admin.mkd                                    |   11 +-
 doc/3-faq-tips-etc.mkd                             |   41 +-
 doc/CHANGELOG                                      |   19 +
 doc/admin-defined-commands.mkd                     |    7 +-
 doc/authentication-vs-authorisation.mkd            |  104 +++
 doc/developer-notes.mkd                            |    2 +-
 doc/gitolite-and-ssh.mkd                           |   11 +-
 doc/gitolite-gitweb-http-backend.mkd               |  303 ++++++++
 doc/gitolite-without-ssh.mkd                       |   75 --
 doc/gitolite.conf.mkd                              |    4 +
 doc/gitolite.rc.mkd                                |   20 +-
 doc/hook-propagation.mkd                           |    4 +-
 doc/http-backend.mkd                               |    8 +-
 doc/migrate.mkd                                    |   86 ++-
 doc/mirroring.mkd                                  |    2 +-
 doc/mob-branches.mkd                               |    8 +-
 doc/monkeysphere.mkd                               |    2 +-
 doc/report-output.mkd                              |    6 +-
 doc/ssh-troubleshooting.mkd                        |  725 ++++++++++---------
 doc/who-uses-it.mkd                                |    2 +-
 doc/wildcard-repositories.mkd                      |    5 +-
 hooks/common/update                                |    4 +-
 hooks/gitolite-admin/post-update                   |    4 +-
 src/gitolite.pm                                    |   33 +-
 src/gitolite_rc.pm                                 |    2 +-
 src/gl-admin-push                                  |   50 ++
 src/gl-compile-conf                                |    3 +-
 src/gl-dont-panic                                  |  113 ---
 src/gl-easy-install                                |    2 +
 src/gl-install                                     |    4 +-
 src/gl-setup                                       |    2 +
 src/gl-system-install                              |   35 +-
 src/sshkeys-lint                                   |    6 +-
 t/README.mkd                                       |   16 +-
 t/install-gitolite                                 |   23 +-
 t/keys/config                                      |    5 +-
 t/rollback.server                                  |    2 +-
 t/t67-hub                                          |    4 +-
 49 files changed, 2193 insertions(+), 935 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-16  0:45 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-16  0:45 UTC (permalink / raw
  To: gentoo-commits

commit:     46089c853b3c7063454c2f16d349d4f7bcf611d7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 00:45:17 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 00:45:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=46089c85

Merge branch 't/export-key-metadata'


 src/gl-auth-command |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     8aaede3d93f8d144807d96397cb6736e772aee83
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:15:58 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:15:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=8aaede3d

Merge branch 't/misc'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9be0ba6aaff0ae8f0446806273e8e61e9affb201
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:15:53 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:15:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=9be0ba6a

Merge branch 't/per_repo_umask'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     8b70af1f50a4e9b1625863356e007d7988486ab1
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:14:54 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:14:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=8b70af1f

Merge branch 't/find_pubkeys-function'

Conflicts:
	src/gitolite.pm


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  101 ++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1144 insertions(+), 282 deletions(-)

diff --cc conf/example.gitolite.rc
index 6b73f34,29272dc..eab1a5d
--- a/conf/example.gitolite.rc
+++ b/conf/example.gitolite.rc
@@@ -35,15 -35,8 +35,16 @@@ $REPO_UMASK = 0077
  $GL_BIG_CONFIG = 0;
  $GL_NO_DAEMON_NO_GITWEB = 0;
  # $GL_NICE_VALUE = 0;
+ # $BIG_INFO_CAP = 20;
  
 +# Define which metadata variables shall be exported to the gitolite environment.
 +# Those variables can be used in hooks, e.g. for cia.vc
 +# A pubkey file might contain one or more of those variable.
 +# They can be defined by e.g:"# git-username: idl0r"
 +# Each '-' (dash) will be replaced by an '_' (underscore).
 +#@GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
 +#@GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
 +
  # ------------------------------------------------------------------------------
  # VARIABLES WITH A SECURITY IMPACT.  READ DOCS BEFORE CHANGING THESE!
  # http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd#_variables_with_a_security_impact
diff --cc src/gitolite.pm
index c6130b7,8fa7c51..1bd4a37
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -908,15 -923,15 +934,15 @@@ sub setup_authkey
      # add our "start" line, each key on its own line (prefixed by command and
      # options, in the standard ssh authorized_keys format), then the "end" line.
      print $newkeys_fh "# gitolite start\n";
 -    wrap_chdir($GL_KEYDIR);
 +    my @pubkeys = find_pubkeys($GL_KEYDIR);
      my @not_in_config;  # pubkeys exist but users don't appear in the config file
 -    for my $pubkey (`find . -type f | sort`)
 -    {
 -        chomp($pubkey); $pubkey =~ s(^\./)();
 +    foreach my $pubkey (@pubkeys) {
 +        my $pubkey_name = $pubkey;
 +        $pubkey_name =~ s(.*/)(); # foo/bar/baz.pub -> baz.pub
  
          # security check (thanks to divVerent for catching this)
 -        unless ($pubkey =~ $REPONAME_PATT) {
 +        unless ($pubkey_name =~ $REPONAME_PATT) {
-             print STDERR "$pubkey contains some unsavoury characters; ignored...\n";
+             warn "$pubkey contains some unsavoury characters; ignored...\n";
              next;
          }
  
diff --cc src/gl-compile-conf
index 8408424,9799841..dcbb062
--- a/src/gl-compile-conf
+++ b/src/gl-compile-conf
@@@ -424,9 -426,9 +433,9 @@@ sub do_normal_repo
          unless ($GL_NO_CREATE_REPOS) {
              unless (-d "$repo.git") {
                  print STDERR "creating $repo...\n";
 -                new_repo($repo, "$GL_ADMINDIR/hooks/common");
 +                new_repo($repo, "$GL_ADMINDIR/hooks/common", undef, $repos{$repo}{"umask"});
                  # new_repo would have chdir'd us away; come back
-                 wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
+                 wrap_chdir($REPO_BASE);
              }
  
              # when repos are copied over from elsewhere, one had to run easy install



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4db4ad9839de43a4d70d0c78919f9208ed7df922
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:15:40 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:15:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=4db4ad98

Merge branch 't/ssh-key-options'

Conflicts:
	src/gitolite.pm




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     a659f40282dfa817790b8d2fdb434f69500bd4a8
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:15:07 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:15:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=a659f402

Merge branch 't/export_key_metadata-function'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     c7e5aceffd63f958b764c1c5bf1ac1a7b1db3b1c
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:15:48 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:15:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=c7e5acef

Merge branch 't/export-key-metadata'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     8d1a77c763d05a0218b2b2dbe073046c8f01ca76
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:05:23 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:05:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=8d1a77c7

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  109 +++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1148 insertions(+), 286 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     520f1706406779df4e072931d4952d07ba29f6e1
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:08:50 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:08:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=520f1706

Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b07673ec0f97155e2912ac9e46f231f5a36e4792
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:08:50 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:08:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b07673ec

Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  101 ++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1144 insertions(+), 282 deletions(-)

diff --cc conf/example.gitolite.rc
index 6b73f34,29272dc..eab1a5d
--- a/conf/example.gitolite.rc
+++ b/conf/example.gitolite.rc
@@@ -35,15 -35,8 +35,16 @@@ $REPO_UMASK = 0077
  $GL_BIG_CONFIG = 0;
  $GL_NO_DAEMON_NO_GITWEB = 0;
  # $GL_NICE_VALUE = 0;
+ # $BIG_INFO_CAP = 20;
  
 +# Define which metadata variables shall be exported to the gitolite environment.
 +# Those variables can be used in hooks, e.g. for cia.vc
 +# A pubkey file might contain one or more of those variable.
 +# They can be defined by e.g:"# git-username: idl0r"
 +# Each '-' (dash) will be replaced by an '_' (underscore).
 +#@GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
 +#@GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
 +
  # ------------------------------------------------------------------------------
  # VARIABLES WITH A SECURITY IMPACT.  READ DOCS BEFORE CHANGING THESE!
  # http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd#_variables_with_a_security_impact



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     57d4ae28e4925d337063d318bdfbb86c2345128c
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:05:23 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:05:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=57d4ae28

Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  109 +++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1148 insertions(+), 286 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     78ea411d7a5d97f56ce3bb3bf1fa445d580ca652
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:08:38 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:08:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=78ea411d

Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata

Conflicts:
	src/gitolite.pm


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  101 ++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1144 insertions(+), 282 deletions(-)

diff --cc src/gitolite.pm
index 438845f,76e83f6..cebf27e
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -907,15 -925,15 +933,15 @@@ sub setup_authkey
      # add our "start" line, each key on its own line (prefixed by command and
      # options, in the standard ssh authorized_keys format), then the "end" line.
      print $newkeys_fh "# gitolite start\n";
 -    wrap_chdir($GL_KEYDIR);
 +    my @pubkeys = find_pubkeys($GL_KEYDIR);
      my @not_in_config;  # pubkeys exist but users don't appear in the config file
 -    for my $pubkey (`find . -type f | sort`)
 -    {
 -        chomp($pubkey); $pubkey =~ s(^\./)();
 +    foreach my $pubkey (@pubkeys) {
 +        my $pubkey_name = $pubkey;
 +        $pubkey_name =~ s(.*/)(); # foo/bar/baz.pub -> baz.pub
  
          # security check (thanks to divVerent for catching this)
 -        unless ($pubkey =~ $REPONAME_PATT) {
 +        unless ($pubkey_name =~ $REPONAME_PATT) {
-             print STDERR "$pubkey contains some unsavoury characters; ignored...\n";
+             warn "$pubkey contains some unsavoury characters; ignored...\n";
              next;
          }
  



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e50e58d5b86e8f4359007fe04398b34e875487bd
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 16:56:44 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 16:56:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=e50e58d5

Merge commit 'refs/top-bases/t/per_repo_umask' into t/per_repo_umask


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  109 +++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1148 insertions(+), 286 deletions(-)

diff --cc src/gl-compile-conf
index 8408424,9799841..dcbb062
--- a/src/gl-compile-conf
+++ b/src/gl-compile-conf
@@@ -424,9 -426,9 +433,9 @@@ sub do_normal_repo
          unless ($GL_NO_CREATE_REPOS) {
              unless (-d "$repo.git") {
                  print STDERR "creating $repo...\n";
 -                new_repo($repo, "$GL_ADMINDIR/hooks/common");
 +                new_repo($repo, "$GL_ADMINDIR/hooks/common", undef, $repos{$repo}{"umask"});
                  # new_repo would have chdir'd us away; come back
-                 wrap_chdir("$ENV{GL_REPO_BASE_ABS}");
+                 wrap_chdir($REPO_BASE);
              }
  
              # when repos are copied over from elsewhere, one had to run easy install



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     71d866e527bad906058851d8b6f6168534e786a4
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 17:04:48 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 17:04:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=71d866e5

Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options

Conflicts:
	src/gitolite.pm


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  101 ++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1144 insertions(+), 282 deletions(-)

diff --cc src/gitolite.pm
index 5f594d2,8fa7c51..480cb35
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -905,15 -923,15 +931,15 @@@ sub setup_authkey
      # add our "start" line, each key on its own line (prefixed by command and
      # options, in the standard ssh authorized_keys format), then the "end" line.
      print $newkeys_fh "# gitolite start\n";
 -    wrap_chdir($GL_KEYDIR);
 +    my @pubkeys = find_pubkeys($GL_KEYDIR);
      my @not_in_config;  # pubkeys exist but users don't appear in the config file
 -    for my $pubkey (`find . -type f | sort`)
 -    {
 -        chomp($pubkey); $pubkey =~ s(^\./)();
 +    foreach my $pubkey (@pubkeys) {
 +        my $pubkey_name = $pubkey;
 +        $pubkey_name =~ s(.*/)(); # foo/bar/baz.pub -> baz.pub
  
          # security check (thanks to divVerent for catching this)
 -        unless ($pubkey =~ $REPONAME_PATT) {
 +        unless ($pubkey_name =~ $REPONAME_PATT) {
-             print STDERR "$pubkey contains some unsavoury characters; ignored...\n";
+             warn "$pubkey contains some unsavoury characters; ignored...\n";
              next;
          }
  



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     6233e080c7a6eb01d6be136803854816c1613a56
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 16:57:20 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 16:57:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=6233e080

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  109 +++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1148 insertions(+), 286 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     76e1b6a1d783412adf6c9371c367d7bbc0d8d562
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 16:57:01 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 16:57:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=76e1b6a1

Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  109 +++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1148 insertions(+), 286 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     43c81ff80418215f1274e7bd56cfd93d5162bbdc
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 16:55:40 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 16:55:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=43c81ff8

Merge commit 'refs/top-bases/t/misc' into t/misc


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  109 +++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1148 insertions(+), 286 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     ff5d4b28b47189aeb99e6ec71d772aa4633666b7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 16:55:40 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 16:55:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=ff5d4b28

Merge branch 'upstream' into refs/top-bases/t/misc


 conf/example.gitolite.rc                |    1 +
 contrib/adc/hub                         |   55 +++++--
 contrib/adc/hub.mkd                     |    6 +
 contrib/adc/s3backup                    |  150 +++++++++++++++++++
 contrib/putty.mkd                       |  248 +++++++++++++++++++++++++++++++
 contrib/update.detect-dup-pubkeys       |   74 +++++++++
 contrib/update.email-check              |    4 +-
 doc/1-INSTALL.mkd                       |   53 ++++---
 doc/2-admin.mkd                         |    4 +
 doc/CHANGELOG                           |   14 ++
 doc/gitolite-and-ssh.mkd                |    7 +-
 doc/gitolite-without-ssh.mkd            |   75 +++++++++
 doc/gitolite.conf.mkd                   |   26 +++-
 doc/gitolite.rc.mkd                     |    5 +
 doc/http-backend.mkd                    |   12 +-
 doc/overkill.mkd                        |   10 ++
 doc/report-output.mkd                   |    8 +-
 doc/who-uses-it.mkd                     |   20 ++-
 hooks/common/post-receive.mirrorpush    |    6 +-
 hooks/common/update                     |   12 +-
 hooks/common/update.secondary.sample    |   44 ++++++
 src/gitolite.pm                         |  109 +++++++++-----
 src/gitolite_rc.pm                      |    7 +
 src/gl-auth-command                     |    6 +-
 src/gl-compile-conf                     |   53 ++++---
 src/gl-easy-install                     |    5 +
 src/gl-install                          |    8 +-
 src/gl-mirror-shell                     |    2 +
 src/gl-setup-authkeys                   |   30 +++--
 src/gl-system-install                   |   38 +++--
 t/install-gitolite                      |    4 +-
 t/out/t01-repo-groups.1bs               |    8 +-
 t/out/t01-repo-groups.2                 |    4 +-
 t/out/t02-user-groups.1bs               |    6 +-
 t/out/t02-user-groups.2bs               |    6 +-
 t/rollback.server                       |    3 +-
 t/t00-initial                           |    2 +-
 t/t04a-wild-all                         |    6 +-
 t/t04a-wild-students                    |    2 +-
 t/t05a-delegation                       |    2 +-
 t/t50-sequence-test                     |    2 +-
 t/t53-check-info-expand-output          |    2 +-
 t/t54-repo-configs                      |    8 +-
 t/t55-repo-configs-wild-without-CREATOR |   14 +-
 t/t56-repo-configs-wild-with-CREATOR    |   14 +-
 t/t57-daemon-gitweb                     |   30 ++--
 t/t58-daemon-gitweb-wild                |   34 ++--
 t/t59-repo-not-on-disk                  |   10 +-
 t/t60-daemon-gitweb-via-setperms        |   50 +++---
 t/t61-setperms-groups                   |    2 +-
 t/t62-rule-sequences                    |    4 +-
 t/t63-perm-cats                         |    2 +-
 t/t64-write-able                        |   16 +-
 t/t67-hub                               |   34 ++++-
 t/t68-include                           |   62 ++++++++
 t/test-driver.sh                        |   14 ++-
 t/update-gitolite                       |    1 +
 57 files changed, 1148 insertions(+), 286 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-06-14 12:02 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-06-14 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4d913e1c5865872c2dce15bafad5d8d99543113e
Author:     Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Sun Mar 13 12:52:49 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 12:52:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=4d913e1c

Merge branch 'master' into pu (only doc updates)


 doc/2-admin.mkd     |   10 ++++++----
 doc/CHANGELOG       |   22 ++++++++++++++++++++++
 doc/mirroring.mkd   |    9 +++++++++
 doc/shell-games.mkd |   19 +++++++++++++++++--
 4 files changed, 54 insertions(+), 6 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: /
@ 2011-03-25 20:00 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     4a8b062276349bf54e4b4235ddd201b1f59bf820
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:33:24 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:33:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=4a8b0622

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1541 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: /
@ 2011-03-25 20:00 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     80d28e6fb02556d600cd48a92b6486c514f8c722
Author:     Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Sat Mar  5 11:59:20 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 11:59:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=80d28e6f

Merge branch 'dmitrijsledkovs/pu' into pu


 doc/gitolite.conf.mkd |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-03-25 20:00 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     1687bc8af04a0e0e602aa902bd2c234d680e4143
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:52:33 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:52:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1687bc8a

Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  776 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   72 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3485 insertions(+), 1542 deletions(-)

diff --cc conf/example.gitolite.rc
index 6f57994,d800357..6b73f34
--- a/conf/example.gitolite.rc
+++ b/conf/example.gitolite.rc
@@@ -31,18 -34,12 +34,20 @@@ $REPO_UMASK = 0077
  # ------------------------------------------------------------------------------
  $GL_BIG_CONFIG = 0;
  $GL_NO_DAEMON_NO_GITWEB = 0;
+ # $GL_NICE_VALUE = 0;
  
 +# Define which metadata variables shall be exported to the gitolite environment.
 +# Those variables can be used in hooks, e.g. for cia.vc
 +# A pubkey file might contain one or more of those variable.
 +# They can be defined by e.g:"# git-username: idl0r"
 +# Each '-' (dash) will be replaced by an '_' (underscore).
 +#@GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
 +#@GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
 +
  # ------------------------------------------------------------------------------
- # VARIABLES WITH A SECURITY IMPACT.  READ DOC WELL BEFORE CHANGING THESE.
+ # VARIABLES WITH A SECURITY IMPACT.  READ DOCS BEFORE CHANGING THESE!
  # http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd#_variables_with_a_security_impact
+ # (or http://sitaramc.github.com/gitolite/doc/gitolite.rc.html#_variables_with_a_security_impact)
  # ------------------------------------------------------------------------------
  # $GL_ALL_READ_ALL = 0;
  $GIT_PATH="";
diff --cc src/gitolite_rc.pm
index 0000000,132fc90..3ae0224
mode 000000,100644..100644
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -1,0 -1,72 +1,72 @@@
+ # stuff to help pull in the rc file, plus various constants
+ 
+ package gitolite_rc;
+ use Exporter 'import';
+ 
+ # the first set (before the blank line) are constants defined right here in
+ # this program.  The second set are from the 'rc'; We're clubbing all in
+ # because they're all "constants" in a programmatic sense
+ @EXPORT = qw(
+     $ABRT $WARN
+     $R_COMMANDS $W_COMMANDS
+     $REPONAME_PATT $USERNAME_PATT $REPOPATT_PATT
+     $ADC_CMD_ARGS_PATT
+     $current_data_version
+ 
+     $ADMIN_POST_UPDATE_CHAINS_TO $ENV $GITOLITE_BASE $GITOLITE_PATH $GIT_PATH
+     $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
+     $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
+     $GL_GITCONFIG_KEYS $GL_GITCONFIG_WILD $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
+     $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
+     $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
+     $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
+     $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
+     $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+ 
+     $GL_HTTP_ANON_USER
+ 
 -	@GL_METADATA
++	@GL_METADATA @GL_METADATA_REQUIRED
+ );
+ 
+ # ------------------------------------------------------------------------------
+ #       real constants
+ # ------------------------------------------------------------------------------
+ 
+ $current_data_version = '1.7';
+ 
+ $ABRT = "\n\t\t***** ABORTING *****\n       ";
+ $WARN = "\n\t\t***** WARNING *****\n       ";
+ 
+ # commands we're expecting
+ $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
+ $W_COMMANDS=qr/^git[ -]receive-pack$/;
+ 
+ # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
+ # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
+ # because a repo can have "CREATOR" in the name
+ $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$);
+ $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);
+ # same as REPONAME, but used for wildcard repos, allows some common regex metas
+ $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
+ 
+ # ADC commands and arguments must match this pattern
+ $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
+ 
+ # ------------------------------------------------------------------------------
+ #       bring in the rc vars and allow querying them
+ # ------------------------------------------------------------------------------
+ 
+ # in case we're running under Apache using smart http
+ $ENV{HOME} = $ENV{GITOLITE_HTTP_HOME} if $ENV{GITOLITE_HTTP_HOME};
+ 
+ # we also need to "bring in" the rc variables.  The rc can only be in one of
+ # these two places; the first one we find, wins
+ for ("$ENV{HOME}/.gitolite.rc", "/etc/gitolite/gitolite.rc") {
+     $ENV{GL_RC} ||= $_ if -f;
+ }
+ die "no rc file found\n" unless $ENV{GL_RC};
+ do $ENV{GL_RC} or die "error parsing $ENV{GL_RC}\n";
+ 
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
+ 1;
diff --cc src/gl-auth-command
index bafa925,754bfad..3ad0302
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@@ -260,18 -173,8 +173,18 @@@ if (-x "$ENV{GL_REPO_BASE_ABS}/$repo.gi
  #       over to git now
  # ----------------------------------------------------------------------------
  
 +my $metaenv = "Metadata ENV:";
 +export_key_metadata($user);
 +foreach my $metadata (@GL_METADATA) {
 +    $metadata =~ s/-/_/g;
 +    if(defined($ENV{$metadata})) {
 +        $metaenv = join(" ", $metaenv, "${metadata}=\"$ENV{$metadata}\"");
 +    }
 +}
 +log_it("${metaenv}\n");
 +
  if ($ENV{REQUEST_URI}) {
-     &log_it($ENV{REQUEST_URI});
+     log_it($ENV{REQUEST_URI});
      exec $ENV{GIT_HTTP_BACKEND};
      # the GIT_HTTP_BACKEND env var should be set either by the rc file, or as
      # a SetEnv in the apache config somewhere



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-03-25 20:00 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     58a9e8581b9f34610ad086792af33fb859264c46
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:47:31 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:47:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=58a9e858

Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  776 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   72 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3485 insertions(+), 1542 deletions(-)

diff --cc src/gitolite.pm
index 64bab29,f32bcf0..af4350a
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -6,44 -41,22 +41,24 @@@ use Data::Dumper
  $Data::Dumper::Deepcopy = 1;
  $|++;
  
- # this file is commonly used using "require".  It is not required to use "use"
- # (because it doesn't live in a different package)
++use Net::SSH::AuthorizedKeysFile; # To parse the pubkeyfile with options etc.
 +
- # warning: preceding para requires 4th attribute of a programmer after
- # laziness, impatience, and hubris: sense of humour :-)
+ # ----------------------------------------------------------------------------
+ #       find the rc file, then pull the libraries
+ # ----------------------------------------------------------------------------
  
- # WARNING
- # -------
- # the name of this file will change as soon as its function/feature set
- # stabilises enough ;-)
+ BEGIN {
+     die "ENV GL_RC not set\n" unless $ENV{GL_RC};
+     die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
+ }
  
- # right now all it does is
- # - define a function that tells you where to find the rc file
- # - define a function that creates a new repo and give it our update hook
+ use lib $ENV{GL_BINDIR};
+ use gitolite_rc;
  
  # ----------------------------------------------------------------------------
- #       common definitions
+ #       the big data structures we care about
  # ----------------------------------------------------------------------------
  
- our $ABRT = "\n\t\t***** ABORTING *****\n       ";
- our $WARN = "\n\t\t***** WARNING *****\n       ";
- 
- # commands we're expecting
- our $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
- our $W_COMMANDS=qr/^git[ -]receive-pack$/;
- 
- # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
- # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
- # because in this version, a repo can have "CREATOR" in the name (see docs)
- our $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$); # very simple pattern
- our $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);  # very simple pattern
- # same as REPONAME, but used for wildcard repos, allows some common regex metas
- our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
- # ADC commands and arguments must match this pattern
- our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
- 
- # these come from the RC file
- our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
  our %repos;
  our %groups;
  our %git_configs;
@@@ -828,18 -875,12 +877,18 @@@ sub setup_authkey
      # may not be passed; so make sure it's a valid hashref, even if empty
      $user_list_p = {} unless $user_list_p;
  
-     # CONSTANTS
+     # LOCAL CONSTANTS
  
      # command and options for authorized_keys
 +    my @AUTH_OPTIONS_PRESERVE = ( "from" );
 +    my %AUTH_OPTIONS = (
 +        "no-port-forwarding" => 1,
 +        "no-X11-forwarding" => 1,
 +        "no-agent-forwarding" => 1,
 +        "no-pty" => 1,
 +    );
-     my $AUTH_COMMAND="$bindir/gl-auth-command";
-     $AUTH_COMMAND="$bindir/gl-time $bindir/gl-auth-command" if $GL_PERFLOGT;
+     my $AUTH_COMMAND="$ENV{GL_BINDIR}/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";
  
      # START
  



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 20:00 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     23f5507b9ad01a7aa82021cb4e0da116ddff3f66
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:54:12 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:54:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=23f5507b

Merge branch 't/misc'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 20:00 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     9dd37c3044ff96b5866e0f12c2f4f89f84749e3c
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:54:19 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:54:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=9dd37c30

Merge branch 't/per_repo_umask'


 src/gitolite.pm     |    4 ++--
 src/gl-compile-conf |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     cc22ce704fde7a17b847fc3035a613f7d8097641
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:54:00 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:54:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=cc22ce70

Merge branch 't/export-key-metadata'


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 +-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 ++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  787 ++++++++++++++----------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   72 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++-
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 +--
 72 files changed, 3485 insertions(+), 1553 deletions(-)

diff --cc src/gl-auth-command
index 56d9c17,3ad0302..4d4f061
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@@ -277,8 -190,7 +190,8 @@@ if ($ENV{REQUEST_URI}) 
      # a SetEnv in the apache config somewhere
  }
  
- &log_it();
+ log_it();
  
 +umask(get_repo_umask($repo));
  $repo = "'$REPO_BASE/$repo.git'";
  exec("git", "shell", "-c", "$verb $repo") unless $verb eq 'git-init';



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     09d925858a778b14e4e364613c2c37d8e903d063
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:47:37 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:47:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=09d92585

Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     85234f9f587c08c8e3ef8fda90ee05a29bdbc194
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:23:25 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:23:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=85234f9f

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1541 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7b847f5884187c8ae490e521b6d95c47a7556641
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:26:06 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:26:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=7b847f58

Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   72 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3485 insertions(+), 1541 deletions(-)

diff --cc src/gitolite.pm
index 9945e91,a880037..f32bcf0
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1205,32 -1186,6 +1186,34 @@@ sub find_pubkeys 
      return sort(@files);
  }
  
 +sub export_key_metadata {
 +    my $user = shift;
 +
 +    my @tmp = find_pubkeys($GL_KEYDIR, $user);
 +    return if $#tmp ne 0; # one pubkey only!
 +
 +    my $pubkey = $tmp[0];
 +
 +    return if ! -f $pubkey;
 +
 +    open(PUBKEY, '<', $pubkey);
 +    while(defined(my $line = <PUBKEY>)) {
 +        chomp($line);
 +        next if $line !~ m/^\s*#/;
 +        $line =~ s/^\s*#\s*//;
 +
 +        my ($variable, $value) = split(/:\s*/, $line, 2);
 +
 +        if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
 +            if(length($value) > 0) {
 +                $variable =~ s/-/_/g;
 +                $ENV{$variable} = $value;
 +            }
 +        }
 +    }
 +    close(PUBKEY);
 +}
 +
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
  1;
diff --cc src/gitolite_rc.pm
index 0000000,09cd172..132fc90
mode 000000,100644..100644
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -1,0 -1,70 +1,72 @@@
+ # stuff to help pull in the rc file, plus various constants
+ 
+ package gitolite_rc;
+ use Exporter 'import';
+ 
+ # the first set (before the blank line) are constants defined right here in
+ # this program.  The second set are from the 'rc'; We're clubbing all in
+ # because they're all "constants" in a programmatic sense
+ @EXPORT = qw(
+     $ABRT $WARN
+     $R_COMMANDS $W_COMMANDS
+     $REPONAME_PATT $USERNAME_PATT $REPOPATT_PATT
+     $ADC_CMD_ARGS_PATT
+     $current_data_version
+ 
+     $ADMIN_POST_UPDATE_CHAINS_TO $ENV $GITOLITE_BASE $GITOLITE_PATH $GIT_PATH
+     $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
+     $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
+     $GL_GITCONFIG_KEYS $GL_GITCONFIG_WILD $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
+     $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
+     $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
+     $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
+     $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
+     $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+ 
+     $GL_HTTP_ANON_USER
++
++	@GL_METADATA
+ );
+ 
+ # ------------------------------------------------------------------------------
+ #       real constants
+ # ------------------------------------------------------------------------------
+ 
+ $current_data_version = '1.7';
+ 
+ $ABRT = "\n\t\t***** ABORTING *****\n       ";
+ $WARN = "\n\t\t***** WARNING *****\n       ";
+ 
+ # commands we're expecting
+ $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
+ $W_COMMANDS=qr/^git[ -]receive-pack$/;
+ 
+ # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
+ # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
+ # because a repo can have "CREATOR" in the name
+ $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$);
+ $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);
+ # same as REPONAME, but used for wildcard repos, allows some common regex metas
+ $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
+ 
+ # ADC commands and arguments must match this pattern
+ $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
+ 
+ # ------------------------------------------------------------------------------
+ #       bring in the rc vars and allow querying them
+ # ------------------------------------------------------------------------------
+ 
+ # in case we're running under Apache using smart http
+ $ENV{HOME} = $ENV{GITOLITE_HTTP_HOME} if $ENV{GITOLITE_HTTP_HOME};
+ 
+ # we also need to "bring in" the rc variables.  The rc can only be in one of
+ # these two places; the first one we find, wins
+ for ("$ENV{HOME}/.gitolite.rc", "/etc/gitolite/gitolite.rc") {
+     $ENV{GL_RC} ||= $_ if -f;
+ }
+ die "no rc file found\n" unless $ENV{GL_RC};
+ do $ENV{GL_RC} or die "error parsing $ENV{GL_RC}\n";
+ 
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
+ 1;



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b1ab3f43f2f26dda61b51b76a3e7ecbdc729cc89
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:41:33 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:41:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b1ab3f43

Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  776 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1542 deletions(-)

diff --cc src/gitolite.pm
index 7b4bb31,a880037..5f594d2
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -6,44 -41,22 +41,24 @@@ use Data::Dumper
  $Data::Dumper::Deepcopy = 1;
  $|++;
  
- # this file is commonly used using "require".  It is not required to use "use"
- # (because it doesn't live in a different package)
++use Net::SSH::AuthorizedKeysFile; # To parse the pubkeyfile with options etc.
 +
- # warning: preceding para requires 4th attribute of a programmer after
- # laziness, impatience, and hubris: sense of humour :-)
+ # ----------------------------------------------------------------------------
+ #       find the rc file, then pull the libraries
+ # ----------------------------------------------------------------------------
  
- # WARNING
- # -------
- # the name of this file will change as soon as its function/feature set
- # stabilises enough ;-)
+ BEGIN {
+     die "ENV GL_RC not set\n" unless $ENV{GL_RC};
+     die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
+ }
  
- # right now all it does is
- # - define a function that tells you where to find the rc file
- # - define a function that creates a new repo and give it our update hook
+ use lib $ENV{GL_BINDIR};
+ use gitolite_rc;
  
  # ----------------------------------------------------------------------------
- #       common definitions
+ #       the big data structures we care about
  # ----------------------------------------------------------------------------
  
- our $ABRT = "\n\t\t***** ABORTING *****\n       ";
- our $WARN = "\n\t\t***** WARNING *****\n       ";
- 
- # commands we're expecting
- our $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
- our $W_COMMANDS=qr/^git[ -]receive-pack$/;
- 
- # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
- # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
- # because in this version, a repo can have "CREATOR" in the name (see docs)
- our $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$); # very simple pattern
- our $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);  # very simple pattern
- # same as REPONAME, but used for wildcard repos, allows some common regex metas
- our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
- # ADC commands and arguments must match this pattern
- our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
- 
- # these come from the RC file
- our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
  our %repos;
  our %groups;
  our %git_configs;
@@@ -828,18 -875,12 +877,18 @@@ sub setup_authkey
      # may not be passed; so make sure it's a valid hashref, even if empty
      $user_list_p = {} unless $user_list_p;
  
-     # CONSTANTS
+     # LOCAL CONSTANTS
  
      # command and options for authorized_keys
 +    my @AUTH_OPTIONS_PRESERVE = ( "from" );
 +    my %AUTH_OPTIONS = (
 +        "no-port-forwarding" => 1,
 +        "no-X11-forwarding" => 1,
 +        "no-agent-forwarding" => 1,
 +        "no-pty" => 1,
 +    );
-     my $AUTH_COMMAND="$bindir/gl-auth-command";
-     $AUTH_COMMAND="$bindir/gl-time $bindir/gl-auth-command" if $GL_PERFLOGT;
+     my $AUTH_COMMAND="$ENV{GL_BINDIR}/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";
  
      # START
  



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     f8da673c1d2b17b85e48c9a9b330625fa277ecc5
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:19:43 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:19:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=f8da673c

Merge commit 'refs/top-bases/t/per_repo_umask' into t/per_repo_umask


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1541 deletions(-)

diff --cc src/gitolite.pm
index d58df32,c0581c8..a59ff17
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1162,19 -1143,6 +1143,21 @@@ sub ext_cmd_svnserv
      die "svnserve exec failed\n";
  }
  
 +# ----------------------------------------------------------------------------
 +#       Gentoo specific stuff
 +# ----------------------------------------------------------------------------
 +
 +sub get_repo_umask {
 +	my $repo = shift;
 +
 +	return $REPO_UMASK if ! $repo;
 +
 +	do $GL_CONF_COMPILED if ! %repos;
 +
 +	return $REPO_UMASK if ! $repos{$repo};
 +	return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
 +}
 +
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
  1;
diff --cc src/gl-auth-command
index deb388e,754bfad..b706ae0
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@@ -267,8 -180,7 +180,8 @@@ if ($ENV{REQUEST_URI}) 
      # a SetEnv in the apache config somewhere
  }
  
- &log_it();
+ log_it();
  
 +umask(get_repo_umask($repo));
  $repo = "'$REPO_BASE/$repo.git'";
  exec("git", "shell", "-c", "$verb $repo") unless $verb eq 'git-init';



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     e5e3102dc252a95974bd06fd3ec9400bec3cfb13
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:12:50 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:12:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=e5e3102d

Merge commit 'refs/top-bases/t/misc' into t/misc


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1541 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     d8dd968616a825bf8958a5d7e6cd245305225fb1
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:20:58 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:20:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d8dd9686

Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1541 deletions(-)

diff --cc src/gitolite.pm
index 7c240dc,c0581c8..a880037
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1162,47 -1143,6 +1143,49 @@@ sub ext_cmd_svnserv
      die "svnserve exec failed\n";
  }
  
 +# ----------------------------------------------------------------------------
 +#       Gentoo specific stuff
 +# ----------------------------------------------------------------------------
 +
 +# Find pubkeys recursive
 +sub find_pubkeys {
 +    my $dir = shift;
 +    my $name = shift;
 +    my @files = ();
 +    my @tmp = ();
 +
 +    opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
 +    foreach my $entry (readdir($dir_fh)) {
 +        next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
 +        $entry = join("/", $dir, $entry);
 +
 +        if(-f $entry and $entry =~ /\.pub$/) {
 +            if(defined($name) && length($name) > 0) {
 +                my $cmp = $entry;
 +                $cmp =~ s(.*/)();
 +                $cmp =~ s/\.pub$//;
 +                if($cmp eq $name) {
 +                    push(@files, $entry);
 +                    next;
 +                }
 +            }
 +            else {
 +                push(@files, $entry);
 +                next;
 +            }
 +        }
 +        if(-d $entry) {
 +            @tmp = find_pubkeys($entry, $name);
 +            @files = (@files, @tmp);
 +            next;
 +        }
 +    }
 +
 +    closedir($dir_fh);
 +
 +    return sort(@files);
 +}
 +
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
  1;



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     70df640a577386c0e6d10230b1ee68033df8804b
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:08 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=70df640a

Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     d86923ab49e0a48fdefa414a133d6922fa2dcdff
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:54 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d86923ab

Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b97115f85bf0380824e1abbc933d5bed40a31a01
Author:     Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Tue Feb 15 09:40:14 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 09:40:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b97115f8

Merge branch 'master' into pu




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/misc commit in: /
@ 2011-03-25 19:57 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     6e25208b65ec11eff915171e860093845d77651f
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:12:50 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:12:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=6e25208b

Merge branch 'upstream' into refs/top-bases/t/misc


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1541 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/per_repo_umask commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     8006c27fbdcc65aeceebb35dd595f0009300fc42
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:29 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=8006c27f

Merge commit 'refs/top-bases/t/per_repo_umask' into t/per_repo_umask


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/misc commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     66b078069127de08807d37bf555b01e22aaf512a
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:13 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=66b07806

Merge branch 'upstream' into refs/top-bases/t/misc


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/misc commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     752e0a376d0e51ff6c94dbd280167c2746a000dc
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:13 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=752e0a37

Merge commit 'refs/top-bases/t/misc' into t/misc


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     955f5e67a58b4f6e91a2a6b7e1dd73b7bfb67f03
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:43 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=955f5e67

Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     699ecfcb0cfcd49652910984e6428d8f84176205
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:54 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=699ecfcb

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function


 .topdeps            |    2 +-
 src/gl-auth-command |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     28b68a153d3ad6500a5da56337a771ab1ebe49fe
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:08 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=28b68a15

Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     56b220a230ed10effc1d473e4a0326f99c12f35e
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:08 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=56b220a2

Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     706abcc91bc0867e75e270f205720d7a4d2a424a
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:01 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=706abcc9

Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     9a416e43e7697dd835053a50d8d6adc086046ea0
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:34 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=9a416e43

Merge branch 'upstream'


 src/gl-auth-command |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a13ed1454bfd839ea26c1af3b8a35061f9b70f2f
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:01 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=a13ed145

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options


 .topdeps            |    2 +-
 src/gl-auth-command |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     2b070af63e9e8350129344ef0e285648f5b64cad
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 17:13:05 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 17:13:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=2b070af6

Merge branch 't/minor'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     11f9b80d4ca6c716178633d2f1dd115ff1d5a9a7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 17:13:00 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 17:13:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=11f9b80d

Merge branch 't/export-key-metadata'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     3faa70d34e1f7f6603fce2dfa1db227434fbb79b
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 17:13:07 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 17:13:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=3faa70d3

Merge branch 't/misc'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     53953c501c04b7b50a09edb218f28d9e1b8924a1
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 17:13:10 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 17:13:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=53953c50

Merge branch 't/per_repo_umask'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     05bb1b5b78c0210705a712b50a29e62a6daf08dd
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:36:36 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:36:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=05bb1b5b

Merge commit 'refs/top-bases/t/misc' into t/misc


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     22afb2a685485d4aeef81748e9373e7cf8bf0912
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 17:12:56 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 17:12:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=22afb2a6

Merge branch 't/ssh-key-options'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6e97c4100de36816fc7fdab43b03773909c064f0
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 17:12:43 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 17:12:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=6e97c410

Merge branch 't/find_pubkeys-function'




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0089df5141c77058b13883587e6504aeeef4a6ed
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:30:40 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:30:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=0089df51

Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     020a5f17573b1dc62679f4309f02df1d14d1cb99
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:28:43 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:28:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=020a5f17

Merge commit 'refs/top-bases/t/per_repo_umask' into t/per_repo_umask


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     88efa7fcce52d84cd654447ad7a1eac9bbfa7259
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:25:17 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:25:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=88efa7fc

Depend upon 1.5.9

---
 .topdeps |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.topdeps b/.topdeps
index b54c519..b8ba6d1 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-upstream/1.5.8
+upstream/1.5.9



^ permalink raw reply related	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     9a47a0f54c82edbafffc52502469f0ecfea35197
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:25:21 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:25:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=9a47a0f5

Merge commit 'refs/top-bases/t/minor' into t/minor


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/misc commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0d16650352a5299e20e98a14631ef44182838ed7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:36:36 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:36:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=0d166503

Merge commit 'upstream/1.5.9' into refs/top-bases/t/misc


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     1f0bc3731de5cd240186656817cf54a7ce81cacb
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:25:53 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:25:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1f0bc373

Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     11f659902acb67987d72a88ced6f86cb99420d04
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=11f65990

Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)

diff --cc src/gitolite.pm
index efd9bed,7c240dc..9945e91
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -40,12 -40,17 +40,17 @@@ our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][
  our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
  
  # these come from the RC file
 -our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
 +our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
  our %repos;
  our %groups;
- our %repo_config;
+ our %git_configs;
+ our %split_conf;;
  our $data_version;
- our $current_data_version = '1.6';
+ our $current_data_version = '1.7';
+ 
+ # the following are read in from individual repo's gl-conf files, if present
+ our %one_repo;
+ our %one_git_config;
  
  # ----------------------------------------------------------------------------
  #       convenience subs



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     96788a960e002d0480a2ebf47908d99da9678e1d
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=96788a96

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function


 .topdeps                                          |    2 +-
 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 33 files changed, 1196 insertions(+), 551 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     473c02d9cf850c2afca1a741ce1588d45571d82b
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:29:16 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:29:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=473c02d9

Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1195 insertions(+), 550 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     31d2fda620e998c6e13693cf6fae5477f139be52
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:30:40 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:30:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=31d2fda6

Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata




^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e24d0debc5565599c4eef70f6a3be602977d0f02
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:35:55 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:35:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=e24d0deb

Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata

Conflicts:
	conf/example.gitolite.rc
	src/gl-auth-command


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  334 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 ++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1198 insertions(+), 552 deletions(-)

diff --cc conf/example.gitolite.rc
index 211b7cb,9ee7840..6f57994
--- a/conf/example.gitolite.rc
+++ b/conf/example.gitolite.rc
@@@ -61,260 -14,65 +14,73 @@@ $GL_ADMINDIR=$ENV{HOME} . "/.gitolite"
  $GL_CONF="$GL_ADMINDIR/conf/gitolite.conf";
  $GL_KEYDIR="$GL_ADMINDIR/keydir";
  $GL_CONF_COMPILED="$GL_ADMINDIR/conf/gitolite.conf-compiled.pm";
+ # DO NOT CHANGE THE NEXT TWO LINES UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
+ # These variables are set automatically by the install method you choose.
+ # $GL_PACKAGE_CONF = "";
+ # $GL_PACKAGE_HOOKS = "";
  
- # --------------------------------------
- 
- # if git on your server is on a standard path (that is
- #       ssh git@server git --version
- # works), leave this setting as is.  Otherwise, choose one of the
- # alternatives, or write your own
- 
- $GIT_PATH="";
- # $GIT_PATH="/opt/bin/";
- 
- # --------------------------------------
- 
- # ----------------------------------------------------------------------
- #                   BIG CONFIG SETTINGS
- 
- # Please read doc/big-config.mkd for details
+ # ------------------------------------------------------------------------------
+ # most often used/changed variables
+ # ------------------------------------------------------------------------------
+ $GL_WILDREPOS = 0;
+ $PROJECTS_LIST = $ENV{HOME} . "/projects.list";
+ $REPO_UMASK = 0077;
  
+ # ------------------------------------------------------------------------------
+ # variables with an efficiency impact
+ # ------------------------------------------------------------------------------
  $GL_BIG_CONFIG = 0;
  $GL_NO_DAEMON_NO_GITWEB = 0;
- $GL_NO_CREATE_REPOS = 0;
- $GL_NO_SETUP_AUTHKEYS = 0;
- 
- # ----------------------------------------------------------------------
- #                   SECURITY SENSITIVE SETTINGS
- #
- #       Settings below this point may have security implications.  That
- #       usually means that I have not thought hard enough about all the
- #       possible ways to crack security if these settings are enabled.
- 
- #       Please see details on each setting for specifics, if any.
- # ----------------------------------------------------------------------
- 
  
 +# Define which metadata variables shall be exported to the gitolite environment.
 +# Those variables can be used in hooks, e.g. for cia.vc
 +# A pubkey file might contain one or more of those variable.
 +# They can be defined by e.g:"# git-username: idl0r"
 +# Each '-' (dash) will be replaced by an '_' (underscore).
- @GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
- @GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
- 
- # --------------------------------------
- # ALLOW REPO ADMIN TO SET GITCONFIG KEYS
- #
- # Gitolite allows you to set git repo options using the "config" keyword; see
- # conf/example.conf for details and syntax.
- #
- # However, if you are in an installation where the repo admin does not (and
- # should not) have shell access to the server, then allowing him to set
- # arbitrary repo config options *may* be a security risk -- some config
- # settings may allow executing arbitrary commands.
- #
- # You have 3 choices.  By default $GL_GITCONFIG_KEYS is left empty, which
- # completely disables this feature (meaning you cannot set git configs from
- # the repo config).
- 
++#@GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
++#@GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
++
+ # ------------------------------------------------------------------------------
+ # VARIABLES WITH A SECURITY IMPACT.  READ DOC WELL BEFORE CHANGING THESE.
+ # http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd#_variables_with_a_security_impact
+ # ------------------------------------------------------------------------------
+ # $GL_ALL_READ_ALL = 0;
+ $GIT_PATH="";
  $GL_GITCONFIG_KEYS = "";
- 
- # The second choice is to give it a space separated list of settings you
- # consider safe.  (These are actually treated as a set of regular expression
- # patterns, and any one of them must match).  For example:
- # $GL_GITCONFIG_KEYS = "core\.logAllRefUpdates core\..*compression";
- # allows repo admins to set one of those 3 config keys (yes, that second
- # pattern matches two settings from "man git-config", if you look)
- #
- # The third choice (which you may have guessed already if you're familiar with
- # regular expressions) is to allow anything and everything:
- # $GL_GITCONFIG_KEYS = ".*";
- 
- # NOTE that due to some quoting and interpolation issues I have not been able
- # to look at, a literal "." needs to be specified in this string as \\.  (two
- # backslashes and a dot).  So this is how you'd allow any keys in the "foo"
- # category:
- #       $GL_GITCONFIG_KEYS = "foo\\..*";
- 
- # --------------------------------------
- # ALLOW GITCONFIG KEYS EVEN FOR WILD REPOS
- #
- # This is an efficiency issue more than a security issue, since this requires
- # trawling through all of $REPO_BASE looking for stuff :)
- 
  # $GL_GITCONFIG_WILD = 0;
- 
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- HTPASSWD
- 
- # security note: runs an external command (htpasswd) with specific arguments,
- # including a user-chosen "password".
- 
- # if you want to enable the "htpasswd" command, give this the absolute path to
- # whatever file apache (etc) expect to find the passwords in.
- 
+ $GL_NO_CREATE_REPOS = 0;
+ $GL_NO_SETUP_AUTHKEYS = 0;
+ # $GL_WILDREPOS_DEFPERMS = 'R @all';
  $HTPASSWD_FILE = "";
- 
- # Look in doc/3 ("easier to link gitweb authorisation with gitolite" section)
- # for more details on using this feature.
- 
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- RSYNC
- 
- # security note: runs an external command (rsync) with specific arguments, all
- # presumably filled in correctly by the client-side rsync.
- 
- # base path of all the files that are accessible via rsync.  Must be an
- # absolute path.  Leave it undefined or set to the empty string to disable the
- # rsync helper.
- 
  $RSYNC_BASE = "";
- 
- # $RSYNC_BASE = "/home/git/up-down";
- # $RSYNC_BASE = "/tmp/up-down";
- 
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- SVNSERVE
- 
- # security note: runs an external command (svnserve) with specific arguments,
- # as specified below. %u is substituted with the username.
- 
- # This setting allows launching svnserve when requested by the ssh client.
- # This allows using the same SSH setup (hostname/username/public key) for both
- # SVN and git access. Leave it undefined or set to the empty string to disable
- # svnserve access.
- 
  $SVNSERVE = "";
- # $SVNSERVE = "/usr/bin/svnserve -r /var/svn/ -t --tunnel-user=%u";
- 
- # --------------------------------------
- # ALLOW REPO CONFIG TO USE WILDCARDS
- 
- # security note: this used to in a separate "wildrepos" branch.  You can
- # create repositories based on wild cards, give "ownership" to the specific
- # user who created it, allow him/her to hand out R and RW permissions to other
- # users to collaborate, etc.  This is powerful stuff, and I've made it as
- # secure as I can, but it hasn't had the kind of rigorous line-by-line
- # analysis that the old "master" branch had.
- 
- # This has now been rolled into master, with all the functionality gated by
- # this variable.  Set this to 1 if you want to enable the wildrepos features.
- # Please see doc/wildcard-repositories.mkd for details.
- 
- $GL_WILDREPOS = 0;
- 
- # --------------------------------------
- # DEFAULT WILDCARD PERMISSIONS
- 
- # If set, this value will be used as the default user-level permission rule of
- # new wildcard repositories. The user can change this value with the setperms command
- # as desired after repository creation; it is only a default. Note that @all can be
- # used here but is special; no other groups can be used in user-level permissions.
- 
- # $GL_WILDREPOS_DEFPERMS = 'R @all';
- 
- # --------------------------------------
- # WILDREPOS PERMS CATEGORIES
- 
- # Originally, we only allowed "R" and "RW" in the setperms command.  Now we
- # allow the admin to define other categories as she wishes (example: MANAGERS,
- # TESTERS, etc).
- 
- # This variable is a space-sep list of the allowed categories.
- 
- # PLEASE, *PLEASE*, read the section in doc/wildcard-repositories.mkd for
- # caveats and warnings.  This is a VERY powerful feature and if you're not
- # careful you could mess up the ACLs nicely.
- 
- # this is the internal default if you don't set it (like if you didn't update
- # your ~/.gitolite.rc with new variables when you upgraded gitolite):
- $GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
- 
- # you can use your own categories in addition to the standard ones; I suggest
- # you include READERS and WRITERS for backward compat though:
- # $GL_WILDREPOS_PERM_CATS = "READERS WRITERS MANAGERS";
- # $GL_WILDREPOS_PERM_CATS = "READERS WRITERS MANAGERS TESTERS";
- 
- # --------------------------------------
- # HOOK CHAINING
- 
- # by default, the update hook in every repo chains to "update.secondary".
- # Similarly, the post-update hook in the admin repo chains to
- # "post-update.secondary".  If you're fine with the defaults, there's no need
- # to do anything here.  However, if you want to use different names or paths,
- # change these variables
- 
  # $UPDATE_CHAINS_TO = "hooks/update.secondary";
  # $ADMIN_POST_UPDATE_CHAINS_TO = "hooks/post-update.secondary";
- 
- # --------------------------------------
- # ADMIN DEFINED COMMANDS
- 
- # WARNING: Use this feature only if (a) you really really know what you're
- # doing or (b) you really don't care too much about security.  Please read
- # doc/admin-defined-commands.mkd for details.
- 
  # $GL_ADC_PATH = "";
+ # $GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
  
- # --------------------------------------
- # SITE-SPECIFIC INFORMATION
- 
- # Some installations would like to give their users customised information
- # (like a link to their own websites, for example) so that each end user does
- # not have to grok all the gitolite documentation.
- 
- # If this variable is defined, the "info" command will print it at the end of
- # the listing.
+ # ------------------------------------------------------------------------------
+ # less used/changed variables
+ # ------------------------------------------------------------------------------
+ # $GL_ALL_INCLUDES_SPECIAL = 0;
+ # $GL_SLAVE_MODE = 0;
+ # $ENV{GL_SLAVES} = 'gitolite@server2 gitolite@server3';
+ # PLEASE USE SINGLE QUOTES ABOVE, NOT DOUBLE QUOTES
+ $GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
  
- # $GL_SITE_INFO = "";
+ # ------------------------------------------------------------------------------
+ # rarely changed variables
+ # ------------------------------------------------------------------------------
+ $GL_LOGT="$GL_ADMINDIR/logs/gitolite-%y-%m.log";
+ # $GL_PERFLOGT="$GL_ADMINDIR/logs/perf-gitolite-%y-%m.log";
  # $GL_SITE_INFO = "XYZ.COM DEVELOPERS: PLEASE SEE http://xyz.com/gitolite/help first";
  
- # --------------------------------------
- # USERGROUP HANDLING
- 
- # Some sites would like to store group membership outside gitolite, because
- # they already have it in (usually) their LDAP server, and it doesn't make
- # sense to be forced to duplicate this information.
- 
- # Set the following variable to the name of a script that, given a username as
- # argument, will return a list of groups that she is a member of.
- 
- # $GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
+ # ------------------------------------------------------------------------------
+ # variables that should NOT be changed after the install step completes
+ # ------------------------------------------------------------------------------
+ $REPO_BASE="repositories";
  
- # --------------------------------------
+ # ------------------------------------------------------------------------------
  # per perl rules, this should be the last line in such a file:
  1;
  
diff --cc src/gitolite.pm
index 7a36858,64bab29..83bf535
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -43,12 -43,17 +43,17 @@@ our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][
  our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
  
  # these come from the RC file
 -our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
 +our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA, @GL_METADATA_REQUIRED);
  our %repos;
  our %groups;
- our %repo_config;
+ our %git_configs;
+ our %split_conf;;
  our $data_version;
- our $current_data_version = '1.6';
+ our $current_data_version = '1.7';
+ 
+ # the following are read in from individual repo's gl-conf files, if present
+ our %one_repo;
+ our %one_git_config;
  
  # ----------------------------------------------------------------------------
  #       convenience subs
diff --cc src/gl-auth-command
index dffdb62,1af4232..9bfca63
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@@ -32,7 -32,7 +32,7 @@@ use warnings
  # ----------------------------------------------------------------------------
  
  # these are set by the "rc" file
- our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, @GL_METADATA);
 -our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, $GL_ALL_READ_ALL);
++our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, $GL_ALL_READ_ALL, @GL_METADATA);
  # and these are set by gitolite.pm
  our ($R_COMMANDS, $W_COMMANDS, $REPONAME_PATT, $REPOPATT_PATT, $ADC_CMD_ARGS_PATT);
  our %repos;



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
  0 siblings, 1 reply; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     56315f2ed48b5dfabcdf774d87f9eb3905fa146f
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:29:16 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:29:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=56315f2e

Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options


 .topdeps                                          |    2 +-
 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  329 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 +++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 33 files changed, 1196 insertions(+), 551 deletions(-)



^ permalink raw reply	[flat|nested] 105+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-15 16:42 Christian Ruppert
  0 siblings, 0 replies; 105+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     231d7fb70ec7acf410fe78e379383c8da021f8dd
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:38:31 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:38:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=231d7fb7

Merge branch 'upstream'

Conflicts:
	conf/example.gitolite.rc
	src/gl-auth-command


 conf/example.conf                                 |    3 -
 conf/example.gitolite.rc                          |  334 +++-----------------
 contrib/adc/get-rights-and-owner.in-perl          |   41 +++
 contrib/ldap/README.mkd                           |   18 ++
 contrib/ldap/ldap-query-example.pl                |   80 +++++
 contrib/ldap/ldap-query-example.sh                |   68 +++++
 contrib/ldap/passwd                               |  112 +++++++
 doc/CHANGELOG                                     |   22 ++
 doc/big-config.mkd                                |  229 ++++++++++----
 doc/delegation.mkd                                |    2 +-
 doc/gitolite.rc.mkd                               |  332 ++++++++++++++++++++
 doc/install-transcript.mkd                        |    2 +-
 doc/overkill.mkd                                  |    8 +-
 doc/progit-article.mkd                            |    2 +-
 doc/ssh-troubleshooting.mkd                       |    2 +-
 doc/who-uses-it.mkd                               |    5 +
 src/gitolite.pm                                   |  124 +++++----
 src/gl-auth-command                               |   14 +-
 src/gl-compile-conf                               |  164 +++++++----
 t/out/t01-repo-groups.1                           |    2 +-
 t/out/t01-repo-groups.1b                          |    2 +-
 t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} |   33 ++-
 t/out/t01-repo-groups.2                           |   28 ++-
 t/out/t02-user-groups.1                           |    2 +-
 t/out/t02-user-groups.1b                          |    2 +-
 t/out/{t02-user-groups.1b => t02-user-groups.1bs} |   35 +--
 t/out/t02-user-groups.2                           |    2 +-
 t/out/{t02-user-groups.2 => t02-user-groups.2bs}  |   49 ++--
 t/t01-repo-groups                                 |    6 +-
 t/t02-user-groups                                 |    8 +-
 t/t59-repo-not-on-disk                            |   12 +-
 t/test-driver.sh                                  |    7 +
 32 files changed, 1198 insertions(+), 552 deletions(-)

diff --cc conf/example.gitolite.rc
index 211b7cb,9ee7840..6f57994
--- a/conf/example.gitolite.rc
+++ b/conf/example.gitolite.rc
@@@ -61,260 -14,65 +14,73 @@@ $GL_ADMINDIR=$ENV{HOME} . "/.gitolite"
  $GL_CONF="$GL_ADMINDIR/conf/gitolite.conf";
  $GL_KEYDIR="$GL_ADMINDIR/keydir";
  $GL_CONF_COMPILED="$GL_ADMINDIR/conf/gitolite.conf-compiled.pm";
+ # DO NOT CHANGE THE NEXT TWO LINES UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
+ # These variables are set automatically by the install method you choose.
+ # $GL_PACKAGE_CONF = "";
+ # $GL_PACKAGE_HOOKS = "";
  
- # --------------------------------------
- 
- # if git on your server is on a standard path (that is
- #       ssh git@server git --version
- # works), leave this setting as is.  Otherwise, choose one of the
- # alternatives, or write your own
- 
- $GIT_PATH="";
- # $GIT_PATH="/opt/bin/";
- 
- # --------------------------------------
- 
- # ----------------------------------------------------------------------
- #                   BIG CONFIG SETTINGS
- 
- # Please read doc/big-config.mkd for details
+ # ------------------------------------------------------------------------------
+ # most often used/changed variables
+ # ------------------------------------------------------------------------------
+ $GL_WILDREPOS = 0;
+ $PROJECTS_LIST = $ENV{HOME} . "/projects.list";
+ $REPO_UMASK = 0077;
  
+ # ------------------------------------------------------------------------------
+ # variables with an efficiency impact
+ # ------------------------------------------------------------------------------
  $GL_BIG_CONFIG = 0;
  $GL_NO_DAEMON_NO_GITWEB = 0;
- $GL_NO_CREATE_REPOS = 0;
- $GL_NO_SETUP_AUTHKEYS = 0;
- 
- # ----------------------------------------------------------------------
- #                   SECURITY SENSITIVE SETTINGS
- #
- #       Settings below this point may have security implications.  That
- #       usually means that I have not thought hard enough about all the
- #       possible ways to crack security if these settings are enabled.
- 
- #       Please see details on each setting for specifics, if any.
- # ----------------------------------------------------------------------
- 
  
 +# Define which metadata variables shall be exported to the gitolite environment.
 +# Those variables can be used in hooks, e.g. for cia.vc
 +# A pubkey file might contain one or more of those variable.
 +# They can be defined by e.g:"# git-username: idl0r"
 +# Each '-' (dash) will be replaced by an '_' (underscore).
- @GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
- @GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
- 
- # --------------------------------------
- # ALLOW REPO ADMIN TO SET GITCONFIG KEYS
- #
- # Gitolite allows you to set git repo options using the "config" keyword; see
- # conf/example.conf for details and syntax.
- #
- # However, if you are in an installation where the repo admin does not (and
- # should not) have shell access to the server, then allowing him to set
- # arbitrary repo config options *may* be a security risk -- some config
- # settings may allow executing arbitrary commands.
- #
- # You have 3 choices.  By default $GL_GITCONFIG_KEYS is left empty, which
- # completely disables this feature (meaning you cannot set git configs from
- # the repo config).
- 
++#@GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
++#@GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
++
+ # ------------------------------------------------------------------------------
+ # VARIABLES WITH A SECURITY IMPACT.  READ DOC WELL BEFORE CHANGING THESE.
+ # http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd#_variables_with_a_security_impact
+ # ------------------------------------------------------------------------------
+ # $GL_ALL_READ_ALL = 0;
+ $GIT_PATH="";
  $GL_GITCONFIG_KEYS = "";
- 
- # The second choice is to give it a space separated list of settings you
- # consider safe.  (These are actually treated as a set of regular expression
- # patterns, and any one of them must match).  For example:
- # $GL_GITCONFIG_KEYS = "core\.logAllRefUpdates core\..*compression";
- # allows repo admins to set one of those 3 config keys (yes, that second
- # pattern matches two settings from "man git-config", if you look)
- #
- # The third choice (which you may have guessed already if you're familiar with
- # regular expressions) is to allow anything and everything:
- # $GL_GITCONFIG_KEYS = ".*";
- 
- # NOTE that due to some quoting and interpolation issues I have not been able
- # to look at, a literal "." needs to be specified in this string as \\.  (two
- # backslashes and a dot).  So this is how you'd allow any keys in the "foo"
- # category:
- #       $GL_GITCONFIG_KEYS = "foo\\..*";
- 
- # --------------------------------------
- # ALLOW GITCONFIG KEYS EVEN FOR WILD REPOS
- #
- # This is an efficiency issue more than a security issue, since this requires
- # trawling through all of $REPO_BASE looking for stuff :)
- 
  # $GL_GITCONFIG_WILD = 0;
- 
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- HTPASSWD
- 
- # security note: runs an external command (htpasswd) with specific arguments,
- # including a user-chosen "password".
- 
- # if you want to enable the "htpasswd" command, give this the absolute path to
- # whatever file apache (etc) expect to find the passwords in.
- 
+ $GL_NO_CREATE_REPOS = 0;
+ $GL_NO_SETUP_AUTHKEYS = 0;
+ # $GL_WILDREPOS_DEFPERMS = 'R @all';
  $HTPASSWD_FILE = "";
- 
- # Look in doc/3 ("easier to link gitweb authorisation with gitolite" section)
- # for more details on using this feature.
- 
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- RSYNC
- 
- # security note: runs an external command (rsync) with specific arguments, all
- # presumably filled in correctly by the client-side rsync.
- 
- # base path of all the files that are accessible via rsync.  Must be an
- # absolute path.  Leave it undefined or set to the empty string to disable the
- # rsync helper.
- 
  $RSYNC_BASE = "";
- 
- # $RSYNC_BASE = "/home/git/up-down";
- # $RSYNC_BASE = "/tmp/up-down";
- 
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- SVNSERVE
- 
- # security note: runs an external command (svnserve) with specific arguments,
- # as specified below. %u is substituted with the username.
- 
- # This setting allows launching svnserve when requested by the ssh client.
- # This allows using the same SSH setup (hostname/username/public key) for both
- # SVN and git access. Leave it undefined or set to the empty string to disable
- # svnserve access.
- 
  $SVNSERVE = "";
- # $SVNSERVE = "/usr/bin/svnserve -r /var/svn/ -t --tunnel-user=%u";
- 
- # --------------------------------------
- # ALLOW REPO CONFIG TO USE WILDCARDS
- 
- # security note: this used to in a separate "wildrepos" branch.  You can
- # create repositories based on wild cards, give "ownership" to the specific
- # user who created it, allow him/her to hand out R and RW permissions to other
- # users to collaborate, etc.  This is powerful stuff, and I've made it as
- # secure as I can, but it hasn't had the kind of rigorous line-by-line
- # analysis that the old "master" branch had.
- 
- # This has now been rolled into master, with all the functionality gated by
- # this variable.  Set this to 1 if you want to enable the wildrepos features.
- # Please see doc/wildcard-repositories.mkd for details.
- 
- $GL_WILDREPOS = 0;
- 
- # --------------------------------------
- # DEFAULT WILDCARD PERMISSIONS
- 
- # If set, this value will be used as the default user-level permission rule of
- # new wildcard repositories. The user can change this value with the setperms command
- # as desired after repository creation; it is only a default. Note that @all can be
- # used here but is special; no other groups can be used in user-level permissions.
- 
- # $GL_WILDREPOS_DEFPERMS = 'R @all';
- 
- # --------------------------------------
- # WILDREPOS PERMS CATEGORIES
- 
- # Originally, we only allowed "R" and "RW" in the setperms command.  Now we
- # allow the admin to define other categories as she wishes (example: MANAGERS,
- # TESTERS, etc).
- 
- # This variable is a space-sep list of the allowed categories.
- 
- # PLEASE, *PLEASE*, read the section in doc/wildcard-repositories.mkd for
- # caveats and warnings.  This is a VERY powerful feature and if you're not
- # careful you could mess up the ACLs nicely.
- 
- # this is the internal default if you don't set it (like if you didn't update
- # your ~/.gitolite.rc with new variables when you upgraded gitolite):
- $GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
- 
- # you can use your own categories in addition to the standard ones; I suggest
- # you include READERS and WRITERS for backward compat though:
- # $GL_WILDREPOS_PERM_CATS = "READERS WRITERS MANAGERS";
- # $GL_WILDREPOS_PERM_CATS = "READERS WRITERS MANAGERS TESTERS";
- 
- # --------------------------------------
- # HOOK CHAINING
- 
- # by default, the update hook in every repo chains to "update.secondary".
- # Similarly, the post-update hook in the admin repo chains to
- # "post-update.secondary".  If you're fine with the defaults, there's no need
- # to do anything here.  However, if you want to use different names or paths,
- # change these variables
- 
  # $UPDATE_CHAINS_TO = "hooks/update.secondary";
  # $ADMIN_POST_UPDATE_CHAINS_TO = "hooks/post-update.secondary";
- 
- # --------------------------------------
- # ADMIN DEFINED COMMANDS
- 
- # WARNING: Use this feature only if (a) you really really know what you're
- # doing or (b) you really don't care too much about security.  Please read
- # doc/admin-defined-commands.mkd for details.
- 
  # $GL_ADC_PATH = "";
+ # $GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
  
- # --------------------------------------
- # SITE-SPECIFIC INFORMATION
- 
- # Some installations would like to give their users customised information
- # (like a link to their own websites, for example) so that each end user does
- # not have to grok all the gitolite documentation.
- 
- # If this variable is defined, the "info" command will print it at the end of
- # the listing.
+ # ------------------------------------------------------------------------------
+ # less used/changed variables
+ # ------------------------------------------------------------------------------
+ # $GL_ALL_INCLUDES_SPECIAL = 0;
+ # $GL_SLAVE_MODE = 0;
+ # $ENV{GL_SLAVES} = 'gitolite@server2 gitolite@server3';
+ # PLEASE USE SINGLE QUOTES ABOVE, NOT DOUBLE QUOTES
+ $GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
  
- # $GL_SITE_INFO = "";
+ # ------------------------------------------------------------------------------
+ # rarely changed variables
+ # ------------------------------------------------------------------------------
+ $GL_LOGT="$GL_ADMINDIR/logs/gitolite-%y-%m.log";
+ # $GL_PERFLOGT="$GL_ADMINDIR/logs/perf-gitolite-%y-%m.log";
  # $GL_SITE_INFO = "XYZ.COM DEVELOPERS: PLEASE SEE http://xyz.com/gitolite/help first";
  
- # --------------------------------------
- # USERGROUP HANDLING
- 
- # Some sites would like to store group membership outside gitolite, because
- # they already have it in (usually) their LDAP server, and it doesn't make
- # sense to be forced to duplicate this information.
- 
- # Set the following variable to the name of a script that, given a username as
- # argument, will return a list of groups that she is a member of.
- 
- # $GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
+ # ------------------------------------------------------------------------------
+ # variables that should NOT be changed after the install step completes
+ # ------------------------------------------------------------------------------
+ $REPO_BASE="repositories";
  
- # --------------------------------------
+ # ------------------------------------------------------------------------------
  # per perl rules, this should be the last line in such a file:
  1;
  
diff --cc src/gitolite.pm
index 550cf1c,53368e9..63f7612
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -43,12 -40,17 +43,17 @@@ our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][
  our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
  
  # these come from the RC file
 -our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
 +our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA, @GL_METADATA_REQUIRED);
  our %repos;
  our %groups;
- our %repo_config;
+ our %git_configs;
+ our %split_conf;;
  our $data_version;
- our $current_data_version = '1.6';
+ our $current_data_version = '1.7';
+ 
+ # the following are read in from individual repo's gl-conf files, if present
+ our %one_repo;
+ our %one_git_config;
  
  # ----------------------------------------------------------------------------
  #       convenience subs
diff --cc src/gl-auth-command
index e2ea9f5,1af4232..2f32dc1
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@@ -32,7 -32,7 +32,7 @@@ use warnings
  # ----------------------------------------------------------------------------
  
  # these are set by the "rc" file
- our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, @GL_METADATA);
 -our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, $GL_ALL_READ_ALL);
++our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, $GL_ALL_READ_ALL, @GL_METADATA);
  # and these are set by gitolite.pm
  our ($R_COMMANDS, $W_COMMANDS, $REPONAME_PATT, $REPOPATT_PATT, $ADC_CMD_ARGS_PATT);
  our %repos;



^ permalink raw reply	[flat|nested] 105+ messages in thread

end of thread, other threads:[~2011-10-17 19:31 UTC | newest]

Thread overview: 105+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:master commit in: / Christian Ruppert
  -- strict thread matches above, loose matches on Subject: below --
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-10-17 19:29 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-08-30 15:46 Christian Ruppert
2011-06-16  0:45 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-06-14 12:02 Christian Ruppert
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 Christian Ruppert
2011-03-25 20:00 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:59 Christian Ruppert
2011-03-25 19:57 [gentoo-commits] proj/gitolite-gentoo:t/misc " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/per_repo_umask " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/misc " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/misc " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/misc " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 Christian Ruppert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox