Revision bump, per repository umask was ignored when initialising a new repo

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

3 files changed, 57 insertions, 2 deletions

diff --git a/dev-vcs/gitolite-gentoo/ChangeLog b/dev-vcs/gitolite-gentoo/ChangeLog
index eb8a08da12c8..8e1154cffa1f 100644
--- a/dev-vcs/gitolite-gentoo/ChangeLog
+++ b/dev-vcs/gitolite-gentoo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/gitolite-gentoo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.10 2011/02/16 17:10:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/ChangeLog,v 1.11 2011/03/02 18:38:32 idl0r Exp $
+
+*gitolite-gentoo-1.5.9.1-r1 (02 Mar 2011)
+
+  02 Mar 2011; Christian Ruppert <idl0r@gentoo.org>
+  -gitolite-gentoo-1.5.9.1.ebuild, +gitolite-gentoo-1.5.9.1-r1.ebuild,
+  +files/gitolite-gentoo-1.5.9.1-umask.patch:
+  Revision bump, per repository umask was ignored when initialising a new repo
 
 *gitolite-gentoo-1.5.9.1 (16 Feb 2011)
 
diff --git a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.9.1-umask.patch b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.9.1-umask.patch
new file mode 100644
index 000000000000..d215f1138886
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-1.5.9.1-umask.patch
@@ -0,0 +1,42 @@
+From cab19e5760b43385347a8960e48a05c547cf54e6 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Tue, 1 Mar 2011 23:37:03 +0100
+Subject: [PATCH] Set umask properly before initialising a new repo
+
+---
+ src/gitolite.pm     |    4 ++--
+ src/gl-compile-conf |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gitolite.pm b/src/gitolite.pm
+index 73038ca..d58df32 100644
+--- a/src/gitolite.pm
++++ b/src/gitolite.pm
+@@ -274,9 +274,9 @@ sub where_is_rc
+ # NOTE: this sub will change your cwd; caller beware!
+ sub new_repo
+ {
+-    my ($repo, $hooks_dir, $creator) = @_;
++    my ($repo, $hooks_dir, $creator, $umask) = @_;
+ 
+-    umask(get_repo_umask($repo));
++    umask($umask ? $umask : get_repo_umask($repo));
+     die "wildrepos disabled, can't set creator $creator on new repo $repo\n"
+         if $creator and not $GL_WILDREPOS;
+ 
+diff --git a/src/gl-compile-conf b/src/gl-compile-conf
+index f8d35bb..e0a5331 100755
+--- a/src/gl-compile-conf
++++ b/src/gl-compile-conf
+@@ -497,7 +497,7 @@ sub do_normal_repos
+         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}");
+             }
+-- 
+1.7.3.4
+
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1-r1.ebuild
index 6333803f8a85..7e80ee28b2b8 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1.ebuild,v 1.1 2011/02/16 17:10:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-1.5.9.1-r1.ebuild,v 1.1 2011/03/02 18:38:32 idl0r Exp $
 
 EAPI=3
 
@@ -28,6 +28,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-umask.patch"
+
 	rm -rf Makefile doc/COPYING contrib/{autotoc,gitweb,vim} || die
 
 	echo "${PF}-gentoo" > conf/VERSION
@@ -63,4 +65,8 @@ pkg_postinst() {
 	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
 	elog "Especially if you're migrating from gitosis."
 	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
 }