Version bumps wrt security bug #107796.

Package-Manager: portage-2.0.51.22-r2

18 files changed, 77 insertions, 62 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index bf30767b7786..3c02c3f122b1 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for www-apps/bugzilla
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.36 2005/08/08 21:32:40 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.37 2005/10/01 16:00:59 rl03 Exp $
+
+*bugzilla-2.20 (01 Oct 2005)
+*bugzilla-2.18.4 (01 Oct 2005)
+
+  01 Oct 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/2.18.1-r1/apache.htaccess, -files/2.18.1-r1/reconfig,
+  -files/2.18.1-r1/bugzilla.cron.daily, +files/2.20/apache.htaccess,
+  -files/2.18.1-r1/bugzilla.cron.tab, +files/2.20/bugzilla.cron.daily,
+  +files/2.18/bugzilla.cron.daily, +files/2.20/bugzilla.cron.tab,
+  +files/2.18/apache.htaccess, +files/2.18/bugzilla.cron.tab,
+  +files/2.18/reconfig, +files/2.20/postinstall-en.txt,
+  +files/2.20/reconfig, -files/2.20_rc1/apache.htaccess,
+  -files/2.20_rc1/bugzilla.cron.daily, -files/2.20_rc1/bugzilla.cron.tab,
+  -files/2.20_rc1/reconfig, bugzilla-2.18.3.ebuild, +bugzilla-2.18.4.ebuild,
+  -bugzilla-2.20_rc1.ebuild, -bugzilla-2.20_rc2.ebuild,
+  +bugzilla-2.20.ebuild:
+  Version bumps wrt security bug #107796.
 
 *bugzilla-2.20_rc2 (08 Aug 2005)
 
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index b7f9b2883aad..8d02a5e282e0 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 80ce7aeb494bf824439dd9b58eb16e5c bugzilla-2.20_rc1.ebuild 1836
-MD5 42cd9d1c4f3dfed79968b3a47e1570c2 bugzilla-2.20_rc2.ebuild 1845
-MD5 91653eed08d2b051ea910cad4942c413 bugzilla-2.18.3.ebuild 1799
-MD5 b4e634c32fcbbb9ade818efcab7c1a90 ChangeLog 8110
+MD5 556e8a2cb080ad72e497fef1cbc871c9 bugzilla-2.18.4.ebuild 1786
+MD5 78e27654d12a7a46a21fb069b1bd6de7 bugzilla-2.20.ebuild 1845
+MD5 246d31921cf90d0d24d5bad6f35e9a9b bugzilla-2.18.3.ebuild 1781
+MD5 560866a1dd0de5bd6999308bfcc05b4b ChangeLog 8936
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 dbfa20dc9adfb7a85a47811b12d6d86e files/digest-bugzilla-2.20_rc1 69
-MD5 dcbc8fa7bd349f3357c4758554094552 files/digest-bugzilla-2.20_rc2 69
+MD5 24f132ccd4b11bb49c26326fd0584f4c files/digest-bugzilla-2.20 66
 MD5 df412a960ab7899d10f4fc42b8a3cc5f files/digest-bugzilla-2.18.3 68
-MD5 b38d67b03726b84833bd8c5f632e4020 files/2.18.1-r1/bugzilla.cron.tab 54
-MD5 0be5a588dc7fdfc9e4898a855bd32361 files/2.18.1-r1/bugzilla.cron.daily 115
-MD5 42151252d49e42c9839f80c80dff9138 files/2.18.1-r1/apache.htaccess 94
-MD5 5d26668841a63cf6ba69e8f191a5c50a files/2.18.1-r1/reconfig 3661
-MD5 b38d67b03726b84833bd8c5f632e4020 files/2.20_rc1/bugzilla.cron.tab 54
-MD5 0be5a588dc7fdfc9e4898a855bd32361 files/2.20_rc1/bugzilla.cron.daily 115
-MD5 42151252d49e42c9839f80c80dff9138 files/2.20_rc1/apache.htaccess 94
-MD5 7d9b3c0019bbcfd85f9398ecdc2eaa39 files/2.20_rc1/reconfig 5084
+MD5 4a34a6ec468afb645b29aaddedeef49a files/digest-bugzilla-2.18.4 68
+MD5 b38d67b03726b84833bd8c5f632e4020 files/2.18/bugzilla.cron.tab 54
+MD5 0be5a588dc7fdfc9e4898a855bd32361 files/2.18/bugzilla.cron.daily 115
+MD5 42151252d49e42c9839f80c80dff9138 files/2.18/apache.htaccess 94
+MD5 5d26668841a63cf6ba69e8f191a5c50a files/2.18/reconfig 3661
+MD5 b38d67b03726b84833bd8c5f632e4020 files/2.20/bugzilla.cron.tab 54
+MD5 ec5f3f87022982a0f130cf592c0c9d83 files/2.20/postinstall-en.txt 122
+MD5 0be5a588dc7fdfc9e4898a855bd32361 files/2.20/bugzilla.cron.daily 115
+MD5 42151252d49e42c9839f80c80dff9138 files/2.20/apache.htaccess 94
+MD5 0def7ca5b4d3ddd839e4663c5d784380 files/2.20/reconfig 5004
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC98+DEzitwsaoONoRAjDDAJ48P0kcnYU66GQA3bVpSlHJnleqGgCfcNWn
-1AzecsUDiTIXR/jtECMVHio=
-=Nr5G
+iD8DBQFDPrLTEzitwsaoONoRAlg/AKCcAcGS8agvLP2jF3MmNzxK64ebqwCgrKOV
+we2R3CM5zQOmWJzAgmYadbc=
+=BDeo
 -----END PGP SIGNATURE-----
