Version bump for bug #56826; see bug #51979 for the ebuilds

11 files changed, 193 insertions, 276 deletions

diff --git a/net-www/bugzilla/ChangeLog b/net-www/bugzilla/ChangeLog
index a0f6734d7005..48a326849c46 100644
--- a/net-www/bugzilla/ChangeLog
+++ b/net-www/bugzilla/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-www/bugzilla
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/bugzilla/ChangeLog,v 1.6 2004/06/25 00:49:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/bugzilla/ChangeLog,v 1.7 2004/07/17 11:54:02 stuart Exp $
+
+*bugzilla-2.18.0_rc1 (17 Jul 2004)
+
+  17 Jul 2004; Stuart Herbert <stuart@gentoo.org> files/bz.cfg.templ,
+  +files/2.18.0_rc1/apache.htaccess, +files/2.18.0_rc1/reconfig,
+  -bugzilla-2.17.6-r1.ebuild, -bugzilla-2.17.6-r2.ebuild,
+  +bugzilla-2.18.0_rc1.ebuild:
+  Insecure versions removed; see bug #56826
+
+*bugzilla-2.18.0_rc1 (17 Jul 2004)
+
+  17 Jul 2004; Stuart Herbert <stuart@gentoo.org> files/bz.cfg.templ,
+  +files/2.18.0_rc1/apache.htaccess, +files/2.18.0_rc1/reconfig,
+  -bugzilla-2.17.6-r1.ebuild, +bugzilla-2.18.0_rc1.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+*bugzilla-2.18.0_rc1 (17 Jul 2004)
+
+  17 Jul 2004; Stuart Herbert <stuart@gentoo.org> files/bz.cfg.templ,
+  +files/2.18.0_rc1/apache.htaccess, +files/2.18.0_rc1/reconfig,
+  +bugzilla-2.18.0_rc1.ebuild:
+  Version bump, for security bug #56826; new ebuild and reconfig script from
+  Renat Lumpau <lumpau@freeshell.org>; see bug #51979
 
 *bugzilla-2.17.6-r2 (23 Apr 2004)
 
diff --git a/net-www/bugzilla/Manifest b/net-www/bugzilla/Manifest
index dc69deec986d..31b80465fe89 100644
--- a/net-www/bugzilla/Manifest
+++ b/net-www/bugzilla/Manifest
@@ -1,12 +1,12 @@
-MD5 bdd19b6363494356ced2ca6a30a96404 bugzilla-2.17.6-r1.ebuild 4452
-MD5 336703e0739f5a983e34c61c403dc708 bugzilla-2.17.6-r2.ebuild 4302
-MD5 225f7ba8011e1ab63bc9f6f5e4ffc7a4 ChangeLog 914
+MD5 960038424cd2aaf7d007fa619ffbe779 ChangeLog 1829
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 400463e8eefe1f3b4d06961fa7795d69 bugzilla-2.18.0_rc1.ebuild 1767
 MD5 0606a9da89d19a505c52818d14de61e3 files/cronset.sh 70
 MD5 b38d67b03726b84833bd8c5f632e4020 files/bugzilla.cron.tab 54
-MD5 8a1339d54a8d4525959a5d398300e7ee files/bz.cfg.templ 323
+MD5 b243138916c1a9e7390fa352aa184a81 files/bz.cfg.templ 273
 MD5 a001fc92584de0cd6f1a0d8de99ee6ce files/firstcheck.sh 48
 MD5 4a9b1a263f16b2a53b44bce45350b373 files/bugzilla.conf 148
 MD5 0be5a588dc7fdfc9e4898a855bd32361 files/bugzilla.cron.daily 115
