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

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

4 files changed, 18 insertions, 104 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/Manifest b/dev-vcs/gitolite/Manifest
index a7ac61054b4f..67ec21696a85 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -6,24 +6,22 @@ DIST gitolite-2.1.0.tar.bz2 189726 SHA256 c55ca02932893f3f6a76a2e31d53d847c2fd5c
 DIST gitolite-2.2.tar.bz2 186414 SHA256 b43a735af62dbb2b05ed679029f3eafd8aa0c0e8041399f2c4dad796f87d6ccc SHA512 ae1bab7cd1433cc6a1dc2635535012c919ba201efaf015d51bc0b256994711054b135b23cf3d644f9ff5570c5f943088b394a7a23decd71488b1031091959808 WHIRLPOOL 39bd7c5f19c0e78a105bb213ffb6d0feac0e1c8778f36b2c67a2937a0fe04c02ee3ba0a63de0dbbf10d2a38ad554bef35f29a4297f9453fbfacb7d81b0107e71
 DIST gitolite-2.3.1.tar.gz 255807 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee WHIRLPOOL 5d08b9c22e6a07478836cca3b7190b61729ef89e181e4746286a4cf48f253fe07647b165f22483d983bae1767d83b39f231414dc96b4e803140f64eb244fc241
 DIST gitolite-2.3.tar.bz2 189284 SHA256 19a01127012930ae59231a898e045bf1eb15df209decc452fb31d71d86a5053d SHA512 90443cadba829f43fceb0b706d6f2dad8f4e2b397bdcc2a633098342969cd4952c8c06f980f77d1ae104661b5649ef56f19e7fe2b7828c23eb3ee2f35ae59c32 WHIRLPOOL 3d1978096b3c4ac174c29d29be045c295e0f2520eddd6db9e8abe67fa74cc02654fb5c0bd45730d7f3b60f07fd29d05c06884e95a1a5d5733fa77b88ef0207f6
