diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index b648a23..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bugzilla-2.22.2.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6a34202 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +bugzilla-3.0.4.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index c2b3080..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: bugzilla -# $Id$ -NAME := bugzilla -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla index ea9b201..2611a75 100644 --- a/README.fedora.bugzilla +++ b/README.fedora.bugzilla @@ -14,3 +14,12 @@ database setting modifications. Lastly, simply re-run checksetup.pl to populate the database tables, set up the templates, and add the administrator ID. You should be done at this point. + +There are two useful cron jobs which are included with Bugzilla which should be +put in place after configuration is done. The first is a daily cron job for +statistics collection. This is in the file "cron.daily" and can be enabled by +simply copying this file to /etc/cron.daily/bugzilla (or any other file name +in the /etc/cron.daily/ directory). The second is the "whine" cron job, +designed to run every 15 minutes. To enable this job, simply coopy the +cron.whine file to /etc/cron.d/bugzilla (or any othe filename within the +/etc/cron.d/ directory). diff --git a/bugzilla-config-path.patch b/bugzilla-config-path.patch deleted file mode 100644 index 1ee006e..0000000 --- a/bugzilla-config-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN bugzilla-neworig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm ---- bugzilla-neworig/Bugzilla/Config.pm 2006-06-19 16:29:00.000000000 -0400 -+++ bugzilla-2.22/Bugzilla/Config.pm 2006-06-25 10:20:02.000000000 -0400 -@@ -61,10 +61,10 @@ - our $datadir; - if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) { - $project = $1; -- $localconfig = "$libpath/localconfig.$project"; -+ $localconfig = "/etc/bugzilla/localconfig.$project"; - $datadir = "/var/lib/bugzilla/data/$project"; - } else { -- $localconfig = "$libpath/localconfig"; -+ $localconfig = "/etc/bugzilla/localconfig"; - $datadir = "/var/lib/bugzilla/data"; - } - our $attachdir = "$datadir/attachments"; diff --git a/bugzilla-data-dir.patch b/bugzilla-data-dir.patch deleted file mode 100644 index b8e2943..0000000 --- a/bugzilla-data-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN bugzilla-orig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm ---- bugzilla-orig/Bugzilla/Config.pm 2006-04-22 22:45:09.000000000 -0400 -+++ bugzilla-2.22/Bugzilla/Config.pm 2006-06-19 16:29:00.000000000 -0400 -@@ -62,10 +62,10 @@ - if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) { - $project = $1; - $localconfig = "$libpath/localconfig.$project"; -- $datadir = "$libpath/data/$project"; -+ $datadir = "/var/lib/bugzilla/data/$project"; - } else { - $localconfig = "$libpath/localconfig"; -- $datadir = "$libpath/data"; -+ $datadir = "/var/lib/bugzilla/data"; - } - our $attachdir = "$datadir/attachments"; - our $webdotdir = "$datadir/webdot"; diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index c251546..e8fbb38 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -4,5 +4,5 @@ Alias /bugzilla /usr/share/bugzilla AddHandler cgi-script .cgi Options +Indexes +ExecCGI +FollowSymLinks DirectoryIndex index.cgi - AllowOverride Limit + AllowOverride Limit Options FileInfo diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch new file mode 100644 index 0000000..d6441e9 --- /dev/null +++ b/bugzilla-rw-paths.patch @@ -0,0 +1,27 @@ +diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0.1/Bugzilla/Constants.pm +--- bugzilla-orig/Bugzilla/Constants.pm 2007-08-23 14:42:23.000000000 -0400 ++++ bugzilla-3.0.1/Bugzilla/Constants.pm 2007-08-27 08:50:50.000000000 -0400 +@@ -423,9 +423,9 @@ + 'cgi_path' => $libpath, + 'templatedir' => "$libpath/template", + 'project' => $project, +- 'localconfig' => "$libpath/$localconfig", +- 'datadir' => "$libpath/$datadir", +- 'attachdir' => "$libpath/$datadir/attachments", ++ 'localconfig' => "/etc/bugzilla/$localconfig", ++ 'datadir' => "/var/lib/bugzilla/$datadir", ++ 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", + 'skinsdir' => "$libpath/skins", + # $webdotdir must be in the webtree somewhere. Even if you use a + # local dot, we output images to there. Also, if $webdotdir is +@@ -433,8 +433,8 @@ + # change showdependencygraph.cgi to set image_url to the correct + # location. + # The script should really generate these graphs directly... +- 'webdotdir' => "$libpath/$datadir/webdot", +- 'extensionsdir' => "$libpath/extensions", ++ 'webdotdir' => "/var/lib/bugzilla/$datadir/webdot", ++ 'extensionsdir' => "/var/lib/bugzilla/extensions", + }; + } + diff --git a/bugzilla.spec b/bugzilla.spec index 454f1e6..41aa472 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,18 +4,17 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 2.22.2 +Version: 3.0.4 Group: Applications/Publishing Release: 1%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla -Patch0: bugzilla-data-dir.patch -Patch1: bugzilla-config-path.patch +Patch0: bugzilla-rw-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: smtpdaemon, webserver, graphviz, patchutils +Requires: smtpdaemon, webserver, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address, which %package doc Summary: Bugzilla documentation @@ -39,7 +38,6 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 # Filter unwanted Requires: cat << \EOF > %{name}-req @@ -77,15 +75,13 @@ done %install mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla -mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily -cat << EOM > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily/bugzilla +cat << EOM > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.daily #!/bin/bash # Daily Bugzilla collectstats cron job run cd %{bzinstallprefix}/bugzilla ./collectstats.pl EOM -mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d -echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla +echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version} cp %{SOURCE2} ./README.fedora @@ -117,12 +113,10 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t %{bzinstallprefix}/bugzilla/template +%{bzinstallprefix}/bugzilla/cron.daily +%{bzinstallprefix}/bugzilla/cron.whine %ghost %{bzinstallprefix}/bugzilla/bugzilla-req %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf -%defattr(0755,root,root,-) -%{_sysconfdir}/cron.daily/* -%defattr(0600,root,root,-) -%{_sysconfdir}/cron.d/* %defattr(-,root,root,-) %doc README %doc QUICKSTART @@ -130,6 +124,7 @@ popd > /dev/null %doc UPGRADING-pre-2.8 %doc README.fedora %dir %{bzdatadir} +%defattr(0750,root,apache,-) %dir %{_sysconfdir}/bugzilla %files doc @@ -139,25 +134,62 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog -* Wed Feb 20 2007 John Berninger - 2.22.2-1 -- Update to 2.22.2 - bz 229163 +* Fri May 9 2008 John Berninger - 3.0.4-1 +- Update to upstream 3.0.4 to fix multiple security vulns +- Change perms on /etc/bugzilla for bz 427981 -* Wed Feb 14 2007 John Berninger - 2.22.1-6 +* Fri Dec 28 2007 John Berninger - 3.0.2-6 +- Add cron.daily, cron.whine to payload list + +* Fri Dec 28 2007 John Berninger - 3.0.2-5 +- Typo in spec file, rebuild + +* Fri Dec 28 2007 John Berninger - 3.0.2-3 +- bz 426465 - don't enable cron jobs so cron doesn't complain about + an unconfigured installation + +* Fri Oct 26 2007 John Berninger - 3.0.2-2 +- fix issue with AlowOverride Options + +* Mon Oct 22 2007 John Berninger - 3.0.2-1 +- updates to requires and httpd conf for BZ's 279961, 295861, 339531 + +* Mon Sep 24 2007 John Berninger - 3.0.2-0 +- update to 3.0.2 - bz 299981 + +* Mon Aug 27 2007 John Berninger - 3.0.1-0 +- update to 3.0.1 - bz 256021 + +* Fri May 18 2007 John Berninger - 3.0-2 +- update Requires for bz's 241037, 241206 + +* Fri May 18 2007 John Berninger - 3.0-1 +- update to upstream version 3.0 +- add new dependencies on mod_perl, perl-SOAP-Lite +- refactor patch(es) to change paths for read-only /usr + +* Tue Feb 20 2007 John Berninger - 2.22.2-1 +- update to 2.22.2 - bz 229163 + +* Wed Feb 14 2007 John Berninger - 2.22-12 - More cron job fixes -* Wed Jan 31 2007 John Berninger - 2.22.1-5 +* Wed Jan 31 2007 John Berninger - 2.22-11 - Fix cron job perms -* Sat Jan 27 2007 John Berninger - 2.22.1-4 -- Fix collectstats cron job, bz 224550 +* Sat Jan 27 2007 John Berninger - 2.22-10 +- Fix collectstats cron job, bx 224550 -* Mon Jan 22 2007 John Berninger - 2.22.1-3 +* Mon Jan 22 2007 John Berninger - 2.22-9 - Fix linebreak issues in specfile -* Mon Jan 22 2007 John Berninger - 2.22.1-2 +* Mon Jan 22 2007 John Berninger - 2.22-8 - Put daily and hourly cronjobs in place per bz 223747 -* Tue Jun 26 2006 John Berninger - 2.22.1-1 +* Wed Nov 8 2006 John Berninger - 2.22-7 +- Fixes for bz # 212355 + +* Tue Jun 26 2006 John Berninger - 2.22-6 - Clean up BugzillaEmail requires (filter it out) * Mon Jun 26 2006 John Berninger - 2.22-5 diff --git a/sources b/sources index 3a8fa13..e0ea8df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb7fdcaacf5efad6f3bd5a1a810c467f bugzilla-2.22.2.tar.gz +f55a3f3cde9cf1bf56492d18c8f7afe4 bugzilla-3.0.4.tar.gz