From 3833cd12a52c3699d795162f413f5ae91e46dc8a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 04:35:53 +0000 Subject: [PATCH 1/9] Initialize branch F-12 for bugzilla --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From d8c5e874f52ff2debd868c1417c214d0a8b596ce Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 18 Nov 2009 02:54:13 +0000 Subject: [PATCH 2/9] Fix all remaining bugs --- .cvsignore | 2 +- bugzilla-httpd-conf | 1 + bugzilla.spec | 20 ++++++++++++++++++-- sources | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 31f2c23..e721459 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.4.2.tar.gz +bugzilla-3.4.3.tar.gz 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 d92fb6d..dec2137 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.4.2 +Version: 3.4.3 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -16,7 +16,17 @@ Patch1: bugzilla-EL5-perl-versions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which +Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), perl(Digest::SHA), which +Requires: perl(CGI) >= 3.33 +Requires: perl(Date::Format) >= 2.21 +Requires: perl(DateTime) >= 0.28 +Requires: perl(DateTime::TimeZone) >= 0.71 +Requires: perl(DBI) >= 1.41 +Requires: perl(Template) >= 2.22 +Requires: perl(Email::Send) >= 2.00 +Requires: perl(Email::MIME) >= 1.859 +Requires: perl(Email::MIME::Encodings) >= 1.313 +Requires: perl(Email::MIME::Modifier) >= 1.441 %package doc Summary: Bugzilla documentation @@ -155,6 +165,12 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Nov 11 2009 Emmanuel Seyman - 3.4.3-1 +- Update to 3.4.3 (fixes memory leak issues) +- Add perl(Digest::SHA) in the Requires +- 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.4.2-1 - Update to 3.4.2 (CVE-2009-3125, CVE-2009-3165 and CVE-2009-3166) diff --git a/sources b/sources index 7dbbefc..eb56f67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db35a67b7470f46f208b9ecb1abc561b bugzilla-3.4.2.tar.gz +99a3fec50673489d8c8f7fee5d7cb0a3 bugzilla-3.4.3.tar.gz From 387e44533da9997bff695958808ca148f1f8acd0 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 19 Nov 2009 11:17:27 +0000 Subject: [PATCH 3/9] Update to 3.4.4 --- .cvsignore | 2 +- bugzilla.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e721459..851a37e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.4.3.tar.gz +bugzilla-3.4.4.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index dec2137..7e9c441 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.4.3 +Version: 3.4.4 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -24,9 +24,9 @@ Requires: perl(DateTime::TimeZone) >= 0.71 Requires: perl(DBI) >= 1.41 Requires: perl(Template) >= 2.22 Requires: perl(Email::Send) >= 2.00 -Requires: perl(Email::MIME) >= 1.859 +Requires: perl(Email::MIME) >= 1.861 Requires: perl(Email::MIME::Encodings) >= 1.313 -Requires: perl(Email::MIME::Modifier) >= 1.441 +Requires: perl(Email::MIME::Modifier) >= 1.442 %package doc Summary: Bugzilla documentation @@ -165,6 +165,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Thu Nov 19 2009 Emmanuel Seyman - 3.4.4-1 +- Update to 3.4.4 (CVE-2009-3386) + * Wed Nov 11 2009 Emmanuel Seyman - 3.4.3-1 - Update to 3.4.3 (fixes memory leak issues) - Add perl(Digest::SHA) in the Requires diff --git a/sources b/sources index eb56f67..40c7b89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99a3fec50673489d8c8f7fee5d7cb0a3 bugzilla-3.4.3.tar.gz +a59031c15fb79e9096c0a350c2382cfe bugzilla-3.4.4.tar.gz From 0f3b4366712a7e678b96da07fc95fb905893d9b1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:55 +0000 Subject: [PATCH 4/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c2b3080..8518ff4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 707763cacb2b87e969ddb184fdc7d5b118f2da9b Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 1 Feb 2010 11:14:51 +0000 Subject: [PATCH 5/9] Update to 3.4.5 --- .cvsignore | 2 +- bugzilla-EL5-perl-versions.patch | 33 -------------------------------- bugzilla.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 bugzilla-EL5-perl-versions.patch diff --git a/.cvsignore b/.cvsignore index 851a37e..b5354fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.4.4.tar.gz +bugzilla-3.4.5.tar.gz diff --git a/bugzilla-EL5-perl-versions.patch b/bugzilla-EL5-perl-versions.patch deleted file mode 100644 index 4ca70e3..0000000 --- a/bugzilla-EL5-perl-versions.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruNp a/bugzilla-3.4.1/Bugzilla/Constants.pm b/bugzilla-3.4.1/Bugzilla/Constants.pm ---- a/bugzilla-3.4.1/Bugzilla/Constants.pm 2009-08-01 11:28:41.000000000 -0300 -+++ b/bugzilla-3.4.1/Bugzilla/Constants.pm 2009-08-04 01:26:18.761892048 -0300 -@@ -400,7 +400,7 @@ use constant DB_MODULE => { - # Disallow development versions - blacklist => ['_'], - # For UTF-8 support -- version => '4.00', -+ version => '3.00', - }, - name => 'MySQL'}, - 'pg' => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000', -diff -ruNp a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm ---- a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm 2009-07-24 15:58:46.000000000 -0300 -+++ b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm 2009-08-04 01:27:02.852909164 -0300 -@@ -118,7 +118,7 @@ sub REQUIRED_MODULES { - { - package => 'Email-MIME', - module => 'Email::MIME', -- version => '1.861' -+ version => '1.859' - }, - { - package => 'Email-MIME-Encodings', -@@ -129,7 +129,7 @@ sub REQUIRED_MODULES { - { - package => 'Email-MIME-Modifier', - module => 'Email::MIME::Modifier', -- version => '1.442' -+ version => '1.441' - }, - { - package => 'URI', diff --git a/bugzilla.spec b/bugzilla.spec index 7e9c441..31e4474 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.4.4 +Version: 3.4.5 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -12,7 +12,6 @@ Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-rw-paths.patch -Patch1: bugzilla-EL5-perl-versions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -59,7 +58,6 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p2 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl: # create a wrapper script which runs the original perl_requires @@ -165,6 +163,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Mon Feb 01 2010 Emmanuel Seyman - 3.4.5-1 +- Update to 3.4.5 (CVE-2009-3989, CVE-2009-3387) +- Remove bugzilla-EL5-perl-versions.patch which is EPEL-specific + * Thu Nov 19 2009 Emmanuel Seyman - 3.4.4-1 - Update to 3.4.4 (CVE-2009-3386) diff --git a/sources b/sources index 40c7b89..31fb27a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a59031c15fb79e9096c0a350c2382cfe bugzilla-3.4.4.tar.gz +42c7f6bf31be3198cbf1f55fffaff441 bugzilla-3.4.5.tar.gz From 206f81ddfca9961e90e8ca4aad2be1f27fbb0e8b Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Fri, 25 Jun 2010 00:04:05 +0000 Subject: [PATCH 6/9] Update to 3.4.7 --- .cvsignore | 2 +- bugzilla.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b5354fa..d44a18a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.4.5.tar.gz +bugzilla-3.4.7.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 31e4474..ee3d7a1 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.4.5 +Version: 3.4.7 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -163,6 +163,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri Jun 25 2010 Emmanuel Seyman - 3.4.7-1 +- Update to 3.4.7 (CVE-2010-1204) + * Mon Feb 01 2010 Emmanuel Seyman - 3.4.5-1 - Update to 3.4.5 (CVE-2009-3989, CVE-2009-3387) - Remove bugzilla-EL5-perl-versions.patch which is EPEL-specific diff --git a/sources b/sources index 31fb27a..b423207 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42c7f6bf31be3198cbf1f55fffaff441 bugzilla-3.4.5.tar.gz +093368cea8c487cce24b23156329a0ab bugzilla-3.4.7.tar.gz From cc3bedbe20f7aac6b037ffe64b6b1e083825147b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:18:55 +0000 Subject: [PATCH 7/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 5 ----- 4 files changed, 27 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8518ff4..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 $$d/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/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 691275c..0000000 --- a/import.log +++ /dev/null @@ -1,5 +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 -bugzilla-3_2_4-1_fc11:HEAD:bugzilla-3.2.4-1.fc11.src.rpm:1247080670 -bugzilla-3_4_1-2_fc12:HEAD:bugzilla-3.4.1-2.fc12.src.rpm:1249360212 From 3dfeb1b163cda53ddcbc82ee77cc4ed95fd2cc86 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 19 Aug 2010 00:10:54 +0200 Subject: [PATCH 8/9] * Update to 3.4.8 (#623426, #615331) * Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210) * Add bugzilla-contrib to Requires (#610198) * Remove mod_perl from the requirements (#600924) --- .gitignore | 1 + bugzilla.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d44a18a..4ae8851 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bugzilla-3.4.7.tar.gz +/bugzilla-3.4.8.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index ee3d7a1..b320f15 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.4.7 +Version: 3.4.8 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -15,7 +15,7 @@ Patch0: bugzilla-rw-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), perl(Digest::SHA), which +Requires: webserver, patchutils, perl(SOAP::Lite), perl(Digest::SHA), which Requires: perl(CGI) >= 3.33 Requires: perl(Date::Format) >= 2.21 Requires: perl(DateTime) >= 0.28 @@ -26,6 +26,7 @@ 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 +Requires: bugzilla-contrib %package doc Summary: Bugzilla documentation @@ -117,7 +118,7 @@ rm -rf ${RPM_BUILD_ROOT} %post (pushd %{bzinstallprefix}/bugzilla > /dev/null -./checksetup.pl > /dev/null +[ -f /etc/bugzilla/localconfig ] || ./checksetup.pl > /dev/null popd > /dev/null) %files @@ -163,6 +164,12 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Thu Aug 19 2010 Emmanuel Seyman - 3.4.8-1 +- Update to 3.4.8 (#623426, #615331) +- Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210) +- Add bugzilla-contrib to Requires (#610198) +- Remove mod_perl from the requirements (#600924) + * Fri Jun 25 2010 Emmanuel Seyman - 3.4.7-1 - Update to 3.4.7 (CVE-2010-1204) diff --git a/sources b/sources index b423207..4442e1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -093368cea8c487cce24b23156329a0ab bugzilla-3.4.7.tar.gz +1b045455035e10094f57a2e160abe121 bugzilla-3.4.8.tar.gz From 3a32a7f25f148014ca889be298a4db100d4da548 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 4 Nov 2010 00:45:52 +0100 Subject: [PATCH 9/9] Update to 3.4.9 --- .gitignore | 1 + bugzilla-rw-paths.patch | 10 +++++----- bugzilla.spec | 5 ++++- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4ae8851..462b857 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bugzilla-3.4.7.tar.gz /bugzilla-3.4.8.tar.gz +/bugzilla-3.4.9.tar.gz diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index a6a9c59..0393fe3 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,6 +1,6 @@ ---- bugzilla-3.4/Bugzilla/Constants.pm 2009-02-03 10:02:53.000000000 +0000 -+++ bugzilla-3.4-rw/Bugzilla/Constants.pm 2009-02-18 17:59:52.000000000 +0000 -@@ -499,9 +499,9 @@ sub bz_locations { +--- bugzilla-3.4/Bugzilla/Constants.pm.orig 2010-11-03 01:47:33.000000000 +0100 ++++ bugzilla-3.4-rw/Bugzilla/Constants.pm 2010-11-04 00:00:51.000000000 +0100 +@@ -511,9 +511,9 @@ 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", 'project' => $project, @@ -11,9 +11,9 @@ + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", 'skinsdir' => "$libpath/skins", + 'graphsdir' => "$libpath/graphs", # $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 -@@ -509,7 +509,7 @@ sub bz_locations { +@@ -522,7 +522,7 @@ # change showdependencygraph.cgi to set image_url to the correct # location. # The script should really generate these graphs directly... diff --git a/bugzilla.spec b/bugzilla.spec index b320f15..af2a95f 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.4.8 +Version: 3.4.9 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -164,6 +164,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Thu Nov 04 2010 Emmanuel Seyman - 3.4.9-1 +- Update to 3.4.9 + * Thu Aug 19 2010 Emmanuel Seyman - 3.4.8-1 - Update to 3.4.8 (#623426, #615331) - Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210) diff --git a/sources b/sources index 4442e1f..81b53aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b045455035e10094f57a2e160abe121 bugzilla-3.4.8.tar.gz +c80b55d24c60d1753afb8b3d82d5a071 bugzilla-3.4.9.tar.gz