From ace80ded1a0291a61595bb9baf85b5a82010a42c Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 1 Jun 2010 12:14:09 +0000 Subject: [PATCH 01/99] - Update to 3.6 - Put graphs in /var/lib/bugzilla/ --- .cvsignore | 2 +- bugzilla-graphs-dir.patch | 104 ++++++++++++++++++++++++++++++++++++++ bugzilla.spec | 36 +++++++++++-- sources | 2 +- 4 files changed, 137 insertions(+), 7 deletions(-) create mode 100644 bugzilla-graphs-dir.patch diff --git a/.cvsignore b/.cvsignore index b5354fa..89bf0b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.4.5.tar.gz +bugzilla-3.6.tar.gz diff --git a/bugzilla-graphs-dir.patch b/bugzilla-graphs-dir.patch new file mode 100644 index 0000000..fc433c5 --- /dev/null +++ b/bugzilla-graphs-dir.patch @@ -0,0 +1,104 @@ +Index: collectstats.pl +=================================================================== +RCS file: /cvsroot/mozilla/webtools/bugzilla/collectstats.pl,v +retrieving revision 1.71 +diff -u -r1.71 collectstats.pl +--- collectstats.pl 6 Sep 2009 22:45:51 -0000 1.71 ++++ collectstats.pl 16 May 2010 09:22:28 -0000 +@@ -51,7 +51,7 @@ + + # Tidy up after graphing module + my $cwd = Cwd::getcwd(); +-if (chdir("graphs")) { ++if (chdir(bz_locations()->{'graphdir'})) { + unlink <./*.gif>; + unlink <./*.png>; + # chdir("..") doesn't work if graphs is a symlink, see bug 429378 +Index: reports.cgi +=================================================================== +RCS file: /cvsroot/mozilla/webtools/bugzilla/reports.cgi,v +retrieving revision 1.95 +diff -u -r1.95 reports.cgi +--- reports.cgi 24 Oct 2009 05:21:06 -0000 1.95 ++++ reports.cgi 16 May 2010 09:22:28 -0000 +@@ -45,6 +45,8 @@ + use Bugzilla::Error; + use Bugzilla::Status; + ++use File::Basename; ++ + # If we're using bug groups for products, we should apply those restrictions + # to viewing reports, as well. Time to check the login in that case. + my $user = Bugzilla->login(); +@@ -54,8 +56,8 @@ + } + + my $dir = bz_locations()->{'datadir'} . "/mining"; +-my $graph_url = 'graphs'; +-my $graph_dir = bz_locations()->{'libpath'} . '/' .$graph_url; ++my $graph_dir = bz_locations()->{'graphdir'}; ++my $graph_url = basename($graph_dir); + + Bugzilla->switch_to_shadow_db(); + +Index: Bugzilla/Constants.pm +=================================================================== +RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Constants.pm,v +retrieving revision 1.126.2.5 +diff -u -r1.126.2.5 Constants.pm +--- Bugzilla/Constants.pm 13 Apr 2010 04:56:24 -0000 1.126.2.5 ++++ Bugzilla/Constants.pm 16 May 2010 09:22:29 -0000 +@@ -551,6 +551,7 @@ + # The script should really generate these graphs directly... + 'webdotdir' => "/var/lib/bugzilla/$datadir/webdot", + 'extensionsdir' => "$libpath/extensions", ++ 'graphdir' => "$libpath/graphs", + }; + } + +Index: Bugzilla/Install/Filesystem.pm +=================================================================== +RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm,v +retrieving revision 1.47.2.1 +diff -u -r1.47.2.1 Filesystem.pm +--- Bugzilla/Install/Filesystem.pm 20 Feb 2010 20:20:55 -0000 1.47.2.1 ++++ Bugzilla/Install/Filesystem.pm 16 May 2010 09:22:29 -0000 +@@ -69,6 +69,7 @@ + my $attachdir = bz_locations()->{'attachdir'}; + my $extensionsdir = bz_locations()->{'extensionsdir'}; + my $webdotdir = bz_locations()->{'webdotdir'}; ++ my $graphdir = bz_locations()->{'graphdir'}; + my $templatedir = bz_locations()->{'templatedir'}; + my $libdir = bz_locations()->{'libpath'}; + my $extlib = bz_locations()->{'ext_libpath'}; +@@ -162,7 +163,7 @@ + dirs => $ws_dir_writeable }, + $webdotdir => { files => $ws_writeable, + dirs => $ws_dir_writeable }, +- graphs => { files => $ws_writeable, ++ $graphdir => { files => $ws_writeable, + dirs => $ws_dir_writeable }, + + # Readable directories +@@ -212,7 +213,7 @@ + "$datadir/extensions" => $ws_dir_readable, + $attachdir => $ws_dir_writeable, + $extensionsdir => $ws_dir_readable, +- graphs => $ws_dir_writeable, ++ $graphdir => $ws_dir_writeable, + $webdotdir => $ws_dir_writeable, + "$skinsdir/custom" => $ws_dir_readable, + "$skinsdir/contrib" => $ws_dir_readable, +@@ -342,10 +343,11 @@ + my %files = %{$fs->{create_files}}; + + my $datadir = bz_locations->{'datadir'}; ++ my $graphdir = bz_locations->{'graphdir'}; + # If the graphs/ directory doesn't exist, we're upgrading from + # a version old enough that we need to update the $datadir/mining + # format. +- if (-d "$datadir/mining" && !-d 'graphs') { ++ if (-d "$datadir/mining" && !-d $graphdir) { + _update_old_charts($datadir); + } + diff --git a/bugzilla.spec b/bugzilla.spec index 31e4474..73ab389 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.6 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -12,11 +12,13 @@ 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-graphs-dir.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, mod_perl, perl(SOAP::Lite), which Requires: perl(CGI) >= 3.33 +Requires: perl(Digest::SHA) Requires: perl(Date::Format) >= 2.21 Requires: perl(DateTime) >= 0.28 Requires: perl(DateTime::TimeZone) >= 0.71 @@ -26,6 +28,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: perl(URI) %package doc Summary: Bugzilla documentation @@ -58,6 +61,10 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p0 +rm -f Bugzilla/Constants.pm.orig +# Remove bundled libs +rm -rf lib # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl: # create a wrapper script which runs the original perl_requires @@ -65,13 +72,28 @@ Contributed scripts and functions for Bugzilla cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ -sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' +sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' |\ +sed -e '/perl(Apache2::Const)/d;/perl(Apache2::ServerUtil)/d;/perl(ModPerl::RegistryLoader)/d' |\ +sed -e '/perl(CPAN)/d;/perl(Net::LDAP)/d;/perl(Email::Reply)/d' |\ +sed -e '/perl(Email::MIME::Attachment::Stripper)/d;/perl(Email::MIME::Modifier)/d' |\ +sed -e '/perl(Image::Magick)/d;/perl(Test::Harness)/d;/perl(Test::Taint)/d' |\ +sed -e '/perl(XML::Twig)/d;/perl(XMLRPC::Lite)/d;/perl(XMLRPC::Transport::HTTP)/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} +# Filter unwanted provides +cat << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ +sed -e '/perl(Bugzilla::Extension::BmpConvert)/d;perl(Bugzilla::Extension::Example)/d' +EOF + +%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov +chmod +x %{__perl_provides} + # Deal with changing /usr/local paths here instead of via patches %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py %{__perl} -pi -e 's|/usr/local/bin/ruby\b|%{_bindir}/ruby|' contrib/*.rb @@ -129,16 +151,16 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/bugzilla.dtd %{bzinstallprefix}/bugzilla/robots.txt %{bzinstallprefix}/bugzilla/Bugzilla +%{bzinstallprefix}/bugzilla/extensions %{bzinstallprefix}/bugzilla/images %{bzinstallprefix}/bugzilla/js %{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 +%ghost %{bzinstallprefix}/bugzilla/bugzilla-prov %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf %defattr(-,root,root,-) %doc README @@ -163,6 +185,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Tue Apr 13 2010 Emmanuel Seyman - 3.6-1 +- Update to 3.6 (#598377) +- Patch to put graphs in /var/lib/bugzilla/ (brc #564450, bmo #313739) + * 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..53d8aac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42c7f6bf31be3198cbf1f55fffaff441 bugzilla-3.4.5.tar.gz +9c0210131ca9915526f63c84030463e1 bugzilla-3.6.tar.gz From 29e4a28ddf0da33aee6e56449d5630b88d1242a4 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 6 Jun 2010 20:05:13 +0000 Subject: [PATCH 02/99] Fix missing provides --- bugzilla.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 73ab389..79ace09 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.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 @@ -72,12 +72,12 @@ rm -rf lib cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ -sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' |\ -sed -e '/perl(Apache2::Const)/d;/perl(Apache2::ServerUtil)/d;/perl(ModPerl::RegistryLoader)/d' |\ -sed -e '/perl(CPAN)/d;/perl(Net::LDAP)/d;/perl(Email::Reply)/d' |\ -sed -e '/perl(Email::MIME::Attachment::Stripper)/d;/perl(Email::MIME::Modifier)/d' |\ -sed -e '/perl(Image::Magick)/d;/perl(Test::Harness)/d;/perl(Test::Taint)/d' |\ -sed -e '/perl(XML::Twig)/d;/perl(XMLRPC::Lite)/d;/perl(XMLRPC::Transport::HTTP)/d' +sed -e '/perl(Authen::Radius)/d' -e '/perl(DBD::Pg)/d' -e '/perl(DBD::Oracle)/d' -e '/perl(sanitycheck.cgi)/d' |\ +sed -e '/perl(Apache2::Const)/d' -e '/perl(Apache2::ServerUtil)/d' -e '/perl(ModPerl::RegistryLoader)/d' |\ +sed -e '/perl(CPAN)/d' -e '/perl(Net::LDAP)/d' -e '/perl(Email::Reply)/d' |\ +sed -e '/perl(Email::MIME::Attachment::Stripper)/d' -e '/perl(Email::MIME::Modifier)/d' |\ +sed -e '/perl(Image::Magick)/d' -e '/perl(Test::Harness)/d' -e '/perl(Test::Taint)/d' |\ +sed -e '/perl(XML::Twig)/d' -e '/perl(XMLRPC::Lite)/d' -e '/perl(XMLRPC::Transport::HTTP)/d' EOF # use that wrapper script instead of the original perl_requires script @@ -88,7 +88,7 @@ chmod +x %{__perl_requires} cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ -sed -e '/perl(Bugzilla::Extension::BmpConvert)/d;perl(Bugzilla::Extension::Example)/d' +sed -e '/perl(Bugzilla::Extension::BmpConvert)/d' -e '/perl(Bugzilla::Extension::Example)/d' EOF %global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov @@ -185,6 +185,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Sun Jun 6 2010 Emmanuel Seyman - 3.6-2 +- Fix missing provides (#600922) + * Tue Apr 13 2010 Emmanuel Seyman - 3.6-1 - Update to 3.6 (#598377) - Patch to put graphs in /var/lib/bugzilla/ (brc #564450, bmo #313739) From 7fb2eaaf1161181bdb5bc883cd9a9280ea08f917 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 6 Jun 2010 20:39:08 +0000 Subject: [PATCH 03/99] Remove mod_perl from requirements --- bugzilla.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 79ace09..d49f396 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -16,7 +16,7 @@ Patch1: bugzilla-graphs-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which +Requires: webserver, patchutils, perl(SOAP::Lite), which Requires: perl(CGI) >= 3.33 Requires: perl(Digest::SHA) Requires: perl(Date::Format) >= 2.21 @@ -185,6 +185,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Sun Jun 6 2010 Emmanuel Seyman - 3.6-3 +- Remove mod_perl from the requirements (#600924) + * Sun Jun 6 2010 Emmanuel Seyman - 3.6-2 - Fix missing provides (#600922) From fb2e757d85749dbdb4fba32d0cf013d1f03f0603 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 24 Jun 2010 23:40:28 +0000 Subject: [PATCH 04/99] Update to 3.6.1 --- .cvsignore | 2 +- bugzilla.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 89bf0b6..d9e78fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.6.tar.gz +bugzilla-3.6.1.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index d49f396..0b19282 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.6 +Version: 3.6.1 Group: Applications/Publishing -Release: 3%{?dist} +Release: 1%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -185,6 +185,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri Jun 25 2010 Emmanuel Seyman - 3.6.1-1 +- Update to 3.6.1 + * Sun Jun 6 2010 Emmanuel Seyman - 3.6-3 - Remove mod_perl from the requirements (#600924) diff --git a/sources b/sources index 53d8aac..b82e8e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c0210131ca9915526f63c84030463e1 bugzilla-3.6.tar.gz +74045f64fa7698f61ef24ef44b2e2074 bugzilla-3.6.1.tar.gz From 5ab76a3bcfc764d18563c330b4a70550a950e7b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:19:00 +0000 Subject: [PATCH 05/99] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 5 ----- 3 files changed, 26 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 7997bb4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: bugzilla -# $Id: Makefile,v 1.1 2006/06/26 17:50:23 jwb Exp $ -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/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 0401528a3aa0178c096339e2a222024fbd33ae51 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 11 Aug 2010 17:17:39 -0400 Subject: [PATCH 06/99] recompiling .py files against Python 2.7 (rhbz#623281) --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 0b19282..33488f2 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6.1 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 @@ -185,6 +185,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Aug 11 2010 David Malcolm - 3.6.1-2 +- recompiling .py files against Python 2.7 (rhbz#623281) + * Fri Jun 25 2010 Emmanuel Seyman - 3.6.1-1 - Update to 3.6.1 From 4b995b4a3c47c5c21d1e6adbb5aab17eb910a5bd Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 18 Aug 2010 23:39:33 +0200 Subject: [PATCH 07/99] * Update to 3.6.2 (#623426) * Only run checksetup if /etc/bugzilla/localconfig does not exist #610210) * Add bugzilla-contrib to Requires (#610198) --- .gitignore | 1 + bugzilla.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d9e78fa..33e8d46 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bugzilla-3.6.1.tar.gz +/bugzilla-3.6.2.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 33488f2..f11d3b9 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.6.1 +Version: 3.6.2 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 @@ -29,6 +29,7 @@ Requires: perl(Email::MIME) >= 1.861 Requires: perl(Email::MIME::Encodings) >= 1.313 Requires: perl(Email::MIME::Modifier) >= 1.442 Requires: perl(URI) +Requires: bugzilla-contrib %package doc Summary: Bugzilla documentation @@ -139,7 +140,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 @@ -185,6 +186,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Aug 18 2010 Emmanuel Seyman - 3.6.2-1 +- Update to 3.6.2 (#623426) +- Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210) +- Add bugzilla-contrib to Requires (#610198) + * Wed Aug 11 2010 David Malcolm - 3.6.1-2 - recompiling .py files against Python 2.7 (rhbz#623281) diff --git a/sources b/sources index b82e8e4..e1881b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74045f64fa7698f61ef24ef44b2e2074 bugzilla-3.6.1.tar.gz +c8bd9b81969cce1a0199a739b48bda06 bugzilla-3.6.2.tar.gz From 26ef7d64aadd817adb2ad5e1fbc5d5b013d28a3b Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 3 Nov 2010 23:28:57 +0100 Subject: [PATCH 08/99] Update to 3.6.3 (#649406) Fix webdot alias in /etc/httpd/conf.d/bugzilla (#630255) Do not apply graphs patch (upstreamed) --- .gitignore | 1 + bugzilla-httpd-conf | 2 +- bugzilla-rw-paths.patch | 6 +++--- bugzilla.spec | 9 +++++++-- sources | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 33e8d46..5b5bfb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bugzilla-3.6.1.tar.gz /bugzilla-3.6.2.tar.gz +/bugzilla-3.6.3.tar.gz diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index bf195de..0373cb4 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -1,4 +1,4 @@ -Alias /bugzilla/var/lib/bugzilla/data/webdot /var/lib/bugzilla/data/webdot +Alias /var/lib/bugzilla/data/webdot /var/lib/bugzilla/data/webdot Alias /bugzilla /usr/share/bugzilla diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index a6a9c59..44d157a 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 { +@@ -539,9 +539,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 { +@@ -550,7 +550,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 f11d3b9..cbfa981 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.6.2 +Version: 3.6.3 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -62,7 +62,7 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p0 +# patch1 -p0 rm -f Bugzilla/Constants.pm.orig # Remove bundled libs rm -rf lib @@ -186,6 +186,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Nov 03 2010 Emmanuel Seyman - 3.6.3-1 +- Update to 3.6.3 (#649406) +- Fix webdot alias in /etc/httpd/conf.d/bugzilla (#630255) +- Do not apply graphs patch (upstreamed) + * Wed Aug 18 2010 Emmanuel Seyman - 3.6.2-1 - Update to 3.6.2 (#623426) - Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210) diff --git a/sources b/sources index e1881b5..454502e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8bd9b81969cce1a0199a739b48bda06 bugzilla-3.6.2.tar.gz +c57031f0d9141239622935c1a50546aa bugzilla-3.6.3.tar.gz From 757a45b397bd9b63f19b9806bb5be448999c2276 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 25 Jan 2011 10:17:22 +0100 Subject: [PATCH 09/99] Update to 3.6.4 --- .gitignore | 1 + bugzilla.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5b5bfb8..e40fcb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-3.6.2.tar.gz /bugzilla-3.6.3.tar.gz +/bugzilla-3.6.4.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index cbfa981..d61f91b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.6.3 +Version: 3.6.4 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -17,17 +17,17 @@ Patch1: bugzilla-graphs-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which -Requires: perl(CGI) >= 3.33 -Requires: perl(Digest::SHA) +Requires: perl(CGI) >= 3.51 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(Digest::SHA) 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: perl(Template) >= 2.22 Requires: perl(URI) Requires: bugzilla-contrib @@ -186,6 +186,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Tue Jan 25 2011 Emmanuel Seyman - 3.6.4-1 +- Update to 3.6.4 + * Wed Nov 03 2010 Emmanuel Seyman - 3.6.3-1 - Update to 3.6.3 (#649406) - Fix webdot alias in /etc/httpd/conf.d/bugzilla (#630255) diff --git a/sources b/sources index 454502e..ae3a903 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c57031f0d9141239622935c1a50546aa bugzilla-3.6.3.tar.gz +1bb7980c50c51590d7c2341bc03d5151 bugzilla-3.6.4.tar.gz From d0883e01ce4ca6498edf96646ec56413c086cb61 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sat, 29 Jan 2011 14:01:54 +0100 Subject: [PATCH 10/99] Move to the current filtering system for provides and requires --- bugzilla.spec | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index d61f91b..cfdc62b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6.4 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 @@ -44,6 +44,20 @@ Summary: Bugzilla contributed scripts Group: Applications/Publishing BuildRequires: python +# Remove all optional modules from the requires stream +%filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBD::Oracle)/d; +%filter_from_requires /perl(sanitycheck.cgi)/d; /perl(Apache2::Const)/d; +%filter_from_requires /perl(Apache2::ServerUtil)/d; /perl(ModPerl::RegistryLoader)/d; +%filter_from_requires /perl(CPAN)/d; /perl(Net::LDAP)/d; /perl(Email::Reply)/d; +%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::MIME::Modifier)/d; +%filter_from_requires /perl(Image::Magick)/d; /perl(Test::Harness)/d; /perl(Test::Taint)/d; +%filter_from_requires /perl(XML::Twig)/d; /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d; + +# Remove extensions from the provides stream +%filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d; + +%{?perl_default_filter} + %description Bugzilla is a popular bug tracking system used by multiple open source projects It requires a database engine installed - either MySQL, PostgreSQL or Oracle. @@ -65,35 +79,7 @@ Contributed scripts and functions for Bugzilla # patch1 -p0 rm -f Bugzilla/Constants.pm.orig # Remove bundled libs -rm -rf lib - -# 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(Authen::Radius)/d' -e '/perl(DBD::Pg)/d' -e '/perl(DBD::Oracle)/d' -e '/perl(sanitycheck.cgi)/d' |\ -sed -e '/perl(Apache2::Const)/d' -e '/perl(Apache2::ServerUtil)/d' -e '/perl(ModPerl::RegistryLoader)/d' |\ -sed -e '/perl(CPAN)/d' -e '/perl(Net::LDAP)/d' -e '/perl(Email::Reply)/d' |\ -sed -e '/perl(Email::MIME::Attachment::Stripper)/d' -e '/perl(Email::MIME::Modifier)/d' |\ -sed -e '/perl(Image::Magick)/d' -e '/perl(Test::Harness)/d' -e '/perl(Test::Taint)/d' |\ -sed -e '/perl(XML::Twig)/d' -e '/perl(XMLRPC::Lite)/d' -e '/perl(XMLRPC::Transport::HTTP)/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} - -# Filter unwanted provides -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ -sed -e '/perl(Bugzilla::Extension::BmpConvert)/d' -e '/perl(Bugzilla::Extension::Example)/d' -EOF - -%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov -chmod +x %{__perl_provides} +rm -rf lib/* # Deal with changing /usr/local paths here instead of via patches %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py @@ -186,6 +172,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Sat Jan 29 2011 Emmanuel Seyman - 3.6.4-2 +- Move to the current filtering system for provides and requires + * Tue Jan 25 2011 Emmanuel Seyman - 3.6.4-1 - Update to 3.6.4 From 3f192c57c2f6603445404db50323f12bb7783f87 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sat, 29 Jan 2011 14:27:29 +0100 Subject: [PATCH 11/99] Remove no-longer-needed files --- bugzilla.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index cfdc62b..aafdcbe 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6.4 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -146,8 +146,6 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/template %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine -%ghost %{bzinstallprefix}/bugzilla/bugzilla-req -%ghost %{bzinstallprefix}/bugzilla/bugzilla-prov %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf %defattr(-,root,root,-) %doc README @@ -172,6 +170,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Sat Jan 29 2011 Emmanuel Seyman - 3.6.4-3 +- Remove no-longer-needed files + * Sat Jan 29 2011 Emmanuel Seyman - 3.6.4-2 - Move to the current filtering system for provides and requires From eb6d870ae35c7ffcf3281e3c7339c133f6fa56ff Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:59:57 -0600 Subject: [PATCH 12/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index aafdcbe..12ac564 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6.4 Group: Applications/Publishing -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -170,6 +170,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.6.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jan 29 2011 Emmanuel Seyman - 3.6.4-3 - Remove no-longer-needed files From 780f1060a8fa4901d8d8d16a85a6ddb7ff1b4166 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 14 Feb 2011 01:44:58 +0100 Subject: [PATCH 13/99] Fix broken dependencies and remove a non-longer used patch --- bugzilla-graphs-dir.patch | 104 -------------------------------------- bugzilla.spec | 14 +++-- 2 files changed, 10 insertions(+), 108 deletions(-) delete mode 100644 bugzilla-graphs-dir.patch diff --git a/bugzilla-graphs-dir.patch b/bugzilla-graphs-dir.patch deleted file mode 100644 index fc433c5..0000000 --- a/bugzilla-graphs-dir.patch +++ /dev/null @@ -1,104 +0,0 @@ -Index: collectstats.pl -=================================================================== -RCS file: /cvsroot/mozilla/webtools/bugzilla/collectstats.pl,v -retrieving revision 1.71 -diff -u -r1.71 collectstats.pl ---- collectstats.pl 6 Sep 2009 22:45:51 -0000 1.71 -+++ collectstats.pl 16 May 2010 09:22:28 -0000 -@@ -51,7 +51,7 @@ - - # Tidy up after graphing module - my $cwd = Cwd::getcwd(); --if (chdir("graphs")) { -+if (chdir(bz_locations()->{'graphdir'})) { - unlink <./*.gif>; - unlink <./*.png>; - # chdir("..") doesn't work if graphs is a symlink, see bug 429378 -Index: reports.cgi -=================================================================== -RCS file: /cvsroot/mozilla/webtools/bugzilla/reports.cgi,v -retrieving revision 1.95 -diff -u -r1.95 reports.cgi ---- reports.cgi 24 Oct 2009 05:21:06 -0000 1.95 -+++ reports.cgi 16 May 2010 09:22:28 -0000 -@@ -45,6 +45,8 @@ - use Bugzilla::Error; - use Bugzilla::Status; - -+use File::Basename; -+ - # If we're using bug groups for products, we should apply those restrictions - # to viewing reports, as well. Time to check the login in that case. - my $user = Bugzilla->login(); -@@ -54,8 +56,8 @@ - } - - my $dir = bz_locations()->{'datadir'} . "/mining"; --my $graph_url = 'graphs'; --my $graph_dir = bz_locations()->{'libpath'} . '/' .$graph_url; -+my $graph_dir = bz_locations()->{'graphdir'}; -+my $graph_url = basename($graph_dir); - - Bugzilla->switch_to_shadow_db(); - -Index: Bugzilla/Constants.pm -=================================================================== -RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Constants.pm,v -retrieving revision 1.126.2.5 -diff -u -r1.126.2.5 Constants.pm ---- Bugzilla/Constants.pm 13 Apr 2010 04:56:24 -0000 1.126.2.5 -+++ Bugzilla/Constants.pm 16 May 2010 09:22:29 -0000 -@@ -551,6 +551,7 @@ - # The script should really generate these graphs directly... - 'webdotdir' => "/var/lib/bugzilla/$datadir/webdot", - 'extensionsdir' => "$libpath/extensions", -+ 'graphdir' => "$libpath/graphs", - }; - } - -Index: Bugzilla/Install/Filesystem.pm -=================================================================== -RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm,v -retrieving revision 1.47.2.1 -diff -u -r1.47.2.1 Filesystem.pm ---- Bugzilla/Install/Filesystem.pm 20 Feb 2010 20:20:55 -0000 1.47.2.1 -+++ Bugzilla/Install/Filesystem.pm 16 May 2010 09:22:29 -0000 -@@ -69,6 +69,7 @@ - my $attachdir = bz_locations()->{'attachdir'}; - my $extensionsdir = bz_locations()->{'extensionsdir'}; - my $webdotdir = bz_locations()->{'webdotdir'}; -+ my $graphdir = bz_locations()->{'graphdir'}; - my $templatedir = bz_locations()->{'templatedir'}; - my $libdir = bz_locations()->{'libpath'}; - my $extlib = bz_locations()->{'ext_libpath'}; -@@ -162,7 +163,7 @@ - dirs => $ws_dir_writeable }, - $webdotdir => { files => $ws_writeable, - dirs => $ws_dir_writeable }, -- graphs => { files => $ws_writeable, -+ $graphdir => { files => $ws_writeable, - dirs => $ws_dir_writeable }, - - # Readable directories -@@ -212,7 +213,7 @@ - "$datadir/extensions" => $ws_dir_readable, - $attachdir => $ws_dir_writeable, - $extensionsdir => $ws_dir_readable, -- graphs => $ws_dir_writeable, -+ $graphdir => $ws_dir_writeable, - $webdotdir => $ws_dir_writeable, - "$skinsdir/custom" => $ws_dir_readable, - "$skinsdir/contrib" => $ws_dir_readable, -@@ -342,10 +343,11 @@ - my %files = %{$fs->{create_files}}; - - my $datadir = bz_locations->{'datadir'}; -+ my $graphdir = bz_locations->{'graphdir'}; - # If the graphs/ directory doesn't exist, we're upgrading from - # a version old enough that we need to update the $datadir/mining - # format. -- if (-d "$datadir/mining" && !-d 'graphs') { -+ if (-d "$datadir/mining" && !-d $graphdir) { - _update_old_charts($datadir); - } - diff --git a/bugzilla.spec b/bugzilla.spec index 12ac564..6a536c9 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,13 +6,12 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6.4 Group: Applications/Publishing -Release: 4%{?dist} +Release: 5%{?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 -Patch1: bugzilla-graphs-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -44,8 +43,11 @@ Summary: Bugzilla contributed scripts Group: Applications/Publishing BuildRequires: python +# Fedora does not ship Oracle +%filter_requires_in %{bzinstallprefix}/Bugzilla/DB/Oracle.pm + # Remove all optional modules from the requires stream -%filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBD::Oracle)/d; +%filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBI::db)/d; %filter_from_requires /perl(sanitycheck.cgi)/d; /perl(Apache2::Const)/d; %filter_from_requires /perl(Apache2::ServerUtil)/d; /perl(ModPerl::RegistryLoader)/d; %filter_from_requires /perl(CPAN)/d; /perl(Net::LDAP)/d; /perl(Email::Reply)/d; @@ -56,7 +58,7 @@ BuildRequires: python # Remove extensions from the provides stream %filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d; -%{?perl_default_filter} +%filter_setup %description Bugzilla is a popular bug tracking system used by multiple open source projects @@ -170,6 +172,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Mon Feb 14 2011 Emmanuel Seyman - 3.6.4-5 +- Fix broken dependencies +- Remove unused patch + * Mon Feb 07 2011 Fedora Release Engineering - 3.6.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 5d1f9b8ff5d9bee3fb7ce6b792965940dcffde3d Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 15 Feb 2011 10:01:54 +0100 Subject: [PATCH 14/99] More filtering --- bugzilla.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 6a536c9..2dc236d 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6.4 Group: Applications/Publishing -Release: 5%{?dist} +Release: 6%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -43,11 +43,9 @@ Summary: Bugzilla contributed scripts Group: Applications/Publishing BuildRequires: python -# Fedora does not ship Oracle -%filter_requires_in %{bzinstallprefix}/Bugzilla/DB/Oracle.pm - # Remove all optional modules from the requires stream %filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBI::db)/d; +%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBI::st)/d; %filter_from_requires /perl(sanitycheck.cgi)/d; /perl(Apache2::Const)/d; %filter_from_requires /perl(Apache2::ServerUtil)/d; /perl(ModPerl::RegistryLoader)/d; %filter_from_requires /perl(CPAN)/d; /perl(Net::LDAP)/d; /perl(Email::Reply)/d; @@ -172,6 +170,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib %changelog +* Tue Feb 15 2011 Emmanuel Seyman - 3.6.4-6 +- More filtering + * Mon Feb 14 2011 Emmanuel Seyman - 3.6.4-5 - Fix broken dependencies - Remove unused patch From 38b37f0231ede0598a3d0661338e033ecaee29f0 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 6 Mar 2011 23:23:56 +0100 Subject: [PATCH 15/99] The main bugzilla package no longer depends on the bugzilla-contrib one. This makes it possible to install bugzilla without having to install python and ruby. The lib directory was needed so only its contents are now removed. --- bugzilla.spec | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 2dc236d..a290285 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.6.4 Group: Applications/Publishing -Release: 6%{?dist} +Release: 7%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -28,7 +28,6 @@ Requires: perl(Email::MIME::Encodings) >= 1.313 Requires: perl(Email::MIME::Modifier) >= 1.442 Requires: perl(Template) >= 2.22 Requires: perl(URI) -Requires: bugzilla-contrib %package doc Summary: Bugzilla documentation @@ -76,10 +75,9 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 -# patch1 -p0 rm -f Bugzilla/Constants.pm.orig # Remove bundled libs -rm -rf lib/* +rm -rf lib/CGI* # Deal with changing /usr/local paths here instead of via patches %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py @@ -141,11 +139,13 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/extensions %{bzinstallprefix}/bugzilla/images %{bzinstallprefix}/bugzilla/js +%{bzinstallprefix}/bugzilla/lib %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t %{bzinstallprefix}/bugzilla/template %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine +%{bzinstallprefix}/bugzilla/contrib/recode.pl %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf %defattr(-,root,root,-) %doc README @@ -167,9 +167,31 @@ popd > /dev/null) %files contrib %defattr(-,root,root,-) -%{bzinstallprefix}/bugzilla/contrib +%{bzinstallprefix}/bugzilla/contrib/bugzilla_ldapsync.rb +%{bzinstallprefix}/bugzilla/contrib/bugzilla-queue +%{bzinstallprefix}/bugzilla/contrib/bugzilla-submit +%{bzinstallprefix}/bugzilla/contrib/bzdbcopy.pl +%{bzinstallprefix}/bugzilla/contrib/bz_webservice_demo.pl +%{bzinstallprefix}/bugzilla/contrib/cmdline +%{bzinstallprefix}/bugzilla/contrib/console.pl +%{bzinstallprefix}/bugzilla/contrib/cvs-update.pl +%{bzinstallprefix}/bugzilla/contrib/extension-convert.pl +%{bzinstallprefix}/bugzilla/contrib/fixperms.pl +%{bzinstallprefix}/bugzilla/contrib/jb2bz.py* +%{bzinstallprefix}/bugzilla/contrib/merge-users.pl +%{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl +%{bzinstallprefix}/bugzilla/contrib/README +%{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl +%{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl +%{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl +%{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Sun Mar 06 2011 Emmanuel Seyman - 3.6.4-7 +- Put contrib/recode.pl in the main package so that it no longer depends on + python and ruby +- Remove the contents of the lib/ directory, not the directory itself. + * Tue Feb 15 2011 Emmanuel Seyman - 3.6.4-6 - More filtering From 3e499de79c3bda371e7771c69f6a00696fc276e3 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 28 Mar 2011 00:18:56 +0200 Subject: [PATCH 16/99] Update to 4.0 --- .gitignore | 1 + bugzilla.cron-daily | 6 ++++ bugzilla.spec | 71 ++++++++++++++++++++++++++++----------------- sources | 2 +- 4 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 bugzilla.cron-daily diff --git a/.gitignore b/.gitignore index e40fcb6..e363e9b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-3.6.2.tar.gz /bugzilla-3.6.3.tar.gz /bugzilla-3.6.4.tar.gz +/bugzilla-4.0-1.fc14.src.rpm diff --git a/bugzilla.cron-daily b/bugzilla.cron-daily new file mode 100644 index 0000000..095c646 --- /dev/null +++ b/bugzilla.cron-daily @@ -0,0 +1,6 @@ +#!/bin/bash +# Daily Bugzilla collectstats cron job run + +cd /usr/share/bugzilla +./collectstats.pl + diff --git a/bugzilla.spec b/bugzilla.spec index a290285..8e32647 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,30 +4,29 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.6.4 +Version: 4.0 Group: Applications/Publishing -Release: 7%{?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 +Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which Requires: perl(CGI) >= 3.51 +Requires: perl(Digest::SHA) Requires: perl(Date::Format) >= 2.21 Requires: perl(DateTime) >= 0.28 Requires: perl(DateTime::TimeZone) >= 0.71 Requires: perl(DBI) >= 1.41 -Requires: perl(Digest::SHA) -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: perl(Template) >= 2.22 +Requires: perl(Email::Send) >= 2.00 +Requires: perl(Email::MIME) >= 1.904 Requires: perl(URI) +Requires: perl(List::MoreUtils) >= 0.22 %package doc Summary: Bugzilla documentation @@ -43,16 +42,34 @@ Group: Applications/Publishing BuildRequires: python # Remove all optional modules from the requires stream -%filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBI::db)/d; -%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBI::st)/d; -%filter_from_requires /perl(sanitycheck.cgi)/d; /perl(Apache2::Const)/d; -%filter_from_requires /perl(Apache2::ServerUtil)/d; /perl(ModPerl::RegistryLoader)/d; -%filter_from_requires /perl(CPAN)/d; /perl(Net::LDAP)/d; /perl(Email::Reply)/d; -%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::MIME::Modifier)/d; -%filter_from_requires /perl(Image::Magick)/d; /perl(Test::Harness)/d; /perl(Test::Taint)/d; -%filter_from_requires /perl(XML::Twig)/d; /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d; -# Remove extensions from the provides stream +%filter_from_requires /perl(sanitycheck.cgi)/d; + +# mod_perl modules +%filter_from_requires /perl(Apache2::Const)/d; /perl(Apache2::ServerUtil)/d; +%filter_from_requires /perl(Apache2::SizeLimit)/d; /perl(ModPerl::RegistryLoader)/d; + +# authentification modules +%filter_from_requires /perl(Authen::Radius)/d; /perl(Net::LDAP)/d; + +# database modules +%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBD::Pg)/d; +%filter_from_requires /perl(DBI::db)/d; /perl(DBI::st)/d; + +# inbound email modules +%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::Reply)/d; + +# bug moving modules +%filter_from_requires /perl(MIME::Parser)/d; /perl(XML::Twig)/d; + +# xml-rpc and json-rpc modules +%filter_from_requires /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d; +%filter_from_requires /perl(HTTP::Message)/d; /perl(Test::Taint)/d; + +# extension modules +%filter_from_requires /perl(Image::Magick)/d; + +# and remove the extensions from the provides stream %filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d; %filter_setup @@ -90,13 +107,13 @@ find . -depth -name CVS -type d -exec rm -rf {} \; find . -depth -name .cvsignore -type f -exec rm -rf {} \; # Remove the execute bit from files that don't start with #! for file in `find -type f -perm /111`; do - if head -1 $file | egrep -v '^\#!' &>/dev/null; then + if head -1 $file | grep -E -v '^\#!' &>/dev/null; then chmod a-x $file fi done # Ensure shebang shell scripts have executable bit set for file in `find -type f -perm /664`; do - if head -1 $file | egrep '^\#!' &>/dev/null; then + if head -1 $file | grep -E '^\#!' &>/dev/null; then chmod a+x $file fi done @@ -105,12 +122,6 @@ done %install mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla -cat << EOM > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.daily -#!/bin/bash -# Daily Bugzilla collectstats cron job run -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,UPGRADING,UPGRADING-pre-2.8} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version} @@ -118,6 +129,7 @@ cp %{SOURCE2} ./README.fedora mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir} mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf +install -m 0755 -D -p %{SOURCE3} ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/cron.daily %clean rm -rf ${RPM_BUILD_ROOT} @@ -142,6 +154,7 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/lib %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t +%{bzinstallprefix}/bugzilla/xt %{bzinstallprefix}/bugzilla/template %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine @@ -168,18 +181,21 @@ popd > /dev/null) %files contrib %defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/contrib/bugzilla_ldapsync.rb -%{bzinstallprefix}/bugzilla/contrib/bugzilla-queue +%{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.rhel +%{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.suse %{bzinstallprefix}/bugzilla/contrib/bugzilla-submit %{bzinstallprefix}/bugzilla/contrib/bzdbcopy.pl %{bzinstallprefix}/bugzilla/contrib/bz_webservice_demo.pl %{bzinstallprefix}/bugzilla/contrib/cmdline %{bzinstallprefix}/bugzilla/contrib/console.pl +%{bzinstallprefix}/bugzilla/contrib/convert-workflow.pl %{bzinstallprefix}/bugzilla/contrib/cvs-update.pl %{bzinstallprefix}/bugzilla/contrib/extension-convert.pl %{bzinstallprefix}/bugzilla/contrib/fixperms.pl %{bzinstallprefix}/bugzilla/contrib/jb2bz.py* %{bzinstallprefix}/bugzilla/contrib/merge-users.pl %{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl +%{bzinstallprefix}/bugzilla/contrib/new-yui.sh %{bzinstallprefix}/bugzilla/contrib/README %{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl %{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl @@ -187,6 +203,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Sun Mar 27 2011 Emmanuel Seyman - 4.0-1 +- Update to 4.0 + * Sun Mar 06 2011 Emmanuel Seyman - 3.6.4-7 - Put contrib/recode.pl in the main package so that it no longer depends on python and ruby diff --git a/sources b/sources index ae3a903..282d8f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bb7980c50c51590d7c2341bc03d5151 bugzilla-3.6.4.tar.gz +c5f119e869193ae58893f8fc7a0373a2 bugzilla-4.0-1.fc14.src.rpm From cbf95c04fd82976fb11c47183af465ef5558949d Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 28 Mar 2011 00:26:56 +0200 Subject: [PATCH 17/99] Add the real sources, not the .src.rpm. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 282d8f1..b991f61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5f119e869193ae58893f8fc7a0373a2 bugzilla-4.0-1.fc14.src.rpm +a1539d5fa8b4b11e6334a56862d6d076 bugzilla-4.0.tar.gz From 5c4159fa360f78d7116c89c781d8e87aab35f48f Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 28 Mar 2011 00:32:04 +0200 Subject: [PATCH 18/99] commit the .gitignore as well --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e363e9b..efb1f37 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-3.6.3.tar.gz /bugzilla-3.6.4.tar.gz /bugzilla-4.0-1.fc14.src.rpm +/bugzilla-4.0.tar.gz From f545e77abdf2b0c48c77463a23ec0aff3eca229f Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 1 May 2011 17:36:01 +0200 Subject: [PATCH 19/99] Update to 4.0.1 and patch the installation procedure to recommend yum --- .gitignore | 1 + bugzilla-yum.patch | 20 ++++++++++++++++++++ bugzilla.spec | 8 +++++++- sources | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 bugzilla-yum.patch diff --git a/.gitignore b/.gitignore index efb1f37..9f899a9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-3.6.4.tar.gz /bugzilla-4.0-1.fc14.src.rpm /bugzilla-4.0.tar.gz +/bugzilla-4.0.1.tar.gz diff --git a/bugzilla-yum.patch b/bugzilla-yum.patch new file mode 100644 index 0000000..9d53205 --- /dev/null +++ b/bugzilla-yum.patch @@ -0,0 +1,20 @@ +--- bugzilla-4.01/Bugzilla/Install/Requirements.pm 2011-05-01 17:09:35.000000000 +0200 ++++ bugzilla-4.01-yum/Bugzilla/Install/Requirements.pm 2011-05-01 17:11:28.000000000 +0200 +@@ -587,7 +587,7 @@ + if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE + && !$check_results->{hide_all}) + { +- print install_string('install_all', { perl => $^X }); ++ # print install_string('install_all', { perl => $^X }); + } + if (!$check_results->{pass}) { + print colored(install_string('installation_failed'), COLOR_ERROR), +@@ -732,7 +732,7 @@ + $package = $module->{package}; + } + else { +- $command = "$^X install-module.pl \%s"; ++ $command = "yum install \"perl(\%s)\""; + # Non-Windows installations need to use module names, because + # CPAN doesn't understand package names. + $package = $module->{module}; diff --git a/bugzilla.spec b/bugzilla.spec index 8e32647..cd881c4 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.0 +Version: 4.0.1 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -13,6 +13,7 @@ Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch +Patch1: bugzilla-yum.patch BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which @@ -92,6 +93,7 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 rm -f Bugzilla/Constants.pm.orig # Remove bundled libs rm -rf lib/CGI* @@ -203,6 +205,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Sun May 01 2011 Emmanuel Seyman - 4.0.1-1 +- Update to 4.0.1 +- Patch the installation procedure to recommend yum + * Sun Mar 27 2011 Emmanuel Seyman - 4.0-1 - Update to 4.0 diff --git a/sources b/sources index b991f61..031f4e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1539d5fa8b4b11e6334a56862d6d076 bugzilla-4.0.tar.gz +2785598c9787f3fe2edad97360c36306 bugzilla-4.0.1.tar.gz From c6fe6692ef4d870ecebf75302384bb595af9476b Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Fri, 5 Aug 2011 14:39:55 +0200 Subject: [PATCH 20/99] Update to 4.0.2, add RPM-4.9-style filtering, put graphs in /var/lib/bugzilla/graphs --- .gitignore | 1 + bugzilla-rw-paths.patch | 14 ++++---- bugzilla.spec | 79 +++++++++++++++++++++++++++++------------ sources | 2 +- 4 files changed, 66 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 9f899a9..1f04fc9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.0-1.fc14.src.rpm /bugzilla-4.0.tar.gz /bugzilla-4.0.1.tar.gz +/bugzilla-4.0.2.tar.gz diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index 44d157a..9c4e2f8 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,19 +1,21 @@ ---- 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 -@@ -539,9 +539,9 @@ +--- bugzilla-4.0.1/Bugzilla/Constants.pm 2011-08-05 12:14:57.301671513 +0200 ++++ bugzilla-4.0.1-rw/Bugzilla/Constants.pm 2011-08-05 12:16:51.798741609 +0200 +@@ -605,18 +605,18 @@ sub bz_locations { 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", 'project' => $project, - 'localconfig' => "$libpath/$localconfig", - 'datadir' => "$libpath/$datadir", - 'attachdir' => "$libpath/$datadir/attachments", -+ 'localconfig' => "/etc/bugzilla/$localconfig", ++ 'localconfig' => "/etc/bugzilla/localconfig", + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", 'skinsdir' => "$libpath/skins", - 'graphsdir' => "$libpath/graphs", +- 'graphsdir' => "$libpath/graphs", ++ 'graphsdir' => "/var/lib/bugzilla/graphs", # $webdotdir must be in the web server's tree somewhere. Even if you use a -@@ -550,7 +550,7 @@ + # local dot, we output images to there. Also, if $webdotdir is + # not relative to the bugzilla root directory, you'll need to # 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 cd881c4..3739bcc 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.0.1 +Version: 4.0.2 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -42,39 +42,65 @@ Summary: Bugzilla contributed scripts Group: Applications/Publishing BuildRequires: python +# RPM 4.8 style: +# Filter underspecified dependencies # Remove all optional modules from the requires stream - -%filter_from_requires /perl(sanitycheck.cgi)/d; - +%filter_from_requires /perl(sanitycheck.cgi)/d # mod_perl modules -%filter_from_requires /perl(Apache2::Const)/d; /perl(Apache2::ServerUtil)/d; -%filter_from_requires /perl(Apache2::SizeLimit)/d; /perl(ModPerl::RegistryLoader)/d; - +%filter_from_requires /perl(Apache2::Const)/d; /perl(Apache2::ServerUtil)/d +%filter_from_requires /perl(Apache2::SizeLimit)/d; /perl(ModPerl::RegistryLoader)/d # authentification modules -%filter_from_requires /perl(Authen::Radius)/d; /perl(Net::LDAP)/d; - +%filter_from_requires /perl(Authen::Radius)/d; /perl(Net::LDAP)/d # database modules -%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBD::Pg)/d; -%filter_from_requires /perl(DBI::db)/d; /perl(DBI::st)/d; - +%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBD::Pg)/d +%filter_from_requires /perl(DBI::db)/d; /perl(DBI::st)/d # inbound email modules -%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::Reply)/d; - +%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::Reply)/d # bug moving modules -%filter_from_requires /perl(MIME::Parser)/d; /perl(XML::Twig)/d; - +%filter_from_requires /perl(MIME::Parser)/d; /perl(XML::Twig)/d # xml-rpc and json-rpc modules -%filter_from_requires /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d; -%filter_from_requires /perl(HTTP::Message)/d; /perl(Test::Taint)/d; - +%filter_from_requires /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d +%filter_from_requires /perl(HTTP::Message)/d; /perl(Test::Taint)/d # extension modules -%filter_from_requires /perl(Image::Magick)/d; - +%filter_from_requires /perl(Image::Magick)/d # and remove the extensions from the provides stream -%filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d; - +%filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d %filter_setup +# RPM 4.9 style: +# Filter underspecified dependencies +# Remove all optional modules from the requires stream +%global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$ +# mod_perl modules +%global __requires_exclude %__requires_exclude|^perl\\(Apache2::Const\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Apache2::ServerUtil\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Apache2::SizeLimit\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(ModPerl::RegistryLoader\\)$ +# authentification modules +%global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP\\)$ +# database modules +%global __requires_exclude %__requires_exclude|^perl\\(DBD::Oracle\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(DBD::Pg\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(DBI::db\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(DBI::st\\)$ +# inbound email modules +%global __requires_exclude %__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$ +# bug moving modules +%global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$ +# xml-rpc and json-rpc modules +%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::Lite\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::Transport::HTTP\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$ +# extension modules +%global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$ +# and remove the extensions from the provides stream +%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla::Extension::Example\\)$ + %description Bugzilla is a popular bug tracking system used by multiple open source projects It requires a database engine installed - either MySQL, PostgreSQL or Oracle. @@ -205,6 +231,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Fri Aug 05 2011 Emmanuel Seyman - 4.0.2-1 +- Update to 4.0.2 +- Add RPM-4.9-style filtering +- Put graphs in /var/lib/bugzilla/graphs. + * Sun May 01 2011 Emmanuel Seyman - 4.0.1-1 - Update to 4.0.1 - Patch the installation procedure to recommend yum @@ -235,6 +266,8 @@ popd > /dev/null) * Tue Jan 25 2011 Emmanuel Seyman - 3.6.4-1 - Update to 3.6.4 +- Add RPM-4.9-style filtering +- * Wed Nov 03 2010 Emmanuel Seyman - 3.6.3-1 - Update to 3.6.3 (#649406) diff --git a/sources b/sources index 031f4e5..6a4140d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2785598c9787f3fe2edad97360c36306 bugzilla-4.0.1.tar.gz +1244a7a477682ecc9caadf840d960d2e bugzilla-4.0.2.tar.gz From 439e2d32daa3a861646db088b9d1d166f2f901eb Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 8 Jan 2012 14:29:39 +0100 Subject: [PATCH 21/99] Update to 4.0.3 Add perl(Locale::Language) to the Requires Put the xml docs source in the doc-build subpackage Add index.html to the DirectoryIndex Fix typo in README.fedora.bugzilla --- .gitignore | 1 + README.fedora.bugzilla | 2 +- bugzilla-httpd-conf | 4 +++- bugzilla.spec | 18 ++++++++++++++++-- sources | 2 +- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1f04fc9..de623e9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.0.tar.gz /bugzilla-4.0.1.tar.gz /bugzilla-4.0.2.tar.gz +/bugzilla-4.0.3.tar.gz diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla index 2611a75..9814898 100644 --- a/README.fedora.bugzilla +++ b/README.fedora.bugzilla @@ -20,6 +20,6 @@ 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 +designed to run every 15 minutes. To enable this job, simply copy the cron.whine file to /etc/cron.d/bugzilla (or any othe filename within the /etc/cron.d/ directory). diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index 0373cb4..be0987f 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -4,6 +4,8 @@ Alias /bugzilla /usr/share/bugzilla AddHandler cgi-script .cgi Options +Indexes +ExecCGI +FollowSymLinks - DirectoryIndex index.cgi + DirectoryIndex index.cgi index.html AllowOverride Limit Options FileInfo + AddType application/vnd.mozilla.xul+xml .xul + AddType application/rdf+xml .rdf diff --git a/bugzilla.spec b/bugzilla.spec index 3739bcc..d91804c 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.0.2 +Version: 4.0.3 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -28,6 +28,7 @@ Requires: perl(Email::Send) >= 2.00 Requires: perl(Email::MIME) >= 1.904 Requires: perl(URI) Requires: perl(List::MoreUtils) >= 0.22 +Requires: perl(Locale::Language) %package doc Summary: Bugzilla documentation @@ -197,7 +198,12 @@ popd > /dev/null) %files doc %defattr(-,root,root,-) -%{bzinstallprefix}/bugzilla/docs/en +%{bzinstallprefix}/bugzilla/docs/en/html +%{bzinstallprefix}/bugzilla/docs/en/images +%{bzinstallprefix}/bugzilla/docs/en/pdf +%{bzinstallprefix}/bugzilla/docs/en/README.docs +%{bzinstallprefix}/bugzilla/docs/en/rel_notes.txt +%{bzinstallprefix}/bugzilla/docs/en/txt %{bzinstallprefix}/bugzilla/docs/bugzilla.ent %{bzinstallprefix}/bugzilla/docs/style.css @@ -205,6 +211,7 @@ popd > /dev/null) %defattr(-,root,root,-) %{bzinstallprefix}/bugzilla/docs/makedocs.pl %{bzinstallprefix}/bugzilla/docs/lib +%{bzinstallprefix}/bugzilla/docs/en/xml %files contrib %defattr(-,root,root,-) @@ -231,6 +238,13 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Fri Dec 30 2011 Emmanuel Seyman - 4.0.3-1 +- Update to 4.0.3 +- Add perl(Locale::Language) to the Requires +- Put the xml docs source in the doc-build subpackage +- Add index.html to the DirectoryIndex +- Fix typo in README.fedora.bugzilla + * Fri Aug 05 2011 Emmanuel Seyman - 4.0.2-1 - Update to 4.0.2 - Add RPM-4.9-style filtering diff --git a/sources b/sources index 6a4140d..8ada0fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1244a7a477682ecc9caadf840d960d2e bugzilla-4.0.2.tar.gz +b7c33202cdb9a794e9f52a39fcb7dec4 bugzilla-4.0.3.tar.gz From 57e3607202fedc4da8fa67a1697f831b77133f42 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 10 Jan 2012 12:05:51 -0500 Subject: [PATCH 22/99] patch to use JSON::RPC::Legacy::Server::CGI --- bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch | 12 ++++++++++++ bugzilla.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch diff --git a/bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch b/bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch new file mode 100644 index 0000000..b7f3d07 --- /dev/null +++ b/bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch @@ -0,0 +1,12 @@ +diff -up bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm.legacy bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm +--- bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm.legacy 2012-01-10 11:58:09.151432054 -0500 ++++ bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm 2012-01-10 11:58:25.661290889 -0500 +@@ -22,7 +22,7 @@ + package Bugzilla::WebService::Server::JSONRPC; + + use strict; +-use base qw(JSON::RPC::Server::CGI Bugzilla::WebService::Server); ++use base qw(JSON::RPC::Legacy::Server::CGI Bugzilla::WebService::Server); + + use Bugzilla::Error; + use Bugzilla::WebService::Constants; diff --git a/bugzilla.spec b/bugzilla.spec index d91804c..833f3b8 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.0.3 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 @@ -14,6 +14,7 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-yum.patch +Patch2: bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which @@ -121,6 +122,8 @@ Contributed scripts and functions for Bugzilla %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 +# Use JSON::RPC::Legacy::Server::CGI +%patch2 -p1 rm -f Bugzilla/Constants.pm.orig # Remove bundled libs rm -rf lib/CGI* @@ -238,6 +241,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Tue Jan 10 2012 Tom Callaway - 4.0.3-2 +- patch bz to use JSON::RPC::Legacy::Server::CGI + * Fri Dec 30 2011 Emmanuel Seyman - 4.0.3-1 - Update to 4.0.3 - Add perl(Locale::Language) to the Requires From 2adbb8556b9455b5be70620def12fed506163d4b Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 1 Feb 2012 22:44:01 +0100 Subject: [PATCH 23/99] Update to 4.0.4 to fix security flaws (#786550) Remove JSON:RPC patch, upstreamed (bmo #706753) Correct upstream URL in README.fedora.bugzilla, thanks to Ken Dreyer (#783014) --- .gitignore | 1 + README.fedora.bugzilla | 2 +- bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch | 12 ------------ bugzilla.spec | 12 +++++++----- sources | 2 +- 5 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch diff --git a/.gitignore b/.gitignore index de623e9..106dae3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.0.1.tar.gz /bugzilla-4.0.2.tar.gz /bugzilla-4.0.3.tar.gz +/bugzilla-4.0.4.tar.gz diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla index 9814898..4663885 100644 --- a/README.fedora.bugzilla +++ b/README.fedora.bugzilla @@ -9,7 +9,7 @@ the values in this file are accurate for your environment. Once this is done, you may need to modify default settings for your database to ensure it accepts Bugzilla data properly. Please see -http://www.bugzilla.org/docs/2.22/html/configuration.html for specifics of +http://www.bugzilla.org/docs/4.0/en/html/configuration.html for specifics of database setting modifications. Lastly, simply re-run checksetup.pl to populate the database tables, set up diff --git a/bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch b/bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch deleted file mode 100644 index b7f3d07..0000000 --- a/bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm.legacy bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm ---- bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm.legacy 2012-01-10 11:58:09.151432054 -0500 -+++ bugzilla-4.0.3/Bugzilla/WebService/Server/JSONRPC.pm 2012-01-10 11:58:25.661290889 -0500 -@@ -22,7 +22,7 @@ - package Bugzilla::WebService::Server::JSONRPC; - - use strict; --use base qw(JSON::RPC::Server::CGI Bugzilla::WebService::Server); -+use base qw(JSON::RPC::Legacy::Server::CGI Bugzilla::WebService::Server); - - use Bugzilla::Error; - use Bugzilla::WebService::Constants; diff --git a/bugzilla.spec b/bugzilla.spec index 833f3b8..fa2843e 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.0.3 +Version: 4.0.4 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 @@ -14,7 +14,6 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-yum.patch -Patch2: bugzilla-4.0.3-JSON-RPC-Legacy-Server-CGI.patch BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which @@ -122,8 +121,6 @@ Contributed scripts and functions for Bugzilla %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -# Use JSON::RPC::Legacy::Server::CGI -%patch2 -p1 rm -f Bugzilla/Constants.pm.orig # Remove bundled libs rm -rf lib/CGI* @@ -241,6 +238,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Wed Feb 1 2012 Emmanuel Seyman - 4.0.4-1 +- Update to 4.0.4 to fix security flaws (#786550) +- Remove JSON:RPC patch, upstreamed (bmo #706753) +- Correct upstream URL in README.fedora.bugzilla, thanks to Ken Dreyer (#783014) + * Tue Jan 10 2012 Tom Callaway - 4.0.3-2 - patch bz to use JSON::RPC::Legacy::Server::CGI diff --git a/sources b/sources index 8ada0fd..afed430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7c33202cdb9a794e9f52a39fcb7dec4 bugzilla-4.0.3.tar.gz +2feaf81535eb3058017517532f8bac3a bugzilla-4.0.4.tar.gz From 80ae7996a3369beab6f92be79f5dcb6e37ff484a Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Fri, 24 Feb 2012 00:12:07 +0100 Subject: [PATCH 24/99] Update to 4.0.5, block mod-perl2 modules from requires and remove rpm4.8 filters --- .gitignore | 1 + bugzilla.spec | 52 ++++++++++++++++----------------------------------- sources | 2 +- 3 files changed, 18 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 106dae3..2734649 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.0.2.tar.gz /bugzilla-4.0.3.tar.gz /bugzilla-4.0.4.tar.gz +/bugzilla-4.0.5.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index fa2843e..c066943 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.0.4 +Version: 4.0.5 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -43,40 +43,15 @@ Summary: Bugzilla contributed scripts Group: Applications/Publishing BuildRequires: python -# RPM 4.8 style: -# Filter underspecified dependencies -# Remove all optional modules from the requires stream -%filter_from_requires /perl(sanitycheck.cgi)/d -# mod_perl modules -%filter_from_requires /perl(Apache2::Const)/d; /perl(Apache2::ServerUtil)/d -%filter_from_requires /perl(Apache2::SizeLimit)/d; /perl(ModPerl::RegistryLoader)/d -# authentification modules -%filter_from_requires /perl(Authen::Radius)/d; /perl(Net::LDAP)/d -# database modules -%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBD::Pg)/d -%filter_from_requires /perl(DBI::db)/d; /perl(DBI::st)/d -# inbound email modules -%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::Reply)/d -# bug moving modules -%filter_from_requires /perl(MIME::Parser)/d; /perl(XML::Twig)/d -# xml-rpc and json-rpc modules -%filter_from_requires /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d -%filter_from_requires /perl(HTTP::Message)/d; /perl(Test::Taint)/d -# extension modules -%filter_from_requires /perl(Image::Magick)/d -# and remove the extensions from the provides stream -%filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d -%filter_setup +%{?perl_default_filter} -# RPM 4.9 style: -# Filter underspecified dependencies -# Remove all optional modules from the requires stream +# Remove private modules from the requires stream %global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$ + +# Remove all optional modules from the requires stream # mod_perl modules -%global __requires_exclude %__requires_exclude|^perl\\(Apache2::Const\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Apache2::ServerUtil\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Apache2::SizeLimit\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(ModPerl::RegistryLoader\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Apache2:: +%global __requires_exclude %__requires_exclude|^perl\\(ModPerl:: # authentification modules %global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$ %global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP\\)$ @@ -92,15 +67,14 @@ BuildRequires: python %global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$ %global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$ # xml-rpc and json-rpc modules -%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::Lite\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::Transport::HTTP\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC:: %global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$ %global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$ # extension modules %global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$ + # and remove the extensions from the provides stream -%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla::Extension::Example\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension:: %description Bugzilla is a popular bug tracking system used by multiple open source projects @@ -122,6 +96,7 @@ Contributed scripts and functions for Bugzilla %patch0 -p1 %patch1 -p1 rm -f Bugzilla/Constants.pm.orig +rm -f Bugzilla/Install/Requirements.pm.orig # Remove bundled libs rm -rf lib/CGI* @@ -238,6 +213,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Thu Feb 23 2012 Emmanuel Seyman - 4.0.5-1 +- Update to 4.0.5 to fix security issues +- Block all ModPerl::* and Apache2::* from requires +- Remove rpm4.8 filters + * Wed Feb 1 2012 Emmanuel Seyman - 4.0.4-1 - Update to 4.0.4 to fix security flaws (#786550) - Remove JSON:RPC patch, upstreamed (bmo #706753) diff --git a/sources b/sources index afed430..f28ab97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2feaf81535eb3058017517532f8bac3a bugzilla-4.0.4.tar.gz +c5b73f5ddfecbf4772852e73ddfd94e4 bugzilla-4.0.5.tar.gz From c9db807549600b7fba031fa31141248c22f3aee4 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 26 Feb 2012 22:19:22 +0100 Subject: [PATCH 25/99] Leave perl(Bugzilla::Extension::Example::Util) in the provides stream --- bugzilla.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index c066943..94e1f47 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.0.5 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 @@ -74,7 +74,15 @@ BuildRequires: python %global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$ # and remove the extensions from the provides stream -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension:: +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Auth::Login\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Auth::Verify\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Config\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::WebService\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::OldBugMove\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::OldBugMove::Params\\)$ +%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Voting\\)$ %description Bugzilla is a popular bug tracking system used by multiple open source projects @@ -213,6 +221,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Sun Feb 26 2012 Emmanuel Seyman - 4.0.5-2 +- Leave perl(Bugzilla::Extension::Example::Util) in the provides stream + * Thu Feb 23 2012 Emmanuel Seyman - 4.0.5-1 - Update to 4.0.5 to fix security issues - Block all ModPerl::* and Apache2::* from requires From 0bf81d266f0e93c55982e98eebedfd2f92dfc87a Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 26 Feb 2012 23:48:13 +0100 Subject: [PATCH 26/99] Update to 4.2 --- .gitignore | 1 + bugzilla-rw-paths.patch | 14 +++++++------- bugzilla.spec | 19 +++++++++++-------- sources | 2 +- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 2734649..9d38efa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.0.3.tar.gz /bugzilla-4.0.4.tar.gz /bugzilla-4.0.5.tar.gz +/bugzilla-4.2.tar.gz diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index 9c4e2f8..66b0d87 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,12 +1,12 @@ ---- bugzilla-4.0.1/Bugzilla/Constants.pm 2011-08-05 12:14:57.301671513 +0200 -+++ bugzilla-4.0.1-rw/Bugzilla/Constants.pm 2011-08-05 12:16:51.798741609 +0200 -@@ -605,18 +605,18 @@ sub bz_locations { - 'cgi_path' => $libpath, +--- bugzilla-4.2/Bugzilla/Constants.pm 2012-02-26 22:39:30.161462858 +0100 ++++ bugzilla-4.2-rw/Bugzilla/Constants.pm 2012-02-26 22:41:55.185107179 +0100 +@@ -629,18 +629,18 @@ 'templatedir' => "$libpath/template", + 'template_cache' => "$datadir/template", 'project' => $project, - 'localconfig' => "$libpath/$localconfig", -- 'datadir' => "$libpath/$datadir", -- 'attachdir' => "$libpath/$datadir/attachments", +- 'datadir' => $datadir, +- 'attachdir' => "$datadir/attachments", + 'localconfig' => "/etc/bugzilla/localconfig", + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", @@ -19,7 +19,7 @@ # change showdependencygraph.cgi to set image_url to the correct # location. # The script should really generate these graphs directly... -- 'webdotdir' => "$libpath/$datadir/webdot", +- 'webdotdir' => "$datadir/webdot", + 'webdotdir' => "/var/lib/bugzilla/$datadir/webdot", 'extensionsdir' => "$libpath/extensions", }; diff --git a/bugzilla.spec b/bugzilla.spec index 94e1f47..1fcf3c9 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.0.5 +Version: 4.2 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 @@ -22,12 +22,13 @@ Requires: perl(Digest::SHA) Requires: perl(Date::Format) >= 2.21 Requires: perl(DateTime) >= 0.28 Requires: perl(DateTime::TimeZone) >= 0.71 -Requires: perl(DBI) >= 1.41 +Requires: perl(DBI) >= 1.614 Requires: perl(Template) >= 2.22 Requires: perl(Email::Send) >= 2.00 Requires: perl(Email::MIME) >= 1.904 -Requires: perl(URI) +Requires: perl(URI) >= 1.37 Requires: perl(List::MoreUtils) >= 0.22 +Requires: perl(Math::Random::ISAAC) >= 1.0.1 Requires: perl(Locale::Language) %package doc @@ -170,7 +171,7 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/template %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine -%{bzinstallprefix}/bugzilla/contrib/recode.pl +%{bzinstallprefix}/bugzilla/contrib/README %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf %defattr(-,root,root,-) %doc README @@ -198,7 +199,6 @@ popd > /dev/null) %files contrib %defattr(-,root,root,-) -%{bzinstallprefix}/bugzilla/contrib/bugzilla_ldapsync.rb %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.rhel %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.suse %{bzinstallprefix}/bugzilla/contrib/bugzilla-submit @@ -214,13 +214,16 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/merge-users.pl %{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl %{bzinstallprefix}/bugzilla/contrib/new-yui.sh -%{bzinstallprefix}/bugzilla/contrib/README +%{bzinstallprefix}/bugzilla/contrib/recode.pl %{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl %{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl -%{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh %changelog +* Sun Feb 26 2012 Emmanuel Seyman - 4.2-1 +- Update to 4.2 (#797225) +- Include contrib/README instead of contrib/recode.pl in the main package + * Sun Feb 26 2012 Emmanuel Seyman - 4.0.5-2 - Leave perl(Bugzilla::Extension::Example::Util) in the provides stream diff --git a/sources b/sources index f28ab97..7d44e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5b73f5ddfecbf4772852e73ddfd94e4 bugzilla-4.0.5.tar.gz +7c712b26fbf7d8684f57c2e89caff422 bugzilla-4.2.tar.gz From d0a986b649f341d899b8dda947d243d5496fbd63 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Fri, 20 Apr 2012 00:42:07 +0200 Subject: [PATCH 27/99] Update to 4.2.1 --- .gitignore | 1 + bugzilla.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9d38efa..47de9ab 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.0.4.tar.gz /bugzilla-4.0.5.tar.gz /bugzilla-4.2.tar.gz +/bugzilla-4.2.1.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 1fcf3c9..370c1e5 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2 +Version: 4.2.1 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -220,6 +220,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Fri Apr 20 2012 Emmanuel Seyman - 4.2.1-1 +- Update to 4.2.1 (CVE-2012-0465, CVE-2012-0466) + * Sun Feb 26 2012 Emmanuel Seyman - 4.2-1 - Update to 4.2 (#797225) - Include contrib/README instead of contrib/recode.pl in the main package diff --git a/sources b/sources index 7d44e24..19fecbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c712b26fbf7d8684f57c2e89caff422 bugzilla-4.2.tar.gz +de5f0fdcbb02de5dae2f54b3af30bff9 bugzilla-4.2.1.tar.gz From d439892d401ac8db4ea4d59577399895a3ad009c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 13:21:50 -0500 Subject: [PATCH 28/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 370c1e5..f6fe573 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.1 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 @@ -220,6 +220,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Apr 20 2012 Emmanuel Seyman - 4.2.1-1 - Update to 4.2.1 (CVE-2012-0465, CVE-2012-0466) From 732379f9a03b5011ae79d2825a5b88bb61c1f84f Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 30 Jul 2012 21:13:22 +0200 Subject: [PATCH 29/99] Update to 4.2.2 --- .gitignore | 1 + bugzilla.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 47de9ab..dcd77fe 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.0.5.tar.gz /bugzilla-4.2.tar.gz /bugzilla-4.2.1.tar.gz +/bugzilla-4.2.2.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index f6fe573..722e669 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.1 +Version: 4.2.2 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 @@ -220,6 +220,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Mon Jul 30 2012 Emmanuel Seyman - 4.2.2-1 +- Update to 4.2.2 + * Wed Jul 18 2012 Fedora Release Engineering - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 19fecbc..5d4820e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de5f0fdcbb02de5dae2f54b3af30bff9 bugzilla-4.2.1.tar.gz +2a77a439080a9ffcc1a7953aa7349c37 bugzilla-4.2.2.tar.gz From 6a8e3f66f81d716e22663249a849d80306178ad4 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 2 Sep 2012 17:53:00 +0200 Subject: [PATCH 30/99] Update to 4.2.3 --- .gitignore | 1 + bugzilla.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dcd77fe..e3204fc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.tar.gz /bugzilla-4.2.1.tar.gz /bugzilla-4.2.2.tar.gz +/bugzilla-4.2.3.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 722e669..e86739e 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.2 +Version: 4.2.3 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -220,6 +220,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Sun Sep 02 2012 Emmanuel Seyman - 4.2.3-1 +- Update to 4.2.3 + * Mon Jul 30 2012 Emmanuel Seyman - 4.2.2-1 - Update to 4.2.2 diff --git a/sources b/sources index 5d4820e..9df9753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a77a439080a9ffcc1a7953aa7349c37 bugzilla-4.2.2.tar.gz +d3f9690ebd41cd084c4b6be9c7d63523 bugzilla-4.2.3.tar.gz From 35b40480d1d7ae3aed363cce176e81ed49b2b056 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 14 Nov 2012 16:59:30 +0100 Subject: [PATCH 31/99] Update to 4.2.4 --- .gitignore | 1 + bugzilla.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e3204fc..0068daa 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.1.tar.gz /bugzilla-4.2.2.tar.gz /bugzilla-4.2.3.tar.gz +/bugzilla-4.2.4.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index e86739e..1fd56e7 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.3 +Version: 4.2.4 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -144,16 +144,12 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf install -m 0755 -D -p %{SOURCE3} ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/cron.daily -%clean -rm -rf ${RPM_BUILD_ROOT} - %post (pushd %{bzinstallprefix}/bugzilla > /dev/null [ -f /etc/bugzilla/localconfig ] || ./checksetup.pl > /dev/null popd > /dev/null) %files -%defattr(-,root,root,-) %dir %{bzinstallprefix}/bugzilla %{bzinstallprefix}/bugzilla/*.cgi %{bzinstallprefix}/bugzilla/*.pl @@ -220,6 +216,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Wed Nov 14 2012 Emmanuel Seyman - 4.2.4-1 +- Update to 4.2.4 +- Remove the defattr and clean macros (no longer used) + * Sun Sep 02 2012 Emmanuel Seyman - 4.2.3-1 - Update to 4.2.3 diff --git a/sources b/sources index 9df9753..e12bcb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3f9690ebd41cd084c4b6be9c7d63523 bugzilla-4.2.3.tar.gz +b2cd55bfbc0b42ce16cdec6383cc702e bugzilla-4.2.4.tar.gz From f0605027b6bfc011950f6538ba0c15b54e673784 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 5 Feb 2013 23:49:33 +0100 Subject: [PATCH 32/99] Update httpd configuration file --- bugzilla-httpd-conf | 7 ++++++- bugzilla.spec | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index be0987f..08f284a 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -2,10 +2,15 @@ Alias /var/lib/bugzilla/data/webdot /var/lib/bugzilla/data/webdot Alias /bugzilla /usr/share/bugzilla + + + Require local + + AddHandler cgi-script .cgi Options +Indexes +ExecCGI +FollowSymLinks DirectoryIndex index.cgi index.html - AllowOverride Limit Options FileInfo + AllowOverride Limit Options FileInfo Indexes AddType application/vnd.mozilla.xul+xml .xul AddType application/rdf+xml .rdf diff --git a/bugzilla.spec b/bugzilla.spec index 1fd56e7..4a612cd 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.4 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 @@ -216,6 +216,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Tue Feb 05 2013 Emmanuel Seyman - 4.2.4-2 +- Update httpd configuration file for Apache 2.4 +- Update httpd configuration file for the upcoming bugzilla 4.4 + * Wed Nov 14 2012 Emmanuel Seyman - 4.2.4-1 - Update to 4.2.4 - Remove the defattr and clean macros (no longer used) From 4158110e811c145ecdd9f73952fa1f258f25bc8a Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 20 Feb 2013 22:40:28 +0100 Subject: [PATCH 33/99] Update to 4.2.5 (fixes CVE-2013-0785) --- .gitignore | 1 + bugzilla.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0068daa..0bdf1af 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.2.tar.gz /bugzilla-4.2.3.tar.gz /bugzilla-4.2.4.tar.gz +/bugzilla-4.2.5.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 4a612cd..94b3189 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.4 +Version: 4.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 @@ -216,6 +216,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Wed Feb 20 2013 Emmanuel Seyman - 4.2.5-1 +- Update to 4.2.5 (fixes CVE-2013-0785) + * Tue Feb 05 2013 Emmanuel Seyman - 4.2.4-2 - Update httpd configuration file for Apache 2.4 - Update httpd configuration file for the upcoming bugzilla 4.4 diff --git a/sources b/sources index e12bcb4..9afe565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b2cd55bfbc0b42ce16cdec6383cc702e bugzilla-4.2.4.tar.gz +070c2d9eee81b2ba621c45d1d3849f66 bugzilla-4.2.5.tar.gz From eab94183e3f835ec0cabb8a7412ea4c9fdbce8b9 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 26 May 2013 11:45:13 +0200 Subject: [PATCH 34/99] Update to 4.2.6 --- .gitignore | 1 + bugzilla.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0bdf1af..cc6785d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.3.tar.gz /bugzilla-4.2.4.tar.gz /bugzilla-4.2.5.tar.gz +/bugzilla-4.2.6.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 94b3189..e90a563 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.5 +Version: 4.2.6 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -216,6 +216,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Sun May 26 2013 Emmanuel Seyman - 4.2.6-1 +- Update to 4.2.6 + * Wed Feb 20 2013 Emmanuel Seyman - 4.2.5-1 - Update to 4.2.5 (fixes CVE-2013-0785) diff --git a/sources b/sources index 9afe565..0e07eb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -070c2d9eee81b2ba621c45d1d3849f66 bugzilla-4.2.5.tar.gz +65d0c7f1f281c37aa17a3ec5724251d6 bugzilla-4.2.6.tar.gz From 08af3a7f9cdda5a0c5979889f4b8e884928bd777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 18 Jul 2013 02:49:53 +0200 Subject: [PATCH 35/99] Perl 5.18 rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index e90a563..3674232 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.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 @@ -216,6 +216,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Thu Jul 18 2013 Petr Pisar - 4.2.6-2 +- Perl 5.18 rebuild + * Sun May 26 2013 Emmanuel Seyman - 4.2.6-1 - Update to 4.2.6 From 62528942107de218f5082c888481d0e5b7c572bc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 23:04:02 -0500 Subject: [PATCH 36/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 3674232..eec0eb2 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.6 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -216,6 +216,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 4.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jul 18 2013 Petr Pisar - 4.2.6-2 - Perl 5.18 rebuild From 4c7b6d591fcce225a8fb877e654f47617aed9de7 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 4 Aug 2013 14:29:38 +0200 Subject: [PATCH 37/99] Make bugzilla accessible from everywhere by default --- bugzilla-httpd-conf | 5 ++++- bugzilla.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index 08f284a..45ec051 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -4,7 +4,10 @@ Alias /bugzilla /usr/share/bugzilla - Require local + # Bugzilla will be accessible to all machines in your network + # Replace with "Require local" if you want access to be restricted + # to this machine. + Require all granted AddHandler cgi-script .cgi diff --git a/bugzilla.spec b/bugzilla.spec index eec0eb2..49841b5 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.6 Group: Applications/Publishing -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -216,6 +216,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Sun Aug 04 2013 Emmanuel Seyman - 4.2.6-4 +- Change apache conf to enable access to all machines + * Sat Aug 03 2013 Fedora Release Engineering - 4.2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 923a885c1df8f10ac3de988e62d29bd22b63ab65 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 15 Aug 2013 19:04:52 +0200 Subject: [PATCH 38/99] Stop creating /usr/share/doc/bugzilla- (which wasn't used anyways) and fix an incorrect date in the package's changelog. --- bugzilla.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 49841b5..5eda576 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.6 Group: Applications/Publishing -Release: 4%{?dist} +Release: 5%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -137,7 +137,6 @@ mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/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,UPGRADING,UPGRADING-pre-2.8} -mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version} cp %{SOURCE2} ./README.fedora mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir} mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla @@ -216,6 +215,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Thu Aug 15 2013 Emmanuel Seyman - 4.2.6-5 +- Stop creating /usr/share/doc/bugzilla- (#993688) +- Fix incorrect date in changelog + * Sun Aug 04 2013 Emmanuel Seyman - 4.2.6-4 - Change apache conf to enable access to all machines @@ -466,7 +469,7 @@ popd > /dev/null) * Wed Nov 8 2006 John Berninger - 2.22-7 - Fixes for bz # 212355 -* Tue Jun 26 2006 John Berninger - 2.22-6 +* Tue Jun 27 2006 John Berninger - 2.22-6 - Clean up BugzillaEmail requires (filter it out) * Mon Jun 26 2006 John Berninger - 2.22-5 From 13c90d777590833c1bae720bda58f271dd650672 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 17 Oct 2013 22:54:51 +0200 Subject: [PATCH 39/99] Update to 4.2.7 since it contains security updates. Patch bugzilla to write compiled templates under /var (#949130). --- .gitignore | 1 + bugzilla-rw-paths.patch | 12 ++++++++---- bugzilla.spec | 8 ++++++-- sources | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index cc6785d..ecdb3a0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.4.tar.gz /bugzilla-4.2.5.tar.gz /bugzilla-4.2.6.tar.gz +/bugzilla-4.2.7.tar.gz diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index 66b0d87..f2f342b 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,8 +1,12 @@ ---- bugzilla-4.2/Bugzilla/Constants.pm 2012-02-26 22:39:30.161462858 +0100 -+++ bugzilla-4.2-rw/Bugzilla/Constants.pm 2012-02-26 22:41:55.185107179 +0100 -@@ -629,18 +629,18 @@ +diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm +--- ./Bugzilla/Constants.pm.orig 2013-09-02 22:51:11.831245853 +0200 ++++ ./Bugzilla/Constants.pm 2013-09-02 22:53:27.733416972 +0200 +@@ -627,20 +627,20 @@ sub bz_locations { + # make sure this still points to the CGIs. + 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", - 'template_cache' => "$datadir/template", +- 'template_cache' => "$datadir/template", ++ 'template_cache' => "/var/lib/bugzilla/$datadir/template", 'project' => $project, - 'localconfig' => "$libpath/$localconfig", - 'datadir' => $datadir, diff --git a/bugzilla.spec b/bugzilla.spec index 5eda576..93f13b3 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.6 +Version: 4.2.7 Group: Applications/Publishing -Release: 5%{?dist} +Release: 1%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -215,6 +215,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Thu Oct 17 2013 Emmanuel Seyman - 4.2.6-6 +- Update to 4.2.7 (security updates) +- Patch bugzilla to write compiled templates under /var (#949130) + * Thu Aug 15 2013 Emmanuel Seyman - 4.2.6-5 - Stop creating /usr/share/doc/bugzilla- (#993688) - Fix incorrect date in changelog diff --git a/sources b/sources index 0e07eb9..ff6e8d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65d0c7f1f281c37aa17a3ec5724251d6 bugzilla-4.2.6.tar.gz +ebf0a75d1037f09994660d3958fc66fb bugzilla-4.2.7.tar.gz From bc9a72be42f9fb45b2fde8db121ab6456a4fefd5 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Fri, 15 Nov 2013 00:01:00 +0100 Subject: [PATCH 40/99] Patch bugzilla so that it will cache bz_locations() and not memorize it. Clean up our own patch to Bugzilla/Constants.pm so that the PROJECT environment variable can be used. --- bugzilla-project-mod_perl.patch | 41 +++++++++++++++++++++++++++++++++ bugzilla.spec | 10 ++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 bugzilla-project-mod_perl.patch diff --git a/bugzilla-project-mod_perl.patch b/bugzilla-project-mod_perl.patch new file mode 100644 index 0000000..a29632a --- /dev/null +++ b/bugzilla-project-mod_perl.patch @@ -0,0 +1,41 @@ +diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm +--- ./Bugzilla/Constants.pm.orig 2013-11-14 23:21:44.947050044 +0100 ++++ ./Bugzilla/Constants.pm 2013-11-14 23:23:55.873245730 +0100 +@@ -591,6 +591,13 @@ use constant AUDIT_CREATE => '__create__ + use constant AUDIT_REMOVE => '__remove__'; + + sub bz_locations { ++ # Force memoize() to re-compute data per project, to avoid ++ # sharing the same data across different installations. ++ return _bz_locations($ENV{'PROJECT'}); ++} ++ ++sub _bz_locations { ++ my $project = shift; + # We know that Bugzilla/Constants.pm must be in %INC at this point. + # So the only question is, what's the name of the directory + # above it? This is the most reliable way to get our current working +@@ -607,12 +614,13 @@ sub bz_locations { + $libpath =~ /(.*)/; + $libpath = $1; + +- my ($project, $localconfig, $datadir); +- if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) { ++ my ($localconfig, $datadir); ++ if ($project && $project =~ /^(\w+)$/) { + $project = $1; + $localconfig = "localconfig.$project"; + $datadir = "data/$project"; + } else { ++ $project = undef; + $localconfig = "localconfig"; + $datadir = "data"; + } +@@ -647,6 +655,6 @@ sub bz_locations { + + # This makes us not re-compute all the bz_locations data every time it's + # called. +-BEGIN { memoize('bz_locations') }; ++BEGIN { memoize('_bz_locations') }; + + 1; diff --git a/bugzilla.spec b/bugzilla.spec index 93f13b3..e3c747f 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.7 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 @@ -14,6 +14,7 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-yum.patch +Patch2: bugzilla-project-mod_perl.patch BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which @@ -104,6 +105,7 @@ Contributed scripts and functions for Bugzilla %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 rm -f Bugzilla/Constants.pm.orig rm -f Bugzilla/Install/Requirements.pm.orig # Remove bundled libs @@ -215,7 +217,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog -* Thu Oct 17 2013 Emmanuel Seyman - 4.2.6-6 +* Thu Nov 14 2013 Emmanuel Seyman - 4.2.7-2 +- Add patch to cache bz_locations() (bmo #843457) +- Fix constants patch to honor the PROJECT environment variable (#911943) + +* Thu Oct 17 2013 Emmanuel Seyman - 4.2.7-1 - Update to 4.2.7 (security updates) - Patch bugzilla to write compiled templates under /var (#949130) From f3a02032d46cab2a2d62b59d90b52e45dfa1be50 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 14 Jan 2014 02:32:03 +0100 Subject: [PATCH 41/99] - Fix the comparison of module versions (#1044854) - Really honor the PROJECT environment variable (#911943) --- bugzilla-invalid-version.patch | 22 ++++++++++++ bugzilla-rw-paths.patch | 2 +- bugzilla-vers-cmp.patch | 64 ++++++++++++++++++++++++++++++++++ bugzilla.spec | 12 ++++++- 4 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 bugzilla-invalid-version.patch create mode 100644 bugzilla-vers-cmp.patch diff --git a/bugzilla-invalid-version.patch b/bugzilla-invalid-version.patch new file mode 100644 index 0000000..21360a8 --- /dev/null +++ b/bugzilla-invalid-version.patch @@ -0,0 +1,22 @@ +=== modified file 'Bugzilla/Install/Requirements.pm' +--- ./Bugzilla/Install/Requirements.pm 2013-03-26 11:07:25 +0000 ++++ ./Bugzilla/Install/Requirements.pm 2013-12-02 16:00:20 +0000 +@@ -659,8 +659,15 @@ + Bugzilla::Install::Util::set_output_encoding(); + + # VERSION is provided by UNIVERSAL::, and can be called even if +- # the module isn't loaded. +- my $vnum = $module->VERSION || -1; ++ # the module isn't loaded. We eval'uate ->VERSION because it can die ++ # when the version is not valid (yes, this happens from time to time). ++ # In that case, we use an uglier method to get the version. ++ my $vnum = eval { $module->VERSION }; ++ if ($@) { ++ no strict 'refs'; ++ $vnum = ${"${module}::VERSION"}; ++ } ++ $vnum ||= -1; + + # CGI's versioning scheme went 2.75, 2.751, 2.752, 2.753, 2.76 + # That breaks the standard version tests, so we need to manually correct + diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index f2f342b..1bad35c 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -11,7 +11,7 @@ diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm - 'localconfig' => "$libpath/$localconfig", - 'datadir' => $datadir, - 'attachdir' => "$datadir/attachments", -+ 'localconfig' => "/etc/bugzilla/localconfig", ++ 'localconfig' => "/etc/bugzilla/$localconfig", + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", 'skinsdir' => "$libpath/skins", diff --git a/bugzilla-vers-cmp.patch b/bugzilla-vers-cmp.patch new file mode 100644 index 0000000..33f4d5e --- /dev/null +++ b/bugzilla-vers-cmp.patch @@ -0,0 +1,64 @@ +=== modified file 'Bugzilla/Install/Requirements.pm' +--- ./Bugzilla/Install/Requirements.pm 2013-12-02 16:00:20 +0000 ++++ ./Bugzilla/Install/Requirements.pm 2013-12-02 16:07:30 +0000 +@@ -24,6 +24,7 @@ + # MUST NOT "use." + + use strict; ++use version; + + use Bugzilla::Constants; + use Bugzilla::Install::Util qw(vers_cmp install_string bin_loc +@@ -206,7 +207,9 @@ + package => 'Chart', + module => 'Chart::Lines', + # Versions below 2.1 cannot be detected accurately. +- version => '2.1', ++ # There is no 2.1.0 release (it was 2.1), but .0 is required to fix ++ # https://rt.cpan.org/Public/Bug/Display.html?id=28218. ++ version => '2.1.0', + feature => [qw(new_charts old_charts)], + }, + { +@@ -640,8 +643,8 @@ + return $return; + } + +-# This was originally clipped from the libnet Makefile.PL, adapted here to +-# use the below vers_cmp routine for accurate version checking. ++# This was originally clipped from the libnet Makefile.PL, adapted here for ++# accurate version checking. + sub have_vers { + my ($params, $output) = @_; + my $module = $params->{module}; +@@ -666,21 +669,17 @@ + if ($@) { + no strict 'refs'; + $vnum = ${"${module}::VERSION"}; ++ ++ # If we come here, then the version is not a valid one. ++ # We try to sanitize it. ++ if ($vnum =~ /^((\d+)(\.\d+)*)/) { ++ $vnum = $1; ++ } + } + $vnum ||= -1; + +- # CGI's versioning scheme went 2.75, 2.751, 2.752, 2.753, 2.76 +- # That breaks the standard version tests, so we need to manually correct +- # the version +- if ($module eq 'CGI' && $vnum =~ /(2\.7\d)(\d+)/) { +- $vnum = $1 . "." . $2; +- } +- # CPAN did a similar thing, where it has versions like 1.9304. +- if ($module eq 'CPAN' and $vnum =~ /^(\d\.\d{2})\d{2}$/) { +- $vnum = $1; +- } +- +- my $vok = (vers_cmp($vnum,$wanted) > -1); ++ # Must do a string comparison as $vnum may be of the form 5.10.1. ++ my $vok = ($vnum ne '-1' && version->new($vnum) >= version->new($wanted)) ? 1 : 0; + my $blacklisted; + if ($vok && $params->{blacklist}) { + $blacklisted = grep($vnum =~ /$_/, @{$params->{blacklist}}); + diff --git a/bugzilla.spec b/bugzilla.spec index e3c747f..358238b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.7 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -15,6 +15,10 @@ Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-yum.patch Patch2: bugzilla-project-mod_perl.patch +# Backport of https://bugzilla.mozilla.org/show_bug.cgi?id=938300 +Patch3: bugzilla-invalid-version.patch +# Backport of https://bugzilla.mozilla.org/show_bug.cgi?id=781672 +Patch4: bugzilla-vers-cmp.patch BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which @@ -106,6 +110,8 @@ Contributed scripts and functions for Bugzilla %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 rm -f Bugzilla/Constants.pm.orig rm -f Bugzilla/Install/Requirements.pm.orig # Remove bundled libs @@ -217,6 +223,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Tue Jan 14 2014 Emmanuel Seyman - 4.2.7-3 +- Fix the comparison of module versions (#1044854) +- Really honor the PROJECT environment variable (#911943) + * Thu Nov 14 2013 Emmanuel Seyman - 4.2.7-2 - Add patch to cache bz_locations() (bmo #843457) - Fix constants patch to honor the PROJECT environment variable (#911943) From df14b7be5d701a0647932bbdd83dc55c1582e759 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sat, 19 Apr 2014 22:47:59 +0200 Subject: [PATCH 42/99] Update to 4.2.9 --- .gitignore | 1 + bugzilla-invalid-version.patch | 22 ------------ bugzilla-project-mod_perl.patch | 41 --------------------- bugzilla-vers-cmp.patch | 64 --------------------------------- bugzilla.spec | 16 ++++----- sources | 2 +- 6 files changed, 8 insertions(+), 138 deletions(-) delete mode 100644 bugzilla-invalid-version.patch delete mode 100644 bugzilla-project-mod_perl.patch delete mode 100644 bugzilla-vers-cmp.patch diff --git a/.gitignore b/.gitignore index ecdb3a0..21ab68c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.5.tar.gz /bugzilla-4.2.6.tar.gz /bugzilla-4.2.7.tar.gz +/bugzilla-4.2.9.tar.gz diff --git a/bugzilla-invalid-version.patch b/bugzilla-invalid-version.patch deleted file mode 100644 index 21360a8..0000000 --- a/bugzilla-invalid-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -=== modified file 'Bugzilla/Install/Requirements.pm' ---- ./Bugzilla/Install/Requirements.pm 2013-03-26 11:07:25 +0000 -+++ ./Bugzilla/Install/Requirements.pm 2013-12-02 16:00:20 +0000 -@@ -659,8 +659,15 @@ - Bugzilla::Install::Util::set_output_encoding(); - - # VERSION is provided by UNIVERSAL::, and can be called even if -- # the module isn't loaded. -- my $vnum = $module->VERSION || -1; -+ # the module isn't loaded. We eval'uate ->VERSION because it can die -+ # when the version is not valid (yes, this happens from time to time). -+ # In that case, we use an uglier method to get the version. -+ my $vnum = eval { $module->VERSION }; -+ if ($@) { -+ no strict 'refs'; -+ $vnum = ${"${module}::VERSION"}; -+ } -+ $vnum ||= -1; - - # CGI's versioning scheme went 2.75, 2.751, 2.752, 2.753, 2.76 - # That breaks the standard version tests, so we need to manually correct - diff --git a/bugzilla-project-mod_perl.patch b/bugzilla-project-mod_perl.patch deleted file mode 100644 index a29632a..0000000 --- a/bugzilla-project-mod_perl.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm ---- ./Bugzilla/Constants.pm.orig 2013-11-14 23:21:44.947050044 +0100 -+++ ./Bugzilla/Constants.pm 2013-11-14 23:23:55.873245730 +0100 -@@ -591,6 +591,13 @@ use constant AUDIT_CREATE => '__create__ - use constant AUDIT_REMOVE => '__remove__'; - - sub bz_locations { -+ # Force memoize() to re-compute data per project, to avoid -+ # sharing the same data across different installations. -+ return _bz_locations($ENV{'PROJECT'}); -+} -+ -+sub _bz_locations { -+ my $project = shift; - # We know that Bugzilla/Constants.pm must be in %INC at this point. - # So the only question is, what's the name of the directory - # above it? This is the most reliable way to get our current working -@@ -607,12 +614,13 @@ sub bz_locations { - $libpath =~ /(.*)/; - $libpath = $1; - -- my ($project, $localconfig, $datadir); -- if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) { -+ my ($localconfig, $datadir); -+ if ($project && $project =~ /^(\w+)$/) { - $project = $1; - $localconfig = "localconfig.$project"; - $datadir = "data/$project"; - } else { -+ $project = undef; - $localconfig = "localconfig"; - $datadir = "data"; - } -@@ -647,6 +655,6 @@ sub bz_locations { - - # This makes us not re-compute all the bz_locations data every time it's - # called. --BEGIN { memoize('bz_locations') }; -+BEGIN { memoize('_bz_locations') }; - - 1; diff --git a/bugzilla-vers-cmp.patch b/bugzilla-vers-cmp.patch deleted file mode 100644 index 33f4d5e..0000000 --- a/bugzilla-vers-cmp.patch +++ /dev/null @@ -1,64 +0,0 @@ -=== modified file 'Bugzilla/Install/Requirements.pm' ---- ./Bugzilla/Install/Requirements.pm 2013-12-02 16:00:20 +0000 -+++ ./Bugzilla/Install/Requirements.pm 2013-12-02 16:07:30 +0000 -@@ -24,6 +24,7 @@ - # MUST NOT "use." - - use strict; -+use version; - - use Bugzilla::Constants; - use Bugzilla::Install::Util qw(vers_cmp install_string bin_loc -@@ -206,7 +207,9 @@ - package => 'Chart', - module => 'Chart::Lines', - # Versions below 2.1 cannot be detected accurately. -- version => '2.1', -+ # There is no 2.1.0 release (it was 2.1), but .0 is required to fix -+ # https://rt.cpan.org/Public/Bug/Display.html?id=28218. -+ version => '2.1.0', - feature => [qw(new_charts old_charts)], - }, - { -@@ -640,8 +643,8 @@ - return $return; - } - --# This was originally clipped from the libnet Makefile.PL, adapted here to --# use the below vers_cmp routine for accurate version checking. -+# This was originally clipped from the libnet Makefile.PL, adapted here for -+# accurate version checking. - sub have_vers { - my ($params, $output) = @_; - my $module = $params->{module}; -@@ -666,21 +669,17 @@ - if ($@) { - no strict 'refs'; - $vnum = ${"${module}::VERSION"}; -+ -+ # If we come here, then the version is not a valid one. -+ # We try to sanitize it. -+ if ($vnum =~ /^((\d+)(\.\d+)*)/) { -+ $vnum = $1; -+ } - } - $vnum ||= -1; - -- # CGI's versioning scheme went 2.75, 2.751, 2.752, 2.753, 2.76 -- # That breaks the standard version tests, so we need to manually correct -- # the version -- if ($module eq 'CGI' && $vnum =~ /(2\.7\d)(\d+)/) { -- $vnum = $1 . "." . $2; -- } -- # CPAN did a similar thing, where it has versions like 1.9304. -- if ($module eq 'CPAN' and $vnum =~ /^(\d\.\d{2})\d{2}$/) { -- $vnum = $1; -- } -- -- my $vok = (vers_cmp($vnum,$wanted) > -1); -+ # Must do a string comparison as $vnum may be of the form 5.10.1. -+ my $vok = ($vnum ne '-1' && version->new($vnum) >= version->new($wanted)) ? 1 : 0; - my $blacklisted; - if ($vok && $params->{blacklist}) { - $blacklisted = grep($vnum =~ /$_/, @{$params->{blacklist}}); - diff --git a/bugzilla.spec b/bugzilla.spec index 358238b..bed23e7 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.7 +Version: 4.2.9 Group: Applications/Publishing -Release: 3%{?dist} +Release: 1%{?dist} License: MPLv1.1 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -14,11 +14,6 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-yum.patch -Patch2: bugzilla-project-mod_perl.patch -# Backport of https://bugzilla.mozilla.org/show_bug.cgi?id=938300 -Patch3: bugzilla-invalid-version.patch -# Backport of https://bugzilla.mozilla.org/show_bug.cgi?id=781672 -Patch4: bugzilla-vers-cmp.patch BuildArch: noarch Requires: webserver, patchutils, perl(SOAP::Lite), which @@ -109,9 +104,6 @@ Contributed scripts and functions for Bugzilla %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 rm -f Bugzilla/Constants.pm.orig rm -f Bugzilla/Install/Requirements.pm.orig # Remove bundled libs @@ -223,6 +215,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Sat Apr 19 2014 Emmanuel Seyman - 4.2.9-1 +- Update to 4.2.9 (regression fix for 4.2.8 which was a security update) +- Drop backported patches + * Tue Jan 14 2014 Emmanuel Seyman - 4.2.7-3 - Fix the comparison of module versions (#1044854) - Really honor the PROJECT environment variable (#911943) diff --git a/sources b/sources index ff6e8d0..6a06105 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebf0a75d1037f09994660d3958fc66fb bugzilla-4.2.7.tar.gz +68ab079ce3c980ed0af632f24bb1a58b bugzilla-4.2.9.tar.gz From ffe1d8b2229018a0598508fc11b98a0267919034 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:40:30 -0500 Subject: [PATCH 43/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index bed23e7..71095b1 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.2.9 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 @@ -215,6 +215,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 4.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Apr 19 2014 Emmanuel Seyman - 4.2.9-1 - Update to 4.2.9 (regression fix for 4.2.8 which was a security update) - Drop backported patches From 13cd8cecf52e9e2699f7e09e267c1acde4d7247b Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 7 Jul 2014 02:29:56 +0200 Subject: [PATCH 44/99] Update to 4.4.4 --- .gitignore | 1 + bugzilla.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 21ab68c..a043ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.6.tar.gz /bugzilla-4.2.7.tar.gz /bugzilla-4.2.9.tar.gz +/bugzilla-4.4.4.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 71095b1..1e5ce50 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.2.9 +Version: 4.4.4 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 @@ -153,7 +153,6 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/*.cgi %{bzinstallprefix}/bugzilla/*.pl %{bzinstallprefix}/bugzilla/Bugzilla.pm -%{bzinstallprefix}/bugzilla/bugzilla.dtd %{bzinstallprefix}/bugzilla/robots.txt %{bzinstallprefix}/bugzilla/Bugzilla %{bzinstallprefix}/bugzilla/extensions @@ -185,6 +184,12 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/docs/en/txt %{bzinstallprefix}/bugzilla/docs/bugzilla.ent %{bzinstallprefix}/bugzilla/docs/style.css +%{bzinstallprefix}/bugzilla/docs/bugzilla.ent.tmpl +%{bzinstallprefix}/bugzilla/docs/xsl/bugzilla-docs.xsl +%{bzinstallprefix}/bugzilla/docs/xsl/chunks.xsl +%{bzinstallprefix}/bugzilla/docs/xsl/nochunks.xsl +%{bzinstallprefix}/bugzilla/docs/xsl/pdf.xsl + %files doc-build %defattr(-,root,root,-) @@ -213,8 +218,12 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl %{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl +%{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Mon Jul 07 2014 Emmanuel Seyman - 4.4.4-1 +- Update to 4.4.4 + * Sat Jun 07 2014 Fedora Release Engineering - 4.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 6a06105..b61f9a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68ab079ce3c980ed0af632f24bb1a58b bugzilla-4.2.9.tar.gz +234ee253eed5a38707c4d53f1124a85a bugzilla-4.4.4.tar.gz From 08a45126edbb46678d2e31598656da5349a25b3a Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Fri, 25 Jul 2014 10:09:12 +0200 Subject: [PATCH 45/99] Update to 4.4.5 --- .gitignore | 1 + bugzilla.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a043ae8..9f42168 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.7.tar.gz /bugzilla-4.2.9.tar.gz /bugzilla-4.4.4.tar.gz +/bugzilla-4.4.5.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 1e5ce50..63119ef 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.4.4 +Version: 4.4.5 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -134,6 +134,9 @@ done %install mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla +# these files are only used for testing Bugzilla code +# see https://bugzilla.mozilla.org/show_bug.cgi?id=995209 +rm Build.PL MANIFEST.SKIP cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/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,UPGRADING,UPGRADING-pre-2.8} @@ -221,6 +224,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Fri Jul 25 2014 Emmanuel Seyman - 4.4.5-1 +- Update to 4.4.5 + * Mon Jul 07 2014 Emmanuel Seyman - 4.4.4-1 - Update to 4.4.4 diff --git a/sources b/sources index b61f9a6..47f4042 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -234ee253eed5a38707c4d53f1124a85a bugzilla-4.4.4.tar.gz +077c123ea9659ccbf76bb35ce951324b bugzilla-4.4.5.tar.gz From 44aee18ab38465743144acae1161f1e08d66f08e Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 8 Oct 2014 08:07:08 +0200 Subject: [PATCH 46/99] Update to 4.4.6 --- .gitignore | 1 + bugzilla.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9f42168..1f2d404 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.2.9.tar.gz /bugzilla-4.4.4.tar.gz /bugzilla-4.4.5.tar.gz +/bugzilla-4.4.6.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 63119ef..1d0d3b8 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.4.5 +Version: 4.4.6 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -224,6 +224,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Oct 08 2014 Emmanuel Seyman - 4.4.6-1 +- Update to 4.4.6 + * Fri Jul 25 2014 Emmanuel Seyman - 4.4.5-1 - Update to 4.4.5 diff --git a/sources b/sources index 47f4042..b71ddb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -077c123ea9659ccbf76bb35ce951324b bugzilla-4.4.5.tar.gz +3e0553c67cbe33f8ae12dfe79a02ecdc bugzilla-4.4.6.tar.gz From 7167db27cf3982f1bca6a4c600acc45975220ba4 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 4 Jan 2015 22:33:22 +0100 Subject: [PATCH 47/99] Remove bundled Flash files since they are not used by the application (#1000245) Add webdot directory perms to httpd configuration (#1070979) --- bugzilla-httpd-conf | 4 ++++ bugzilla.spec | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index 45ec051..1ed7679 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -17,3 +17,7 @@ Alias /bugzilla /usr/share/bugzilla AddType application/vnd.mozilla.xul+xml .xul AddType application/rdf+xml .rdf + + + Require all granted + diff --git a/bugzilla.spec b/bugzilla.spec index 1d0d3b8..5a0b1ec 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.4.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 @@ -108,6 +108,8 @@ rm -f Bugzilla/Constants.pm.orig rm -f Bugzilla/Install/Requirements.pm.orig # Remove bundled libs rm -rf lib/CGI* +# Remove bundled binary files +rm -f js/yui/*/*.swf # Deal with changing /usr/local paths here instead of via patches %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py @@ -224,6 +226,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Jan 04 2015 Emmanuel Seyman - 4.4.6-2 +- Remove bundled binary files (#1000245) +- Add webdot directory perms to apache configuration + * Wed Oct 08 2014 Emmanuel Seyman - 4.4.6-1 - Update to 4.4.6 From 899374e98b125bd126b6f72bd1932ea6d6b3c10d Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sat, 31 Jan 2015 21:24:49 +0100 Subject: [PATCH 48/99] Update to 4.4.8 (fixes regressions in 4.4.7 which itself fixed security flaws) (CVE-2014-1571, CVE-2014-8630) --- .gitignore | 1 + bugzilla.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1f2d404..d638e66 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.4.4.tar.gz /bugzilla-4.4.5.tar.gz /bugzilla-4.4.6.tar.gz +/bugzilla-4.4.8.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 5a0b1ec..c6377c5 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.4.6 +Version: 4.4.8 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 @@ -226,6 +226,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sat Jan 31 2015 Emmanuel Seyman - 4.4.8-1 +- Update to 4.4.8 (fixes regressions in 4.4.7 which itself + fixed security flaws) (CVE-2014-1571, CVE-2014-8630) + * Sun Jan 04 2015 Emmanuel Seyman - 4.4.6-2 - Remove bundled binary files (#1000245) - Add webdot directory perms to apache configuration diff --git a/sources b/sources index b71ddb2..b0f7553 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e0553c67cbe33f8ae12dfe79a02ecdc bugzilla-4.4.6.tar.gz +86aed922fc99aee0498f864f18d9be96 bugzilla-4.4.8.tar.gz From 8378b3a728943c99488ffde1a0b3a875f7ad4ed4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 02:08:31 +0000 Subject: [PATCH 49/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index c6377c5..8b75e30 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 4.4.8 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 @@ -226,6 +226,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 4.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jan 31 2015 Emmanuel Seyman - 4.4.8-1 - Update to 4.4.8 (fixes regressions in 4.4.7 which itself fixed security flaws) (CVE-2014-1571, CVE-2014-8630) From 514ce27a8bce37317b54b4288e0149964e040171 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 13 Sep 2015 17:24:00 +0200 Subject: [PATCH 50/99] Update to 4.4.10 --- .gitignore | 1 + bugzilla.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d638e66..b874aa5 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.4.5.tar.gz /bugzilla-4.4.6.tar.gz /bugzilla-4.4.8.tar.gz +/bugzilla-4.4.10.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 8b75e30..029f517 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.4.8 +Version: 4.4.10 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 @@ -147,6 +147,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir} mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf install -m 0755 -D -p %{SOURCE3} ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/cron.daily +rm ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/LICENSE %post (pushd %{bzinstallprefix}/bugzilla > /dev/null @@ -159,6 +160,7 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/*.pl %{bzinstallprefix}/bugzilla/Bugzilla.pm %{bzinstallprefix}/bugzilla/robots.txt +%{bzinstallprefix}/bugzilla/taskgraph.json %{bzinstallprefix}/bugzilla/Bugzilla %{bzinstallprefix}/bugzilla/extensions %{bzinstallprefix}/bugzilla/images @@ -175,6 +177,7 @@ popd > /dev/null) %defattr(-,root,root,-) %doc README %doc README.fedora +%license LICENSE %dir %{bzdatadir} %defattr(0750,root,apache,-) %dir %{_sysconfdir}/bugzilla @@ -226,6 +229,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Sep 13 2015 Emmanuel Seyman - 4.4.10-1 +- Update to 4.4.10 +- Use %%license to flag the LICENSE file + * Wed Jun 17 2015 Fedora Release Engineering - 4.4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index b0f7553..a849a30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86aed922fc99aee0498f864f18d9be96 bugzilla-4.4.8.tar.gz +c0490b7461a0d6520d118c720e1c3f37 bugzilla-4.4.10.tar.gz From 5ccadfbfa74a3400d3fc92a335f9c1e54ad6694f Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 23 Dec 2015 16:21:10 +0100 Subject: [PATCH 51/99] Update to 4.4.11 --- .gitignore | 1 + bugzilla.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b874aa5..ec294de 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.4.6.tar.gz /bugzilla-4.4.8.tar.gz /bugzilla-4.4.10.tar.gz +/bugzilla-4.4.11.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 029f517..0ad0156 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 4.4.10 +Version: 4.4.11 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 @@ -229,6 +229,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Dec 23 2015 Emmanuel Seyman - 4.4.11-1 +- Update to 4.4.11 + * Sun Sep 13 2015 Emmanuel Seyman - 4.4.10-1 - Update to 4.4.10 - Use %%license to flag the LICENSE file diff --git a/sources b/sources index a849a30..17f0e7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0490b7461a0d6520d118c720e1c3f37 bugzilla-4.4.10.tar.gz +d3380aba9b4f4b606a804b00f1a56bf1 bugzilla-4.4.11.tar.gz From fbfe368dc1f3440fa87450876beb540699064930 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sat, 16 Jan 2016 18:24:29 +0100 Subject: [PATCH 52/99] Update to 5.0.2 --- .gitignore | 1 + README.fedora.bugzilla | 2 +- bugzilla-yum.patch => bugzilla-dnf.patch | 6 +- bugzilla-rw-paths.patch | 37 +++--- bugzilla.spec | 140 ++++++++++++++--------- sources | 2 +- 6 files changed, 115 insertions(+), 73 deletions(-) rename bugzilla-yum.patch => bugzilla-dnf.patch (90%) diff --git a/.gitignore b/.gitignore index ec294de..3d873aa 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.4.8.tar.gz /bugzilla-4.4.10.tar.gz /bugzilla-4.4.11.tar.gz +/bugzilla-5.0.2.tar.gz diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla index 4663885..20725f7 100644 --- a/README.fedora.bugzilla +++ b/README.fedora.bugzilla @@ -9,7 +9,7 @@ the values in this file are accurate for your environment. Once this is done, you may need to modify default settings for your database to ensure it accepts Bugzilla data properly. Please see -http://www.bugzilla.org/docs/4.0/en/html/configuration.html for specifics of +https://bugzilla.readthedocs.org/en/5.0/ for specifics of database setting modifications. Lastly, simply re-run checksetup.pl to populate the database tables, set up diff --git a/bugzilla-yum.patch b/bugzilla-dnf.patch similarity index 90% rename from bugzilla-yum.patch rename to bugzilla-dnf.patch index 9d53205..78c1d18 100644 --- a/bugzilla-yum.patch +++ b/bugzilla-dnf.patch @@ -1,6 +1,6 @@ --- bugzilla-4.01/Bugzilla/Install/Requirements.pm 2011-05-01 17:09:35.000000000 +0200 +++ bugzilla-4.01-yum/Bugzilla/Install/Requirements.pm 2011-05-01 17:11:28.000000000 +0200 -@@ -587,7 +587,7 @@ +@@ -648,7 +648,7 @@ if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE && !$check_results->{hide_all}) { @@ -9,12 +9,12 @@ } if (!$check_results->{pass}) { print colored(install_string('installation_failed'), COLOR_ERROR), -@@ -732,7 +732,7 @@ +@@ -797,7 +797,7 @@ $package = $module->{package}; } else { - $command = "$^X install-module.pl \%s"; -+ $command = "yum install \"perl(\%s)\""; ++ $command = "dnf install \"perl(\%s)\""; # Non-Windows installations need to use module names, because # CPAN doesn't understand package names. $package = $module->{module}; diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index 1bad35c..3f60dea 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,30 +1,35 @@ -diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm ---- ./Bugzilla/Constants.pm.orig 2013-09-02 22:51:11.831245853 +0200 -+++ ./Bugzilla/Constants.pm 2013-09-02 22:53:27.733416972 +0200 -@@ -627,20 +627,20 @@ sub bz_locations { - # make sure this still points to the CGIs. - 'cgi_path' => $libpath, +diff -up bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths bugzilla-5.0.1/Bugzilla/Constants.pm +--- bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths 2015-09-10 21:36:29.000000000 +0300 ++++ bugzilla-5.0.1/Bugzilla/Constants.pm 2015-09-28 19:20:45.347013271 +0300 +@@ -670,7 +670,7 @@ sub _bz_locations { + $datadir = "data"; + } + +- $datadir = "$libpath/$datadir"; ++ $datadir = "/var/lib/bugzilla/$datadir"; + # We have to return absolute paths for mod_perl. + # That means that if you modify these paths, they must be absolute paths. + return { +@@ -682,11 +682,11 @@ sub _bz_locations { 'templatedir' => "$libpath/template", -- 'template_cache' => "$datadir/template", -+ 'template_cache' => "/var/lib/bugzilla/$datadir/template", + 'template_cache' => "$datadir/template", 'project' => $project, - 'localconfig' => "$libpath/$localconfig", -- 'datadir' => $datadir, -- 'attachdir' => "$datadir/attachments", + 'localconfig' => "/etc/bugzilla/$localconfig", -+ 'datadir' => "/var/lib/bugzilla/$datadir", -+ 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", + 'datadir' => $datadir, + 'attachdir' => "$datadir/attachments", 'skinsdir' => "$libpath/skins", - 'graphsdir' => "$libpath/graphs", + 'graphsdir' => "/var/lib/bugzilla/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 # not relative to the bugzilla root directory, you'll need to - # change showdependencygraph.cgi to set image_url to the correct - # location. +@@ -695,7 +695,7 @@ sub _bz_locations { # The script should really generate these graphs directly... -- 'webdotdir' => "$datadir/webdot", -+ 'webdotdir' => "/var/lib/bugzilla/$datadir/webdot", + 'webdotdir' => "$datadir/webdot", 'extensionsdir' => "$libpath/extensions", +- 'assetsdir' => "$datadir/assets", ++ 'assetsdir' => "$libpath/assets", }; } + diff --git a/bugzilla.spec b/bugzilla.spec index 0ad0156..396ab7a 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -1,35 +1,53 @@ %define bzinstallprefix %{_datadir} -%define bzdatadir %{_localstatedir}/lib/bugzilla +%define bzdatadir %{_sharedstatedir}/bugzilla Summary: Bug tracking system -URL: http://www.bugzilla.org/ +URL: https://www.bugzilla.org/ Name: bugzilla -Version: 4.4.11 +Version: 5.0.2 Group: Applications/Publishing Release: 1%{?dist} License: MPLv1.1 -Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz +Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch -Patch1: bugzilla-yum.patch +Patch1: bugzilla-dnf.patch BuildArch: noarch -Requires: webserver, patchutils, perl(SOAP::Lite), which +Requires: patchutils Requires: perl(CGI) >= 3.51 Requires: perl(Digest::SHA) -Requires: perl(Date::Format) >= 2.21 -Requires: perl(DateTime) >= 0.28 -Requires: perl(DateTime::TimeZone) >= 0.71 +Requires: perl(Date::Format) >= 2.23 +Requires: perl(DateTime) >= 0.75 +Requires: perl(DateTime::TimeZone) >= 1.64 Requires: perl(DBI) >= 1.614 -Requires: perl(Template) >= 2.22 -Requires: perl(Email::Send) >= 2.00 +Requires: perl(Template) >= 2.24 +Requires: perl(Email::Sender) >= 1.300011 Requires: perl(Email::MIME) >= 1.904 -Requires: perl(URI) >= 1.37 -Requires: perl(List::MoreUtils) >= 0.22 +Requires: perl(URI) >= 1.55 +Requires: perl(List::MoreUtils) >= 0.32 Requires: perl(Math::Random::ISAAC) >= 1.0.1 +Requires: perl(File::Slurp) >= 9999.13 +Requires: perl(JSON::XS) >= 2.01 Requires: perl(Locale::Language) +Requires: webserver +Requires: which +# for building docs +BuildRequires: perl(File::Copy::Recursive) +BuildRequires: perl(File::Which) +BuildRequires: perl(Memoize) +BuildRequires: python-sphinx +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-collection-latexrecommended +BuildRequires: texlive-collection-basic +BuildRequires: texlive-upquote +BuildRequires: tex-framed +BuildRequires: tex-multirow +BuildRequires: tex-threeparttable +BuildRequires: tex-titlesec +BuildRequires: tex-wrapfig %package doc Summary: Bugzilla documentation @@ -103,9 +121,15 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 +if [ -f Bugzilla/Constants.pm.orig ]; then + : ERROR: Patch0 did not apply cleanly + exit 1 +fi %patch1 -p1 -rm -f Bugzilla/Constants.pm.orig -rm -f Bugzilla/Install/Requirements.pm.orig +if [ -f Bugzilla/Install/Requirements.pm.orig ]; then + : ERROR: Patch1 did not apply cleanly + exit 1 +fi # Remove bundled libs rm -rf lib/CGI* # Remove bundled binary files @@ -118,8 +142,8 @@ grep -rl '/usr/lib/sendmail\b' contrib docs \ | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' %build -find . -depth -name CVS -type d -exec rm -rf {} \; -find . -depth -name .cvsignore -type f -exec rm -rf {} \; +# Build docs +docs/makedocs.pl --with-pdf # Remove the execute bit from files that don't start with #! for file in `find -type f -perm /111`; do if head -1 $file | grep -E -v '^\#!' &>/dev/null; then @@ -133,21 +157,23 @@ for file in `find -type f -perm /664`; do fi done - %install -mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla +mkdir -p %{buildroot}%{bzinstallprefix}/bugzilla # these files are only used for testing Bugzilla code # see https://bugzilla.mozilla.org/show_bug.cgi?id=995209 rm Build.PL MANIFEST.SKIP -cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/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,UPGRADING,UPGRADING-pre-2.8} +cp -pr * %{buildroot}%{bzinstallprefix}/bugzilla +echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > %{buildroot}%{bzinstallprefix}/bugzilla/cron.whine +rm -f %{buildroot}%{bzinstallprefix}/bugzilla/README \ + %{buildroot}%{bzinstallprefix}/bugzilla/docs/TODO \ + %{buildroot}%{bzinstallprefix}/bugzilla/docs/en/Makefile \ + %{buildroot}%{bzinstallprefix}/bugzilla/docs/en/make.bat cp %{SOURCE2} ./README.fedora -mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir} -mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla -install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf -install -m 0755 -D -p %{SOURCE3} ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/cron.daily -rm ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/LICENSE +mkdir -p %{buildroot}%{bzdatadir}/assets +mkdir -p %{buildroot}%{_sysconfdir}/bugzilla +install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/bugzilla.conf +install -m 0755 -D -p %{SOURCE3} %{buildroot}%{bzinstallprefix}/bugzilla/cron.daily +ln -s ../../..%{bzdatadir}/assets %{buildroot}%{bzinstallprefix}/bugzilla/assets %post (pushd %{bzinstallprefix}/bugzilla > /dev/null @@ -155,12 +181,14 @@ rm ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/LICENSE popd > /dev/null) %files +%defattr(-,root,apache,-) %dir %{bzinstallprefix}/bugzilla +%{bzinstallprefix}/bugzilla/LICENSE %{bzinstallprefix}/bugzilla/*.cgi +%{bzinstallprefix}/bugzilla/*.json %{bzinstallprefix}/bugzilla/*.pl %{bzinstallprefix}/bugzilla/Bugzilla.pm %{bzinstallprefix}/bugzilla/robots.txt -%{bzinstallprefix}/bugzilla/taskgraph.json %{bzinstallprefix}/bugzilla/Bugzilla %{bzinstallprefix}/bugzilla/extensions %{bzinstallprefix}/bugzilla/images @@ -173,40 +201,32 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/cron.daily %{bzinstallprefix}/bugzilla/cron.whine %{bzinstallprefix}/bugzilla/contrib/README +%{bzinstallprefix}/bugzilla/assets %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf +%attr(770,root,apache) %dir %{bzdatadir} +%attr(770,root,apache) %dir %{bzdatadir}/assets +%attr(750,root,apache) %dir %{_sysconfdir}/bugzilla %defattr(-,root,root,-) %doc README %doc README.fedora -%license LICENSE -%dir %{bzdatadir} -%defattr(0750,root,apache,-) -%dir %{_sysconfdir}/bugzilla %files doc -%defattr(-,root,root,-) +%defattr(-,root,apache,-) %{bzinstallprefix}/bugzilla/docs/en/html %{bzinstallprefix}/bugzilla/docs/en/images %{bzinstallprefix}/bugzilla/docs/en/pdf -%{bzinstallprefix}/bugzilla/docs/en/README.docs -%{bzinstallprefix}/bugzilla/docs/en/rel_notes.txt %{bzinstallprefix}/bugzilla/docs/en/txt -%{bzinstallprefix}/bugzilla/docs/bugzilla.ent +%{bzinstallprefix}/bugzilla/docs/en/rst %{bzinstallprefix}/bugzilla/docs/style.css -%{bzinstallprefix}/bugzilla/docs/bugzilla.ent.tmpl -%{bzinstallprefix}/bugzilla/docs/xsl/bugzilla-docs.xsl -%{bzinstallprefix}/bugzilla/docs/xsl/chunks.xsl -%{bzinstallprefix}/bugzilla/docs/xsl/nochunks.xsl -%{bzinstallprefix}/bugzilla/docs/xsl/pdf.xsl %files doc-build -%defattr(-,root,root,-) +%defattr(-,root,apache,-) %{bzinstallprefix}/bugzilla/docs/makedocs.pl %{bzinstallprefix}/bugzilla/docs/lib -%{bzinstallprefix}/bugzilla/docs/en/xml %files contrib -%defattr(-,root,root,-) +%defattr(-,root,apache,-) %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.rhel %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.suse %{bzinstallprefix}/bugzilla/contrib/bugzilla-submit @@ -215,7 +235,6 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/cmdline %{bzinstallprefix}/bugzilla/contrib/console.pl %{bzinstallprefix}/bugzilla/contrib/convert-workflow.pl -%{bzinstallprefix}/bugzilla/contrib/cvs-update.pl %{bzinstallprefix}/bugzilla/contrib/extension-convert.pl %{bzinstallprefix}/bugzilla/contrib/fixperms.pl %{bzinstallprefix}/bugzilla/contrib/jb2bz.py* @@ -229,15 +248,32 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog -* Wed Dec 23 2015 Emmanuel Seyman - 4.4.11-1 -- Update to 4.4.11 +* Sat Jan 16 2016 Emmanuel Seyman - 5.0.2-1 +- Update to 5.0.2, with thnaks to Tuomo Soini (#1275609) +- Use dnf instead of yum when advising to install perl modules +- Change documentation URL to bugzilla.readthedocs.org -* Sun Sep 13 2015 Emmanuel Seyman - 4.4.10-1 -- Update to 4.4.10 -- Use %%license to flag the LICENSE file +* Mon Sep 28 2015 Tuomo Soini - 5.0.1-3 +- fix data directory permissions and config dir permissions -* Wed Jun 17 2015 Fedora Release Engineering - 4.4.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Mon Sep 28 2015 Tuomo Soini - 5.0.1-2 +- Fix file owners to be mostly correct +- rewrite patching of paths in Constants.pm + +* Fri Sep 11 2015 Tuomo Soini - 5.0.1-1 +- Update to 5.0.1 new stable series +- update dependencies for 5.0.1 +- build documentation +- add documentation build dependencies + +* Thu Sep 10 2015 Tuomo Soini - 4.4.10-1 +- Update to 4.4.10 to fix CVE-2015-4499 + +* Wed Jun 17 2015 Tuomo Soini - 4.4.9-1 +- Update to 4.4.9 for several important bug fixes + +* Tue Jun 16 2015 Tuomo Soini - 4.4.8-1 +- Import from rawhide (F23) * Sat Jan 31 2015 Emmanuel Seyman - 4.4.8-1 - Update to 4.4.8 (fixes regressions in 4.4.7 which itself diff --git a/sources b/sources index 17f0e7a..fd424e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3380aba9b4f4b606a804b00f1a56bf1 bugzilla-4.4.11.tar.gz +84e6a070d425846d55a1f926e883957e bugzilla-5.0.2.tar.gz From 0a8472a7dfddaf061771b653157ede084fa4269e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:16:34 +0000 Subject: [PATCH 53/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 396ab7a..caf3a93 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -248,6 +248,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Emmanuel Seyman - 5.0.2-1 - Update to 5.0.2, with thnaks to Tuomo Soini (#1275609) - Use dnf instead of yum when advising to install perl modules From a703d31a8f4ec536d1f08bc16092b351ecde5201 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 1 May 2016 18:14:04 +0200 Subject: [PATCH 54/99] backport patch to prevent email address encoding --- bugzilla-email-encode.patch | 50 +++++++++++++++++++++++++++++++++++++ bugzilla.spec | 13 +++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 bugzilla-email-encode.patch diff --git a/bugzilla-email-encode.patch b/bugzilla-email-encode.patch new file mode 100644 index 0000000..70c2953 --- /dev/null +++ b/bugzilla-email-encode.patch @@ -0,0 +1,50 @@ +diff --git a/Bugzilla/MIME.pm b/Bugzilla/MIME.pm +index 7b5843a..8c6c141 100644 +--- a/Bugzilla/MIME.pm ++++ b/Bugzilla/MIME.pm +@@ -13,9 +13,6 @@ use warnings; + + use parent qw(Email::MIME); + +-use Encode qw(encode); +-use Encode::MIME::Header; +- + sub new { + my ($class, $msg) = @_; + state $use_utf8 = Bugzilla->params->{'utf8'}; +@@ -79,20 +76,12 @@ sub as_string { + # MIME-Version must be set otherwise some mailsystems ignore the charset + $self->header_set('MIME-Version', '1.0') if !$self->header('MIME-Version'); + +- # Encode the headers correctly in quoted-printable ++ # Encode the headers correctly. + foreach my $header ($self->header_names) { + my @values = $self->header($header); +- # We don't recode headers that happen multiple times. +- next if scalar(@values) > 1; +- if (my $value = $values[0]) { +- utf8::decode($value) unless $use_utf8 && utf8::is_utf8($value); +- +- # avoid excessive line wrapping done by Encode. +- local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 998; ++ map { utf8::decode($_) if defined($_) && !utf8::is_utf8($_) } @values; + +- my $encoded = encode('MIME-Q', $value); +- $self->header_set($header, $encoded); +- } ++ $self->header_str_set($header, @values); + } + + # Ensure the character-set and encoding is set correctly on single part +diff --git a/attachment.cgi b/attachment.cgi +index 5db8f59..40b0c9d 100755 +--- a/attachment.cgi ++++ b/attachment.cgi +@@ -26,6 +26,7 @@ use Bugzilla::Attachment::PatchReader; + use Bugzilla::Token; + + use Encode qw(encode find_encoding); ++use Encode::MIME::Header; # Required to alter Encode::Encoding{'MIME-Q'}. + + # For most scripts we don't make $cgi and $template global variables. But + # when preparing Bugzilla for mod_perl, this script used these diff --git a/bugzilla.spec b/bugzilla.spec index caf3a93..aff339d 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.2 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -14,6 +14,8 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-dnf.patch +# https://bugzilla.mozilla.org/show_bug.cgi?id=1246228 +Patch2: bugzilla-email-encode.patch BuildArch: noarch Requires: patchutils @@ -130,6 +132,12 @@ if [ -f Bugzilla/Install/Requirements.pm.orig ]; then : ERROR: Patch1 did not apply cleanly exit 1 fi +%patch2 -p1 +if [ -f Bugzilla/MIME.pm.orig ]; then + : ERROR: Patch2 did not apply cleanly + exit 1 +fi + # Remove bundled libs rm -rf lib/CGI* # Remove bundled binary files @@ -248,6 +256,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun May 01 2016 Emmanuel Seyman - 5.0.2-3 +- backport patch to prevent email address encoding + * Wed Feb 03 2016 Fedora Release Engineering - 5.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From c2e485b289dee2cfd6d250c4cb3fbe16e88da2c3 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 16 May 2016 22:35:36 +0200 Subject: [PATCH 55/99] Update to 5.0.3, dropping backported patch --- .gitignore | 1 + bugzilla.spec | 14 +++++--------- sources | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 3d873aa..771d696 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.4.10.tar.gz /bugzilla-4.4.11.tar.gz /bugzilla-5.0.2.tar.gz +/bugzilla-5.0.3.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index aff339d..fcc7b20 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla -Version: 5.0.2 +Version: 5.0.3 Group: Applications/Publishing -Release: 3%{?dist} +Release: 1%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -14,8 +14,6 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-dnf.patch -# https://bugzilla.mozilla.org/show_bug.cgi?id=1246228 -Patch2: bugzilla-email-encode.patch BuildArch: noarch Requires: patchutils @@ -132,11 +130,6 @@ if [ -f Bugzilla/Install/Requirements.pm.orig ]; then : ERROR: Patch1 did not apply cleanly exit 1 fi -%patch2 -p1 -if [ -f Bugzilla/MIME.pm.orig ]; then - : ERROR: Patch2 did not apply cleanly - exit 1 -fi # Remove bundled libs rm -rf lib/CGI* @@ -256,6 +249,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Mon May 16 2016 Emmanuel Seyman - 5.0.3-1 +- Update to 5.0.3, dropping backported patch + * Sun May 01 2016 Emmanuel Seyman - 5.0.2-3 - backport patch to prevent email address encoding diff --git a/sources b/sources index fd424e6..e160adf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84e6a070d425846d55a1f926e883957e bugzilla-5.0.2.tar.gz +b78365742a85cd030c87af12c196e8e9 bugzilla-5.0.3.tar.gz From c883589de861f6b9d76626de534521949fb61a7a Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 16 May 2016 23:02:28 +0200 Subject: [PATCH 56/99] remove unused patch --- bugzilla-email-encode.patch | 50 ------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 bugzilla-email-encode.patch diff --git a/bugzilla-email-encode.patch b/bugzilla-email-encode.patch deleted file mode 100644 index 70c2953..0000000 --- a/bugzilla-email-encode.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/Bugzilla/MIME.pm b/Bugzilla/MIME.pm -index 7b5843a..8c6c141 100644 ---- a/Bugzilla/MIME.pm -+++ b/Bugzilla/MIME.pm -@@ -13,9 +13,6 @@ use warnings; - - use parent qw(Email::MIME); - --use Encode qw(encode); --use Encode::MIME::Header; -- - sub new { - my ($class, $msg) = @_; - state $use_utf8 = Bugzilla->params->{'utf8'}; -@@ -79,20 +76,12 @@ sub as_string { - # MIME-Version must be set otherwise some mailsystems ignore the charset - $self->header_set('MIME-Version', '1.0') if !$self->header('MIME-Version'); - -- # Encode the headers correctly in quoted-printable -+ # Encode the headers correctly. - foreach my $header ($self->header_names) { - my @values = $self->header($header); -- # We don't recode headers that happen multiple times. -- next if scalar(@values) > 1; -- if (my $value = $values[0]) { -- utf8::decode($value) unless $use_utf8 && utf8::is_utf8($value); -- -- # avoid excessive line wrapping done by Encode. -- local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 998; -+ map { utf8::decode($_) if defined($_) && !utf8::is_utf8($_) } @values; - -- my $encoded = encode('MIME-Q', $value); -- $self->header_set($header, $encoded); -- } -+ $self->header_str_set($header, @values); - } - - # Ensure the character-set and encoding is set correctly on single part -diff --git a/attachment.cgi b/attachment.cgi -index 5db8f59..40b0c9d 100755 ---- a/attachment.cgi -+++ b/attachment.cgi -@@ -26,6 +26,7 @@ use Bugzilla::Attachment::PatchReader; - use Bugzilla::Token; - - use Encode qw(encode find_encoding); -+use Encode::MIME::Header; # Required to alter Encode::Encoding{'MIME-Q'}. - - # For most scripts we don't make $cgi and $template global variables. But - # when preparing Bugzilla for mod_perl, this script used these From 7a0709ff6fa94fcbd5c993f306da04b839167cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:18:43 +0200 Subject: [PATCH 57/99] Mandatory Perl build-requires added --- bugzilla.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/bugzilla.spec b/bugzilla.spec index fcc7b20..7ba263b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -35,6 +35,7 @@ Requires: perl(Locale::Language) Requires: webserver Requires: which # for building docs +BuildRequires: perl-generators BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(File::Which) BuildRequires: perl(Memoize) From 4e0e86a721268cad2e3a27ea65ccf57f6ff1d7d9 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Mon, 18 Jul 2016 11:12:02 +0200 Subject: [PATCH 58/99] add more build-requires && filter out optional modules --- bugzilla.spec | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 7ba263b..7246630 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -43,12 +43,16 @@ BuildRequires: python-sphinx BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latexrecommended BuildRequires: texlive-collection-basic -BuildRequires: texlive-upquote BuildRequires: tex-framed BuildRequires: tex-multirow BuildRequires: tex-threeparttable BuildRequires: tex-titlesec BuildRequires: tex-wrapfig +%if 0%{?fedora} +BuildRequires: texlive-capt-of.noarch +BuildRequires: texlive-eqparbox.noarch +BuildRequires: texlive-upquote +%endif %package doc Summary: Bugzilla documentation @@ -72,20 +76,50 @@ BuildRequires: python # mod_perl modules %global __requires_exclude %__requires_exclude|^perl\\(Apache2:: %global __requires_exclude %__requires_exclude|^perl\\(ModPerl:: +# installation of optional modules +%global __requires_exclude %__requires_exclude|^perl\\(Config\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(CPAN\\)$ # authentification modules %global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP # database modules %global __requires_exclude %__requires_exclude|^perl\\(DBD::Oracle\\)$ %global __requires_exclude %__requires_exclude|^perl\\(DBD::Pg\\)$ %global __requires_exclude %__requires_exclude|^perl\\(DBI::db\\)$ %global __requires_exclude %__requires_exclude|^perl\\(DBI::st\\)$ +# graphical reports and charts +%global __requires_exclude %__requires_exclude|^perl\\(Chart::Lines\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Template::Plugin::GD::Image\\)$ # inbound email modules %global __requires_exclude %__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$ %global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(HTML::FormatText::WithLinks\\)$ +# automatic charset detection for text attachments +%global __requires_exclude %__requires_exclude|^perl\\(Encode +# sniff MIME type of attachments +%global __requires_exclude %__requires_exclude|^perl\\(File::MimeInfo::Magic\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(IO::Scalar\\)$ +# mail queueing +%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Daemon::Generic\\)$ +# smtp security +%global __requires_exclude %__requires_exclude|^perl\\(Authen::SASL\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Net::SMTP::SSL\\)$ # bug moving modules %global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$ %global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$ +# update notifications +%global __requires_exclude %__requires_exclude|^perl\\(LWP::UserAgent\\)$ +# use html in product and group descriptions +%global __requires_exclude %__requires_exclude|^perl\\(HTML::Parser\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(HTML::Scrubber\\)$ +# memcached support +%global __requires_exclude %__requires_exclude|^perl\\(Cache::Memcached\\)$ +# documentation +%global __requires_exclude %__requires_exclude|^perl\\(File::Copy::Recursive\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(File::Which\\)$ # xml-rpc and json-rpc modules %global __requires_exclude %__requires_exclude|^perl\\(XMLRPC:: %global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$ @@ -250,6 +284,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Jul 17 2016 Emmanuel Seyman - 5.0.3-2 +- Add build requirements for texlive sub-packages +- Filter out more optional dependencies + * Mon May 16 2016 Emmanuel Seyman - 5.0.3-1 - Update to 5.0.3, dropping backported patch @@ -260,7 +298,7 @@ popd > /dev/null) - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild * Sat Jan 16 2016 Emmanuel Seyman - 5.0.2-1 -- Update to 5.0.2, with thnaks to Tuomo Soini (#1275609) +- Update to 5.0.2, with thanks to Tuomo Soini (#1275609) - Use dnf instead of yum when advising to install perl modules - Change documentation URL to bugzilla.readthedocs.org From ea8a6e08bcb9dee37693bdcfb7032e78f30137b2 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 27 Nov 2016 11:47:58 +0100 Subject: [PATCH 59/99] Check for perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC) --- bugzilla-dnf.patch | 13 +++++++++++-- bugzilla.spec | 5 ++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/bugzilla-dnf.patch b/bugzilla-dnf.patch index 78c1d18..8824d21 100644 --- a/bugzilla-dnf.patch +++ b/bugzilla-dnf.patch @@ -1,5 +1,14 @@ ---- bugzilla-4.01/Bugzilla/Install/Requirements.pm 2011-05-01 17:09:35.000000000 +0200 -+++ bugzilla-4.01-yum/Bugzilla/Install/Requirements.pm 2011-05-01 17:11:28.000000000 +0200 +--- bugzilla-5.0.3/Bugzilla/Install/Requirements.pm.orig 2016-11-13 11:03:43.977035344 +0100 ++++ bugzilla-5.0.3/Bugzilla/Install/Requirements.pm 2016-11-13 11:16:26.115320528 +0100 +@@ -304,7 +304,7 @@ sub OPTIONAL_MODULES { + }, + { + package => 'JSON-RPC', +- module => 'JSON::RPC', ++ module => 'JSON::RPC::Legacy::Server::CGI', + version => 0, + feature => ['jsonrpc', 'rest'], + }, @@ -648,7 +648,7 @@ if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE && !$check_results->{hide_all}) diff --git a/bugzilla.spec b/bugzilla.spec index 7246630..d142409 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -284,6 +284,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Nov 27 2016 Emmanuel Seyman - 5.0.3-3 +- Check for perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC) + * Sun Jul 17 2016 Emmanuel Seyman - 5.0.3-2 - Add build requirements for texlive sub-packages - Filter out more optional dependencies From d7bd71eda52b64cb30ff903fa700c17dc60af980 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:07:10 +0000 Subject: [PATCH 60/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index d142409..b37182d 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 Group: Applications/Publishing -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -284,6 +284,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 5.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Nov 27 2016 Emmanuel Seyman - 5.0.3-3 - Check for perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC) From 2b03c179d6b33f5050af64cf79a1be955dee3491 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Wed, 5 Apr 2017 07:39:28 +0200 Subject: [PATCH 61/99] Fix FTBFS, fix apache configuration and backport a File::Slurp fix --- bugzilla-1301887-File-Slurp-Warnings.patch | 256 +++++++++++++++++++++ bugzilla-httpd-conf | 2 +- bugzilla.spec | 17 +- 3 files changed, 271 insertions(+), 4 deletions(-) create mode 100644 bugzilla-1301887-File-Slurp-Warnings.patch diff --git a/bugzilla-1301887-File-Slurp-Warnings.patch b/bugzilla-1301887-File-Slurp-Warnings.patch new file mode 100644 index 0000000..e983cc3 --- /dev/null +++ b/bugzilla-1301887-File-Slurp-Warnings.patch @@ -0,0 +1,256 @@ +diff -up ./Bugzilla/Config.pm.orig ./Bugzilla/Config.pm +--- ./Bugzilla/Config.pm.orig 2017-03-05 20:38:55.540137017 +0100 ++++ ./Bugzilla/Config.pm 2017-03-05 20:40:18.954614192 +0100 +@@ -16,10 +16,9 @@ use autodie qw(:default); + + use Bugzilla::Constants; + use Bugzilla::Hook; +-use Bugzilla::Util qw(trick_taint); ++use Bugzilla::Util qw(trick_taint read_text write_text); + + use JSON::XS; +-use File::Slurp; + use File::Temp; + use File::Basename; + +@@ -284,7 +283,7 @@ sub write_params { + my $param_file = bz_locations()->{'datadir'} . '/params.json'; + + my $json_data = JSON::XS->new->canonical->pretty->encode($param_data); +- write_file($param_file, { binmode => ':utf8', atomic => 1 }, \$json_data); ++ write_text($param_file, $json_data); + + # It's not common to edit parameters and loading + # Bugzilla::Install::Filesystem is slow. +@@ -301,8 +300,8 @@ sub read_param_file { + my $file = bz_locations()->{'datadir'} . '/params.json'; + + if (-e $file) { +- my $data; +- read_file($file, binmode => ':utf8', buf_ref => \$data); ++ my $data = read_text($file); ++ trick_taint($data); + + # If params.json has been manually edited and e.g. some quotes are + # missing, we don't want JSON::XS to leak the content of the file +diff -up ./Bugzilla/Install/Filesystem.pm.orig ./Bugzilla/Install/Filesystem.pm +--- ./Bugzilla/Install/Filesystem.pm.orig 2017-03-05 20:40:25.563572768 +0100 ++++ ./Bugzilla/Install/Filesystem.pm 2017-03-05 20:40:53.516397565 +0100 +@@ -31,7 +31,6 @@ use File::Path; + use File::Basename; + use File::Copy qw(move); + use File::Spec; +-use File::Slurp; + use IO::File; + use POSIX (); + +@@ -536,7 +535,7 @@ sub update_filesystem { + + # Remove old assets htaccess file to force recreation with correct values. + if (-e "$assetsdir/.htaccess") { +- if (read_file("$assetsdir/.htaccess") =~ //) { ++ if (read_text("$assetsdir/.htaccess") =~ //) { + unlink("$assetsdir/.htaccess"); + } + } +diff -up ./Bugzilla/Install/Requirements.pm.orig ./Bugzilla/Install/Requirements.pm +--- ./Bugzilla/Install/Requirements.pm.orig 2017-03-05 20:41:00.420354292 +0100 ++++ ./Bugzilla/Install/Requirements.pm 2017-03-05 20:41:24.044206223 +0100 +@@ -156,11 +156,6 @@ sub REQUIRED_MODULES { + version => '1.0.1', + }, + { +- package => 'File-Slurp', +- module => 'File::Slurp', +- version => '9999.13', +- }, +- { + package => 'JSON-XS', + module => 'JSON::XS', + # 2.0 is the first version that will work with JSON::RPC. +diff -up ./Bugzilla/JobQueue.pm.orig ./Bugzilla/JobQueue.pm +--- ./Bugzilla/JobQueue.pm.orig 2017-03-05 20:41:33.460147206 +0100 ++++ ./Bugzilla/JobQueue.pm 2017-03-05 20:42:40.659726012 +0100 +@@ -14,8 +14,8 @@ use warnings; + use Bugzilla::Constants; + use Bugzilla::Error; + use Bugzilla::Install::Util qw(install_string); ++use Bugzilla::Util qw(read_text); + use File::Basename; +-use File::Slurp; + use base qw(TheSchwartz); + use fields qw(_worker_pidfile); + +@@ -124,7 +124,7 @@ sub subprocess_worker { + # And poll the PID to detect when the working has finished. + # We do this instead of system() to allow for the INT signal to + # interrup us and trigger kill_worker(). +- my $pid = read_file($self->{_worker_pidfile}, err_mode => 'quiet'); ++ my $pid = read_text($self->{_worker_pidfile}, err_mode => 'quiet'); + if ($pid) { + sleep(3) while(kill(0, $pid)); + } +@@ -139,7 +139,7 @@ sub subprocess_worker { + sub kill_worker { + my $self = Bugzilla->job_queue(); + if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) { +- my $worker_pid = read_file($self->{_worker_pidfile}); ++ my $worker_pid = read_text($self->{_worker_pidfile}); + if ($worker_pid && kill(0, $worker_pid)) { + $self->debug("Stopping worker process"); + system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop"; +diff -up ./Bugzilla/Template.pm.orig ./Bugzilla/Template.pm +--- ./Bugzilla/Template.pm.orig 2017-03-05 20:42:47.460683385 +0100 ++++ ./Bugzilla/Template.pm 2017-03-05 20:46:35.942251308 +0100 +@@ -32,7 +32,6 @@ use Digest::MD5 qw(md5_hex); + use File::Basename qw(basename dirname); + use File::Find; + use File::Path qw(rmtree mkpath); +-use File::Slurp; + use File::Spec; + use IO::Dir; + use List::MoreUtils qw(firstidx); +@@ -502,7 +501,7 @@ sub _concatenate_css { + next unless -e "$cgi_path/$files{$source}"; + my $file = $skins_path . '/' . md5_hex($source) . '.css'; + if (!-e $file) { +- my $content = read_file("$cgi_path/$files{$source}"); ++ my $content = read_text("$cgi_path/$files{$source}"); + + # minify + $content =~ s{/\*.*?\*/}{}sg; # comments +@@ -512,7 +511,7 @@ sub _concatenate_css { + # rewrite urls + $content =~ s{url\(([^\)]+)\)}{_css_url_rewrite($source, $1)}eig; + +- write_file($file, "/* $files{$source} */\n" . $content . "\n"); ++ write_text($file, "/* $files{$source} */\n" . $content . "\n"); + } + push @minified, $file; + } +@@ -522,9 +521,9 @@ sub _concatenate_css { + if (!-e $file) { + my $content = ''; + foreach my $source (@minified) { +- $content .= read_file($source); ++ $content .= read_text($source); + } +- write_file($file, $content); ++ write_text($file, $content); + } + + $file =~ s/^\Q$cgi_path\E\///o; +@@ -563,7 +562,7 @@ sub _concatenate_js { + next unless -e "$cgi_path/$files{$source}"; + my $file = $skins_path . '/' . md5_hex($source) . '.js'; + if (!-e $file) { +- my $content = read_file("$cgi_path/$files{$source}"); ++ my $content = read_text("$cgi_path/$files{$source}"); + + # minimal minification + $content =~ s#/\*.*?\*/##sg; # block comments +@@ -572,7 +571,7 @@ sub _concatenate_js { + $content =~ s#\n{2,}#\n#g; # blank lines + $content =~ s#(^\s+|\s+$)##g; # whitespace at the start/end of file + +- write_file($file, ";/* $files{$source} */\n" . $content . "\n"); ++ write_text($file, ";/* $files{$source} */\n" . $content . "\n"); + } + push @minified, $file; + } +@@ -582,9 +581,9 @@ sub _concatenate_js { + if (!-e $file) { + my $content = ''; + foreach my $source (@minified) { +- $content .= read_file($source); ++ $content .= read_text($source); + } +- write_file($file, $content); ++ write_text($file, $content); + } + + $file =~ s/^\Q$cgi_path\E\///o; +diff -up ./Bugzilla/Util.pm.orig ./Bugzilla/Util.pm +--- ./Bugzilla/Util.pm.orig 2017-03-05 20:46:54.370135805 +0100 ++++ ./Bugzilla/Util.pm 2017-03-05 20:48:12.190648042 +0100 +@@ -24,7 +24,7 @@ use parent qw(Exporter); + validate_email_syntax check_email_syntax clean_text + get_text template_var display_value disable_utf8 + detect_encoding email_filter +- join_activity_entries); ++ join_activity_entries read_text write_text); + + use Bugzilla::Constants; + use Bugzilla::RNG qw(irand); +@@ -39,6 +39,8 @@ use Scalar::Util qw(tainted blessed); + use Text::Wrap; + use Encode qw(encode decode resolve_alias); + use Encode::Guess; ++use File::Basename qw(dirname); ++use File::Temp qw(tempfile); + + sub trick_taint { + require Carp; +@@ -106,6 +108,27 @@ sub html_quote { + return $var; + } + ++sub read_text { ++ my ($filename) = @_; ++ open my $fh, '<:encoding(utf-8)', $filename; ++ local $/ = undef; ++ my $content = <$fh>; ++ close $fh; ++ return $content; ++} ++ ++sub write_text { ++ my ($filename, $content) = @_; ++ my ($tmp_fh, $tmp_filename) = tempfile('.tmp.XXXXXXXXXX', ++ DIR => dirname($filename), ++ UNLINK => 0, ++ ); ++ binmode $tmp_fh, ':encoding(utf-8)'; ++ print $tmp_fh $content; ++ close $tmp_fh; ++ rename $tmp_filename, $filename; ++} ++ + sub html_light_quote { + my ($text) = @_; + # admin/table.html.tmpl calls |FILTER html_light| many times. +diff -up ./docs/en/rst/installing/linux.rst.orig ./docs/en/rst/installing/linux.rst +--- ./docs/en/rst/installing/linux.rst.orig 2017-03-05 20:48:20.526595794 +0100 ++++ ./docs/en/rst/installing/linux.rst 2017-03-05 20:49:00.375346030 +0100 +@@ -49,7 +49,7 @@ graphviz patchutils gcc 'perl(Apache2::S + 'perl(Daemon::Generic)' 'perl(Date::Format)' 'perl(DateTime)' + 'perl(DateTime::TimeZone)' 'perl(DBI)' 'perl(Digest::SHA)' 'perl(Email::MIME)' + 'perl(Email::Reply)' 'perl(Email::Sender)' 'perl(Encode)' 'perl(Encode::Detect)' +-'perl(File::MimeInfo::Magic)' 'perl(File::Slurp)' 'perl(GD)' 'perl(GD::Graph)' ++'perl(File::MimeInfo::Magic)' 'perl(GD)' 'perl(GD::Graph)' + 'perl(GD::Text)' 'perl(HTML::FormatText::WithLinks)' 'perl(HTML::Parser)' + 'perl(HTML::Scrubber)' 'perl(IO::Scalar)' 'perl(JSON::RPC)' 'perl(JSON::XS)' + 'perl(List::MoreUtils)' 'perl(LWP::UserAgent)' 'perl(Math::Random::ISAAC)' +diff -up ./docs/en/rst/installing/windows.rst.orig ./docs/en/rst/installing/windows.rst +--- ./docs/en/rst/installing/windows.rst.orig 2017-03-05 20:49:10.415283101 +0100 ++++ ./docs/en/rst/installing/windows.rst 2017-03-05 20:49:25.631187731 +0100 +@@ -85,7 +85,6 @@ Install the following mandatory modules + * URI + * List-MoreUtils + * Math-Random-ISAAC +-* File-Slurp + * JSON-XS + * Win32 + * Win32-API +diff -up ./template/en/default/pages/release-notes.html.tmpl.orig ./template/en/default/pages/release-notes.html.tmpl +--- ./template/en/default/pages/release-notes.html.tmpl.orig 2017-03-05 20:49:34.287133477 +0100 ++++ ./template/en/default/pages/release-notes.html.tmpl 2017-03-05 20:49:52.223021059 +0100 +@@ -174,7 +174,7 @@ +

