Update to 5.0.2

.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

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

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};

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",
      };
  }
+ 

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 <emmanuel@seyman.fr> - 4.4.11-1
-- Update to 4.4.11
+* Sat Jan 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 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 <emmanuel@seyman.fr> - 4.4.10-1
-- Update to 4.4.10
-- Use %%license to flag the LICENSE file
+* Mon Sep 28 2015 Tuomo Soini <tis@foobar.fi> - 5.0.1-3
+- fix data directory permissions and config dir permissions
 
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+* Mon Sep 28 2015 Tuomo Soini <tis@foobar.fi> - 5.0.1-2
+- Fix file owners to be mostly correct
+- rewrite patching of paths in Constants.pm
+
+* Fri Sep 11 2015 Tuomo Soini <tis@foobar.fi> - 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 <tis@foobar.fi> - 4.4.10-1
+- Update to 4.4.10 to fix CVE-2015-4499
+
+* Wed Jun 17 2015 Tuomo Soini <tis@foobar.fi> - 4.4.9-1
+- Update to 4.4.9 for several important bug fixes
+
+* Tue Jun 16 2015 Tuomo Soini <tis@foobar.fi> - 4.4.8-1
+- Import from rawhide (F23)
 
 * Sat Jan 31 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.8-1
 - Update to 4.4.8 (fixes regressions in 4.4.7 which itself

sources

@@ -1 +1 @@
-d3380aba9b4f4b606a804b00f1a56bf1  bugzilla-4.4.11.tar.gz
+84e6a070d425846d55a1f926e883957e  bugzilla-5.0.2.tar.gz