From 27ac7e4dc286647b69c44f01560c2793970071a8 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emman...@seyman.fr>
Date: Mon, 16 May 2016 22:35:36 +0200
Subject: Update to 5.0.3, dropping backported patch
---
.gitignore | 1 +
bugzilla-email-encode.patch | 50 ---------------------------------------------
bugzilla.spec | 14 +++++--------
sources | 2 +-
4 files changed, 7 insertions(+), 60 deletions(-)
delete mode 100644 bugzilla-email-encode.patch
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-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
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 <emman...@seyman.fr> - 5.0.3-1
+- Update to 5.0.3, dropping backported patch
+
* Sun May 01 2016 Emmanuel Seyman <emman...@seyman.fr> - 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
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/bugzilla.git/commit/?h=f24&id=27ac7e4dc286647b69c44f01560c2793970071a8
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
