From 84613f7414a08447a540e9b44321ad539e3fbe4b Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: May 24 2020 15:58:13 +0000 Subject: Drop patch --- diff --git a/sympa-6.2.54-fix_urlize_with_older_MIME_tools.patch b/sympa-6.2.54-fix_urlize_with_older_MIME_tools.patch deleted file mode 100644 index ac39ae7..0000000 --- a/sympa-6.2.54-fix_urlize_with_older_MIME_tools.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 80ee8503d314d2947e57fe767fbb614ef0abe400 Mon Sep 17 00:00:00 2001 -From: IKEDA Soji -Date: Wed, 26 Feb 2020 11:48:00 +0900 -Subject: [PATCH] urlize: File names in URLized parts are incorrect (#889) - Recommended file name won't be decoded with earlier version of MIME-tools. - ---- - src/lib/Sympa/Message.pm | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/src/lib/Sympa/Message.pm b/src/lib/Sympa/Message.pm -index 467f3069c..bd100086b 100644 ---- a/src/lib/Sympa/Message.pm -+++ b/src/lib/Sympa/Message.pm -@@ -2181,9 +2181,16 @@ sub _urlize_one_part { - my $filename; - if ($head->recommended_filename) { - $filename = $head->recommended_filename; -- # MIME-tools >= 5.501 returns Unicode value ("utf8 flag" on). -- $filename = Encode::encode_utf8($filename) -- if Encode::is_utf8($filename); -+ if (Encode::is_utf8($filename)) { -+ # MIME-tools >= 5.501 returns Unicode value ("utf8 flag" on). -+ $filename = Encode::encode_utf8($filename); -+ } elsif ($filename !~ /[^\s\x20-\x7E]/ -+ and $filename =~ /=[?][-.+\w]+[?][BQ][?].*[?]=/i) { -+ # Earlier versions of MIME-tools won't decode (nonstandard) -+ # RFC-2047-encoded parameters. -+ $filename = MIME::EncWords::decode_mimewords($filename, -+ Charset => 'UTF-8') // $filename; -+ } - } else { - my $content_disposition = - lc($entity->head->mime_attr('Content-Disposition') // ''); diff --git a/sympa.spec b/sympa.spec index 9b3b6eb..c66e288 100644 --- a/sympa.spec +++ b/sympa.spec @@ -123,8 +123,6 @@ Patch5: sympa-6.2.36-wizard-mhonarc.patch Patch13: sympa-6.2.19b.1-confdef.patch # Disable sympa service by default Patch14: sympa-6.2-initdefault.patch -# https://patch-diff.githubusercontent.com/raw/sympa-community/sympa/pull/890.patch -Patch15: sympa-6.2.54-fix_urlize_with_older_MIME_tools.patch BuildRequires: gcc, make BuildRequires: gettext @@ -486,7 +484,6 @@ Sympa documentation for developers. %patch5 -p0 -b .mhonarc %patch13 -p0 -b .confdef %patch14 -p0 -b .initdefault -%patch15 -p1 %build