-MD5 3e92270cf32fdc56568c03aa92c5488d files/digest-bugzilla-2.17.6-r1 68
-MD5 3e92270cf32fdc56568c03aa92c5488d files/digest-bugzilla-2.17.6-r2 68
+MD5 8d37835f4224135a849a73ab8b6b893a files/digest-bugzilla-2.18.0_rc1 69
+MD5 2b4f3ae5bc1d383a4951a22cf65b28ae files/2.18.0_rc1/reconfig 3214
+MD5 32cb42777a779ac279c5384643970729 files/2.18.0_rc1/apache.htaccess 70
diff --git a/net-www/bugzilla/bugzilla-2.17.6-r1.ebuild b/net-www/bugzilla/bugzilla-2.17.6-r1.ebuild
deleted file mode 100644
index 17cebe4184fe..000000000000
--- a/net-www/bugzilla/bugzilla-2.17.6-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-IUSE="apache2"
-
-# See http://www.bugzilla.org/docs216/html/stepbystep.html to verify dependancies
-DEPEND=">=dev-db/mysql-3.22.5
-	>=dev-lang/perl-5.01
-	>=dev-perl/AppConfig-1.52
-	dev-perl/Template-Toolkit
-	>=dev-perl/Text-Tabs+Wrap-2001.0131
-	>=dev-perl/File-Spec-0.8.2
-	>=dev-perl/DBD-mysql-1.2209
-	>=dev-perl/DBI-1.13
-	dev-perl/TimeDate
-	>=dev-perl/CGI-2.88
-	>=dev-perl/GD-1.19
-	dev-perl/GDGraph
-	>=dev-perl/Chart-0.99c
-	dev-perl/XML-Parser
-	dev-perl/MIME-tools
-	net-www/apache"
-
-# removed deps:  dev-perl/Data-Dumper
-
-src_compile() {
-	:;
-}
-
-src_install () {
-	if use apache2 ; then
-		dodir /usr/bonsaitools/bin /etc/apache2/conf
-	else
-		dodir /usr/bonsaitools/bin /etc/apache/conf
-	fi
-
-	cd ${S}
-
-	# Bugzilla originally needs perl to be installed in /usr/bonsaitools/bin
-	# So let's change it for /usr/bin/perl
-	perl -pi -e 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm || die
-	# syncshadowdb is gone
-	# Copy files to /var/www/bugzilla
-	insinto /var/www/bugzilla
-
-#	doins * doesn't work recursively
-	cp -r ${S}/* ${D}/var/www/bugzilla || die
-# htdocs is for common apache docs, while bugzilla is a web app
-# So, it's better to keep it outside
-
-	if use apache2 ; then
-		cp ${FILESDIR}/bugzilla.conf ${D}/etc/apache2/conf || die
-	else
-		cp ${FILESDIR}/bugzilla.conf ${D}/etc/apache/conf || die
-	fi
-
-	cp ${FILESDIR}/bugzilla.cron.* ${D}/var/www/bugzilla || die
-	cp ${FILESDIR}/bz.cfg.templ ${D}/var/www/bugzilla || die
-	cp ${FILESDIR}/firstcheck.sh ${D}/var/www/bugzilla || die
-	cp ${FILESDIR}/cronset.sh ${D}/var/www/bugzilla || die
-	chown -R apache:apache ${D}/var/www/bugzilla || die
-}
-
-pkg_config() {
-	# moved here as it doesn't work in a sandbox
-	cd /var/www/bugzilla || die
-	if ( test -a localconfig ) ; then
-	die "The following does not work on previous installations, please run checksetup.pl in /var/www/bugzilla followed by a chown -R apache:apache /var/www/bugzilla."
-	fi
-
-	einfo "Finalizing the installation of bugzilla in /var/www/bugzilla"
-
-	echo -n "mysql root dbuser password: "; read myrootpwd
-	if (test -z $myrootpwd) ; then eerror "No root db password" ; die ; fi
-
-	echo -n "mysql bugs db name [bugs]: "; read mybugsdb
-	if (test -z $mybugsdb) ; then mybugsdb="bugs" ; fi
-
-	echo -n "mysql bugs db host [localhost]: "; read mybugshost
-	if (test -z $mybugshost) ; then mybugshost="localhost" ; fi
-
-	echo -n "mysql bugs dbuser name [bugs]: "; read mybugsuser
-	if (test -z $mybugsuser) ; then mybugsuser="bugs" ; fi
-
-	echo -n "mysql bugs dbuser password: "; read mybugspwd
-	if (test -z $mybugspwd) ; then  eerror "No dbuser password" ; die ; fi
-
-	cat bz.cfg.templ   | sed -e "s/tmpdbname/${mybugsdb}/"   > bz.cfg.templ.1
-	cat bz.cfg.templ.1 | sed -e "s/tmphost/${mybugshost}/"   > bz.cfg.templ.2
-	cat bz.cfg.templ.2 | sed -e "s/tmpdbuser/${mybugsuser}/" > bz.cfg.templ.3
-	cat bz.cfg.templ.3 | sed -e "s/tmpdbpass/${mybugspwd}/"  > bz.cfg.pl
-
-	if [ ! -f bz.cfg.pl ] ; then eerror "No template for db vars" ; die ; fi
-
-	rm bz.cfg.templ.[0-9]* || die
-
-	einfo "Setting correct privelegies"
-	mysql --password=${myrootpwd} mysql --exec="GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${mybugsdb}.* TO ${mybugsuser}@${mybugshost} IDENTIFIED BY '${mybugspwd}'; FLUSH PRIVILEGES;"  || die
-
-	einfo "Setting the template for localconfig variables"
-	./checksetup.pl bz.cfg.pl || die
-	chown -R apache:apache /var/www/bugzilla || die
-
-	einfo "Final step: setting all html templates and db tables"
-	chmod 750 /var/www/bugzilla/firstcheck.sh
-	./firstcheck.sh || die
-
-	echo -n "Do you want to set a crontab [y/N]" ; read cronyes
-	chmod 750 /var/www/bugzilla/cronset.sh
-	if ( test $cronyes = "y") ; then su - apache -c /var/www/bugzilla/cronset.sh ; fi
-
-	chown -R apache:apache /var/www/bugzilla || die
-
-	einfo "Then you just have to :"
-	einfo "append to apache/conf: Include conf/bugzilla.conf"
-	einfo "Restart Apache"
-	einfo "login on http://yourhost/bugzilla/index.cgi and edit global parameters click *parameters* at the bottom"
-	einfo "enjoy bugzilla!"
-
-}
-
-pkg_postinst() {
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	}
diff --git a/net-www/bugzilla/bugzilla-2.17.6-r2.ebuild b/net-www/bugzilla/bugzilla-2.17.6-r2.ebuild
deleted file mode 100644
index 9504a790838a..000000000000
--- a/net-www/bugzilla/bugzilla-2.17.6-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-IUSE="apache2"
-
-# See http://www.bugzilla.org/docs216/html/stepbystep.html to verify dependancies
-DEPEND=">=dev-db/mysql-3.22.5
-	>=dev-lang/perl-5.01
-	>=dev-perl/AppConfig-1.52
-	dev-perl/Template-Toolkit
-	>=dev-perl/Text-Tabs+Wrap-2001.0131
-	>=dev-perl/File-Spec-0.8.2
-	>=dev-perl/DBD-mysql-1.2209
-	>=dev-perl/DBI-1.13
-	dev-perl/TimeDate
-	>=dev-perl/CGI-2.88
-	>=dev-perl/GD-1.19
-	dev-perl/GDGraph
-	>=dev-perl/Chart-0.99c
-	dev-perl/XML-Parser
-	dev-perl/MIME-tools
-	net-www/apache"
-
-# removed deps:  dev-perl/Data-Dumper
-
-src_compile() {
-	:;
-}
-
-src_install () {
-	if use apache2 ; then
-		dodir /usr/bonsaitools/bin /etc/apache2/conf
-	else
-		dodir /usr/bonsaitools/bin /etc/apache/conf
-	fi
-
-	cd ${S}
-
-	# Bugzilla originally needs perl to be installed in /usr/bonsaitools/bin
-	# So let's change it for /usr/bin/perl
-	perl -pi -e 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm || die
-	# syncshadowdb is gone
-	# Copy files to /var/www/bugzilla
-	insinto /var/www/bugzilla
-
-#	doins * doesn't work recursively
-	cp -r ${S}/* ${D}/var/www/bugzilla || die
-# htdocs is for common apache docs, while bugzilla is a web app
-# So, it's better to keep it outside
-
-	if use apache2 ; then
-		cp ${FILESDIR}/bugzilla.conf ${D}/etc/apache2/conf || die
-	else
-		cp ${FILESDIR}/bugzilla.conf ${D}/etc/apache/conf || die
-	fi
-
-	cp ${FILESDIR}/bugzilla.cron.* ${D}/var/www/bugzilla || die
-	cp ${FILESDIR}/bz.cfg.templ ${D}/var/www/bugzilla || die
-	cp ${FILESDIR}/firstcheck.sh ${D}/var/www/bugzilla || die
-	cp ${FILESDIR}/cronset.sh ${D}/var/www/bugzilla || die
-	chown -R apache:apache ${D}/var/www/bugzilla || die
-}
-
-pkg_config() {
-	# moved here as it doesn't work in a sandbox
-	cd /var/www/bugzilla || die
-	if ( test -a localconfig ) ; then
-	die "The following does not work on previous installations, please run checksetup.pl in /var/www/bugzilla followed by a chown -R apache:apache /var/www/bugzilla."
-	fi
-
-	einfo "Finalizing the installation of bugzilla in /var/www/bugzilla"
-
-	echo -n "mysql bugs db name [bugs]: "; read mybugsdb
-	if (test -z $mybugsdb) ; then mybugsdb="bugs" ; fi
-
-	echo -n "mysql bugs db host [localhost]: "; read mybugshost
-	if (test -z $mybugshost) ; then mybugshost="localhost" ; fi
-
-	echo -n "mysql bugs dbuser name [bugs]: "; read mybugsuser
-	if (test -z $mybugsuser) ; then mybugsuser="bugs" ; fi
-
-	echo -n "mysql bugs dbuser password: "; read mybugspwd
-	if (test -z $mybugspwd) ; then  eerror "No dbuser password" ; die ; fi
-
-	cat bz.cfg.templ   | sed -e "s/tmpdbname/${mybugsdb}/"   > bz.cfg.templ.1
-	cat bz.cfg.templ.1 | sed -e "s/tmphost/${mybugshost}/"   > bz.cfg.templ.2
-	cat bz.cfg.templ.2 | sed -e "s/tmpdbuser/${mybugsuser}/" > bz.cfg.templ.3
-	cat bz.cfg.templ.3 | sed -e "s/tmpdbpass/${mybugspwd}/"  > bz.cfg.pl
-
-	if [ ! -f bz.cfg.pl ] ; then eerror "No template for db vars" ; die ; fi
-
-	rm bz.cfg.templ.[0-9]* || die
-
-	einfo "Setting correct privelegies"
-	mysql -p mysql --exec="GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${mybugsdb}.* TO ${mybugsuser}@${mybugshost} IDENTIFIED BY '${mybugspwd}'; FLUSH PRIVILEGES;"  || die
-
-	einfo "Setting the template for localconfig variables"
-	./checksetup.pl bz.cfg.pl || die
-	chown -R apache:apache /var/www/bugzilla || die
-
-	einfo "Final step: setting all html templates and db tables"
-	chmod 750 /var/www/bugzilla/firstcheck.sh
-	./firstcheck.sh || die
-
-	echo -n "Do you want to set a crontab [y/N]" ; read cronyes
-	chmod 750 /var/www/bugzilla/cronset.sh
-	if ( test $cronyes = "y") ; then su - apache -c /var/www/bugzilla/cronset.sh ; fi
-
-	chown -R apache:apache /var/www/bugzilla || die
-
-	einfo "Then you just have to :"
-	einfo "append to apache/conf: Include conf/bugzilla.conf"
-	einfo "Restart Apache"
-	einfo "login on http://yourhost/bugzilla/index.cgi and edit global parameters click *parameters* at the bottom"
-	einfo "enjoy bugzilla!"
-
-}
-
-pkg_postinst() {
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	}
diff --git a/net-www/bugzilla/bugzilla-2.18.0_rc1.ebuild b/net-www/bugzilla/bugzilla-2.18.0_rc1.ebuild
new file mode 100644
index 000000000000..85cc596d1943
--- /dev/null
+++ b/net-www/bugzilla/bugzilla-2.18.0_rc1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/bugzilla/bugzilla-2.18.0_rc1.ebuild,v 1.1 2004/07/17 11:54:02 stuart Exp $
+
+inherit webapp
+MY_P=${P/.0_/}
+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"
+HOMEPAGE="http://www.bugzilla.org"
+
+LICENSE="MPL-1.1 NPL-1.1"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+IUSE="apache2"
+
+# See http://www.bugzilla.org/docs216/html/stepbystep.html to verify dependancies
+DEPEND="$DEPEND"
+RDEPEND=">=dev-db/mysql-3.22.5
+	>=dev-lang/perl-5.01
+	dev-perl/Template-Toolkit
+	>=dev-perl/AppConfig-1.52
+	>=dev-perl/Text-Tabs+Wrap-2001.0131
+	>=dev-perl/File-Spec-0.8.2
+	>=dev-perl/DBD-mysql-1.2209
+	>=dev-perl/DBI-1.13
+	dev-perl/TimeDate
+	>=dev-perl/CGI-2.88
+	>=dev-perl/GD-1.19
+	dev-perl/GDGraph
+	>=dev-perl/Chart-2.3
+	dev-perl/XML-Parser
+	dev-perl/PatchReader
+	dev-perl/MIME-tools
+	apache2? ( >=net-www/apache-2 ) : ( =net-www/apache-1* )"
+
+# removed deps:  dev-perl/Data-Dumper
+
+src_install () {
+	webapp_src_preinst
+	
+	cd ${S}
+
+	# remove CVS directories
+	find . -type d -name 'CVS' -print | xargs rm -rf
+
+	cp -r ${S}/* ${D}/${MY_HTDOCSDIR} || die
+	for file in `find -type d -printf "%p/* "`; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+
+	cp ${FILESDIR}/${PVR}/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
+
+	FILE="bugzilla.cron.daily bugzilla.cron.tab bz.cfg.templ firstcheck.sh cronset.sh"
+	for file in ${FILE}; do
+		cp ${FILESDIR}/${file} ${D}/${MY_HTDOCSDIR}
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+	
+	# add the reconfigure hook
+	webapp_hook_script ${FILESDIR}/${PVR}/reconfig
+
+	webapp_src_install
+}
diff --git a/net-www/bugzilla/files/2.18.0_rc1/apache.htaccess b/net-www/bugzilla/files/2.18.0_rc1/apache.htaccess
new file mode 100644
index 000000000000..65b074866f11
--- /dev/null
+++ b/net-www/bugzilla/files/2.18.0_rc1/apache.htaccess
@@ -0,0 +1,3 @@
+Order Allow,Deny
+Options +ExecCGI +FollowSymLinks
+AllowOverride Limit
diff --git a/net-www/bugzilla/files/2.18.0_rc1/reconfig b/net-www/bugzilla/files/2.18.0_rc1/reconfig
new file mode 100644
index 000000000000..7979bf7900e0
--- /dev/null
+++ b/net-www/bugzilla/files/2.18.0_rc1/reconfig
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+function die () 
+{
+	echo
+	echo "***"
+	echo "*** Fatal error: $*"
+	echo "***"
+	exit 1
+}
+
+if [ $1 = "start" -o $1 = "install" ]; then
+
+	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
+
+	FILE="bugzilla.cron.daily bugzilla.cron.tab cronset.sh firstcheck.sh"
+	for file in ${FILE}; do
+		sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g;" -i ${D}/${MY_INSTALLDIR}/${FILE}
+	done
+	
+	if ( test -a localconfig ) ; then
+		echo "The following does not work on previous installations, please run checksetup.pl in ${MY_INSTALLDIR}"
+		exit 1
+	fi
+
+	echo
+	echo "Finalizing the installation of bugzilla in ${MY_INSTALLDIR}"
+	echo
+	
+	# config setting
+	echo "Details for the bugzilla database"
+	echo "(This scripts creates the database & user)"
+	echo
+	echo -n "mysql bugs db name [bugs]: "; read mybugsdb
+	if (test -z ${mybugsdb}) ; then mybugsdb="bugs" ; fi
+
+	echo -n "mysql bugs db host [localhost]: "; read mybugshost
+	if (test -z ${mybugshost}) ; then mybugshost="localhost" ; fi
+
+	echo -n "mysql bugs dbuser name [bugs]: "; read mybugsuser
+	if (test -z ${mybugsuser}) ; then mybugsuser="bugs" ; fi
+
+	echo -n "mysql bugs dbuser password: "; read mybugspwd
+	if (test -z ${mybugspwd}) ; then echo "Error: no dbuser password" ; exit 1; fi
+
+	cat bz.cfg.templ   | sed -e "s/tmpdbname/${mybugsdb}/
+	s/tmphost/${mybugshost}/
+	s/tmpdbuser/${mybugsuser}/
+	s/tmpdbpass/${mybugspwd}/"  > bz.cfg.pl
+
+	if [ ! -f bz.cfg.pl ] ; then echo "Error: no template for db vars" ; exit 1 ; fi
+
+	# privileges
+	echo "Setting correct privileges for bugzilla mysql connection"
+	echo -n "Please enter login info for user who has grant privileges on ${mybugshost} [$USER]: "; read adminuser
+	if (test -z ${adminuser}) ; then adminuser="$USER" ; fi
+	if [ "${mybugshost}" != "localhost" ]; then
+		echo -n "Client address for bugzilla (at db side) [$(hostname -f)]: "; read clientaddr
+		if (test -z ${clientaddr}) ; then clientaddr="$(hostname -f)" ; fi
+	fi
+	# this will be default for localhost
+	if (test -z ${clientaddr}) ; then clientaddr="${mybugshost}" ; fi
+
+	# if $bugshost == localhost, don't specify -h argument, so local socket can be used.
+	host=${mybugshost/localhost}
+	mysql -u ${adminuser} ${host:+-h ${host}} -p mysql --exec="GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${mybugsdb}.* TO ${mybugsuser}@${clientaddr} IDENTIFIED BY '${mybugspwd}'; FLUSH PRIVILEGES;"  || {
+		echo "Error running query!"
+		echo
+		echo "Please run it manually on ${host}."
+		echo
+		echo "   \$ mysql -u ${adminuser} -p mysql --exec=\"GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${mybugsdb}.* TO ${mybugsuser}@${clientaddr} IDENTIFIED BY '${mybugspwd}'; FLUSH PRIVILEGES;\""
+		echo
+	}
+
+	echo "Setting the template for localconfig variables"
+	chmod 755 ./checksetup.pl
+	./checksetup.pl bz.cfg.pl || exit 1
+
+	echo "Final step: setting all html templates and db tables"
+	chmod 750 ${VHOST_ROOT}/bugzilla/firstcheck.sh
+	chmod 755 ./firstcheck.sh
+	./firstcheck.sh || die "firstcheck.sh config script failed"
+
+	echo -n "Do you want to set a crontab [y/N]" ; read cronyes
+	if [ "${cronyes}+" = "y+" ] ; then 
+		crontab -u apache ${MY_INSTALLDIR}/bugzilla.cron.tab
+	fi
+
+else
+	echo $1
+fi
diff --git a/net-www/bugzilla/files/bz.cfg.templ b/net-www/bugzilla/files/bz.cfg.templ
index ecd9fc5c90f7..2bcfc4ad19cd 100644
--- a/net-www/bugzilla/files/bz.cfg.templ
+++ b/net-www/bugzilla/files/bz.cfg.templ
@@ -1,10 +1,9 @@
 
-$answer{'db_host'} = '$db_host = "tmphost"; 
+$db_host = "tmphost"; 
 $db_port = 3306; 
 $db_name = "tmpdbname"; 
-$db_user = "tmpdbuser";'; 
-
-$answer{'db_pass'} = q[$db_pass = 'tmpdbpass';]; 
+$db_user = "tmpdbuser"; 
+$db_pass = "tmpdbpass"; 
 
 $answer{'ADMIN_OK'} = 'Y'; 
 $answer{'ADMIN_EMAIL'} = 'tmpadmemail'; 
diff --git a/net-www/bugzilla/files/digest-bugzilla-2.17.6-r1 b/net-www/bugzilla/files/digest-bugzilla-2.17.6-r1
deleted file mode 100644
index bf009c3e8f1f..000000000000
--- a/net-www/bugzilla/files/digest-bugzilla-2.17.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fd6bdcd18838d54f54b30eeaa7d14ce bugzilla-2.17.6.tar.gz 1226064
diff --git a/net-www/bugzilla/files/digest-bugzilla-2.17.6-r2 b/net-www/bugzilla/files/digest-bugzilla-2.17.6-r2
deleted file mode 100644
index bf009c3e8f1f..000000000000
--- a/net-www/bugzilla/files/digest-bugzilla-2.17.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fd6bdcd18838d54f54b30eeaa7d14ce bugzilla-2.17.6.tar.gz 1226064
diff --git a/net-www/bugzilla/files/digest-bugzilla-2.18.0_rc1 b/net-www/bugzilla/files/digest-bugzilla-2.18.0_rc1
new file mode 100644
index 000000000000..120fe1e126a3
--- /dev/null
+++ b/net-www/bugzilla/files/digest-bugzilla-2.18.0_rc1
@@ -0,0 +1 @@
+MD5 564e018803ce07c41db7af9fc8919d1a bugzilla-2.18rc1.tar.gz 1218999