diff --git a/www-apps/bugzilla/bugzilla-2.18.3.ebuild b/www-apps/bugzilla/bugzilla-2.18.3.ebuild
index fd4643826dfd..77f9e3e0ed20 100644
--- a/www-apps/bugzilla/bugzilla-2.18.3.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.18.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.18.3.ebuild,v 1.5 2005/07/11 18:21:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.18.3.ebuild,v 1.6 2005/10/01 16:00:59 rl03 Exp $
 
 inherit webapp
 
@@ -53,14 +53,14 @@ src_install () {
 		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
 	done
 
-	cp ${FILESDIR}/2.18.1-r1/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
+	cp ${FILESDIR}/2.18/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
 
 	local FILE="bugzilla.cron.daily bugzilla.cron.tab"
-	cd ${FILESDIR}/2.18.1-r1
+	cd ${FILESDIR}/2.18
 	cp ${FILE} ${D}/${MY_HTDOCSDIR}
 
 	# add the reconfigure hook
-	webapp_hook_script ${FILESDIR}/2.18.1-r1/reconfig
+	webapp_hook_script ${FILESDIR}/2.18/reconfig
 
 	webapp_src_install
 }
diff --git a/www-apps/bugzilla/bugzilla-2.20_rc2.ebuild b/www-apps/bugzilla/bugzilla-2.18.4.ebuild
index 649fdcc311a6..01d358cdbefe 100644
--- a/www-apps/bugzilla/bugzilla-2.20_rc2.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.18.4.ebuild
@@ -1,47 +1,40 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20_rc2.ebuild,v 1.1 2005/08/08 21:32:40 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.18.4.ebuild,v 1.1 2005/10/01 16:00:59 rl03 Exp $
 
-inherit webapp eutils
+inherit webapp
 
-MY_P=${PN}-${PV/_/}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${MY_P}.tar.gz"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
 LICENSE="MPL-1.1 NPL-1.1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="apache2 postgres graphviz"
+IUSE="apache2"
 
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	postgres? ( >=dev-db/postgresql-7.3 >=dev-perl/DBD-Pg-1.43 )
-	!postgres? ( >=dev-db/mysql-3.23.41	>=dev-perl/DBD-mysql-2.9003 )
-	apache2? ( >=net-www/apache-2.0 )
-	!apache2? ( =net-www/apache-1* )
-	graphviz? ( media-gfx/graphviz )
+# See http://www.bugzilla.org/docs218/html/stepbystep.html to verify dependancies
+# updated list of deps: http://www.bugzilla.org/releases/2.18/release-notes.html
+# removed deps:	dev-perl/MIME-tools
+RDEPEND=">=dev-db/mysql-3.23.41
+	>=dev-lang/perl-5.6.0
 	>=dev-perl/AppConfig-1.52
 	>=perl-core/CGI-2.93
 	>=dev-perl/TimeDate-1.16
-	>=dev-perl/DBI-1.38
-	>=perl-core/File-Spec-0.82
-	perl-core/File-Temp
+	>=dev-perl/DBI-1.36
+	>=dev-perl/DBD-mysql-2.1010
+	>=perl-core/File-Spec-0.8.2
 	>=dev-perl/Template-Toolkit-2.08
 	>=dev-perl/Text-Tabs+Wrap-2001.0131
-	>=dev-perl/MailTools-1.67
-	perl-core/Storable
-	>=dev-perl/GD-1.20
 	>=dev-perl/Chart-2.3
