rpms/gitolite/devel gitolite-1.5-rpm.patch,NONE,1.1
Jon Ciesla
limb at fedoraproject.org
Mon May 24 14:26:53 UTC 2010
- Previous message: rpms/krb5-appl/devel krb5-appl-1.0.1-largefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 krb5-appl.spec, 1.3, 1.4 sources, 1.2, 1.3 krb5-appl-1.0-largefile.patch, 1.1, NONE krb5-appl-1.0.tar.gz.asc, 1.1, NONE
- Next message: File cacti-0.8.7f.tar.gz uploaded to lookaside cache by mmcgrath
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: limb
Update of /cvs/pkgs/rpms/gitolite/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28002
Added Files:
gitolite-1.5-rpm.patch
Log Message:
Oops.
gitolite-1.5-rpm.patch:
sitaramc-gitolite-3ddc8aa.orig/hooks/common/update.orig |only
sitaramc-gitolite-3ddc8aa.orig/hooks/common/update.rej |only
sitaramc-gitolite-3ddc8aa.orig/src/gitolite.pm.orig |only
sitaramc-gitolite-3ddc8aa.orig/src/gl-auth-command.orig |only
sitaramc-gitolite-3ddc8aa.orig/src/gl-auth-command.rej |only
sitaramc-gitolite-3ddc8aa.orig/src/gl-compile-conf.orig |only
sitaramc-gitolite-3ddc8aa.orig/src/gl-compile-conf.rej |only
sitaramc-gitolite-3ddc8aa.orig/src/gl-install.orig |only
sitaramc-gitolite-3ddc8aa/hooks/common/update | 2
sitaramc-gitolite-3ddc8aa/src/gl-auth-command | 2
sitaramc-gitolite-3ddc8aa/src/gl-compile-conf | 2
sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/gitolite-admin/post-update | 2
sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm | 2
sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-auth-command | 2
sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-compile-conf | 4 -
sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-install | 36 ++++------
sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-setup | 2
17 files changed, 25 insertions(+), 29 deletions(-)
--- NEW FILE gitolite-1.5-rpm.patch ---
diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/hooks/gitolite-admin/post-update sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/gitolite-admin/post-update
--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/hooks/gitolite-admin/post-update 2010-04-21 21:27:25.000000000 -0500
+++ sitaramc-gitolite-v1.4.2-0-g820d3f5/hooks/gitolite-admin/post-update 2010-04-23 16:09:46.107694728 -0500
@@ -15,7 +15,7 @@
od=$PWD
cd $GL_ADMINDIR
-$GL_BINDIR/gl-compile-conf
+gl-compile-conf
cd $od
diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gitolite.pm sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm
--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gitolite.pm 2010-04-21 21:27:25.000000000 -0500
+++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm 2010-04-23 16:10:26.674695513 -0500
@@ -280,7 +280,7 @@
sub report_version {
my($GL_ADMINDIR, $user) = @_;
print "hello $user, the gitolite version here is ";
- system("cat", ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION");
+ system("rpm", "-q", "--qf", '%{version}-%{release}', 'gitolite');
}
# basic means wildcards will be shown as wildcards; this is pretty much what
diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-auth-command sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-auth-command
--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-auth-command 2010-04-21 21:27:25.000000000 -0500
+++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-auth-command 2010-04-23 16:12:50.316931744 -0500
@@ -33,7 +33,7 @@
my $bindir = $0;
$bindir =~ s/\/[^\/]+$//;
$bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
-require "$bindir/gitolite.pm";
+require gitolite;
# ask where the rc file is, get it, and "do" it
&where_is_rc();
diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-compile-conf sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-compile-conf
--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-compile-conf 2010-04-21 21:27:25.000000000 -0500
+++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-compile-conf 2010-04-23 16:13:50.649928701 -0500
@@ -60,7 +60,7 @@
my $bindir = $0;
$bindir =~ s/\/[^\/]+$//;
$bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
-require "$bindir/gitolite.pm";
+require gitolite;
# ask where the rc file is, get it, and "do" it
&where_is_rc();
@@ -74,7 +74,7 @@
# ----------------------------------------------------------------------------
# command and options for authorized_keys
-$AUTH_COMMAND="$bindir/gl-auth-command";
+$AUTH_COMMAND="/usr/bin/gl-auth-command";
$AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
# groups can now represent user groups or repo groups.
diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-install sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-install
--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-install 2010-04-21 21:27:25.000000000 -0500
+++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-install 2010-04-23 16:19:15.030679332 -0500
@@ -24,18 +24,14 @@
# the common setup module is in the same directory as this running program is
my $bindir = $0;
$bindir =~ s/\/[^\/]+$//;
-require "$bindir/gitolite.pm";
+require gitolite;
# ask where the rc file is, get it, and "do" it
&where_is_rc();
unless ($ENV{GL_RC}) {
# doesn't exist. Copy it across, tell user to edit it and come back
my $glrc = $ENV{HOME} . "/.gitolite.rc";
- if ($GL_PACKAGE_CONF) {
- system("cp $GL_PACKAGE_CONF/example.gitolite.rc $glrc");
- } else {
- system("cp $bindir/../conf/example.gitolite.rc $glrc");
- }
+ system("cp /usr/share/gitolite/conf/example.gitolite.rc $glrc");
print "created $glrc\n";
print "please edit it, change the paths if you wish to, and RERUN THIS SCRIPT\n";
exit;
@@ -52,18 +48,18 @@
wrap_mkdir($repo_base_abs);
wrap_mkdir($GL_ADMINDIR);
# mkdir $GL_ADMINDIR's subdirs
-for my $dir qw(conf doc keydir logs src hooks hooks/common hooks/gitolite-admin) {
+for my $dir qw(conf keydir logs hooks hooks/common hooks/gitolite-admin) {
# some of them will stay empty; too lazy to fix right now ;-)
wrap_mkdir("$GL_ADMINDIR/$dir");
}
# "src" and "doc" will be overwritten on each install, but not conf
-if ($GL_PACKAGE_HOOKS) {
- system("cp -R -p $GL_PACKAGE_HOOKS $GL_ADMINDIR");
-} else {
- system("cp -R -p $bindir/../src $bindir/../doc $bindir/../hooks $GL_ADMINDIR");
- system("cp $bindir/../conf/VERSION $GL_ADMINDIR/conf");
-}
+#if ($GL_PACKAGE_HOOKS) {
+# system("cp -R -p $GL_PACKAGE_HOOKS $GL_ADMINDIR");
+#} else {
+# system("cp -R -p $bindir/../src $bindir/../doc $bindir/../hooks $GL_ADMINDIR");
+# system("cp $bindir/../conf/VERSION $GL_ADMINDIR/conf");
+#}
unless (-f $GL_CONF or $GL_PACKAGE_CONF) {
print <<EOF;
@@ -73,7 +69,7 @@
RW+ = yourname
2. copy "yourname.pub" to $GL_ADMINDIR/keydir
3. run this command
- $GL_ADMINDIR/src/gl-compile-conf
+ gl-compile-conf
EOF
}
@@ -82,7 +78,7 @@
for my $repo (`find . -type d -name "*.git"`) {
chomp ($repo);
# propagate our own, plus any local admin-defined, hooks
- ln_sf("$GL_ADMINDIR/hooks/common", "*", "$repo/hooks");
+ ln_sf("/usr/share/gitolite/hooks/common", "*", "$repo/hooks");
# in case of package install, GL_ADMINDIR is no longer the top cop;
# override with the package hooks
ln_sf("$GL_PACKAGE_HOOKS/common", "*", "$repo/hooks") if $GL_PACKAGE_HOOKS;
@@ -93,7 +89,7 @@
if ( -d "gitolite-admin.git/hooks" ) {
print "copying post-update hook to gitolite-admin repo...\n";
unlink "gitolite-admin.git/hooks/post-update";
- symlink "$GL_ADMINDIR/hooks/gitolite-admin/post-update", "gitolite-admin.git/hooks/post-update"
+ symlink "/usr/share/gitolite/hooks/gitolite-admin/post-update", "gitolite-admin.git/hooks/post-update"
or die "could not symlink post-update hook\n";
# ditto... (see previous block)
ln_sf("$GL_PACKAGE_HOOKS/gitolite-admin", "post-update", "gitolite-admin.git/hooks") if $GL_PACKAGE_HOOKS;
@@ -101,7 +97,7 @@
}
# fixup program renames
-for my $oldname qw(pta-hook.sh conf-convert.pl 00-easy-install.sh 99-emergency-addkey.sh install.pl update-hook.pl hooks/update ga-post-update-hook VERSION) {
- unlink "$GL_ADMINDIR/src/$oldname";
- unlink "$ENV{HOME}/gitolite-install/src/$oldname";
-}
+#for my $oldname qw(pta-hook.sh conf-convert.pl 00-easy-install.sh 99-emergency-addkey.sh install.pl update-hook.pl hooks/update ga-post-update-hook VERSION) {
+# unlink "$GL_ADMINDIR/src/$oldname";
+# unlink "$ENV{HOME}/gitolite-install/src/$oldname";
+#}
diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-setup sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-setup
--- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-setup 2010-04-21 21:27:25.000000000 -0500
+++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gl-setup 2010-04-23 16:19:53.849932100 -0500
@@ -1,6 +1,6 @@
#!/bin/sh
-GL_PACKAGE_CONF=/tmp/share/gitolite/conf
+GL_PACKAGE_CONF=/usr/share/gitolite/conf
# must be the same as the value for the same variable in
# $GL_PACKAGE_CONF/example.gitolite.rc. Sorry about the catch-22 :)
diff -r -U3 sitaramc-gitolite-3ddc8aa.orig/hooks/common/update sitaramc-gitolite-3ddc8aa/hooks/common/update
--- sitaramc-gitolite-3ddc8aa.orig/hooks/common/update 2010-05-19 04:03:35.000000000 -0500
+++ sitaramc-gitolite-3ddc8aa/hooks/common/update 2010-05-20 16:08:35.094177610 -0500
@@ -35,7 +35,7 @@
# we should already have the GL_RC env var set when we enter this hook
die "parse $ENV{GL_RC} failed: " . ($! or $@) unless do $ENV{GL_RC};
-require "$ENV{GL_BINDIR}/gitolite.pm";
+require gitolite;
my ($perm, $creator, $wild) = &repo_rights($ENV{GL_REPO});
my $reported_repo = $ENV{GL_REPO} . ( $ENV{GL_REPOPATT} ? " ($ENV{GL_REPOPATT})" : "" );
Only in sitaramc-gitolite-3ddc8aa.orig/hooks/common: update.orig
Only in sitaramc-gitolite-3ddc8aa.orig/hooks/common: update.rej
Only in sitaramc-gitolite-3ddc8aa.orig/src: gitolite.pm.orig
diff -r -U3 sitaramc-gitolite-3ddc8aa.orig/src/gl-auth-command sitaramc-gitolite-3ddc8aa/src/gl-auth-command
--- sitaramc-gitolite-3ddc8aa.orig/src/gl-auth-command 2010-05-20 16:05:15.692178554 -0500
+++ sitaramc-gitolite-3ddc8aa/src/gl-auth-command 2010-05-20 16:09:59.787173835 -0500
@@ -197,7 +197,7 @@
if ($perm =~ /C/) {
# it was missing, and you have create perms
wrap_chdir("$repo_base_abs");
- new_repo($repo, "$GL_ADMINDIR/hooks/common", $user);
+ new_repo($repo, "/usr/share/gitolite/hooks/common", $user);
wrap_chdir($ENV{HOME});
}
Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-auth-command.orig
Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-auth-command.rej
diff -r -U3 sitaramc-gitolite-3ddc8aa.orig/src/gl-compile-conf sitaramc-gitolite-3ddc8aa/src/gl-compile-conf
--- sitaramc-gitolite-3ddc8aa.orig/src/gl-compile-conf 2010-05-20 16:05:15.695174046 -0500
+++ sitaramc-gitolite-3ddc8aa/src/gl-compile-conf 2010-05-20 16:11:29.303178634 -0500
@@ -427,7 +427,7 @@
next if $repo =~ m(^\@|EXTCMD/); # these are not real repos
unless (-d "$repo.git") {
print STDERR "creating $repo...\n";
- new_repo($repo, "$GL_ADMINDIR/hooks/common");
+ new_repo($repo, "/usr/share/gitolite/hooks/common");
# new_repo would have chdir'd us away; come back
wrap_chdir("$repo_base_abs");
}
Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-compile-conf.orig
Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-compile-conf.rej
Only in sitaramc-gitolite-3ddc8aa.orig/src: gl-install.orig
- Previous message: rpms/krb5-appl/devel krb5-appl-1.0.1-largefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 krb5-appl.spec, 1.3, 1.4 sources, 1.2, 1.3 krb5-appl-1.0-largefile.patch, 1.1, NONE krb5-appl-1.0.tar.gz.asc, 1.1, NONE
- Next message: File cacti-0.8.7f.tar.gz uploaded to lookaside cache by mmcgrath
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list