From 26197cf2164556c1f52cfbfdbcbf87dd9a20b122 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:23:42 +0000 Subject: [PATCH 1/8] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 7fb753a6590cdaced09bfec4aad80d0141f91eb3 Mon Sep 17 00:00:00 2001 From: Itamar Reis Peixoto Date: Wed, 8 Jul 2009 19:20:52 +0000 Subject: [PATCH 2/8] new version 3.2.4 fix Unauthorized Bug Change --- .cvsignore | 2 +- bugzilla.spec | 5 ++++- import.log | 1 + sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6399c1b..d30801d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.2.3.tar.gz +bugzilla-3.2.4.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 1097a21..37757a3 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.2.3 +Version: 3.2.4 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -143,6 +143,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* 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 index dae9c27..7d3266d 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ 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:F-11:bugzilla-3.2.4-1.fc11.src.rpm:1247080787 diff --git a/sources b/sources index afc4623..a823be9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcc8f64fec821e76718fbda13e232b59 bugzilla-3.2.3.tar.gz +845c94c8a498340b244a2c36db7abd76 bugzilla-3.2.4.tar.gz From 4093a8fe9a16576a53a7be93edf9d878197d8c96 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Fri, 11 Sep 2009 21:21:29 +0000 Subject: [PATCH 3/8] Update to 3.2.5 --- .cvsignore | 2 +- bugzilla.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index d30801d..d079a0f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.2.4.tar.gz +bugzilla-3.2.5.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 37757a3..5a3ab34 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.2.4 +Version: 3.2.5 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -88,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} @@ -126,9 +126,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 +140,9 @@ popd > /dev/null) %{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 diff --git a/sources b/sources index a823be9..fda3a06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -845c94c8a498340b244a2c36db7abd76 bugzilla-3.2.4.tar.gz +4e6a9c872bc1420a3702e244500ce964 bugzilla-3.2.5.tar.gz From ab6e29b0006125ac6e2943b80bf0324763ca162f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:54 +0000 Subject: [PATCH 4/8] 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 ff7d9518a52232e5947721f06da6c3212b45df7d Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 1 Feb 2010 12:37:34 +0000 Subject: [PATCH 5/8] Update to 3.2.6 --- .cvsignore | 2 +- bugzilla-httpd-conf | 1 + bugzilla.spec | 13 ++++++++++++- sources | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d079a0f..1b86ca1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.2.5.tar.gz +bugzilla-3.2.6.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 5a3ab34..8014e48 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.2.5 +Version: 3.2.6 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -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.22 +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 @@ -142,6 +151,8 @@ popd > /dev/null) %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) +- Specify Perl module versions in the Requires (fixes #524309) +- Add an alias to make $webdotdir a working path (fixes #458848) * Wed Jul 08 2009 Itamar Reis Peixoto - 3.2.4-1 - fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257 diff --git a/sources b/sources index fda3a06..473a213 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e6a9c872bc1420a3702e244500ce964 bugzilla-3.2.5.tar.gz +d23089b3ce8062a3cab944d66973e4da bugzilla-3.2.6.tar.gz From d4013216c9aaa00740d0dba3f7951164584db0d6 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 1 Feb 2010 12:40:11 +0000 Subject: [PATCH 6/8] Correct the specfile's changelog --- bugzilla.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 8014e48..2fb7bde 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -149,11 +149,14 @@ popd > /dev/null) %{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) +* Mon Feb 02 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 From 00a7a1a5f75559ecbd515ecb71b7098660f69185 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 2 Feb 2010 13:17:59 +0000 Subject: [PATCH 7/8] Use Linux requirements, not Windows' --- bugzilla.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 2fb7bde..cd428c7 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla 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 @@ -20,7 +20,7 @@ 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.22 +Requires: perl(Template) >= 2.15 Requires: perl(Email::Send) >= 2.00 Requires: perl(Email::MIME) >= 1.861 Requires: perl(Email::MIME::Encodings) >= 1.313 @@ -149,7 +149,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog -* Mon Feb 02 2010 Emmanuel Seyman - 3.2.6-1 +* 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) From b2d95bf273abeafc5599d6ecd44b4823c32c332e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:19:06 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 4 ---- 4 files changed, 26 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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 7d3266d..0000000 --- a/import.log +++ /dev/null @@ -1,4 +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:F-11:bugzilla-3.2.4-1.fc11.src.rpm:1247080787