+	>=dev-perl/GD-1.20
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil
-	dev-perl/XML-Parser
-	>=dev-perl/PatchReader-0.9.4
-	dev-perl/MIME-tools
 	dev-perl/perl-ldap
-	virtual/mta
-"
+	>=dev-perl/PatchReader-0.9.4
+	dev-perl/XML-Parser
+	apache2? ( >=net-www/apache-2.0 )
+	!apache2? ( =net-www/apache-1* )"
 
 src_unpack() {
 	unpack ${A}
@@ -53,17 +46,21 @@ src_unpack() {
 src_install () {
 	webapp_src_preinst
 
+	cd ${S}
+
 	cp -r ${S}/* ${D}/${MY_HTDOCSDIR} || die
 	for file in `find -type d -printf "%p/* "`; do
 		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
 	done
 
-	cp ${FILESDIR}/2.20_rc1/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
+	cp ${FILESDIR}/2.18/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
 
 	local FILE="bugzilla.cron.daily bugzilla.cron.tab"
-	cd ${FILESDIR}/2.20_rc1
+	cd ${FILESDIR}/2.18
 	cp ${FILE} ${D}/${MY_HTDOCSDIR}
 
-	webapp_hook_script ${FILESDIR}/2.20_rc1/reconfig
+	# add the reconfigure hook
+	webapp_hook_script ${FILESDIR}/2.18/reconfig
+
 	webapp_src_install
 }
diff --git a/www-apps/bugzilla/bugzilla-2.20_rc1.ebuild b/www-apps/bugzilla/bugzilla-2.20.ebuild
index 1fa6e78b5176..0b09f8ce1830 100644
--- a/www-apps/bugzilla/bugzilla-2.20_rc1.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.20.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20_rc1.ebuild,v 1.2 2005/07/09 14:18:41 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.ebuild,v 1.1 2005/10/01 16:00:59 rl03 Exp $
 
 inherit webapp eutils
 
-MY_P=${PN}-${PV/_/}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${MY_P}.tar.gz"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
 LICENSE="MPL-1.1 NPL-1.1"
@@ -18,7 +16,7 @@ IUSE="apache2 postgres graphviz"
 RDEPEND="
 	>=dev-lang/perl-5.6.1
 	postgres? ( >=dev-db/postgresql-7.3 >=dev-perl/DBD-Pg-1.43 )
-	!postgres? ( >=dev-db/mysql-3.23.41	>=dev-perl/DBD-mysql-2.9003 )
+	!postgres? ( >=dev-db/mysql-3.23.41 >=dev-perl/DBD-mysql-2.9003 )
 	apache2? ( >=net-www/apache-2.0 )
 	!apache2? ( =net-www/apache-1* )
 	graphviz? ( media-gfx/graphviz )
@@ -26,7 +24,7 @@ RDEPEND="
 	>=perl-core/CGI-2.93
 	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DBI-1.38
-	>=perl-core/File-Spec-0.82
+	>=perl-core/File-Spec-0.84
 	perl-core/File-Temp
 	>=dev-perl/Template-Toolkit-2.08
 	>=dev-perl/Text-Tabs+Wrap-2001.0131
@@ -58,12 +56,13 @@ src_install () {
 		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
 	done
 
-	cp ${FILESDIR}/${PV}/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
+	cp ${FILESDIR}/2.20/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
 
 	local FILE="bugzilla.cron.daily bugzilla.cron.tab"
-	cd ${FILESDIR}/${PV}
+	cd ${FILESDIR}/2.20
 	cp ${FILE} ${D}/${MY_HTDOCSDIR}
 
-	webapp_hook_script ${FILESDIR}/${PV}/reconfig
+	webapp_hook_script ${FILESDIR}/2.20/reconfig
+	webapp_postinst_txt en ${FILESDIR}/2.20/postinstall-en.txt
 	webapp_src_install
 }
diff --git a/www-apps/bugzilla/files/2.18.1-r1/apache.htaccess b/www-apps/bugzilla/files/2.18/apache.htaccess
index eb747223ccec..eb747223ccec 100644
--- a/www-apps/bugzilla/files/2.18.1-r1/apache.htaccess
+++ b/www-apps/bugzilla/files/2.18/apache.htaccess
diff --git a/www-apps/bugzilla/files/2.18.1-r1/bugzilla.cron.daily b/www-apps/bugzilla/files/2.18/bugzilla.cron.daily
index e3e86589891d..e3e86589891d 100644
--- a/www-apps/bugzilla/files/2.18.1-r1/bugzilla.cron.daily
+++ b/www-apps/bugzilla/files/2.18/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.18.1-r1/bugzilla.cron.tab b/www-apps/bugzilla/files/2.18/bugzilla.cron.tab
index 0ac2ef6d65a6..0ac2ef6d65a6 100644
--- a/www-apps/bugzilla/files/2.18.1-r1/bugzilla.cron.tab
+++ b/www-apps/bugzilla/files/2.18/bugzilla.cron.tab
diff --git a/www-apps/bugzilla/files/2.18.1-r1/reconfig b/www-apps/bugzilla/files/2.18/reconfig
index f62bfe278642..f62bfe278642 100644
--- a/www-apps/bugzilla/files/2.18.1-r1/reconfig
+++ b/www-apps/bugzilla/files/2.18/reconfig
diff --git a/www-apps/bugzilla/files/2.20_rc1/apache.htaccess b/www-apps/bugzilla/files/2.20/apache.htaccess
index eb747223ccec..eb747223ccec 100644
--- a/www-apps/bugzilla/files/2.20_rc1/apache.htaccess
+++ b/www-apps/bugzilla/files/2.20/apache.htaccess
diff --git a/www-apps/bugzilla/files/2.20_rc1/bugzilla.cron.daily b/www-apps/bugzilla/files/2.20/bugzilla.cron.daily
index e3e86589891d..e3e86589891d 100644
--- a/www-apps/bugzilla/files/2.20_rc1/bugzilla.cron.daily
+++ b/www-apps/bugzilla/files/2.20/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.20_rc1/bugzilla.cron.tab b/www-apps/bugzilla/files/2.20/bugzilla.cron.tab
index 0ac2ef6d65a6..0ac2ef6d65a6 100644
--- a/www-apps/bugzilla/files/2.20_rc1/bugzilla.cron.tab
+++ b/www-apps/bugzilla/files/2.20/bugzilla.cron.tab
diff --git a/www-apps/bugzilla/files/2.20/postinstall-en.txt b/www-apps/bugzilla/files/2.20/postinstall-en.txt
new file mode 100644
index 000000000000..ba8abb222a26
--- /dev/null
+++ b/www-apps/bugzilla/files/2.20/postinstall-en.txt
@@ -0,0 +1,2 @@
+Please read the Release Notes, especially if you are upgrading:
+ http://www.bugzilla.org/releases/2.20/release-notes.html
diff --git a/www-apps/bugzilla/files/2.20_rc1/reconfig b/www-apps/bugzilla/files/2.20/reconfig
index 407a434f4ee9..4d24f23d0adf 100644
--- a/www-apps/bugzilla/files/2.20_rc1/reconfig
+++ b/www-apps/bugzilla/files/2.20/reconfig
@@ -134,6 +134,5 @@ if [ $1 = "install" ]; then
 	fi
 
 else
-	[[ -z "${MY_INSTALLDIR}" ]] && die "${MY_INSTALLDIR} not found!"
-	rm -f "${FILES}" bz.cfg.pl
+	echo "done."
 fi
diff --git a/www-apps/bugzilla/files/digest-bugzilla-2.18.4 b/www-apps/bugzilla/files/digest-bugzilla-2.18.4
new file mode 100644
index 000000000000..85a0e8f3f733
--- /dev/null
+++ b/www-apps/bugzilla/files/digest-bugzilla-2.18.4
@@ -0,0 +1 @@
+MD5 ace9b1724482b679c4e71c1f6424eec2 bugzilla-2.18.4.tar.gz 1659552
diff --git a/www-apps/bugzilla/files/digest-bugzilla-2.20 b/www-apps/bugzilla/files/digest-bugzilla-2.20
new file mode 100644
index 000000000000..140e73ad0d0d
--- /dev/null
+++ b/www-apps/bugzilla/files/digest-bugzilla-2.20
@@ -0,0 +1 @@
+MD5 bd8638501bc3f6ce93499ae0227d1ec2 bugzilla-2.20.tar.gz 1924992
diff --git a/www-apps/bugzilla/files/digest-bugzilla-2.20_rc1 b/www-apps/bugzilla/files/digest-bugzilla-2.20_rc1
deleted file mode 100644
index f8ab04bbb1d6..000000000000
--- a/www-apps/bugzilla/files/digest-bugzilla-2.20_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a539b1151f376bd9e777835ef9a82652 bugzilla-2.20rc1.tar.gz 1902600
diff --git a/www-apps/bugzilla/files/digest-bugzilla-2.20_rc2 b/www-apps/bugzilla/files/digest-bugzilla-2.20_rc2
deleted file mode 100644
index 4083c4940328..000000000000
--- a/www-apps/bugzilla/files/digest-bugzilla-2.20_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 391fc01da3ccb53b5979e06584c59baf bugzilla-2.20rc2.tar.gz 1760142