Version bump and cleanup, CVE-2012-0453, bug 405477.

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

4 files changed, 223 insertions, 55 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index d3249c2afc45..30fb2eff41aa 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/bugzilla
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.207 2012/02/01 20:21:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.208 2012/02/28 14:51:52 idl0r Exp $
+
+*bugzilla-4.2 (28 Feb 2012)
+*bugzilla-4.0.5 (28 Feb 2012)
+
+  28 Feb 2012; Christian Ruppert <idl0r@gentoo.org> -bugzilla-3.6.6.ebuild,
+  +bugzilla-4.0.5.ebuild, +bugzilla-4.2.ebuild:
+  Version bump and cleanup, CVE-2012-0453, bug 405477.
 
   01 Feb 2012; Agostino Sarubbo <ago@gentoo.org> bugzilla-3.6.8.ebuild:
   Stable for AMD64/X86, wrt security bug #401809
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 82b2e7e30014..e2e1d4ecd674 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 3.6/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e SHA1 f7811fd35ce2abc6f8358abfdb5afd5b903d6cf4 SHA256 004cf631625c9a6f2b0aeccf2a2ead815008f59029326c13b28658586023b241
 AUX 3.6/bugzilla.cron.tab 54 RMD160 199919c125f0b214e17d6eadf909f7172b025137 SHA1 cbfc9f2051c3ce7f2f968f65a683c0fe7c8884df SHA256 ccbc9369bf52e6afd91e31ba2a89fa9a0bbbdae080e0fa7eb26d06fa21ef1eab
@@ -11,22 +11,24 @@ AUX 4.0/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e
 AUX 4.0/bugzilla.cron.tab 49 RMD160 4bf0074418ec9f98a3eb392172ae9b303211943f SHA1 a875518b367006641d90045ce137ea4762968c1c SHA256 bb66591cd659ae93b10b2b01bcf698a8b06b0d1c45fc4b996cce3759ae483c50
 AUX 4.0/postinstall-en.txt 669 RMD160 9c8ffa9f5171921f100790060548f1b04fb0d87e SHA1 626524ab45110298901c3753c24d9ebc91abe39b SHA256 8785744b482dfbc4f7e7b5620e3a79dc9742ff67ab43f49923e0c9a982cbf409
 AUX 4.0/reconfig 349 RMD160 e5658372e9a1b67a39a0090e1a638261e05cf10a SHA1 93651b403924a270f1c693491c3c564999528b03 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455dcc7d175aa50
-DIST bugzilla-3.6.6.tar.gz 2528601 RMD160 29a6d3b6aed1dc8666ed908a95538ad09875f4cf SHA1 d37433efb5b1034bf11e7ad3224d8922fd691f71 SHA256 76f0fac1bc2c1bb498868728bd64a90081ff848db96a75e9a2fc9bbe9942e546
 DIST bugzilla-3.6.8.tar.gz 2509304 RMD160 9c3236dd049c75445b9b545f3228472488a980fa SHA1 b763848e73b6f857b6fe728d2742028a6ed5dc7d SHA256 a07efee28c905d3b0afd10d1efe6fa6ecaaa7e0e89c299f1f20fe21a74ad16bf
 DIST bugzilla-4.0.4.tar.gz 2801949 RMD160 e78162d456c9e8fcdecf9c9afe77c38de18bed31 SHA1 e21d3c0fb8e283192dc6413f789c3988536484fa SHA256 67c321306e1f796ff1d159083dcdaba7e72c3ec5742292cb5980c23c46e2dc4d
