.gear/rules | 2 + .../tags/ddd54d8f1b367aa9dac35462c11f20973414bb99 | 13 ++ .gear/tags/list | 1 + lib/MIME/Decoder.pm | 4 +- lib/MIME/Decoder/QuotedPrint.pm | 25 +--- lib/MIME/Words.pm | 1 - perl-MIME-tools.spec | 158 +++++++++++++++++++++ t/Decoder.t | 5 +- 8 files changed, 179 insertions(+), 30 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..709f6dd --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @version@:. name=MIME-tools-@version@ +diff: @version@:. . name=perl-MIME-tools-@version@-@release@.patch diff --git a/.gear/tags/ddd54d8f1b367aa9dac35462c11f20973414bb99 b/.gear/tags/ddd54d8f1b367aa9dac35462c11f20973414bb99 new file mode 100644 index 0000000..885998b --- /dev/null +++ b/.gear/tags/ddd54d8f1b367aa9dac35462c11f20973414bb99 @@ -0,0 +1,13 @@ +object 09dce6982fadea620a8006315d40ff61c8700437 +type commit +tag 5.510 +tagger Igor Vlasenko 1657177433 +0300 + +5.510 +-----BEGIN PGP SIGNATURE----- + +iG8EABECAC8WIQQIPAL4FLbkB2MCkecNf0ykhFonYwUCYsaFWREcdml5QGFsdGxp +bnV4Lm9yZwAKCRANf0ykhFonY5E4AJ0VO5VNlqK5ctSvSX6KV/AmkaUleQCgj2Qi +FpbAMV/WgHWHhxUjyVP2tIM= +=XHmi +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..5a45668 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +ddd54d8f1b367aa9dac35462c11f20973414bb99 5.510 diff --git a/lib/MIME/Decoder.pm b/lib/MIME/Decoder.pm index 5e48115..c2b5119 100644 --- a/lib/MIME/Decoder.pm +++ b/lib/MIME/Decoder.pm @@ -122,7 +122,7 @@ use Carp; ### 'x-gzip' => 'MIME::Decoder::Gzip64', ### This is no longer installed by default, since not all folks have gzip: -### 'x-gzip64' => 'MIME::Decoder::Gzip64', + 'x-gzip64' => 'MIME::Decoder::Gzip64', # But we do have. ); ### The package version, both in 1.23 style *and* usable by MakeMaker: @@ -176,7 +176,7 @@ sub new { ### Create the new object (if we can): my $self = { MD_Encoding => lc($encoding) }; unless (eval "require $concrete_name;") { - carp $@; + warn $@; return undef; } bless $self, $concrete_name; diff --git a/lib/MIME/Decoder/QuotedPrint.pm b/lib/MIME/Decoder/QuotedPrint.pm index 89bb3da..6eae4b7 100644 --- a/lib/MIME/Decoder/QuotedPrint.pm +++ b/lib/MIME/Decoder/QuotedPrint.pm @@ -53,34 +53,13 @@ it and/or modify it under the same terms as Perl itself. use vars qw(@ISA $VERSION); use MIME::Decoder; -use MIME::QuotedPrint; +use MIME::QuotedPrint 3.03; @ISA = qw(MIME::Decoder); # The package version, both in 1.23 style *and* usable by MakeMaker: $VERSION = "5.510"; -#------------------------------ -# If we have MIME::QuotedPrint 3.03 or later, use the three-argument -# version. If we have an earlier version of MIME::QuotedPrint, we -# may get the wrong results. However, on some systems (RH Linux, -# for example), MIME::QuotedPrint is part of the Perl package and -# upgrading it separately breaks their magic auto-update tools. -# We are supporting older versions of MIME::QuotedPrint even though -# they may give incorrect results simply because it's too painful -# for many people to upgrade. - -# The following code is horrible. I know. Beat me up. --dfs -BEGIN { - if (!defined(&encode_qp_threearg)) { - if ($::MIME::QuotedPrint::VERSION >= 3.03) { - eval 'sub encode_qp_threearg ( $$$ ) { encode_qp(shift, shift, shift); }'; - } else { - eval 'sub encode_qp_threearg ( $$$ ) { encode_qp(shift); }'; - } - } -} - #------------------------------ # # encode_qp_really STRING TEXTUAL_TYPE_FLAG @@ -91,7 +70,7 @@ BEGIN { # grow beyond 76 characters! # sub encode_qp_really { - my $enc = encode_qp_threearg(shift, undef, not shift); + my $enc = encode_qp(shift, undef, not shift); if (length($enc) < 74) { $enc =~ s/^\.\n/=2E\n/g; # force encoding of /^\.$/ $enc =~ s/^From /=46rom /g; # force encoding of /^From / diff --git a/lib/MIME/Words.pm b/lib/MIME/Words.pm index 7aa99d1..2fbe2dd 100644 --- a/lib/MIME/Words.pm +++ b/lib/MIME/Words.pm @@ -83,7 +83,6 @@ Exporter::export_ok_tags('all'); ### Other modules: use MIME::Base64; -use MIME::QuotedPrint; diff --git a/perl-MIME-tools.spec b/perl-MIME-tools.spec new file mode 100644 index 0000000..cc0f1ed --- /dev/null +++ b/perl-MIME-tools.spec @@ -0,0 +1,158 @@ +%define _unpackaged_files_terminate_build 1 +%define dist MIME-tools +Name: perl-%dist +Version: 5.510 +Release: alt1 +Epoch: 1 + +Summary: Perl modules for parsing and creating MIME entities +License: GPL or Artistic +Group: Development/Perl + +URL: %CPAN %dist +Source: %dist-%version.tar +Patch: %name-%version-%release.patch + +BuildArch: noarch + +# Automatically added by buildreq on Wed Sep 26 2012 +BuildRequires: perl-Convert-BinHex perl-MailTools perl-Test-Deep perl-Test-Pod + +%description +MIME-tools is a collection of Perl modules for parsing, decoding, +and generating single- or multipart (even nested multipart) MIME +messages. + +%prep +%setup -q -n %dist-%version +%patch -p1 + +%build +%perl_vendor_build + +%install +%perl_vendor_install + +%files +%doc ChangeLog README examples +%perl_vendor_privlib/MIME* + +%changelog +* Thu Jul 07 2022 Igor Vlasenko 1:5.510-alt1 +- new version + +* Sun Oct 01 2017 Igor Vlasenko 1:5.509-alt1 +- automated CPAN update + +* Thu Sep 22 2016 Igor Vlasenko 1:5.508-alt1 +- automated CPAN update + +* Thu Oct 15 2015 Igor Vlasenko 1:5.507-alt1 +- automated CPAN update + +* Fri Mar 07 2014 Igor Vlasenko 1:5.505-alt1 +- automated CPAN update + +* Tue Oct 29 2013 Igor Vlasenko 1:5.504-alt1 +- 5.503 -> 5.504 + +* Wed Sep 26 2012 Alexey Tourbin 1:5.503-alt1 +- 5.502 -> 5.503 + +* Sat Nov 19 2011 Alexey Tourbin 1:5.502-alt2 +- disabled build dependency on perl-Module-Install + +* Tue Mar 15 2011 Alexey Tourbin 1:5.502-alt1 +- 5.500 -> 5.502 + +* Sun Jan 16 2011 Alexey Tourbin 1:5.500-alt1 +- 5.428 -> 5.550 +- reverted boundary_delimiter.patch + +* Wed Apr 28 2010 Alexey Tourbin 1:5.428-alt1 +- 5.427 -> 5.428 + +* Mon Jul 07 2008 Alexey Tourbin 1:5.427-alt1 +- 5.426 -> 5.427 + +* Thu Jun 19 2008 Alexey Tourbin 1:5.426-alt1 +- 5.420 -> 5.426 + +* Sun Oct 29 2006 Alexey Tourbin 1:5.420-alt2 +- imported sources into git and built with gear +- MIME/Body.pm (open): protection against malicious filenames (cpan #22680) +- Decoder/Gzip64.pm: use strict and fix bug in `use vars' (cpan #22681) +- MIME/Decoder.pm (new): warn when `eval require ...' fails (#22682) +- MIME/Decoder.pm (filter): use select() for IO multiplexing (cpan #22684) +- MIME/Words.pm, WordDecoder.pm: removing the nasty eval <::DATA> (cpan #20474) + +* Thu Apr 20 2006 Alexey Tourbin 1:5.420-alt1 +- 5.418 -> 5.420 +- updated patches +- alt-localize-underscore.patch merged upstream (cpan #12785) + +* Tue Oct 04 2005 Alexey Tourbin 1:5.418-alt1 +- 5.417 -> 5.418 +- cpan-7368-stderr.patch merged upstream (cpan #7368) +- updated alt-localize-underscore.patch (cpan #12785) + +* Fri May 13 2005 Alexey Tourbin 1:5.417-alt1 +- 6.200_02 -> 5.417 (rolled back to earlier branch) +- clarified dependency on MIME::QuotedPrint 3.03 +- clarified dependency on IO::InnerFile 2.110 (cpan #12784) +- fixed $_ localization (cpan #12785) +- backported and fixed boundary delimiter stuff (#5407, cpan #12787) +- dropped debugging output in MIME::WordDecoder (cpan #7368) + +* Fri Aug 20 2004 Alexey Tourbin 6.200-alt0.2 +- alt-default-charset-fallback.patch: fall back to ISO-8859-1 when + LC_CTYPE charset is unsupported (should fix sympa4, amavisd-new) + +* Fri Feb 20 2004 Alexey Tourbin 6.200-alt0.1 +- 6.200_02 (beta) +- alt-syntax.patch: fixed a few bugs + +* Thu Jun 12 2003 Alexey Tourbin 5.411a-alt1 +- 5.411a +- specfile cleanup; docs added + +* Tue Nov 05 2002 Alexey Tourbin 5.411-alt4 +- rebuilt for perl-5.8 with new rpm macros + +* Mon Jun 25 2001 Stanislav Ievlev 5.411-alt3 +- Rebuilt with perl-5.6.1 + +* Fri Jun 13 2001 Grigory Milev 5.411-alt2 +- Rewrite spec for compatible with new police + +* Fri Jun 08 2001 Grigory Milev 5.411-alt1 +- new version (5.411) + +* Sun Feb 4 2001 AEN +- RE adaptation + +* Thu Oct 12 2000 François Pons 5.316-1mdk +- 5.316. + +* Tue Aug 29 2000 François Pons 5.311-1mdk +- 5.311. + +* Thu Aug 03 2000 François Pons 5.306-2mdk +- Oops, added missing clean. + +* Thu Aug 03 2000 François Pons 5.306-1mdk +- macroszifications. +- added doc. +- noarch. +- 5.306. + +* Tue Jul 18 2000 François Pons 5.304-1mdk +- 5.304. + +* Mon Apr 3 2000 Guillaume Cottenceau 4.124-2mdk +- fixed group +- rebuild with new perl +- fixed location + +* Thu Dec 2 1999 Jerome Dumonteil +- first version of rpm. diff --git a/t/Decoder.t b/t/Decoder.t index 937e64d..f298435 100644 --- a/t/Decoder.t +++ b/t/Decoder.t @@ -12,10 +12,7 @@ use MIME::Decoder; #------------------------------------------------------------ # Is gzip available? Quick and dirty test: -my $has_gzip; -foreach (split $^O eq "MSWin32" ? ';' : ':', $ENV{PATH}) { - last if ($has_gzip = -x "$_/gzip"); -} +my $has_gzip = 1; # oh yes! if ($has_gzip) { require MIME::Decoder::Gzip64; install MIME::Decoder::Gzip64 'x-gzip64';