Version bump, CVE-2012-0440, bug 401809.

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

8 files changed, 20 insertions, 149 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index 84f810824a61..05646868a8d6 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/bugzilla
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.205 2011/08/27 20:13:12 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.206 2012/02/01 18:30:55 idl0r Exp $
+
+*bugzilla-4.0.4 (01 Feb 2012)
+*bugzilla-3.6.8 (01 Feb 2012)
+
+  01 Feb 2012; Christian Ruppert <idl0r@gentoo.org> -bugzilla-3.4.12.ebuild,
+  -bugzilla-3.6.4.ebuild, +bugzilla-3.6.8.ebuild, -bugzilla-4.0.2.ebuild,
+  +bugzilla-4.0.4.ebuild, -files/3.4/bugzilla.cron.daily,
+  -files/3.4/bugzilla.cron.tab, -files/3.4/postinstall-en.txt,
+  -files/3.4/reconfig:
+  Version bump, CVE-2012-0440, bug 401809.
 
   27 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> bugzilla-3.6.6.ebuild:
   x86 stable wrt security bug #380255
diff --git a/www-apps/bugzilla/bugzilla-3.4.12.ebuild b/www-apps/bugzilla/bugzilla-3.4.12.ebuild
deleted file mode 100644
index df2f9d27a577..000000000000
--- a/www-apps/bugzilla/bugzilla-3.4.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.4.12.ebuild,v 1.1 2011/08/26 11:59:19 idl0r Exp $
-
-EAPI="3"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=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/Template-Toolkit-2.22
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-Digest-SHA-5.46
-	>=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 )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	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/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
-		dev-perl/TheSchwartz
-		dev-perl/Daemon-Generic
-	)
-"
-# from extras we miss:
-# (nothing)
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r . || die
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f} || die
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.6.4.ebuild b/www-apps/bugzilla/bugzilla-3.6.8.ebuild
index 48ca7c3e26a7..a5bca6990463 100644
--- a/www-apps/bugzilla/bugzilla-3.6.4.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.6.8.ebuild
@@ -1,8 +1,8 @@
-# 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.4.ebuild,v 1.8 2011/07/23 20:12:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.8.ebuild,v 1.1 2012/02/01 18:30:55 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit webapp depend.apache versionator eutils
 
@@ -13,8 +13,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
 LICENSE="MPL-1.1"
-# KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="modperl extras graphviz mysql postgres"
 
@@ -68,6 +67,7 @@ RDEPEND="
 		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
+		dev-perl/Math-Random-Secure
 	)
 "
 # from extras we miss:
@@ -90,7 +90,7 @@ src_install () {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r .
+	doins -r . || die
 	for f in bugzilla.cron.daily bugzilla.cron.tab; do
 		doins "${FILESDIR}"/${MY_PB}/${f} || die
 	done
diff --git a/www-apps/bugzilla/bugzilla-4.0.2.ebuild b/www-apps/bugzilla/bugzilla-4.0.4.ebuild
index f602e28ff855..603085b6bb93 100644
--- a/www-apps/bugzilla/bugzilla-4.0.2.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.0.4.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-4.0.2.ebuild,v 1.1 2011/08/15 16:49:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.0.4.ebuild,v 1.1 2012/02/01 18:30:55 idl0r Exp $
 
 EAPI="3"
 
diff --git a/www-apps/bugzilla/files/3.4/bugzilla.cron.daily b/www-apps/bugzilla/files/3.4/bugzilla.cron.daily
deleted file mode 100644
index e3e86589891d..000000000000
--- a/www-apps/bugzilla/files/3.4/bugzilla.cron.daily
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd /var/www/bugzilla/
-./collectstats.pl
-./whineatnews.pl
-echo "*** Bugzilla nighlty flush has done! ***"
diff --git a/www-apps/bugzilla/files/3.4/bugzilla.cron.tab b/www-apps/bugzilla/files/3.4/bugzilla.cron.tab
deleted file mode 100644
index 0ac2ef6d65a6..000000000000
--- a/www-apps/bugzilla/files/3.4/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * *      /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/3.4/postinstall-en.txt b/www-apps/bugzilla/files/3.4/postinstall-en.txt
deleted file mode 100644
index c1d9007e7d12..000000000000
--- a/www-apps/bugzilla/files/3.4/postinstall-en.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-0. Bugzilla has been installed into ${MY_INSTALLDIR}
-
-1. To finish the installation, please read
-   http://www.bugzilla.org/docs/3.4/html/installing-bugzilla.html
-   You will need to run ${MY_INSTALLDIR}/checksetup.pl
-
-2. Please read the Release Notes, especially if you are upgrading:
-   http://www.bugzilla.org/releases/3.4/release-notes.html
-
-3. Please note that Apache2 sets AllowOverride None by default. You may have
-   to edit it to process the .htaccess file provided by Bugzilla. Please see
-   http://httpd.apache.org/docs/2.2/mod/core.html#allowoverride for more info.
diff --git a/www-apps/bugzilla/files/3.4/reconfig b/www-apps/bugzilla/files/3.4/reconfig
deleted file mode 100644
index 71b0acea2585..000000000000
--- a/www-apps/bugzilla/files/3.4/reconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-FILE="bugzilla.cron.daily bugzilla.cron.tab"
-
-function die ()
-{
-	echo
-	echo "***"
-	echo "*** Fatal error: $*"
-	echo "***"
-	exit 1
-}
-
-if [ $1 = "install" ]; then
-	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
-	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed"
-else
-	echo "done."
-fi