From 8cb63c26b1a459e73b16703b4ecb3a61c7ba2ff1 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <[email protected]>
Date: Tue, 17 May 2016 23:10:47 +0200
Subject: Update to 4.4.12, dropping backported patch
---
.gitignore | 1 +
bugzilla-email-encode.patch | 51 ---------------------------------------------
bugzilla.spec | 10 ++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 57 deletions(-)
delete mode 100644 bugzilla-email-encode.patch
diff --git a/.gitignore b/.gitignore
index ec294de..c624637 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-4.4.12.tar.gz
diff --git a/bugzilla-email-encode.patch b/bugzilla-email-encode.patch
deleted file mode 100644
index 21a457f..0000000
--- a/bugzilla-email-encode.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
-index 6464015..1149eb0 100644
---- a/Bugzilla/Mailer.pm
-+++ b/Bugzilla/Mailer.pm
-@@ -19,8 +19,6 @@ use Bugzilla::Util;
-
- use Date::Format qw(time2str);
-
--use Encode qw(encode);
--use Encode::MIME::Header;
- use Email::Address;
- use Email::MIME;
- # Return::Value 1.666002 pollutes the error log with warnings about this
-@@ -71,22 +69,12 @@ sub MessageToMTA {
- # MIME-Version must be set otherwise some mailsystems ignore the charset
- $email->header_set('MIME-Version', '1.0') if
!$email->header('MIME-Version');
-
-- # Encode the headers correctly in quoted-printable
-+ # Encode the headers correctly.
- foreach my $header ($email->header_names) {
- my @values = $email->header($header);
-- # We don't recode headers that happen multiple times.
-- next if scalar(@values) > 1;
-- if (my $value = $values[0]) {
-- if (Bugzilla->params->{'utf8'} && !utf8::is_utf8($value)) {
-- utf8::decode($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);
-- $email->header_set($header, $encoded);
-- }
-+ $email->header_str_set($header, @values);
- }
-
- my $from = $email->header('From');
-diff --git a/attachment.cgi b/attachment.cgi
-index e003e1f..319e46f 100755
---- a/attachment.cgi
-+++ b/attachment.cgi
-@@ -31,6 +31,7 @@ use Bugzilla::Token;
- use Bugzilla::Keyword;
-
- 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 3f8c32d..7dd8074 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.11
+Version: 4.4.12
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,8 +14,6 @@ Source2: README.fedora.bugzilla
Source3: bugzilla.cron-daily
Patch0: bugzilla-rw-paths.patch
Patch1: bugzilla-yum.patch
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1246228
-Patch2: bugzilla-email-encode.patch
BuildArch: noarch
Requires: webserver, patchutils, perl(SOAP::Lite), which
@@ -106,7 +104,6 @@ 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
@@ -232,6 +229,9 @@ popd > /dev/null)
%{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
%changelog
+* Tue May 17 2016 Emmanuel Seyman <[email protected]> - 4.4.12-1
+- Update to 4.4.12, dropping backported patch
+
* Sun May 01 2016 Emmanuel Seyman <[email protected]> - 4.4.11-2
- backport patch to prevent email address encoding
diff --git a/sources b/sources
index 17f0e7a..2468bde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3380aba9b4f4b606a804b00f1a56bf1 bugzilla-4.4.11.tar.gz
+32b2ddb6d544e3599043cc58a23a0c5d bugzilla-4.4.12.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/bugzilla.git/commit/?h=f23&id=8cb63c26b1a459e73b16703b4ecb3a61c7ba2ff1
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
[email protected]
http://lists.fedoraproject.org/admin/lists/[email protected]