Required Perl Modules

+ + [% INCLUDE req_table reqs = REQUIRED_MODULES +- new = ['File-Slurp','JSON-XS', 'Email-Sender'] ++ new = ['JSON-XS', 'Email-Sender'] + updated = ['DateTime', 'DateTime-TimeZone', + 'Template-Toolkit', 'URI'] %] + diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index 1ed7679..bdf6d85 100644 --- a/bugzilla-httpd-conf +++ b/bugzilla-httpd-conf @@ -13,7 +13,7 @@ Alias /bugzilla /usr/share/bugzilla AddHandler cgi-script .cgi Options +Indexes +ExecCGI +FollowSymLinks DirectoryIndex index.cgi index.html - AllowOverride Limit Options FileInfo Indexes + AllowOverride Limit Options FileInfo Indexes AuthConfig AddType application/vnd.mozilla.xul+xml .xul AddType application/rdf+xml .rdf diff --git a/bugzilla.spec b/bugzilla.spec index b37182d..e62b7f5 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 Group: Applications/Publishing -Release: 4%{?dist} +Release: 5%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -14,6 +14,7 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-dnf.patch +Patch2: bugzilla-1301887-File-Slurp-Warnings.patch BuildArch: noarch Requires: patchutils @@ -43,14 +44,16 @@ BuildRequires: python-sphinx BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latexrecommended BuildRequires: texlive-collection-basic +BuildRequires: texlive-fncychap BuildRequires: tex-framed BuildRequires: tex-multirow BuildRequires: tex-threeparttable BuildRequires: tex-titlesec BuildRequires: tex-wrapfig %if 0%{?fedora} -BuildRequires: texlive-capt-of.noarch -BuildRequires: texlive-eqparbox.noarch +BuildRequires: texlive-capt-of +BuildRequires: texlive-eqparbox +BuildRequires: texlive-tabulary BuildRequires: texlive-upquote %endif @@ -165,6 +168,7 @@ if [ -f Bugzilla/Install/Requirements.pm.orig ]; then : ERROR: Patch1 did not apply cleanly exit 1 fi +%patch2 -p1 # Remove bundled libs rm -rf lib/CGI* @@ -174,6 +178,8 @@ rm -f js/yui/*/*.swf # Deal with changing /usr/local paths here instead of via patches %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py %{__perl} -pi -e 's|/usr/local/bin/ruby\b|%{_bindir}/ruby|' contrib/*.rb +%{__perl} -pi -e 's|/usr/bin/env python|%{__python}|' contrib/bugzilla-submit/bugzilla-submit + grep -rl '/usr/lib/sendmail\b' contrib docs \ | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' @@ -284,6 +290,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Tue Apr 04 2017 Emmanuel Seyman - 5.0.3-5 +- Include more dependencies to fix FTBFS (#1423283) +- Allow AuthConfig directives in Bugzilla's directory (#1403588) +- Backport patch to use internal functions rather than File::Slurp (#1425077) + * Fri Feb 10 2017 Fedora Release Engineering - 5.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8a9a591c375922aa3ee243fae6458f05229f368e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 04:18:37 +0000 Subject: [PATCH 62/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index e62b7f5..7427f0b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 Group: Applications/Publishing -Release: 5%{?dist} +Release: 6%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -290,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 5.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Apr 04 2017 Emmanuel Seyman - 5.0.3-5 - Include more dependencies to fix FTBFS (#1423283) - Allow AuthConfig directives in Bugzilla's directory (#1403588) From a1ca9f922437438a006be5bd2f2b0cd92c1d312a Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 8 Aug 2017 00:22:28 +0200 Subject: [PATCH 63/99] Add BuildRequires and Requires --- bugzilla.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 7427f0b..9be4f3b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 Group: Applications/Publishing -Release: 6%{?dist} +Release: 7%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -24,6 +24,7 @@ Requires: perl(Date::Format) >= 2.23 Requires: perl(DateTime) >= 0.75 Requires: perl(DateTime::TimeZone) >= 1.64 Requires: perl(DBI) >= 1.614 +Requires: perl(ExtUtils::MM) Requires: perl(Template) >= 2.24 Requires: perl(Email::Sender) >= 1.300011 Requires: perl(Email::MIME) >= 1.904 @@ -36,6 +37,7 @@ Requires: perl(Locale::Language) Requires: webserver Requires: which # for building docs +BuildRequires: latexmk BuildRequires: perl-generators BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(File::Which) @@ -53,6 +55,7 @@ BuildRequires: tex-wrapfig %if 0%{?fedora} BuildRequires: texlive-capt-of BuildRequires: texlive-eqparbox +BuildRequires: texlive-needspace BuildRequires: texlive-tabulary BuildRequires: texlive-upquote %endif @@ -290,6 +293,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Mon Aug 07 2017 Emmanuel Seyman - 5.0.3-7 +- Add doc-building requirement to fix FTBS +- Add perl(ExtUtils::MM) to the list of required modules + * Wed Jul 26 2017 Fedora Release Engineering - 5.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 75097493586d68ae4d9079651e448adf93a515ee Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 20 Aug 2017 17:10:01 +0200 Subject: [PATCH 64/99] tighten macro expansion --- bugzilla.spec | 123 ++++++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 9be4f3b..f8e8c36 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,8 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 -Group: Applications/Publishing -Release: 7%{?dist} +Release: 8%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -36,6 +35,7 @@ Requires: perl(JSON::XS) >= 2.01 Requires: perl(Locale::Language) Requires: webserver Requires: which + # for building docs BuildRequires: latexmk BuildRequires: perl-generators @@ -43,21 +43,20 @@ BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(File::Which) BuildRequires: perl(Memoize) BuildRequires: python-sphinx -BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latexrecommended BuildRequires: texlive-collection-basic -BuildRequires: texlive-fncychap -BuildRequires: tex-framed -BuildRequires: tex-multirow -BuildRequires: tex-threeparttable -BuildRequires: tex-titlesec -BuildRequires: tex-wrapfig +BuildRequires: tex(fncychap.sty) +BuildRequires: tex(framed.sty) +BuildRequires: tex(multirow.sty) +BuildRequires: tex(threeparttable.sty) +BuildRequires: tex(titlesec.sty) +BuildRequires: tex(wrapfig.sty) %if 0%{?fedora} -BuildRequires: texlive-capt-of -BuildRequires: texlive-eqparbox -BuildRequires: texlive-needspace -BuildRequires: texlive-tabulary -BuildRequires: texlive-upquote +BuildRequires: tex(capt-of.sty) +BuildRequires: tex(eqparbox.sty) +BuildRequires: tex(needspace.sty) +BuildRequires: tex(tabulary.sty) +BuildRequires: tex(upquote.sty) %endif %package doc @@ -76,73 +75,72 @@ BuildRequires: python %{?perl_default_filter} # Remove private modules from the requires stream -%global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(sanitycheck.cgi\\)$ # Remove all optional modules from the requires stream # mod_perl modules -%global __requires_exclude %__requires_exclude|^perl\\(Apache2:: -%global __requires_exclude %__requires_exclude|^perl\\(ModPerl:: +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Apache2:: +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(ModPerl:: # installation of optional modules -%global __requires_exclude %__requires_exclude|^perl\\(Config\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(CPAN\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Config\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(CPAN\\)$ # authentification modules -%global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Authen::Radius\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Net::LDAP # database modules -%global __requires_exclude %__requires_exclude|^perl\\(DBD::Oracle\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(DBD::Pg\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(DBI::db\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(DBI::st\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBD::Oracle\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBD::Pg\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBI::db\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBI::st\\)$ # graphical reports and charts -%global __requires_exclude %__requires_exclude|^perl\\(Chart::Lines\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Template::Plugin::GD::Image\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Chart::Lines\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(GD::Graph\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Template::Plugin::GD::Image\\)$ # inbound email modules -%global __requires_exclude %__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(HTML::FormatText::WithLinks\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Email::MIME::Attachment::Stripper\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Email::Reply\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::FormatText::WithLinks\\)$ # automatic charset detection for text attachments -%global __requires_exclude %__requires_exclude|^perl\\(Encode +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Encode # sniff MIME type of attachments -%global __requires_exclude %__requires_exclude|^perl\\(File::MimeInfo::Magic\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(IO::Scalar\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::MimeInfo::Magic\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(IO::Scalar\\)$ # mail queueing -%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Daemon::Generic\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(TheSchwartz\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Daemon::Generic\\)$ # smtp security -%global __requires_exclude %__requires_exclude|^perl\\(Authen::SASL\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Net::SMTP::SSL\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Authen::SASL\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Net::SMTP::SSL\\)$ # bug moving modules -%global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(MIME::Parser\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(XML::Twig\\)$ # update notifications -%global __requires_exclude %__requires_exclude|^perl\\(LWP::UserAgent\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(LWP::UserAgent\\)$ # use html in product and group descriptions -%global __requires_exclude %__requires_exclude|^perl\\(HTML::Parser\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(HTML::Scrubber\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::Parser\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::Scrubber\\)$ # memcached support -%global __requires_exclude %__requires_exclude|^perl\\(Cache::Memcached\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Cache::Memcached\\)$ # documentation -%global __requires_exclude %__requires_exclude|^perl\\(File::Copy::Recursive\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(File::Which\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::Copy::Recursive\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::Which\\)$ # xml-rpc and json-rpc modules -%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC:: -%global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$ -%global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(XMLRPC:: +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTTP::Message\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Test::Taint\\)$ # extension modules -%global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$ +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Image::Magick\\)$ # and remove the extensions from the provides stream -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Auth::Login\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Auth::Verify\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Config\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::WebService\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::OldBugMove\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::OldBugMove::Params\\)$ -%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Voting\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::BmpConvert\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::Auth::Login\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::Auth::Verify\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::Config\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::WebService\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::OldBugMove\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::OldBugMove::Params\\)$ +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Voting\\)$ %description Bugzilla is a popular bug tracking system used by multiple open source projects @@ -293,6 +291,11 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Aug 20 2017 Emmanuel Seyman - 5.0.3-8 +- Tighten macro expansion (thanks to ppisar) +- Drop Group tag +- Use tex(..) BuildRequires where possible + * Mon Aug 07 2017 Emmanuel Seyman - 5.0.3-7 - Add doc-building requirement to fix FTBS - Add perl(ExtUtils::MM) to the list of required modules From a4a058324bc73e952e1489040c7eb5dac2ff20c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 04:16:52 +0000 Subject: [PATCH 65/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index f8e8c36..5117f6b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 -Release: 8%{?dist} +Release: 9%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -291,6 +291,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 5.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Aug 20 2017 Emmanuel Seyman - 5.0.3-8 - Tighten macro expansion (thanks to ppisar) - Drop Group tag From f0c8d3c95c7b5242d3c95cb316b5ccbf1170dbe4 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 7 Feb 2018 10:34:36 +0100 Subject: [PATCH 66/99] Update Python 2 dependency declarations to new packaging standards --- bugzilla.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 5117f6b..cc2edd3 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.3 -Release: 9%{?dist} +Release: 10%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -42,7 +42,7 @@ BuildRequires: perl-generators BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(File::Which) BuildRequires: perl(Memoize) -BuildRequires: python-sphinx +BuildRequires: python2-sphinx BuildRequires: texlive-collection-latexrecommended BuildRequires: texlive-collection-basic BuildRequires: tex(fncychap.sty) @@ -70,7 +70,7 @@ Group: Applications/Publishing %package contrib Summary: Bugzilla contributed scripts Group: Applications/Publishing -BuildRequires: python +BuildRequires: python2 %{?perl_default_filter} @@ -291,6 +291,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Feb 07 2018 Iryna Shcherbina - 5.0.3-10 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 5.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 652fac8187c97cc74342b7a154ccc96f79d232e5 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 18 Feb 2018 16:20:02 +0100 Subject: [PATCH 67/99] update to 5.0.4 --- .gitignore | 1 + bugzilla-1438957-concatenate-assets.patch | 12 ++++++++++++ bugzilla.spec | 18 ++++++++++++------ sources | 2 +- 4 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 bugzilla-1438957-concatenate-assets.patch diff --git a/.gitignore b/.gitignore index 771d696..c0922ac 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-4.4.11.tar.gz /bugzilla-5.0.2.tar.gz /bugzilla-5.0.3.tar.gz +/bugzilla-5.0.4.tar.gz diff --git a/bugzilla-1438957-concatenate-assets.patch b/bugzilla-1438957-concatenate-assets.patch new file mode 100644 index 0000000..a678976 --- /dev/null +++ b/bugzilla-1438957-concatenate-assets.patch @@ -0,0 +1,12 @@ +diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm +--- ./Bugzilla/Constants.pm.orig 2018-02-18 12:22:45.541837039 +0100 ++++ ./Bugzilla/Constants.pm 2018-02-18 12:22:53.538784733 +0100 +@@ -213,7 +213,7 @@ use constant LOCAL_FILE => 'bugzilla-up + # When true CSS and JavaScript assets will be concatanted and minified at + # run-time, to reduce the number of requests required to render a page. + # Setting this to a false value can help debugging. +-use constant CONCATENATE_ASSETS => 1; ++use constant CONCATENATE_ASSETS => 0; + + # These are unique values that are unlikely to match a string or a number, + # to be used in criteria for match() functions and other things. They start diff --git a/bugzilla.spec b/bugzilla.spec index cc2edd3..1cb5851 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,8 +4,8 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla -Version: 5.0.3 -Release: 10%{?dist} +Version: 5.0.4 +Release: 1%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -13,7 +13,7 @@ Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-dnf.patch -Patch2: bugzilla-1301887-File-Slurp-Warnings.patch +Patch2: bugzilla-1438957-concatenate-assets.patch BuildArch: noarch Requires: patchutils @@ -71,6 +71,7 @@ Group: Applications/Publishing Summary: Bugzilla contributed scripts Group: Applications/Publishing BuildRequires: python2 +BuildRequires: python2-rpm-macros %{?perl_default_filter} @@ -177,9 +178,8 @@ rm -rf lib/CGI* rm -f js/yui/*/*.swf # Deal with changing /usr/local paths here instead of via patches -%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py -%{__perl} -pi -e 's|/usr/local/bin/ruby\b|%{_bindir}/ruby|' contrib/*.rb -%{__perl} -pi -e 's|/usr/bin/env python|%{__python}|' contrib/bugzilla-submit/bugzilla-submit +%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python2}|' contrib/*.py +%{__perl} -pi -e 's|/usr/bin/env python|%{__python2}|' contrib/bugzilla-submit/bugzilla-submit grep -rl '/usr/lib/sendmail\b' contrib docs \ | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' @@ -291,6 +291,12 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Feb 18 2018 Emmanuel Seyman - 5.0.4-1 +- Update to 5.0.4 +- Remove backported File::Slurp patch, no longer needed +- use %%{__python2} instead of %%{__python} +- Disable the concatenation of assets (#1438957) + * Wed Feb 07 2018 Iryna Shcherbina - 5.0.3-10 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index e160adf..6ed1eab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b78365742a85cd030c87af12c196e8e9 bugzilla-5.0.3.tar.gz +SHA512 (bugzilla-5.0.4.tar.gz) = 9a508c623406fe71c485f85091c0dec87f7f600190bb88e6b097afaeb94a0bfc32db664609debb2265f21f48734bd040e2f5ecbf40dba0071940f31e195c8dbc From 0a604167b563030a5e8ddabf51c1f7358a4f4e8e Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 18 Feb 2018 17:32:14 +0100 Subject: [PATCH 68/99] get rid of no longer used patch --- bugzilla-1301887-File-Slurp-Warnings.patch | 256 --------------------- 1 file changed, 256 deletions(-) delete mode 100644 bugzilla-1301887-File-Slurp-Warnings.patch diff --git a/bugzilla-1301887-File-Slurp-Warnings.patch b/bugzilla-1301887-File-Slurp-Warnings.patch deleted file mode 100644 index e983cc3..0000000 --- a/bugzilla-1301887-File-Slurp-Warnings.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff -up ./Bugzilla/Config.pm.orig ./Bugzilla/Config.pm ---- ./Bugzilla/Config.pm.orig 2017-03-05 20:38:55.540137017 +0100 -+++ ./Bugzilla/Config.pm 2017-03-05 20:40:18.954614192 +0100 -@@ -16,10 +16,9 @@ use autodie qw(:default); - - use Bugzilla::Constants; - use Bugzilla::Hook; --use Bugzilla::Util qw(trick_taint); -+use Bugzilla::Util qw(trick_taint read_text write_text); - - use JSON::XS; --use File::Slurp; - use File::Temp; - use File::Basename; - -@@ -284,7 +283,7 @@ sub write_params { - my $param_file = bz_locations()->{'datadir'} . '/params.json'; - - my $json_data = JSON::XS->new->canonical->pretty->encode($param_data); -- write_file($param_file, { binmode => ':utf8', atomic => 1 }, \$json_data); -+ write_text($param_file, $json_data); - - # It's not common to edit parameters and loading - # Bugzilla::Install::Filesystem is slow. -@@ -301,8 +300,8 @@ sub read_param_file { - my $file = bz_locations()->{'datadir'} . '/params.json'; - - if (-e $file) { -- my $data; -- read_file($file, binmode => ':utf8', buf_ref => \$data); -+ my $data = read_text($file); -+ trick_taint($data); - - # If params.json has been manually edited and e.g. some quotes are - # missing, we don't want JSON::XS to leak the content of the file -diff -up ./Bugzilla/Install/Filesystem.pm.orig ./Bugzilla/Install/Filesystem.pm ---- ./Bugzilla/Install/Filesystem.pm.orig 2017-03-05 20:40:25.563572768 +0100 -+++ ./Bugzilla/Install/Filesystem.pm 2017-03-05 20:40:53.516397565 +0100 -@@ -31,7 +31,6 @@ use File::Path; - use File::Basename; - use File::Copy qw(move); - use File::Spec; --use File::Slurp; - use IO::File; - use POSIX (); - -@@ -536,7 +535,7 @@ sub update_filesystem { - - # Remove old assets htaccess file to force recreation with correct values. - if (-e "$assetsdir/.htaccess") { -- if (read_file("$assetsdir/.htaccess") =~ //) { -+ if (read_text("$assetsdir/.htaccess") =~ //) { - unlink("$assetsdir/.htaccess"); - } - } -diff -up ./Bugzilla/Install/Requirements.pm.orig ./Bugzilla/Install/Requirements.pm ---- ./Bugzilla/Install/Requirements.pm.orig 2017-03-05 20:41:00.420354292 +0100 -+++ ./Bugzilla/Install/Requirements.pm 2017-03-05 20:41:24.044206223 +0100 -@@ -156,11 +156,6 @@ sub REQUIRED_MODULES { - version => '1.0.1', - }, - { -- package => 'File-Slurp', -- module => 'File::Slurp', -- version => '9999.13', -- }, -- { - package => 'JSON-XS', - module => 'JSON::XS', - # 2.0 is the first version that will work with JSON::RPC. -diff -up ./Bugzilla/JobQueue.pm.orig ./Bugzilla/JobQueue.pm ---- ./Bugzilla/JobQueue.pm.orig 2017-03-05 20:41:33.460147206 +0100 -+++ ./Bugzilla/JobQueue.pm 2017-03-05 20:42:40.659726012 +0100 -@@ -14,8 +14,8 @@ use warnings; - use Bugzilla::Constants; - use Bugzilla::Error; - use Bugzilla::Install::Util qw(install_string); -+use Bugzilla::Util qw(read_text); - use File::Basename; --use File::Slurp; - use base qw(TheSchwartz); - use fields qw(_worker_pidfile); - -@@ -124,7 +124,7 @@ sub subprocess_worker { - # And poll the PID to detect when the working has finished. - # We do this instead of system() to allow for the INT signal to - # interrup us and trigger kill_worker(). -- my $pid = read_file($self->{_worker_pidfile}, err_mode => 'quiet'); -+ my $pid = read_text($self->{_worker_pidfile}, err_mode => 'quiet'); - if ($pid) { - sleep(3) while(kill(0, $pid)); - } -@@ -139,7 +139,7 @@ sub subprocess_worker { - sub kill_worker { - my $self = Bugzilla->job_queue(); - if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) { -- my $worker_pid = read_file($self->{_worker_pidfile}); -+ my $worker_pid = read_text($self->{_worker_pidfile}); - if ($worker_pid && kill(0, $worker_pid)) { - $self->debug("Stopping worker process"); - system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop"; -diff -up ./Bugzilla/Template.pm.orig ./Bugzilla/Template.pm ---- ./Bugzilla/Template.pm.orig 2017-03-05 20:42:47.460683385 +0100 -+++ ./Bugzilla/Template.pm 2017-03-05 20:46:35.942251308 +0100 -@@ -32,7 +32,6 @@ use Digest::MD5 qw(md5_hex); - use File::Basename qw(basename dirname); - use File::Find; - use File::Path qw(rmtree mkpath); --use File::Slurp; - use File::Spec; - use IO::Dir; - use List::MoreUtils qw(firstidx); -@@ -502,7 +501,7 @@ sub _concatenate_css { - next unless -e "$cgi_path/$files{$source}"; - my $file = $skins_path . '/' . md5_hex($source) . '.css'; - if (!-e $file) { -- my $content = read_file("$cgi_path/$files{$source}"); -+ my $content = read_text("$cgi_path/$files{$source}"); - - # minify - $content =~ s{/\*.*?\*/}{}sg; # comments -@@ -512,7 +511,7 @@ sub _concatenate_css { - # rewrite urls - $content =~ s{url\(([^\)]+)\)}{_css_url_rewrite($source, $1)}eig; - -- write_file($file, "/* $files{$source} */\n" . $content . "\n"); -+ write_text($file, "/* $files{$source} */\n" . $content . "\n"); - } - push @minified, $file; - } -@@ -522,9 +521,9 @@ sub _concatenate_css { - if (!-e $file) { - my $content = ''; - foreach my $source (@minified) { -- $content .= read_file($source); -+ $content .= read_text($source); - } -- write_file($file, $content); -+ write_text($file, $content); - } - - $file =~ s/^\Q$cgi_path\E\///o; -@@ -563,7 +562,7 @@ sub _concatenate_js { - next unless -e "$cgi_path/$files{$source}"; - my $file = $skins_path . '/' . md5_hex($source) . '.js'; - if (!-e $file) { -- my $content = read_file("$cgi_path/$files{$source}"); -+ my $content = read_text("$cgi_path/$files{$source}"); - - # minimal minification - $content =~ s#/\*.*?\*/##sg; # block comments -@@ -572,7 +571,7 @@ sub _concatenate_js { - $content =~ s#\n{2,}#\n#g; # blank lines - $content =~ s#(^\s+|\s+$)##g; # whitespace at the start/end of file - -- write_file($file, ";/* $files{$source} */\n" . $content . "\n"); -+ write_text($file, ";/* $files{$source} */\n" . $content . "\n"); - } - push @minified, $file; - } -@@ -582,9 +581,9 @@ sub _concatenate_js { - if (!-e $file) { - my $content = ''; - foreach my $source (@minified) { -- $content .= read_file($source); -+ $content .= read_text($source); - } -- write_file($file, $content); -+ write_text($file, $content); - } - - $file =~ s/^\Q$cgi_path\E\///o; -diff -up ./Bugzilla/Util.pm.orig ./Bugzilla/Util.pm ---- ./Bugzilla/Util.pm.orig 2017-03-05 20:46:54.370135805 +0100 -+++ ./Bugzilla/Util.pm 2017-03-05 20:48:12.190648042 +0100 -@@ -24,7 +24,7 @@ use parent qw(Exporter); - validate_email_syntax check_email_syntax clean_text - get_text template_var display_value disable_utf8 - detect_encoding email_filter -- join_activity_entries); -+ join_activity_entries read_text write_text); - - use Bugzilla::Constants; - use Bugzilla::RNG qw(irand); -@@ -39,6 +39,8 @@ use Scalar::Util qw(tainted blessed); - use Text::Wrap; - use Encode qw(encode decode resolve_alias); - use Encode::Guess; -+use File::Basename qw(dirname); -+use File::Temp qw(tempfile); - - sub trick_taint { - require Carp; -@@ -106,6 +108,27 @@ sub html_quote { - return $var; - } - -+sub read_text { -+ my ($filename) = @_; -+ open my $fh, '<:encoding(utf-8)', $filename; -+ local $/ = undef; -+ my $content = <$fh>; -+ close $fh; -+ return $content; -+} -+ -+sub write_text { -+ my ($filename, $content) = @_; -+ my ($tmp_fh, $tmp_filename) = tempfile('.tmp.XXXXXXXXXX', -+ DIR => dirname($filename), -+ UNLINK => 0, -+ ); -+ binmode $tmp_fh, ':encoding(utf-8)'; -+ print $tmp_fh $content; -+ close $tmp_fh; -+ rename $tmp_filename, $filename; -+} -+ - sub html_light_quote { - my ($text) = @_; - # admin/table.html.tmpl calls |FILTER html_light| many times. -diff -up ./docs/en/rst/installing/linux.rst.orig ./docs/en/rst/installing/linux.rst ---- ./docs/en/rst/installing/linux.rst.orig 2017-03-05 20:48:20.526595794 +0100 -+++ ./docs/en/rst/installing/linux.rst 2017-03-05 20:49:00.375346030 +0100 -@@ -49,7 +49,7 @@ graphviz patchutils gcc 'perl(Apache2::S - 'perl(Daemon::Generic)' 'perl(Date::Format)' 'perl(DateTime)' - 'perl(DateTime::TimeZone)' 'perl(DBI)' 'perl(Digest::SHA)' 'perl(Email::MIME)' - 'perl(Email::Reply)' 'perl(Email::Sender)' 'perl(Encode)' 'perl(Encode::Detect)' --'perl(File::MimeInfo::Magic)' 'perl(File::Slurp)' 'perl(GD)' 'perl(GD::Graph)' -+'perl(File::MimeInfo::Magic)' 'perl(GD)' 'perl(GD::Graph)' - 'perl(GD::Text)' 'perl(HTML::FormatText::WithLinks)' 'perl(HTML::Parser)' - 'perl(HTML::Scrubber)' 'perl(IO::Scalar)' 'perl(JSON::RPC)' 'perl(JSON::XS)' - 'perl(List::MoreUtils)' 'perl(LWP::UserAgent)' 'perl(Math::Random::ISAAC)' -diff -up ./docs/en/rst/installing/windows.rst.orig ./docs/en/rst/installing/windows.rst ---- ./docs/en/rst/installing/windows.rst.orig 2017-03-05 20:49:10.415283101 +0100 -+++ ./docs/en/rst/installing/windows.rst 2017-03-05 20:49:25.631187731 +0100 -@@ -85,7 +85,6 @@ Install the following mandatory modules - * URI - * List-MoreUtils - * Math-Random-ISAAC --* File-Slurp - * JSON-XS - * Win32 - * Win32-API -diff -up ./template/en/default/pages/release-notes.html.tmpl.orig ./template/en/default/pages/release-notes.html.tmpl ---- ./template/en/default/pages/release-notes.html.tmpl.orig 2017-03-05 20:49:34.287133477 +0100 -+++ ./template/en/default/pages/release-notes.html.tmpl 2017-03-05 20:49:52.223021059 +0100 -@@ -174,7 +174,7 @@ -

