Version bump, bug 437836 - CVE CVE-2012-4506.

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

3 files changed, 8 insertions, 92 deletions

diff --git a/dev-vcs/gitolite/ChangeLog b/dev-vcs/gitolite/ChangeLog
index 6240f99294db..ea351d5d9a2b 100644
--- a/dev-vcs/gitolite/ChangeLog
+++ b/dev-vcs/gitolite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitolite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.24 2012/09/22 15:17:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/ChangeLog,v 1.25 2012/10/10 18:51:22 idl0r Exp $
+
+*gitolite-3.1 (10 Oct 2012)
+
+  10 Oct 2012; Christian Ruppert <idl0r@gentoo.org> +gitolite-3.1.ebuild,
+  -gitolite-3.03.ebuild, -gitolite-3.04.ebuild:
+  Version bump, bug 437836 - CVE CVE-2012-4506.
 
   22 Sep 2012; Christian Ruppert <idl0r@gentoo.org> gitolite-3.04.ebuild:
   Fix upgrade warning when upgrading from 2.x to 3.x, bug 435816.
diff --git a/dev-vcs/gitolite/gitolite-3.03.ebuild b/dev-vcs/gitolite/gitolite-3.03.ebuild
deleted file mode 100644
index 81a051a834d1..000000000000
--- a/dev-vcs/gitolite/gitolite-3.03.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.03.ebuild,v 1.2 2012/06/07 21:53:43 zmedico Exp $
-
-EAPI=4
-
-inherit eutils perl-module user
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="http://milki.github.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.mkd doc/CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use doc; then
-		dodoc doc/*.mkd
-
-		docinto extras
-		dodoc doc/extras/*.mkd
-	fi
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if has_version "=dev-vcs/gitolite-2*"; then
-		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
-		elog "Alternatively there's a local and probably older copy in /usr/share/doc/${PF}"
-		elog "in case you have the \"doc\" useflag set."
-	fi
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/gitolite/gitolite-3.04.ebuild b/dev-vcs/gitolite/gitolite-3.1.ebuild
index ade0376182a3..57af8b6d23d6 100644
--- a/dev-vcs/gitolite/gitolite-3.04.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.04.ebuild,v 1.2 2012/09/22 15:17:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.1.ebuild,v 1.1 2012/10/10 18:51:22 idl0r Exp $
 
 EAPI=4