diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 6399c1b..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bugzilla-3.2.3.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1b86ca1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +bugzilla-3.2.6.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/bugzilla-httpd-conf b/bugzilla-httpd-conf index e8fbb38..bf195de 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -1,3 +1,4 @@ +Alias /bugzilla/var/lib/bugzilla/data/webdot /var/lib/bugzilla/data/webdot Alias /bugzilla /usr/share/bugzilla diff --git a/bugzilla.spec b/bugzilla.spec index 1097a21..cd428c7 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.2.3 +Version: 3.2.6 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -16,6 +16,15 @@ Patch0: bugzilla-rw-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which +Requires: perl(CGI) >= 3.33 +Requires: perl(Date::Format) >= 2.21 +Requires: perl(File::Spec) >= 0.84 +Requires: perl(DBI) >= 1.41 +Requires: perl(Template) >= 2.15 +Requires: perl(Email::Send) >= 2.00 +Requires: perl(Email::MIME) >= 1.861 +Requires: perl(Email::MIME::Encodings) >= 1.313 +Requires: perl(Email::MIME::Modifier) >= 1.442 %package doc Summary: Bugzilla documentation @@ -88,7 +97,7 @@ cd %{bzinstallprefix}/bugzilla ./collectstats.pl EOM 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} +rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/README mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version} cp %{SOURCE2} ./README.fedora mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir} @@ -126,9 +135,6 @@ popd > /dev/null) %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf %defattr(-,root,root,-) %doc README -%doc QUICKSTART -%doc UPGRADING -%doc UPGRADING-pre-2.8 %doc README.fedora %dir %{bzdatadir} %defattr(0750,root,apache,-) @@ -143,6 +149,20 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Tue Feb 02 2010 Emmanuel Seyman - 3.2.6-2 +- Use Linux requirements, not Windows' + +* Mon Feb 01 2010 Emmanuel Seyman - 3.2.6-1 +- Update to 3.2.6 (CVE-2009-3989, CVE-2009-3387) +- Specify Perl module versions in the Requires (fixes #524309) +- Add an alias to make $webdotdir a working path (fixes #458848) + +* Fri Sep 11 2009 Emmanuel Seyman - 3.2.5-1 +- Update to 3.2.5 (CVE-2009-3125, CVE-2009-3165 and CVE-2009-3166) + +* Wed Jul 08 2009 Itamar Reis Peixoto - 3.2.4-1 +- fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257 + * Mon Apr 06 2009 Itamar Reis Peixoto 3.2.3-1 - fix CVE-2009-1213 diff --git a/import.log b/import.log deleted file mode 100644 index dae9c27..0000000 --- a/import.log +++ /dev/null @@ -1,3 +0,0 @@ -bugzilla-3_0_8-1_fc11:HEAD:bugzilla-3.0.8-1.fc11.src.rpm:1235878106 -bugzilla-3_2_2-2_fc10:HEAD:bugzilla-3.2.2-2.fc10.src.rpm:1236265998 -bugzilla-3_2_3-1_fc11:HEAD:bugzilla-3.2.3-1.fc11.src.rpm:1239059931 diff --git a/sources b/sources index afc4623..473a213 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcc8f64fec821e76718fbda13e232b59 bugzilla-3.2.3.tar.gz +d23089b3ce8062a3cab944d66973e4da bugzilla-3.2.6.tar.gz