-EBUILD bugzilla-3.6.6.ebuild 2541 RMD160 3ca4ce172f28b285dc7a82a9ca56c526acc83c69 SHA1 3d5b5af7ba191250cd34361e6d2035c88f9ee23c SHA256 255d2435d3060b0ceee33d4f3ecf9acbb438d5c874ba4f54d7b505c0d8cb7b7a
+DIST bugzilla-4.0.5.tar.gz 2900587 RMD160 c3723a915cb112a88ef5f98d0016145d8f391661 SHA1 23d0f81442d9513ed6cc79796bcd5b837472d9a9 SHA256 7583f2e7d8c74aa29e8583230024970b420f45f230538273b8eac4cd7c36acbe
+DIST bugzilla-4.2.tar.gz 2968522 RMD160 c8f4d39979a7622f737171fcbd93096db1c15b8c SHA1 9ecde503712de41f90d84cdb5bf892841ad16840 SHA256 67f603c081cea1063f1c0131d54b2a51965c579ba136fd02e333dbb719a3f8ae
 EBUILD bugzilla-3.6.8.ebuild 2534 RMD160 0d83679c031538b5e3da182492f0fa3bd709beaf SHA1 5c1749e416e393bcdfc128dfdf89dc052e138c86 SHA256 267374910491af4185e578c7e93a742ab0c8091256facbe9e3bdc67f95ce48a1
 EBUILD bugzilla-4.0.4.ebuild 2945 RMD160 52e32fb041320968a6046ac9ce1b1b9eba4f4224 SHA1 428a4586e932ce4d005779e6d36d1fe8ea0f753a SHA256 17e24ad23c2fa004a24a41274afbfff2e25bfa89dea7ad1bc74acab9b9b0b4df
-MISC ChangeLog 35473 RMD160 883820b0c3dc20e8cacb4d0c0f54de88b68c8e15 SHA1 a0b33a1b800778ba621ca948f857ef550c14f4fa SHA256 62a049c3e7b99c3cb7ff6fc506c7f818f4528f752ca244a2663ea65c04b1a449
+EBUILD bugzilla-4.0.5.ebuild 2945 RMD160 c3ce76f9d719fcf4974a04e1f30480111adeb144 SHA1 d64157614c7ec4b469605c6b5b3b42ffe1c21257 SHA256 e5e89e5c5e22634d3b6940d617890cf207777548fe329c2e4017a0dce284a6e2
+EBUILD bugzilla-4.2.ebuild 3049 RMD160 cb4813e49291c7a7c870c8fb2591d2ef7c85807d SHA1 ad0eafa86c1caca0a20d87afd4dd608eb94fe4d2 SHA256 c7e75c0c69e47d717f2cc78076c553c8d7578f157dc440efd1826fb27b9b0919
+MISC ChangeLog 35714 RMD160 a9b1658d0127e624750f6e4aac10bd84338bbc91 SHA1 e1e2a08a98a20ee798e168e15c5299a5b3446d3e SHA256 ca9cbe812b7f64ba5ba02ad985be611ed1d110f1188f39573c1ec06cc7e8547e
 MISC metadata.xml 304 RMD160 b5fdc620a69ac920cf242384882b38e9dcd04694 SHA1 f88703f6a8fec95666732939aba680eb635e0978 SHA256 90bc0a03cdc3329de7601f0b8035105a09edd165f5de74e92a46bb695c9072d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPKZ7SAAoJEOTDgjZ80txdnq8H/0KgYQhKKOucDlJx1R8TWxC6
-LGOluiMUesem7CdEtCdxgSjJaWn77n2n0TvJOYZYMiWwSryFXItEnXtVzgnXYmlP
-ET0Vj9I7FT3t3EJmjuJsZxRQFfK1DL8LlBXxKCJoVpnrxu5kD1O/XDSF1uOURHMB
-WZAhvt9Z0e4ceea/H+V5tPvgB5dNloUzjx6g12xWliQ5VzhdQjdUpryFG7lZjXK3
-LJvOrZ8vCQrTGotfQhaHQQJCh40m3mSMRFiHNxGCgc26moqf/01wrK06B0rmkpoJ
-tTpN/A7rRJzbeca862e+z1fEbcM8tUoiBlaXKDD44wgB0ALNyczKCgw7pdjjR58=
-=FkeW
+iQEcBAEBCAAGBQJPTOoRAAoJEMOx0zmdw4Z174kH/jBmMCst9jj57YGqlHtP4Qo0
+3BMuD5NVBVyqZtl6hKRMhp5WrNFxJ87HoX2iQ5heXjGFcghvoj/zBOXVul2dbbBD
+MUye/Krijjt47ErJKaxu6bWRL712V1hZP6KRkG+oPvpayd5WvunlPobf7a/F/uWS
+X1pVKMYy7GQrvfbRP8YnsYCbAfLFrutjI5HDV5m5s0Fupw8Ey1IOKxpBFHONIkgV
+II2f0/j9FBh4PzITtiLJGkd0wxtL9Jfqdrkvl/C/CaTz+R7QXQ0DPPRZpYwN6PIe
+HB37z2SQ2zj143i0izrPVbrSFzCS+G73WBiZ8KgOiPjiQpojAlQwlLQYqC0LilE=
+=urLW
 -----END PGP SIGNATURE-----