-DIST gitolite-3.03.tar.gz 199433 SHA256 b3487fd99cc46a7be32a58f8a86a520fc0943814794cc56b5f83d803591737ca SHA512 566f2b0f32fe0cc6f1ea9e9458d593e183e49bb9178fe071e64bb74346ead7c0d2406cd99ac45e59ee57d9afd8efea476f930f210cb3408a88d8c686e32c8bb7 WHIRLPOOL 037dc230973352282ae1d8ec7e096f8c4986b6b7948f19244996a77bf56eb931ad9f352335a814d83062c34b9fa6f9d1f989035efbce19231581867d80a634d6
-DIST gitolite-3.04.tar.gz 114010 SHA256 900dd144ddfa88cc21fadfef7652799ead78c1be52304506994307c448e6b618 SHA512 e902a13bccfbfdfd4fa8cb59860d0718662e1029ec6813f8e8e08cebdc63d02dd87610f1edf4e92ed199d4c45fc9008821bb7b60ac82485124c3a4d4cd5a26bd WHIRLPOOL bd3688d7e46fb1c6cadd5fa56b5b2973afec07df109cc38a95dc893905ae024280cd11ce4b1862b346fdd6424902374922b1f264807bae57137d91d1356a7962
+DIST gitolite-3.1.tar.gz 119322 SHA256 36fc270c29e980f7217c203656373d1c44f73035fe18053163301cd10a4e0f04 SHA512 4b6a5a7fc558f4428350af7960e9f8ef923c114c2772c523d44c968a8c7d78dd52f2ae906f70d0f86fb1eab2c09f70a32df42c7cc24c002bec96dd654b904ec4 WHIRLPOOL 477f69bfcd2d5eff45f336fe569fd2b73c4349dd45d124cb0841a849b9f68b732afb3d1ddb497bf980bb3fd902b872b9c1018f09325a77e9eb1a16d0d4a94c3d
 EBUILD gitolite-2.1.0.ebuild 1623 SHA256 22cf29a1ced7305a836ac8b4798537254c361ba6fcb80be01b84188029c9d4e1 SHA512 7bbacc1050a133d4546be412b1ccfa09c67b2f4f9154ab291a0038121508aceb78b2521d70560f8bacb7f5709a706478004545b54243902c4207f39092f34a06 WHIRLPOOL 0f971cb6759d688aef828e99449775690db9acac49cf0bea61a7df7b5a1e8bec18cc385987eb8db9c71e6239c96d3bb39e36bd0ba15786b98b4cc30580b07ec3
 EBUILD gitolite-2.2.ebuild 1745 SHA256 5812001619e193ff5788f3e68540644c6db604f056b0861e31fe38edf45f3f6d SHA512 d6a17084ba7811073735ecb33ea9145ce459cbb39b4485cf8251b24a99f4f91c9f1148c975a5193ef52cb4c679d245b248cf0755b4d9821d3239b750e5facdc2 WHIRLPOOL c324d8e243b4bfdf9e0d759cf3e03abe66502a50ad39bbcade5cde74db952b4a5e0eaa51c4f463e4f1128fe9dfb742ef532246c6ccbb47335325f93c7ab3b9d2
 EBUILD gitolite-2.3.1.ebuild 1762 SHA256 f137729a5f313809bf987c31089ed5aaa1e16d426b75b625a21875e6a09f14d5 SHA512 a214ee52168ddae51477b9f16e849e3d78d40b595a54600fe47400e21e4c849499baed68efb57fb6d51ed433f87f6c494a4000cb3ac1f0253295f3652e71a0ba WHIRLPOOL 3388b1e698d11a36dae9194e98401f126fee3d786e24eadfcc50bfdfd34f92907dbb7839a6376104f51d8db2253378e6ad0e4c67ae60079e5934fef7631717b0
 EBUILD gitolite-2.3.ebuild 1751 SHA256 6cd10fe0235d7b6e2015a38e017d48a4004c7fb5d1c1eff3bf352027d3c81bbe SHA512 da64fee2b8a1ab227b821c2111f44796dd9fc026ecbbab0319d5bc1f57726a81c76edf033976dc7b92494518a98e736730df817250ea4d2dc8c93f5380f152ef WHIRLPOOL b9bb84ff314a41a52b621fd045082aa0dbb021f710ffcf2c47abafc3fbbcea39f5edc803b937aa26e59f1c2c238bee9e0b48258470d2d8fb1866d2b2e1c6be67
