diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 6a34202..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bugzilla-3.0.4.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d079a0f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +bugzilla-3.2.5.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-rw-paths.patch b/bugzilla-rw-paths.patch index d6441e9..a9ae59f 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,7 +1,6 @@ -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 @@ +--- bugzilla-3.2.2/Bugzilla/Constants.pm 2009-02-03 10:02:53.000000000 +0000 ++++ bugzilla-3.2.2-rw/Bugzilla/Constants.pm 2009-02-18 17:59:52.000000000 +0000 +@@ -465,9 +465,9 @@ 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", 'project' => $project, @@ -12,9 +11,9 @@ diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0.1/Bugzilla/Constants.p + '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 + # $webdotdir must be in the web server's tree somewhere. Even if you use a # local dot, we output images to there. Also, if $webdotdir is -@@ -433,8 +433,8 @@ +@@ -475,8 +475,8 @@ # change showdependencygraph.cgi to set image_url to the correct # location. # The script should really generate these graphs directly... @@ -24,4 +23,4 @@ diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0.1/Bugzilla/Constants.p + 'extensionsdir' => "/var/lib/bugzilla/extensions", }; } - + diff --git a/bugzilla.spec b/bugzilla.spec index 3949561..5a3ab34 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,17 +4,18 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.4 +Version: 3.2.5 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-rw-paths.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -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 +Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which %package doc Summary: Bugzilla documentation @@ -23,11 +24,13 @@ Group: Documentation %package contrib Summary: Bugzilla contributed scripts Group: Applications/Publishing +BuildRequires: python %description -Bugzilla is a popular bug tracking system used by multiple open source -projects. It requires a database engine installed - either MySQL or -PostgreSQL. Without one of these database engines, Bugzilla will not work. +Bugzilla is a popular bug tracking system used by multiple open source projects +It requires a database engine installed - either MySQL, PostgreSQL or Oracle. +Without one of these database engines (local or remote), Bugzilla will not work +- see the Release Notes for details. %description doc Documentation distributed with the Bugzilla bug tracking system @@ -39,13 +42,16 @@ Contributed scripts and functions for Bugzilla %setup -q -n %{name}-%{version} %patch0 -p1 -# Filter unwanted Requires: +# Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl: +# create a wrapper script which runs the original perl_requires +# command and strips some of the output cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ - sed -e '/perl(globals.pl)/d;/perl(BugzillaEmail)/d' +sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' EOF +# use that wrapper script instead of the original perl_requires script %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} @@ -82,7 +88,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} @@ -93,15 +99,14 @@ install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/b rm -rf ${RPM_BUILD_ROOT} %post -pushd %{bzinstallprefix}/bugzilla > /dev/null +(pushd %{bzinstallprefix}/bugzilla > /dev/null ./checksetup.pl > /dev/null -popd > /dev/null +popd > /dev/null) %files %defattr(-,root,root,-) %dir %{bzinstallprefix}/bugzilla %{bzinstallprefix}/bugzilla/*.cgi -%{bzinstallprefix}/bugzilla/*.js %{bzinstallprefix}/bugzilla/*.pl %{bzinstallprefix}/bugzilla/Bugzilla.pm %{bzinstallprefix}/bugzilla/bugzilla.dtd @@ -113,33 +118,70 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t %{bzinstallprefix}/bugzilla/template +%{bzinstallprefix}/bugzilla/extensions/example +%{bzinstallprefix}/bugzilla/lib/README %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine %ghost %{bzinstallprefix}/bugzilla/bugzilla-req %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,-) %dir %{_sysconfdir}/bugzilla %files doc +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/docs %files contrib +%defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/contrib %changelog +* 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 + +* Thu Mar 05 2009 Itamar Reis Peixoto 3.2.2-2 +- fix from BZ #474250 Comment #16, from Chris Eveleigh --> +- add python BR for contrib subpackage +- fix description +- change Requires perl-SOAP-Lite to perl(SOAP::Lite) according guidelines + +* Sun Mar 01 2009 Itamar Reis Peixoto 3.2.2-1 +- thanks to Chris Eveleigh +- for contributing with patches :-) +- Upgrade to upstream 3.2.2 to fix multiple security vulns +- Removed old perl_requires exclusions, added new ones for RADIUS, Oracle and sanitycheck.cgi +- Added Oracle to supported DBs in description (and moved line breaks) +- Include a patch to fix max_allowed_packet warnin when using with mysql + +* Sat Feb 28 2009 Itamar Reis Peixoto 3.0.8-1 +- Upgrade to 3.0.8, fix #466077 #438080 +- fix macro in changelog rpmlint warning +- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages + +* Mon Feb 23 2009 Fedora Release Engineering - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 2 2009 Stepan Kasal - 3.0.4-3 +- do not require perl-Email-Simple, it is (no longer) in use +- remove several explicit perl-* requires; the automatic dependencies + do handle them + * Mon Jul 14 2008 Tom "spot" Callaway - 3.0.4-2 - fix license tag * 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 +- Change perms on /etc/bugzilla for bz 427981 * Sun May 4 2008 John Berninger - 3.0.3-0 - Update to upstream 3.0.3 - bz 444669 @@ -200,7 +242,7 @@ popd > /dev/null * Mon Jun 26 2006 John Berninger - 2.22-5 - License is MPL, not GPL -- Clean up %doc specs +- Clean up %%doc specs * Sun Jun 25 2006 John Benringer - 2.22-4 - Remove localconfig file per upstream diff --git a/sources b/sources index e0ea8df..fda3a06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f55a3f3cde9cf1bf56492d18c8f7afe4 bugzilla-3.0.4.tar.gz +4e6a9c872bc1420a3702e244500ce964 bugzilla-3.2.5.tar.gz