diff --git a/www-apps/bugzilla/bugzilla-3.6.6.ebuild b/www-apps/bugzilla/bugzilla-4.0.5.ebuild
index 834aede85484..280d79cc4a06 100644
--- a/www-apps/bugzilla/bugzilla-3.6.6.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.6.ebuild,v 1.3 2011/08/27 20:13:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.0.5.ebuild,v 1.1 2012/02/28 14:51:52 idl0r Exp $
 
 EAPI="3"
 
@@ -13,65 +13,78 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
 LICENSE="MPL-1.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="modperl extras graphviz mysql postgres"
+IUSE="modperl extras graphviz mysql postgres test"
 
-RDEPEND="
-	virtual/httpd-cgi
+COMMON_DEPS="
 	>=dev-lang/perl-5.8.8
 
-	>=dev-perl/DBI-1.601
+	>=virtual/perl-CGI-3.510
+	virtual/perl-Digest-SHA
+	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DateTime-0.50
-	>=dev-perl/DateTime-Locale-0.43
 	>=dev-perl/DateTime-TimeZone-0.71
-	>=dev-perl/URI-1.38
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
+	>=dev-perl/DBI-1.601
 	>=dev-perl/Template-Toolkit-2.22
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.510
-	>=virtual/perl-Digest-SHA-5.46
+	>=dev-perl/Email-Send-2.190
+	>=dev-perl/Email-MIME-1.904
+	dev-perl/URI
+	>=dev-perl/List-MoreUtils-0.22
+
+	virtual/perl-File-Path
+	virtual/perl-Scalar-List-Utils
+
 	>=virtual/perl-File-Spec-3.27.01
 	>=virtual/perl-MIME-Base64-3.07
+"
 
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
+DEPEND="test? ( ${COMMON_DEPS} )"
+RDEPEND="
+	virtual/httpd-cgi
 
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
+	${COMMON_DEPS}
+
+	postgres? ( >=dev-perl/DBD-Pg-1.49 )
+	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
 
 	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
 		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
+		>=dev-perl/Chart-2.4.1
+		dev-perl/Template-GD
 		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/JSON-RPC
+		dev-perl/GDGraph
+		dev-perl/XML-Twig
+		>=dev-perl/MIME-tools-5.427
 		dev-perl/libwww-perl
 		>=dev-perl/PatchReader-0.9.5
 		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
+		dev-perl/Authen-SASL
+		>=dev-perl/SOAP-Lite-0.712
+		dev-perl/JSON-RPC
+		>=dev-perl/JSON-XS-2.0
 		dev-perl/Test-Taint
-		dev-perl/XML-Twig
-		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+		>=dev-perl/HTML-Parser-3.60
+		dev-perl/HTML-Scrubber
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
-		dev-perl/Math-Random-Secure
+		>=dev-perl/Math-Random-Secure-0.50
+
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+		dev-perl/MIME-tools
+	)
+
+	modperl? (
+		www-apache/mod_perl:1
+		>=dev-perl/Apache-SizeLimit-0.93
 	)
+
+	graphviz? ( media-gfx/graphviz )
 "
-# from extras we miss:
-# (nothing)
+
+# RadiusPerl for extras? bug 252128
 
 want_apache modperl
 
@@ -81,9 +94,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	ecvs_clean
+	# Get a rid of the bzr files
+	rm -rf .bzr*
+
 	# Remove bundled perl modules