-EBUILD gitolite-3.03.ebuild 2142 SHA256 b1c9135b18d59365c001a7bed8dead20e31a30ffe8dc66d8f7c13507a6291c47 SHA512 1e98ca35a57f7b54d69732d8a0f4f77c0d4ec1e2f0400c24220d7abe678efb09914904fcc64d7b0b0f685a50708b33c87743b8b0407843676e409c06689caec6 WHIRLPOOL 0d024e779f54db03019e572110a153c5e0879adf626ff83566e2d395cddaa662fba9d25bd1e66e1e15ec424d6249c007e921f79471861fdad39919bcb4a1707c
-EBUILD gitolite-3.04.ebuild 1941 SHA256 24b5a98fc6fdd4a33c695e4cd4044254819449f61d4c8574c20253d8074e4b0f SHA512 3297b680fc16ae4459fd723eded713930fe885133ad7f0aa920c1314b52c5215d103085f55a8878d3b7b5556ec466d7f554e523a421bfc8784c04472d4e1a15b WHIRLPOOL 88d8ff1e10591aa417c014a3f21ea9eb7f8862b2119b7bde7d2bec27986b5c1e085b2a555acc07d6266dc5640f02986d4a8802395b2b92df3ed32add603d19af
-MISC ChangeLog 3770 SHA256 30718d9cbc3f89f11d0d3b7ed07f0f2c8531d75a5ea4fe27deba1220320fb2aa SHA512 77b8e491cdcf3e1c0d5374493c9887f2a83b2c09c63723a9b6d06a451deffb2b4244c50d99c647ed329e4d9adfcaec74e5ce802082b33cf42ee0396715dc7cdf WHIRLPOOL 180e8df28a4f922630e6d2405a03e56da346e9b0b1f40e5c0f5824e398ba02ffe972b6d7423079140b80c6a14ad5ebf5d3cbdd760aebf675c059c65420ee5bbc
+EBUILD gitolite-3.1.ebuild 1940 SHA256 7451928a5d548617713e19816b70f6329ffeb2a7f9cbc98075f55de5f555aeeb SHA512 7af7af3ad8c8cdf8731824b7a20d498c3ec71b464422b8eaba85cae15b54cb0c29063fd0a47e5f3a2961a71c702535b48f5ab320995cce811b06f01d96cfb523 WHIRLPOOL da772af3c5b98c2ba49c104386b02e186b152de5db3c21104ff0c052e1ef4b718bf1bc2fcf590ea382954b9c54748b4d4f6bd84276d910955a214761d6901384
+MISC ChangeLog 3970 SHA256 8a2471380f7d174d52cac926c2f8276a7cf89ee2ac61dcb81a4bd1dbc1e80e6b SHA512 fa95a6563533ac959c1822a9cb55479482859369393ee0399851b55254f342d4ccb431f9157cafa11ea0c15ad3c23b0ffd6d7e70c79c638fbe2547757ad81126 WHIRLPOOL beba96e3dd8b2f6bf0a1d7ea52c210194d0a0be3eb426e12bc92fa6e39eefa66a5eadc98128087c652850eccd88c3300751a39aba60aa6f3553df680b876f790
 MISC metadata.xml 779 SHA256 b4ffa2d440bbd0bad5a09952ae8b0240b7056ad2773cd36c617d89ac0b589e8b SHA512 119a713d329854b20633d292fddd5e38f2292a81c76de4fe776cb06168ba03a2bde59b954b5453ec5232645516a62b2d0a2ec68ad27f9d011dbc309ebd1d123a WHIRLPOOL 1abe55643411d0c9a0750d221784ecd085916a3f806af052b6c5c8dc93844bed9897400535545d387697663cd1bec73b37f7fbc25956d517583eef156b945cf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQXdahAAoJEMOx0zmdw4Z1qaYIALLW/2DlVO3mZx/tgfcEmvet
-QoME2DE9mLF/GH6eDijKldQ27V2MRHJyidbmqwJIIWYay6yzoNQgSSWXqjwDAbGf
-Etxt5VtDt8tm2ylP2rFbW3wQfK3OByxx+2IPNRWx0JNHrH9oZ1Bb6Lce3EcnpcF/
-clNW3DUe4CW7iigFxTM7642XDrxhCIXsAjLY4yKhf60rU1xxEgwAXTjQ801E27qC
-ICnbhoE3GJC8Ns9/oqLupQ714nWvJA/LUEZ5AByL1WjvV/O1cHMWXaDIygqeEBW1
-akl02xbJ1mHL7Acp+O3adTXb7ADsZw0FaF1UTTm+CQ20SgTYvfRLDwMHgcU0CLA=
-=Wxa2
+iQEcBAEBCAAGBQJQdcOuAAoJEMOx0zmdw4Z1yY8IAJX47V5HCbp5W11TcHui6OzV
+qP83zMQjIGY09EkJREtOygxP4t/2ojL1KNOFQOER3vNmLioOzkwtcEn8pPiFmvXK
+HmKt6XwEN/gZFL6FQhrnjdZbJxHRhoaIqtuidgGSZHZk4yJZ68bh+YVJ1JwGMIIZ
+MwBgcFV7lYSYqw7EJypkBZU6tDPHS4muEdFO54oqEBdhJFPNyY858DDbhbXrfARu
+U+1xuWdj5cgBCL8Q3+DvGVTrFyq/oCno+MZwGbmECxHjXlVuxcNJ4QT4s+YI3CgH
+HG//T4ap1LyrJjHwWWGO7DLeOffqIqElmsC9whRCzma2xnDb7+eETW2uGdBXhI0=
+=8QgZ
 -----END PGP SIGNATURE-----
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