Version bump

6 files changed, 181 insertions, 7 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index db60b311b18f..894cc3d52b93 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/bugzilla
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.1 2004/08/15 09:44:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.2 2004/08/17 22:23:09 rl03 Exp $
+
+*bugzilla-2.18.0_rc2 (17 Aug 2004)
+
+  17 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/2.18.0_rc2/apache.htaccess,
+  +files/2.18.0_rc2/reconfig, +bugzilla-2.18.0_rc2.ebuild:
+  Version bump (bug 59165). Cleaned up dependancies.
 
 *bugzilla-2.18.0_rc1 (15 Aug 2004)
 
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index a30b4e09816d..b0f3ec5bcced 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,12 +1,16 @@
-MD5 ddf46c4706a664e877c51705a6519312 ChangeLog 2062
+MD5 f2c7b4975c95b0ff6b931e6e41a94034 bugzilla-2.18.0_rc2.ebuild 1846
+MD5 78e7d5cba5a381df959fe8fd59c445c7 bugzilla-2.18.0_rc1.ebuild 1775
+MD5 2f6c135253118bb681dd16025d3fbe10 ChangeLog 2682
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 97f885e96e9c482584e546e539d11609 bugzilla-2.18.0_rc1.ebuild 1777
-MD5 4a9b1a263f16b2a53b44bce45350b373 files/bugzilla.conf 148
-MD5 0be5a588dc7fdfc9e4898a855bd32361 files/bugzilla.cron.daily 115
+MD5 0606a9da89d19a505c52818d14de61e3 files/cronset.sh 70
 MD5 b38d67b03726b84833bd8c5f632e4020 files/bugzilla.cron.tab 54
 MD5 b243138916c1a9e7390fa352aa184a81 files/bz.cfg.templ 273
-MD5 0606a9da89d19a505c52818d14de61e3 files/cronset.sh 70
-MD5 8d37835f4224135a849a73ab8b6b893a files/digest-bugzilla-2.18.0_rc1 69
 MD5 a001fc92584de0cd6f1a0d8de99ee6ce files/firstcheck.sh 48
+MD5 4a9b1a263f16b2a53b44bce45350b373 files/bugzilla.conf 148
+MD5 8d37835f4224135a849a73ab8b6b893a files/digest-bugzilla-2.18.0_rc1 69
+MD5 6a37c51e53b1fc63769e3bf5d8c258a4 files/digest-bugzilla-2.18.0_rc2 69
+MD5 0be5a588dc7fdfc9e4898a855bd32361 files/bugzilla.cron.daily 115
 MD5 32cb42777a779ac279c5384643970729 files/2.18.0_rc1/apache.htaccess 70
 MD5 2b4f3ae5bc1d383a4951a22cf65b28ae files/2.18.0_rc1/reconfig 3214
+MD5 32cb42777a779ac279c5384643970729 files/2.18.0_rc2/apache.htaccess 70
+MD5 2b4f3ae5bc1d383a4951a22cf65b28ae files/2.18.0_rc2/reconfig 3214
diff --git a/www-apps/bugzilla/bugzilla-2.18.0_rc2.ebuild b/www-apps/bugzilla/bugzilla-2.18.0_rc2.ebuild
new file mode 100644
index 000000000000..44ce67e06dd2
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-2.18.0_rc2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.18.0_rc2.ebuild,v 1.1 2004/08/17 22:23:09 rl03 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
+# updated list of deps: http://www.bugzilla.org/releases/2.18/release-notes.html
+# removed deps:	dev-perl/MIME-tools
+# dev-perl/Data-Dumper is back
+DEPEND="$DEPEND"
+RDEPEND=">=dev-db/mysql-3.23.41
+	>=dev-lang/perl-5.6.0
+	>=dev-perl/AppConfig-1.52
+	>=dev-perl/CGI-2.93
+	dev-perl/Data-Dumper
+	>=dev-perl/TimeDate-1.11
+	>=dev-perl/DBI-1.36
+	>=dev-perl/DBD-mysql-2.1010
+	>=dev-perl/File-Spec-0.8.2
+	>=dev-perl/Template-Toolkit-2.08
+	>=dev-perl/Text-Tabs+Wrap-2001.0131
+	>=dev-perl/Chart-2.3
+	>=dev-perl/GD-1.20
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil
+	dev-perl/perl-ldap
+	>=dev-perl/PatchReader-0.9.4
+	dev-perl/XML-Parser
+	apache2? ( >=net-www/apache-2.0 )
+	!apache2? ( =net-www/apache-1* )"
+
+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/www-apps/bugzilla/files/2.18.0_rc2/apache.htaccess b/www-apps/bugzilla/files/2.18.0_rc2/apache.htaccess
new file mode 100644
index 000000000000..65b074866f11
--- /dev/null
+++ b/www-apps/bugzilla/files/2.18.0_rc2/apache.htaccess
@@ -0,0 +1,3 @@
+Order Allow,Deny
+Options +ExecCGI +FollowSymLinks
+AllowOverride Limit
diff --git a/www-apps/bugzilla/files/2.18.0_rc2/reconfig b/www-apps/bugzilla/files/2.18.0_rc2/reconfig
new file mode 100644
index 000000000000..7979bf7900e0
--- /dev/null
+++ b/www-apps/bugzilla/files/2.18.0_rc2/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/www-apps/bugzilla/files/digest-bugzilla-2.18.0_rc2 b/www-apps/bugzilla/files/digest-bugzilla-2.18.0_rc2
new file mode 100644
index 000000000000..bedc4001165d
--- /dev/null
+++ b/www-apps/bugzilla/files/digest-bugzilla-2.18.0_rc2
@@ -0,0 +1 @@
+MD5 aadd24a0177a7b44ef7b2785c0d6740f bugzilla-2.18rc2.tar.gz 1221714