From 12e26d1eff3da45b5708ad490d99a0acaeb5f31c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Aug 21 2023 15:29:01 +0000 Subject: 3.008 bump (bug #2230299) --- diff --git a/.gitignore b/.gitignore index 37a886f..da613c4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Mail-Box-IMAP4-3.005.tar.gz /Mail-Box-IMAP4-3.006.tar.gz /Mail-Box-IMAP4-3.007.tar.gz +/Mail-Box-IMAP4-3.008.tar.gz diff --git a/Mail-Box-IMAP4-3.007-Adapt-tests-to-Mail-Message-3.013.patch b/Mail-Box-IMAP4-3.007-Adapt-tests-to-Mail-Message-3.013.patch deleted file mode 100644 index 0624eaf..0000000 --- a/Mail-Box-IMAP4-3.007-Adapt-tests-to-Mail-Message-3.013.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 168ecffc014fc341853f8388ecc9cc1f02ec01f5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 3 Aug 2023 12:22:49 +0200 -Subject: [PATCH] Adapt tests to Mail-Message-3.013 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -After upgrading Mail-Message from 3.012 to 3.013, t/20server-fetch.t -fails like this: - - # Failed test '...body' - # at t/20server-fetch.t line 37. - # got: '("TEXT" "PLAIN" ("charset" "us-ascii") "" NIL "8BIT" 10 2) - # ' - # expected: '("TEXT" "PLAIN" ("charset" "utf-8") "" NIL "8BIT" 10 2) - # ' - -This is caused by an intentional change in Mail-Message which changed detection -of character set . - -This patch fixes the tests by explicitly setting the character set. - -CPAN RT#149119 - -Signed-off-by: Petr Písař ---- - t/20server-fetch.t | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/t/20server-fetch.t b/t/20server-fetch.t -index b8fb1b8..4ec7fca 100755 ---- a/t/20server-fetch.t -+++ b/t/20server-fetch.t -@@ -8,6 +8,7 @@ use warnings; - use Mail::Box::Test; - use Mail::Message; - use Mail::Message::Body::Lines; -+use Mail::Message::Head::Complete; - use Mail::Server::IMAP4::Fetch; - - use Test::More tests => 44; -@@ -20,6 +21,7 @@ my $msg = Mail::Message->build - , Date => 'now' - , Subject => 'Life of Brian' - , 'Message-ID' => 'unique' -+ , 'Content-Type' => 'text/plain; charset="utf-8"' - - , data => [ "two\n", "lines\n" ] - ); -@@ -51,20 +53,28 @@ __ENVELOPE - # - - my $data = Mail::Message::Body::Lines->new -+ ( mime_type => 'text/plain' -+ , charset => 'utf-8' -+ , data => [ "two\n", "lines\n" ] -+ ); -+ -+my $attach = Mail::Message::Body::Lines->new - ( mime_type => 'audio/mpeg3' - , transfer_encoding => 'base64' - , charset => 'utf8' - , data => "ABBA\n" - ); - --my $mp = Mail::Message->build -+my $head = Mail::Message::Head::Complete->build - ( From => 'me' - , Date => 'now' - , Subject => 'multi' - , 'Message-ID' => 'unique' -+ ); - -- , data => [ "two\n", "lines\n" ] -- , attach => $data -+my $mp = Mail::Message->new -+ ( head => $head -+ , body => $data->attach($attach) - ); - - ok(defined $mp, "Simple multipart"); --- -2.41.0 - diff --git a/Mail-Box-IMAP4-3.007-Create-a-temporary-directory-with-File-Temp.patch b/Mail-Box-IMAP4-3.007-Create-a-temporary-directory-with-File-Temp.patch deleted file mode 100644 index b1e76c8..0000000 --- a/Mail-Box-IMAP4-3.007-Create-a-temporary-directory-with-File-Temp.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0b796dc5e1fbf7cb781bb3e45ca909b8c8529867 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 3 Aug 2023 13:30:34 +0200 -Subject: [PATCH] Create a temporary directory with File::Temp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -t/21server-list.t fails if run from a read-only location. The reason -is that it attempts to create a temporary directory in a current -working directory. - -This patch fixes it by using File::Temp. That core Perl module -utilizes a location dedicated for temporary files which is usually -writable. That module also simplifies cleaning the directory. - -Signed-off-by: Petr Písař ---- - Makefile.PL | 1 + - t/21server-list.t | 7 ++----- - 2 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/Makefile.PL b/Makefile.PL -index e2a2442..80e70d6 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -13,6 +13,7 @@ my %prereq = - , File::Compare => 0 - , File::Copy => 0 - , File::Spec => 0 -+ , File::Temp => 0.19 - , IO::Socket::IP => 0 - , List::Util => 0 - , Mail::IMAPClient => 3.42 -diff --git a/t/21server-list.t b/t/21server-list.t -index c20eb72..996f9fc 100755 ---- a/t/21server-list.t -+++ b/t/21server-list.t -@@ -6,7 +6,7 @@ - use strict; - use warnings; - --use Mail::Box::Test; -+use File::Temp 0.19 (); - use Mail::Box::MH; - use Mail::Box::Identity; - use Mail::Server::IMAP4::List; -@@ -32,9 +32,7 @@ my @boxes = - - # Create the directory hierarchy - --my $top = '60imap-test'; --clean_dir($top); --mkdir $top or die "$top: $!"; -+my $top = File::Temp->newdir(); - - foreach my $box (@boxes) - { my $dir = "$top/$box"; -@@ -271,4 +269,3 @@ is(str($imap->list('/usr/staff/jones', '')), <<'__DELIM'); - (\Noselect) "/" / - __DELIM - --clean_dir($top); --- -2.41.0 - diff --git a/perl-Mail-Box-IMAP4.spec b/perl-Mail-Box-IMAP4.spec index 4d72131..42817d7 100644 --- a/perl-Mail-Box-IMAP4.spec +++ b/perl-Mail-Box-IMAP4.spec @@ -1,16 +1,10 @@ Name: perl-Mail-Box-IMAP4 -Version: 3.007 -Release: 14%{?dist} +Version: 3.008 +Release: 1%{?dist} Summary: Handle IMAP4 folders as client License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Mail-Box-IMAP4 Source0: https://cpan.metacpan.org/authors/id/M/MA/MARKOV/Mail-Box-IMAP4-%{version}.tar.gz -# Adapt tests to Mail-Message-3.013, bug #2225452, CPAN RT#149119, -# proposed to the upstream. -Patch0: Mail-Box-IMAP4-3.007-Adapt-tests-to-Mail-Message-3.013.patch -# Make tests not to write into CWD, proposed to the upstream, -# . -Patch1: Mail-Box-IMAP4-3.007-Create-a-temporary-directory-with-File-Temp.patch BuildArch: noarch # Build BuildRequires: coreutils @@ -48,7 +42,7 @@ BuildRequires: perl(File::Temp) >= 0.19 BuildRequires: perl(Mail::Box::Identity) BuildRequires: perl(Mail::Box::MH) BuildRequires: perl(Mail::Box::Test) >= 3 -BuildRequires: perl(Mail::Message) >= 3 +BuildRequires: perl(Mail::Message) >= 3.013 BuildRequires: perl(Mail::Message::Body::Lines) >= 3 BuildRequires: perl(Test::More) Requires: perl(Mail::Box) >= 3.007 @@ -91,7 +85,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: perl-Mail-Server-IMAP4 = %{?epoch:%{epoch}:}%{version}-%{release} Requires: perl-Test-Harness Requires: perl(Mail::Box::Test) >= 3 -Requires: perl(Mail::Message) >= 3 +Requires: perl(Mail::Message) >= 3.013 Requires: perl(Mail::Message::Body::Lines) >= 3 %description tests @@ -149,6 +143,9 @@ make test %{_libexecdir}/%{name} %changelog +* Mon Aug 21 2023 Jitka Plesnikova - 3.008-1 +- 3.008 bump (bug #2230299) + * Thu Aug 03 2023 Petr Pisar - 3.007-14 - Adapt tests to Mail-Message-3.013 (bug #2225452) - Specify all dependencies diff --git a/sources b/sources index 874ba45..f123b7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Mail-Box-IMAP4-3.007.tar.gz) = f2cdf0063ec5ba66b9e29aa71c827aa5eb7f14cb25d139ff9dcdbcd111ebf5507763f501d7ca80b4269961cee83a91d8b282191e3beb0711536a505453342faf +SHA512 (Mail-Box-IMAP4-3.008.tar.gz) = 4f65944105547546b96ba5e465d29c4692cf2ee15801b25012c9e33cbac00b1d90c9d231e21415631a3658495e77da03364af8ad0b69dc2ca4d39924a52b9640