-	rm -rf "${S}"/lib || die
+	rm -rf lib/
+}
+
+src_test() {
+	# Shall we remove runtests.pl and t/,xt/ on install?
+	perl runtests.pl || die
 }
 
 src_install () {
@@ -91,14 +111,17 @@ src_install () {
 
 	insinto "${MY_HTDOCSDIR}"
 	doins -r . || die
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f} || die
-	done
+	doins "${FILESDIR}"/${MY_PB}/bugzilla.cron.{daily,tab} || die
 
 	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
 	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
 	webapp_src_install
 
+	if use extras; then
+		newconfd "${FILESDIR}"/${MY_PB}/bugzilla-queue.confd bugzilla-queue || die
+		newinitd "${FILESDIR}"/${MY_PB}/bugzilla-queue.initd bugzilla-queue || die
+	fi
+
 	# bug #124282
 	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
 	# configuration must be executable
diff --git a/www-apps/bugzilla/bugzilla-4.2.ebuild b/www-apps/bugzilla/bugzilla-4.2.ebuild
new file mode 100644
index 000000000000..d3f4baf61b17
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-4.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.2.ebuild,v 1.1 2012/02/28 14:51:52 idl0r Exp $
+
+EAPI="4"
+
+inherit webapp depend.apache versionator eutils
+
+#MY_PB=$(get_version_component_range 1-2)
+MY_PB="4.0"
+
+DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
+HOMEPAGE="http://www.bugzilla.org"
+
+LICENSE="MPL-1.1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="modperl extras graphviz mysql postgres test"
+
+COMMON_DEPS="
+	>=dev-lang/perl-5.8.8
+
+	>=virtual/perl-CGI-3.510
+	virtual/perl-Digest-SHA
+	>=dev-perl/TimeDate-1.16
+	>=dev-perl/DateTime-0.50
+	>=dev-perl/DateTime-TimeZone-0.71
+	>=dev-perl/DBI-1.601
+	>=dev-perl/Template-Toolkit-2.22
+	>=dev-perl/Email-Send-2.190
+	>=dev-perl/Email-MIME-1.904
+	dev-perl/URI
+	>=dev-perl/List-MoreUtils-0.22
+
+	virtual/perl-File-Path
+	virtual/perl-Scalar-List-Utils
+
+	>=virtual/perl-File-Spec-3.27.01
+	>=virtual/perl-MIME-Base64-3.07
+
+	dev-perl/Math-Random-ISAAC
+"
+
+DEPEND="test? ( ${COMMON_DEPS} )"
+RDEPEND="
+	virtual/httpd-cgi
+
+	${COMMON_DEPS}
+
+	postgres? ( >=dev-perl/DBD-Pg-1.49 )
+	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
+
+	extras? (
+		>=dev-perl/GD-2.35
+		>=dev-perl/Chart-2.4.1
+		dev-perl/Template-GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+		dev-perl/XML-Twig
+		>=dev-perl/MIME-tools-5.427
+		dev-perl/libwww-perl
+		>=dev-perl/PatchReader-0.9.6
+		dev-perl/perl-ldap
+		dev-perl/Authen-SASL
+		>=dev-perl/SOAP-Lite-0.712
+		dev-perl/JSON-RPC
+		>=dev-perl/JSON-XS-2.0
+		dev-perl/Test-Taint
+		>=dev-perl/HTML-Parser-3.67
+		dev-perl/HTML-Scrubber
+		>=virtual/perl-Encode-2.21
+		dev-perl/Encode-Detect
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
+		dev-perl/TheSchwartz
+		dev-perl/Daemon-Generic
+
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+		dev-perl/MIME-tools
+	)
+
+	modperl? (
+		www-apache/mod_perl:1
+		>=dev-perl/Apache-SizeLimit-0.96
+	)
+
+	graphviz? ( media-gfx/graphviz )
+"
+
+# RadiusPerl for extras? bug 252128
+
+want_apache modperl
+
+pkg_setup() {
+	depend.apache_pkg_setup modperl
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	# Get a rid of the bzr files
+	rm -rf .bzr*
+
+	# Remove bundled perl modules
+	rm -rf lib/
+}
+
+src_test() {
+	# Shall we remove runtests.pl and t/,xt/ on install?
+	perl runtests.pl || die
+}
+
+src_install () {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r . || die
+	doins "${FILESDIR}"/${MY_PB}/bugzilla.cron.{daily,tab} || die
+
+	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
+	webapp_src_install
+
+	if use extras; then
+		newconfd "${FILESDIR}"/${MY_PB}/bugzilla-queue.confd bugzilla-queue || die
+		newinitd "${FILESDIR}"/${MY_PB}/bugzilla-queue.initd bugzilla-queue || die
+	fi
+
+	# bug #124282
+	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
+
+	chmod u+x "${D}${MY_HTDOCSDIR}"/jobqueue.pl
+
+	# configuration must be executable
+	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
+}