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

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

3 files changed, 210 insertions, 44 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/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
+}