Required Perl Modules

- - [% INCLUDE req_table reqs = REQUIRED_MODULES -- new = ['File-Slurp','JSON-XS', 'Email-Sender'] -+ new = ['JSON-XS', 'Email-Sender'] - updated = ['DateTime', 'DateTime-TimeZone', - 'Template-Toolkit', 'URI'] %] - From 4b89e8845408481cc211b663049d90b7ef10d1f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:24:38 +0000 Subject: [PATCH 69/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 1cb5851..f273b03 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -291,6 +291,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 5.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 18 2018 Emmanuel Seyman - 5.0.4-1 - Update to 5.0.4 - Remove backported File::Slurp patch, no longer needed From 4907aa1e0854766d2ec35373bdb6ea0e1f282356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Nov 2018 12:53:54 +0100 Subject: [PATCH 70/99] https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 --- bugzilla.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bugzilla.spec b/bugzilla.spec index f273b03..99ebaf1 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -1,3 +1,7 @@ +# This package depends on automagic byte compilation +# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 +%global _python_bytecompile_extra 1 + %define bzinstallprefix %{_datadir} %define bzdatadir %{_sharedstatedir}/bugzilla From 6367c03b4af3c52990f80d3791231765ed998a43 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:40 +0100 Subject: [PATCH 71/99] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- bugzilla.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 99ebaf1..ab69e1a 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -65,15 +65,12 @@ BuildRequires: tex(upquote.sty) %package doc Summary: Bugzilla documentation -Group: Documentation %package doc-build Summary: Tools to generate the Bugzilla documentation -Group: Applications/Publishing %package contrib Summary: Bugzilla contributed scripts -Group: Applications/Publishing BuildRequires: python2 BuildRequires: python2-rpm-macros From 782ff55adc22f532a4c6c15a926add1dca1989be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 15:00:02 +0000 Subject: [PATCH 72/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index ab69e1a..77796f1 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.4 -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -292,6 +292,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 5.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 5.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6373ec6d70256247592b093c6040533e68ee68f4 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 14 Feb 2019 21:37:49 +0100 Subject: [PATCH 73/99] Update to 5.0.6 --- .gitignore | 1 + bugzilla-dnf.patch | 53 +++++++++++++++++----------------- bugzilla-rw-paths.patch | 64 ++++++++++++++++++++--------------------- bugzilla.spec | 25 ++++++---------- sources | 2 +- 5 files changed, 69 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index c0922ac..182d354 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ bugzilla-3.6.1.tar.gz /bugzilla-5.0.2.tar.gz /bugzilla-5.0.3.tar.gz /bugzilla-5.0.4.tar.gz +/release-5.0.6.tar.gz diff --git a/bugzilla-dnf.patch b/bugzilla-dnf.patch index 8824d21..f7e28e8 100644 --- a/bugzilla-dnf.patch +++ b/bugzilla-dnf.patch @@ -1,29 +1,30 @@ ---- bugzilla-5.0.3/Bugzilla/Install/Requirements.pm.orig 2016-11-13 11:03:43.977035344 +0100 -+++ bugzilla-5.0.3/Bugzilla/Install/Requirements.pm 2016-11-13 11:16:26.115320528 +0100 -@@ -304,7 +304,7 @@ sub OPTIONAL_MODULES { +diff -up ./Bugzilla/Install/Requirements.pm.dnf ./Bugzilla/Install/Requirements.pm +--- ./Bugzilla/Install/Requirements.pm.dnf 2019-02-14 20:47:13.396609293 +0100 ++++ ./Bugzilla/Install/Requirements.pm 2019-02-14 20:49:04.733906799 +0100 +@@ -298,7 +298,7 @@ sub OPTIONAL_MODULES { }, { - package => 'JSON-RPC', -- module => 'JSON::RPC', -+ module => 'JSON::RPC::Legacy::Server::CGI', - version => 0, - feature => ['jsonrpc', 'rest'], + package => 'JSON-RPC', +- module => 'JSON::RPC', ++ module => 'JSON::RPC::Legacy::Server::CGI', + version => 0, + feature => ['jsonrpc', 'rest'], }, -@@ -648,7 +648,7 @@ - if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE - && !$check_results->{hide_all}) - { -- print install_string('install_all', { perl => $^X }); -+ # print install_string('install_all', { perl => $^X }); - } - if (!$check_results->{pass}) { - print colored(install_string('installation_failed'), COLOR_ERROR), -@@ -797,7 +797,7 @@ - $package = $module->{package}; - } - else { -- $command = "$^X install-module.pl \%s"; -+ $command = "dnf install \"perl(\%s)\""; - # Non-Windows installations need to use module names, because - # CPAN doesn't understand package names. - $package = $module->{module}; +@@ -657,7 +657,7 @@ sub print_module_instructions { + && !ON_ACTIVESTATE + && !$check_results->{hide_all}) + { +- print install_string('install_all', {perl => $^X}); ++ # print install_string('install_all', {perl => $^X}); + } + if (!$check_results->{pass}) { + print colored(install_string('installation_failed'), COLOR_ERROR), "\n\n"; +@@ -811,7 +811,7 @@ sub install_command { + $package = $module->{package}; + } + else { +- $command = "$^X install-module.pl \%s"; ++ $command = "dnf install \"perl(\%s)\""; + + # Non-Windows installations need to use module names, because + # CPAN doesn't understand package names. diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index 3f60dea..98a5ec9 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,35 +1,35 @@ -diff -up bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths bugzilla-5.0.1/Bugzilla/Constants.pm ---- bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths 2015-09-10 21:36:29.000000000 +0300 -+++ bugzilla-5.0.1/Bugzilla/Constants.pm 2015-09-28 19:20:45.347013271 +0300 -@@ -670,7 +670,7 @@ sub _bz_locations { - $datadir = "data"; - } +diff -up ./Bugzilla/Constants.pm.rw-paths ./Bugzilla/Constants.pm +--- ./Bugzilla/Constants.pm.rw-paths 2019-02-14 20:42:11.280492600 +0100 ++++ ./Bugzilla/Constants.pm 2019-02-14 20:44:39.281581534 +0100 +@@ -700,7 +700,7 @@ sub _bz_locations { + $datadir = "data"; + } -- $datadir = "$libpath/$datadir"; -+ $datadir = "/var/lib/bugzilla/$datadir"; - # We have to return absolute paths for mod_perl. - # That means that if you modify these paths, they must be absolute paths. - return { -@@ -682,11 +682,11 @@ sub _bz_locations { - 'templatedir' => "$libpath/template", - 'template_cache' => "$datadir/template", - 'project' => $project, -- 'localconfig' => "$libpath/$localconfig", -+ 'localconfig' => "/etc/bugzilla/$localconfig", - 'datadir' => $datadir, - 'attachdir' => "$datadir/attachments", - 'skinsdir' => "$libpath/skins", -- 'graphsdir' => "$libpath/graphs", -+ 'graphsdir' => "/var/lib/bugzilla/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 - # not relative to the bugzilla root directory, you'll need to -@@ -695,7 +695,7 @@ sub _bz_locations { - # The script should really generate these graphs directly... - 'webdotdir' => "$datadir/webdot", - 'extensionsdir' => "$libpath/extensions", -- 'assetsdir' => "$datadir/assets", -+ 'assetsdir' => "$libpath/assets", - }; +- $datadir = "$libpath/$datadir"; ++ $datadir = "/var/lib/bugzilla/$datadir"; + + # We have to return absolute paths for mod_perl. + # That means that if you modify these paths, they must be absolute paths. +@@ -714,11 +714,11 @@ sub _bz_locations { + 'templatedir' => "$libpath/template", + 'template_cache' => "$datadir/template", + 'project' => $project, +- 'localconfig' => "$libpath/$localconfig", ++ 'localconfig' => "/etc/bugzilla/$localconfig", + 'datadir' => $datadir, + 'attachdir' => "$datadir/attachments", + 'skinsdir' => "$libpath/skins", +- 'graphsdir' => "$libpath/graphs", ++ 'graphsdir' => "/var/lib/bugzilla/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 +@@ -728,7 +728,7 @@ sub _bz_locations { + # The script should really generate these graphs directly... + 'webdotdir' => "$datadir/webdot", + 'extensionsdir' => "$libpath/extensions", +- 'assetsdir' => "$datadir/assets", ++ 'assetsdir' => "$libpath/assets", + }; } diff --git a/bugzilla.spec b/bugzilla.spec index 77796f1..28ec416 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -8,10 +8,10 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla -Version: 5.0.4 -Release: 3%{?dist} +Version: 5.0.6 +Release: 1%{?dist} License: MPLv1.1 -Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz +Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Source3: bugzilla.cron-daily @@ -160,24 +160,11 @@ Tools to generate the documentation distributed with Bugzilla Contributed scripts and functions for Bugzilla %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-release-%{version} %patch0 -p1 -if [ -f Bugzilla/Constants.pm.orig ]; then - : ERROR: Patch0 did not apply cleanly - exit 1 -fi %patch1 -p1 -if [ -f Bugzilla/Install/Requirements.pm.orig ]; then - : ERROR: Patch1 did not apply cleanly - exit 1 -fi %patch2 -p1 -# Remove bundled libs -rm -rf lib/CGI* -# Remove bundled binary files -rm -f js/yui/*/*.swf - # Deal with changing /usr/local paths here instead of via patches %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python2}|' contrib/*.py %{__perl} -pi -e 's|/usr/bin/env python|%{__python2}|' contrib/bugzilla-submit/bugzilla-submit @@ -285,6 +272,7 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/merge-users.pl %{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl %{bzinstallprefix}/bugzilla/contrib/new-yui.sh +%{bzinstallprefix}/bugzilla/contrib/perl-fmt %{bzinstallprefix}/bugzilla/contrib/recode.pl %{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl %{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl @@ -292,6 +280,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Thu Feb 14 2019 Emmanuel Seyman - 5.0.6-1 +- Update to 5.0.6 + * Thu Jan 31 2019 Fedora Release Engineering - 5.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 6ed1eab..df32c14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bugzilla-5.0.4.tar.gz) = 9a508c623406fe71c485f85091c0dec87f7f600190bb88e6b097afaeb94a0bfc32db664609debb2265f21f48734bd040e2f5ecbf40dba0071940f31e195c8dbc +SHA512 (release-5.0.6.tar.gz) = 941087510e2c742ffd4f9c82f6d93253e04c4bde0b3a992d7bbec7672e02604d5cc8b63a12c86b0af8f7a5f7dd8e2ee4e0fa136b4b343fe4d03fd884796a4d2c From f3b000115f236e851a86485f70ee55037e14fd40 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 10 Mar 2019 11:45:38 +0100 Subject: [PATCH 74/99] Use python3 instead of python2 --- bugzilla.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 28ec416..f301d2d 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -46,7 +46,7 @@ BuildRequires: perl-generators BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(File::Which) BuildRequires: perl(Memoize) -BuildRequires: python2-sphinx +BuildRequires: python3-sphinx BuildRequires: texlive-collection-latexrecommended BuildRequires: texlive-collection-basic BuildRequires: tex(fncychap.sty) @@ -166,8 +166,8 @@ Contributed scripts and functions for Bugzilla %patch2 -p1 # Deal with changing /usr/local paths here instead of via patches -%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python2}|' contrib/*.py -%{__perl} -pi -e 's|/usr/bin/env python|%{__python2}|' contrib/bugzilla-submit/bugzilla-submit +%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py +%{__perl} -pi -e 's|/usr/bin/env python|%{__python3}|' contrib/bugzilla-submit/bugzilla-submit grep -rl '/usr/lib/sendmail\b' contrib docs \ | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' @@ -280,6 +280,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Mar 10 2019 Emmanuel Seyman - 5.0.6-2 +- Use %%{__python3} instead of %%{__python2} +- Depend on python3-sphinx instead of python2-sphinx + * Thu Feb 14 2019 Emmanuel Seyman - 5.0.6-1 - Update to 5.0.6 From bb38698cbc4f92a05a8c4a69f594973ae498dcfd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:39:44 +0000 Subject: [PATCH 75/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index f301d2d..8883d4c 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -280,6 +280,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 5.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Mar 10 2019 Emmanuel Seyman - 5.0.6-2 - Use %%{__python3} instead of %%{__python2} - Depend on python3-sphinx instead of python2-sphinx From a3effd08610c28efab07adb78416e4b1c096329a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 4 Sep 2019 14:35:31 +0200 Subject: [PATCH 76/99] Drop unused build dependency on Python 2 --- bugzilla.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 8883d4c..f8a5e01 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -71,8 +71,7 @@ Summary: Tools to generate the Bugzilla documentation %package contrib Summary: Bugzilla contributed scripts -BuildRequires: python2 -BuildRequires: python2-rpm-macros +BuildRequires: python3-devel %{?perl_default_filter} @@ -280,6 +279,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Sep 04 2019 Miro Hrončok - 5.0.6-4 +- Drop unused build dependency on Python 2 + * Wed Jul 24 2019 Fedora Release Engineering - 5.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2e629944be9b9f83a23862d56cf64d0feed9cf4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 13:23:12 +0000 Subject: [PATCH 77/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index f8a5e01..a6018f9 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 4%{?dist} +Release: 5%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -279,6 +279,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 5.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Sep 04 2019 Miro Hrončok - 5.0.6-4 - Drop unused build dependency on Python 2 From f386283cab61d6c3a2e5d32fa5a92e0ba9297569 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 24 Mar 2020 17:12:37 +0100 Subject: [PATCH 78/99] Add all perl dependencies needed for build --- bugzilla.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index a6018f9..596427b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 5%{?dist} +Release: 6%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -43,9 +43,20 @@ Requires: which # for building docs BuildRequires: latexmk BuildRequires: perl-generators +BuildRequires: perl(constant) +BuildRequires: perl(Cwd) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Basename) BuildRequires: perl(File::Copy::Recursive) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Path) BuildRequires: perl(File::Which) +BuildRequires: perl(lib) BuildRequires: perl(Memoize) +BuildRequires: perl(parent) +BuildRequires: perl(Pod::Simple) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) BuildRequires: python3-sphinx BuildRequires: texlive-collection-latexrecommended BuildRequires: texlive-collection-basic @@ -279,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Tue Mar 24 2020 Jitka Plesnikova - 5.0.6-6 +- Add all perl dependencies needed for build + * Tue Jan 28 2020 Fedora Release Engineering - 5.0.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 04b6f9dffde24e1d14414210ac4f3f59d75d3480 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:27:54 +0000 Subject: [PATCH 79/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 596427b..3a45d95 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 6%{?dist} +Release: 7%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -290,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 5.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Mar 24 2020 Jitka Plesnikova - 5.0.6-6 - Add all perl dependencies needed for build From 688bb60ec79368c080968817260d1f19f76bdf77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:16:58 +0000 Subject: [PATCH 80/99] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 3a45d95..904abff 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -9,7 +9,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 7%{?dist} +Release: 8%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -290,6 +290,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 5.0.6-8 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 5.0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f1620ad7fc28dfee4cb5136cf0a5750bb12e196b Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 29 Sep 2020 20:30:16 +0200 Subject: [PATCH 81/99] Remove bytecompilation macro and add upstream mail patch Remove bytecompilation macro and add upstream mail patch --- bugzilla-1855962-non-html-mail.patch | 19 +++++++++++++++++++ bugzilla.spec | 13 +++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 bugzilla-1855962-non-html-mail.patch diff --git a/bugzilla-1855962-non-html-mail.patch b/bugzilla-1855962-non-html-mail.patch new file mode 100644 index 0000000..0fd0637 --- /dev/null +++ b/bugzilla-1855962-non-html-mail.patch @@ -0,0 +1,19 @@ +diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm +index 18795d735..2075a71e1 100644 +--- a/Bugzilla/BugMail.pm ++++ b/Bugzilla/BugMail.pm +@@ -495,10 +495,10 @@ sub _generate_bugmail { + } + + my $email = Bugzilla::MIME->new($msg_header); +- if (scalar(@parts) == 1) { +- $email->content_type_set($parts[0]->content_type); +- } +- else { ++ ++ # If there's only one part, we don't need to set the overall content type ++ # because Email::MIME will automatically take it from that part (bug 1657496) ++ if (scalar(@parts) > 1) { + $email->content_type_set('multipart/alternative'); + + # Some mail clients need same encoding for each part, even empty ones. diff --git a/bugzilla.spec b/bugzilla.spec index 904abff..0dbbcd7 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -1,7 +1,3 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - %define bzinstallprefix %{_datadir} %define bzdatadir %{_sharedstatedir}/bugzilla @@ -9,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 8%{?dist} +Release: 9%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -18,6 +14,8 @@ Source3: bugzilla.cron-daily Patch0: bugzilla-rw-paths.patch Patch1: bugzilla-dnf.patch Patch2: bugzilla-1438957-concatenate-assets.patch +# https://bug1657496.bmoattachments.org/attachment.cgi?id=9169528 +Patch3: bugzilla-1855962-non-html-mail.patch BuildArch: noarch Requires: patchutils @@ -290,13 +288,16 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Tue Sep 29 2020 Emmanuel Seyman - 5.0.6-9 +- Remove automagic Python bytecompilation macro +- Include upstream patch for text mails (#1855962) + * Sat Aug 01 2020 Fedora Release Engineering - 5.0.6-8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Mon Jul 27 2020 Fedora Release Engineering - 5.0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Tue Mar 24 2020 Jitka Plesnikova - 5.0.6-6 - Add all perl dependencies needed for build From 978fff30d074432f26942c5c0c242943de103284 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 20 Oct 2020 21:26:14 +0200 Subject: [PATCH 82/99] Apply patch --- bugzilla.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 0dbbcd7..24211ac 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 9%{?dist} +Release: 10%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -172,13 +172,14 @@ Contributed scripts and functions for Bugzilla %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Deal with changing /usr/local paths here instead of via patches -%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py -%{__perl} -pi -e 's|/usr/bin/env python|%{__python3}|' contrib/bugzilla-submit/bugzilla-submit +/usr/bin/perl -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py +/usr/bin/rm -rf contrib/bugzilla-submit grep -rl '/usr/lib/sendmail\b' contrib docs \ -| xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' +| xargs /usr/bin/perl -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' %build # Build docs @@ -268,7 +269,6 @@ popd > /dev/null) %defattr(-,root,apache,-) %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.rhel %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.suse -%{bzinstallprefix}/bugzilla/contrib/bugzilla-submit %{bzinstallprefix}/bugzilla/contrib/bzdbcopy.pl %{bzinstallprefix}/bugzilla/contrib/bz_webservice_demo.pl %{bzinstallprefix}/bugzilla/contrib/cmdline @@ -288,6 +288,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Mon Oct 19 2020 Emmanuel Seyman - 5.0.6-10 +- Replace calls to %%{__perl} with /usr/bin/perl +- Remove contrib/bugzilla-submit (no longers works) (#1835451) + * Tue Sep 29 2020 Emmanuel Seyman - 5.0.6-9 - Remove automagic Python bytecompilation macro - Include upstream patch for text mails (#1855962) From 807cf7d7ba4d638f4c3da28ca5b56f471baa3ef2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:27:56 +0000 Subject: [PATCH 83/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 24211ac..e6f9f6a 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 10%{?dist} +Release: 11%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -288,6 +288,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.0.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 19 2020 Emmanuel Seyman - 5.0.6-10 - Replace calls to %%{__perl} with /usr/bin/perl - Remove contrib/bugzilla-submit (no longers works) (#1835451) From 0bba40ef02fb5321a66f7e2b7f1a28c6bb18112e Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 14 Feb 2021 09:49:57 +0100 Subject: [PATCH 84/99] Add make to BuildRequires --- bugzilla.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index e6f9f6a..b8528cd 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 11%{?dist} +Release: 12%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -40,6 +40,7 @@ Requires: which # for building docs BuildRequires: latexmk +BuildRequires: make BuildRequires: perl-generators BuildRequires: perl(constant) BuildRequires: perl(Cwd) @@ -288,6 +289,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Feb 14 2021 Emmanuel Seyman - 5.0.6-12 +- Add make to BuildRequires + * Tue Jan 26 2021 Fedora Release Engineering - 5.0.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1bc122b71d780338175d6a38ea710750285ea3bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:59:30 +0000 Subject: [PATCH 85/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From deaa460bbaaa30be79da06e809608ee1f616b2b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:56:51 +0000 Subject: [PATCH 86/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index b8528cd..4da0fef 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 12%{?dist} +Release: 13%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -289,6 +289,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 5.0.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Feb 14 2021 Emmanuel Seyman - 5.0.6-12 - Add make to BuildRequires From 3fd8f2ba982bf872d8d897855f440c2bc5131f2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:40:35 +0000 Subject: [PATCH 87/99] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 4da0fef..b6e42b3 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 13%{?dist} +Release: 14%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -289,6 +289,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 5.0.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 5.0.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ea9e67afcb1d517dc33e180f626c79714a1e8ea8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:21:06 +0000 Subject: [PATCH 88/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index b6e42b3..d50c3f5 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 14%{?dist} +Release: 15%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -289,6 +289,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 5.0.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 5.0.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 18ce8733c536b5c44f0f3cf97234f78852c367e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:15:56 +0000 Subject: [PATCH 89/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index d50c3f5..923333b 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 15%{?dist} +Release: 16%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -289,6 +289,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 5.0.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 5.0.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8c3a898b84a6e7e034b6bd133c4815e4220db2e5 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 12 Feb 2023 19:12:45 +0100 Subject: [PATCH 90/99] Add missing buildrequirement on tgtermes.sty --- bugzilla.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 923333b..942ad22 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 16%{?dist} +Release: 17%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -62,6 +62,7 @@ BuildRequires: texlive-collection-basic BuildRequires: tex(fncychap.sty) BuildRequires: tex(framed.sty) BuildRequires: tex(multirow.sty) +BuildRequires: tex(tgtermes.sty) BuildRequires: tex(threeparttable.sty) BuildRequires: tex(titlesec.sty) BuildRequires: tex(wrapfig.sty) @@ -289,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun Feb 12 2023 Emmanuel Seyman - 5.0.6-17 +- Add missing buildrequirement on tgtermes.sty (#2160038) + * Wed Jan 18 2023 Fedora Release Engineering - 5.0.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a7a641dfd5ef847fd63aaf7894e5e2a28bd27fb0 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Sun, 7 May 2023 12:24:16 +0200 Subject: [PATCH 91/99] Patch to build against Sphinx 6.1.3 --- bugzilla-2180465-sphinx-build.patch | 11 +++++++++++ bugzilla.spec | 16 +++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 bugzilla-2180465-sphinx-build.patch diff --git a/bugzilla-2180465-sphinx-build.patch b/bugzilla-2180465-sphinx-build.patch new file mode 100644 index 0000000..f6bdebb --- /dev/null +++ b/bugzilla-2180465-sphinx-build.patch @@ -0,0 +1,11 @@ +diff -up ./docs/en/rst/conf.py.orig ./docs/en/rst/conf.py +--- ./docs/en/rst/conf.py.orig 2023-04-17 12:51:46.689758866 +0200 ++++ ./docs/en/rst/conf.py 2023-04-17 22:43:10.003583492 +0200 +@@ -391,5 +391,5 @@ if on_rtd: + else: + base_api_url = '../integrating/api/' + +-extlinks = {'bug': ('https://bugzilla.mozilla.org/show_bug.cgi?id=%s', 'bug '), +- 'api': (base_api_url + '%s', '')} ++extlinks = {'bug': ('https://bugzilla.mozilla.org/show_bug.cgi?id=%s', 'bug %s'), ++ 'api': (base_api_url + '%s', '%s')} diff --git a/bugzilla.spec b/bugzilla.spec index 942ad22..def372d 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 17%{?dist} +Release: 18%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -16,6 +16,7 @@ Patch1: bugzilla-dnf.patch Patch2: bugzilla-1438957-concatenate-assets.patch # https://bug1657496.bmoattachments.org/attachment.cgi?id=9169528 Patch3: bugzilla-1855962-non-html-mail.patch +Patch4: bugzilla-2180465-sphinx-build.patch BuildArch: noarch Requires: patchutils @@ -171,10 +172,11 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-release-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 # Deal with changing /usr/local paths here instead of via patches /usr/bin/perl -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py @@ -290,6 +292,10 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Sun May 07 2023 Emmanuel Seyman - 5.0.6-18 +- Patch to build against Sphinx 6.1.3 (#2180465) +- Use new patch syntax + * Sun Feb 12 2023 Emmanuel Seyman - 5.0.6-17 - Add missing buildrequirement on tgtermes.sty (#2160038) From 8f1c7811318b1bae905ff77e9636b557f9028f4b Mon Sep 17 00:00:00 2001 From: FAS Marie Loise Nolden Date: Sat, 27 May 2023 19:54:36 +0000 Subject: [PATCH 92/99] Update bugzilla.spec --- bugzilla.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index def372d..7ba4723 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -67,13 +67,11 @@ BuildRequires: tex(tgtermes.sty) BuildRequires: tex(threeparttable.sty) BuildRequires: tex(titlesec.sty) BuildRequires: tex(wrapfig.sty) -%if 0%{?fedora} BuildRequires: tex(capt-of.sty) BuildRequires: tex(eqparbox.sty) BuildRequires: tex(needspace.sty) BuildRequires: tex(tabulary.sty) BuildRequires: tex(upquote.sty) -%endif %package doc Summary: Bugzilla documentation From 0ad697b1b87d3912d77a55b7ec5a6cd382fce545 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:02:48 +0000 Subject: [PATCH 93/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 7ba4723..31fdc89 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 18%{?dist} +Release: 19%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -290,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 5.0.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun May 07 2023 Emmanuel Seyman - 5.0.6-18 - Patch to build against Sphinx 6.1.3 (#2180465) - Use new patch syntax From 50da18f975ffc55839b91986c7f37772b3983373 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:48:23 +0000 Subject: [PATCH 94/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 31fdc89..f145355 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 19%{?dist} +Release: 20%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -290,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 5.0.6-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 5.0.6-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From fcdfd48db8210e5db29ee2ebd464e43436da83d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:56:08 +0000 Subject: [PATCH 95/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index f145355..d18e957 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 20%{?dist} +Release: 21%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -290,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 5.0.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 5.0.6-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 49ccd136a545e92dd26126bec761fd749533434a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:42:27 +0000 Subject: [PATCH 96/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index d18e957..27b79a9 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 21%{?dist} +Release: 22%{?dist} License: MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -290,6 +290,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 5.0.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 23 2024 Fedora Release Engineering - 5.0.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1f470af09a09f52e747a63a1f3cb34d001e9ae09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 08:20:19 +0200 Subject: [PATCH 97/99] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- bugzilla.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index 27b79a9..f98c640 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,8 +5,9 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 22%{?dist} -License: MPLv1.1 +Release: 23%{?dist} +# Automatically converted from old format: MPLv1.1 - review is highly recommended. +License: LicenseRef-Callaway-MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla @@ -290,6 +291,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Aug 28 2024 Miroslav Suchý - 5.0.6-23 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 5.0.6-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6c0b734d1b8f33e0c9ec87298e9a6de9e52c9a2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:00:24 +0000 Subject: [PATCH 98/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index f98c640..3088986 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 23%{?dist} +Release: 24%{?dist} # Automatically converted from old format: MPLv1.1 - review is highly recommended. License: LicenseRef-Callaway-MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz @@ -291,6 +291,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 5.0.6-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Miroslav Suchý - 5.0.6-23 - convert license to SPDX From 8d879f23d369f8180c8503dd5f6e6345dac60dd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:56:47 +0000 Subject: [PATCH 99/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 3088986..41c4a86 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -5,7 +5,7 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla Version: 5.0.6 -Release: 24%{?dist} +Release: 25%{?dist} # Automatically converted from old format: MPLv1.1 - review is highly recommended. License: LicenseRef-Callaway-MPLv1.1 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz @@ -291,6 +291,9 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 5.0.6-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 5.0.6-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild