From 9525c948dbd29022486d163145a8fa9bff998bd9 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Thu, 14 Feb 2019 21:37:49 +0100 Subject: [PATCH] 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 f273b03..fe0a484 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,10 +4,10 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla -Version: 5.0.4 -Release: 2%{?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 @@ -159,24 +159,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 @@ -284,6 +271,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 @@ -291,6 +279,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 Jul 12 2018 Fedora Release Engineering - 5.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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