diff -Nru libmime-tools-perl-5.504/ChangeLog libmime-tools-perl-5.505/ChangeLog --- libmime-tools-perl-5.504/ChangeLog 2013-01-30 20:33:24.000000000 +0000 +++ libmime-tools-perl-5.505/ChangeLog 2013-11-14 15:21:02.000000000 +0000 @@ -1,3 +1,22 @@ +5.505 2013-11-14 David F. Skoll + + * VERSION 5.505 RELEASED + + * Fix documentation typos. + https://rt.cpan.org/Public/Bug/Display.html?id=80473 + + * Fix broken test. + https://rt.cpan.org/Public/Bug/Display.html?id=84668 + + * Don't run Kwalitee tests unless author or release tests are enabled. + https://rt.cpan.org/Public/Bug/Display.html?id=87094 + + * Fix many documentation typos. + https://rt.cpan.org/Public/Bug/Display.html?id=87783 + + * Fix bug in header parsing that would fail to parse a header like: + Content-Type: ; name="malware.zip" + 5.504 2013-01-30 David F. Skoll * VERSION 5.504 RELEASED diff -Nru libmime-tools-perl-5.504/MANIFEST libmime-tools-perl-5.505/MANIFEST --- libmime-tools-perl-5.504/MANIFEST 2013-01-30 20:34:12.000000000 +0000 +++ libmime-tools-perl-5.505/MANIFEST 2013-11-14 15:23:53.000000000 +0000 @@ -1,5 +1,11 @@ -ChangeLog COPYING +ChangeLog +INSTALLING +MANIFEST +META.yml +Makefile.PL +README +examples/README examples/mimeabuse examples/mimedump examples/mimeencode @@ -10,7 +16,6 @@ examples/mimesend examples/mimesender examples/mimetour -examples/README inc/Module/Install.pm inc/Module/Install/Base.pm inc/Module/Install/Can.pm @@ -19,19 +24,18 @@ inc/Module/Install/Metadata.pm inc/Module/Install/Win32.pm inc/Module/Install/WriteAll.pm -INSTALLING lib/MIME/Body.pm lib/MIME/Decoder.pm lib/MIME/Decoder/Base64.pm -lib/MIME/Decoder/Binary.pm lib/MIME/Decoder/BinHex.pm +lib/MIME/Decoder/Binary.pm lib/MIME/Decoder/Gzip64.pm lib/MIME/Decoder/NBit.pm lib/MIME/Decoder/QuotedPrint.pm lib/MIME/Decoder/UU.pm lib/MIME/Entity.pm -lib/MIME/Field/ContDisp.pm lib/MIME/Field/ConTraEnc.pm +lib/MIME/Field/ContDisp.pm lib/MIME/Field/ContType.pm lib/MIME/Field/ParamVal.pm lib/MIME/Head.pm @@ -42,15 +46,10 @@ lib/MIME/Tools.pm lib/MIME/WordDecoder.pm lib/MIME/Words.pm -Makefile.PL -MANIFEST -META.yml -README t/02-kwalitee.t t/02-pod-coverage.t t/02-pod.t t/99-prepare.t -t/attachment-filename-encoding.t t/Body.t t/BodyPrint.t t/Decoder.t @@ -67,6 +66,10 @@ t/ParserPreamble.t t/Ref.t t/Smtpsend.t +t/WordDecoder.t +t/WordEncoder.t +t/Words.t +t/attachment-filename-encoding.t t/ticket-11901.t t/ticket-22684.t t/ticket-37139.t @@ -80,9 +83,6 @@ t/ticket-71041.t t/ticket-71677.t t/ticket-80433.t -t/WordDecoder.t -t/WordEncoder.t -t/Words.t testin/ak-0696.msg testin/andreas-1296.txt testin/andreas-1296.uu @@ -155,6 +155,7 @@ testmsgs/german.ref testmsgs/hdr-fakeout.msg testmsgs/hdr-fakeout.ref +testmsgs/malformed-content-type-zip.msg testmsgs/multi-2evil.msg testmsgs/multi-2evil.ref testmsgs/multi-2gifs.msg diff -Nru libmime-tools-perl-5.504/META.yml libmime-tools-perl-5.505/META.yml --- libmime-tools-perl-5.504/META.yml 2013-01-30 20:34:29.000000000 +0000 +++ libmime-tools-perl-5.505/META.yml 2013-11-14 15:24:59.000000000 +0000 @@ -3,13 +3,14 @@ author: - "Eryq , David F. Skoll , Dave O'Neill " build_requires: - ExtUtils::MakeMaker: 6.42 + ExtUtils::MakeMaker: 6.59 Test::Deep: 0 Test::More: 0 configure_requires: - ExtUtils::MakeMaker: 6.42 + ExtUtils::MakeMaker: 6.59 distribution_type: module -generated_by: 'Module::Install version 1.00' +dynamic_config: 1 +generated_by: 'Module::Install version 1.06' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -37,4 +38,4 @@ perl: 5.8.0 resources: license: http://dev.perl.org/licenses/ -version: 5.504 +version: 5.505 diff -Nru libmime-tools-perl-5.504/debian/changelog libmime-tools-perl-5.505/debian/changelog --- libmime-tools-perl-5.504/debian/changelog 2013-10-17 14:13:08.000000000 +0000 +++ libmime-tools-perl-5.505/debian/changelog 2013-12-02 22:36:18.000000000 +0000 @@ -1,3 +1,14 @@ +libmime-tools-perl (5.505-1) unstable; urgency=low + + * Imported Upstream version 5.505 + - clarifies MIME PRIMER location in manpage (Closes: #460394) + * Update copyright years for included Module::Install copy + * Drop fix-spelling.patch patch (applied upstream) + * Bump Standards-Version to 3.9.5 + * Wrap and sort fields in debian/control file + + -- Salvatore Bonaccorso Mon, 02 Dec 2013 23:24:50 +0100 + libmime-tools-perl (5.504-1) unstable; urgency=low * Imported Upstream version 5.504 diff -Nru libmime-tools-perl-5.504/debian/control libmime-tools-perl-5.505/debian/control --- libmime-tools-perl-5.504/debian/control 2013-10-17 14:13:08.000000000 +0000 +++ libmime-tools-perl-5.505/debian/control 2013-12-02 22:36:18.000000000 +0000 @@ -1,35 +1,38 @@ Source: libmime-tools-perl Maintainer: Debian Perl Group -Uploaders: Niko Tyni , - Damyan Ivanov , - gregor herrmann , - Jonathan Yu , - Nicholas Bamber , - Salvatore Bonaccorso +Uploaders: + Niko Tyni , + Damyan Ivanov , + gregor herrmann , + Jonathan Yu , + Nicholas Bamber , + Salvatore Bonaccorso Section: perl Priority: optional Build-Depends: debhelper (>= 8) -Build-Depends-Indep: libconvert-binhex-perl, - libtest-deep-perl, - libmailtools-perl, - libtest-pod-perl, - netbase, - perl -Standards-Version: 3.9.4 +Build-Depends-Indep: + libconvert-binhex-perl, + libmailtools-perl, + libtest-deep-perl, + libtest-pod-perl, + netbase, + perl +Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libmime-tools-perl.git Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libmime-tools-perl.git Homepage: https://metacpan.org/release/MIME-tools/ Package: libmime-tools-perl Architecture: all -Depends: ${misc:Depends}, - ${perl:Depends}, - libconvert-binhex-perl, - libmailtools-perl +Depends: + libconvert-binhex-perl, + libmailtools-perl, + ${misc:Depends}, + ${perl:Depends} Breaks: libmime-perl (<< 5.425-2) Provides: libmime-perl Replaces: libmime-perl (<< 5.425-2) Description: Perl5 modules for MIME-compliant messages This package provides the MIME-tools modules. MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and generating - single- or multipart (even nested multipart) MIME messages. + single- or multipart (even nested multipart) MIME messages. diff -Nru libmime-tools-perl-5.504/debian/copyright libmime-tools-perl-5.505/debian/copyright --- libmime-tools-perl-5.504/debian/copyright 2013-10-17 14:13:08.000000000 +0000 +++ libmime-tools-perl-5.505/debian/copyright 2013-12-02 22:36:18.000000000 +0000 @@ -32,9 +32,9 @@ author..." and that script can not even be found in the net. Files: inc/Module/* -Copyright: 2002-2010, Adam Kennedy - 2002-2010, Audrey Tang - 2002-2010, Brian Ingerson +Copyright: 2002-2012, Adam Kennedy + 2002-2012, Audrey Tang + 2002-2012, Brian Ingerson License: Artistic or GPL-1+ Files: debian/* diff -Nru libmime-tools-perl-5.504/debian/patches/fix-spelling.patch libmime-tools-perl-5.505/debian/patches/fix-spelling.patch --- libmime-tools-perl-5.504/debian/patches/fix-spelling.patch 2013-10-17 14:13:08.000000000 +0000 +++ libmime-tools-perl-5.505/debian/patches/fix-spelling.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: spelling fix -Origin: vendor -Forwarded: http://rt.cpan.org/Ticket/Display.html?id=64610 -Author: gregor herrmann -Last-Update: 2012-06-08 -Reviewed-by: Salvatore Bonaccorso - ---- a/lib/MIME/Parser.pm -+++ b/lib/MIME/Parser.pm -@@ -1791,7 +1791,7 @@ - - B - It's much faster to use E$fooE than $foo-Egetline. --For backwards compatibilty, this module must continue to use -+For backwards compatibility, this module must continue to use - object-oriented I/O in most places, but if you use L - with a "real" filehandle (string, globref, or subclass of IO::File) - then MIME::Parser is able to perform some crucial optimizations. diff -Nru libmime-tools-perl-5.504/debian/patches/series libmime-tools-perl-5.505/debian/patches/series --- libmime-tools-perl-5.504/debian/patches/series 2013-10-17 14:13:08.000000000 +0000 +++ libmime-tools-perl-5.505/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -fix-spelling.patch diff -Nru libmime-tools-perl-5.504/inc/Module/Install/Base.pm libmime-tools-perl-5.505/inc/Module/Install/Base.pm --- libmime-tools-perl-5.504/inc/Module/Install/Base.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install/Base.pm 2013-11-14 15:24:58.000000000 +0000 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.00'; + $VERSION = '1.06'; } # Suspend handler for "redefined" warnings diff -Nru libmime-tools-perl-5.504/inc/Module/Install/Can.pm libmime-tools-perl-5.505/inc/Module/Install/Can.pm --- libmime-tools-perl-5.504/inc/Module/Install/Can.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install/Can.pm 2013-11-14 15:24:58.000000000 +0000 @@ -3,13 +3,12 @@ use strict; use Config (); -use File::Spec (); use ExtUtils::MakeMaker (); use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '1.06'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -29,7 +28,7 @@ eval { require $mod; $pkg->VERSION($ver || 0); 1 }; } -# check if we can run some command +# Check if we can run some command sub can_run { my ($self, $cmd) = @_; @@ -38,14 +37,88 @@ for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { next if $dir eq ''; - my $abs = File::Spec->catfile($dir, $_[1]); + require File::Spec; + my $abs = File::Spec->catfile($dir, $cmd); return $abs if (-x $abs or $abs = MM->maybe_command($abs)); } return; } -# can we locate a (the) C compiler +# Can our C compiler environment build XS files +sub can_xs { + my $self = shift; + + # Ensure we have the CBuilder module + $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); + + # Do we have the configure_requires checker? + local $@; + eval "require ExtUtils::CBuilder;"; + if ( $@ ) { + # They don't obey configure_requires, so it is + # someone old and delicate. Try to avoid hurting + # them by falling back to an older simpler test. + return $self->can_cc(); + } + + # Do we have a working C compiler + my $builder = ExtUtils::CBuilder->new( + quiet => 1, + ); + unless ( $builder->have_compiler ) { + # No working C compiler + return 0; + } + + # Write a C file representative of what XS becomes + require File::Temp; + my ( $FH, $tmpfile ) = File::Temp::tempfile( + "compilexs-XXXXX", + SUFFIX => '.c', + ); + binmode $FH; + print $FH <<'END_C'; +#include "EXTERN.h" +#include "perl.h" +#include "XSUB.h" + +int main(int argc, char **argv) { + return 0; +} + +int boot_sanexs() { + return 1; +} + +END_C + close $FH; + + # Can the C compiler access the same headers XS does + my @libs = (); + my $object = undef; + eval { + local $^W = 0; + $object = $builder->compile( + source => $tmpfile, + ); + @libs = $builder->link( + objects => $object, + module_name => 'sanexs', + ); + }; + my $result = $@ ? 0 : 1; + + # Clean up all the build files + foreach ( $tmpfile, $object, @libs ) { + next unless defined $_; + 1 while unlink; + } + + return $result; +} + +# Can we locate a (the) C compiler sub can_cc { my $self = shift; my @chunks = split(/ /, $Config::Config{cc}) or return; @@ -78,4 +151,4 @@ __END__ -#line 156 +#line 236 diff -Nru libmime-tools-perl-5.504/inc/Module/Install/Fetch.pm libmime-tools-perl-5.505/inc/Module/Install/Fetch.pm --- libmime-tools-perl-5.504/inc/Module/Install/Fetch.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install/Fetch.pm 2013-11-14 15:24:58.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '1.06'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libmime-tools-perl-5.504/inc/Module/Install/Makefile.pm libmime-tools-perl-5.505/inc/Module/Install/Makefile.pm --- libmime-tools-perl-5.504/inc/Module/Install/Makefile.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install/Makefile.pm 2013-11-14 15:24:58.000000000 +0000 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '1.06'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -215,18 +215,22 @@ require ExtUtils::MakeMaker; if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { - # MakeMaker can complain about module versions that include - # an underscore, even though its own version may contain one! - # Hence the funny regexp to get rid of it. See RT #35800 - # for details. - my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; - $self->build_requires( 'ExtUtils::MakeMaker' => $v ); - $self->configure_requires( 'ExtUtils::MakeMaker' => $v ); + # This previous attempted to inherit the version of + # ExtUtils::MakeMaker in use by the module author, but this + # was found to be untenable as some authors build releases + # using future dev versions of EU:MM that nobody else has. + # Instead, #toolchain suggests we use 6.59 which is the most + # stable version on CPAN at time of writing and is, to quote + # ribasushi, "not terminally fucked, > and tested enough". + # TODO: We will now need to maintain this over time to push + # the version up as new versions are released. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); } else { # Allow legacy-compatibility with 5.005 by depending on the # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); + $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); } # Generate the MakeMaker params @@ -241,7 +245,6 @@ 'all_from' if you prefer) in Makefile.PL. EOT - $DB::single = 1; if ( $self->tests ) { my @tests = split ' ', $self->tests; my %seen; @@ -412,4 +415,4 @@ __END__ -#line 541 +#line 544 diff -Nru libmime-tools-perl-5.504/inc/Module/Install/Metadata.pm libmime-tools-perl-5.505/inc/Module/Install/Metadata.pm --- libmime-tools-perl-5.504/inc/Module/Install/Metadata.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install/Metadata.pm 2013-11-14 15:24:58.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '1.06'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -151,15 +151,21 @@ sub install_as_vendor { $_[0]->installdirs('vendor') } sub dynamic_config { - my $self = shift; - unless ( @_ ) { - warn "You MUST provide an explicit true/false value to dynamic_config\n"; - return $self; + my $self = shift; + my $value = @_ ? shift : 1; + if ( $self->{values}->{dynamic_config} ) { + # Once dynamic we never change to static, for safety + return 0; } - $self->{values}->{dynamic_config} = $_[0] ? 1 : 0; + $self->{values}->{dynamic_config} = $value ? 1 : 0; return 1; } +# Convenience command +sub static_config { + shift->dynamic_config(0); +} + sub perl_version { my $self = shift; return $self->{values}->{perl_version} unless @_; @@ -170,7 +176,7 @@ # Normalize the version $version = $self->_perl_version($version); - # We don't support the reall old versions + # We don't support the really old versions unless ( $version >= 5.005 ) { die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; } @@ -515,6 +521,7 @@ 'GNU Free Documentation license' => 'unrestricted', 1, 'GNU Affero General Public License' => 'open_source', 1, '(?:Free)?BSD license' => 'bsd', 1, + 'Artistic license 2\.0' => 'artistic_2', 1, 'Artistic license' => 'artistic', 1, 'Apache (?:Software )?license' => 'apache', 1, 'GPL' => 'gpl', 1, @@ -550,9 +557,9 @@ sub _extract_bugtracker { my @links = $_[0] =~ m#L<( - \Qhttp://rt.cpan.org/\E[^>]+| - \Qhttp://github.com/\E[\w_]+/[\w_]+/issues| - \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list + https?\Q://rt.cpan.org/\E[^>]+| + https?\Q://github.com/\E[\w_]+/[\w_]+/issues| + https?\Q://code.google.com/p/\E[\w_\-]+/issues/list )>#gx; my %links; @links{@links}=(); @@ -581,7 +588,7 @@ sub requires_from { my $self = shift; my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; while ( @requires ) { my $module = shift @requires; my $version = shift @requires; diff -Nru libmime-tools-perl-5.504/inc/Module/Install/Win32.pm libmime-tools-perl-5.505/inc/Module/Install/Win32.pm --- libmime-tools-perl-5.504/inc/Module/Install/Win32.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install/Win32.pm 2013-11-14 15:24:58.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '1.06'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libmime-tools-perl-5.504/inc/Module/Install/WriteAll.pm libmime-tools-perl-5.505/inc/Module/Install/WriteAll.pm --- libmime-tools-perl-5.504/inc/Module/Install/WriteAll.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install/WriteAll.pm 2013-11-14 15:24:58.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '1.06'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff -Nru libmime-tools-perl-5.504/inc/Module/Install.pm libmime-tools-perl-5.505/inc/Module/Install.pm --- libmime-tools-perl-5.504/inc/Module/Install.pm 2013-01-30 20:34:28.000000000 +0000 +++ libmime-tools-perl-5.505/inc/Module/Install.pm 2013-11-14 15:24:58.000000000 +0000 @@ -31,7 +31,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.00'; + $VERSION = '1.06'; # Storage for the pseudo-singleton $MAIN = undef; @@ -451,7 +451,7 @@ } sub _cmp ($$) { - _version($_[0]) <=> _version($_[1]); + _version($_[1]) <=> _version($_[2]); } # Cloned from Params::Util::_CLASS @@ -467,4 +467,4 @@ 1; -# Copyright 2008 - 2010 Adam Kennedy. +# Copyright 2008 - 2012 Adam Kennedy. diff -Nru libmime-tools-perl-5.504/lib/MIME/Body.pm libmime-tools-perl-5.505/lib/MIME/Body.pm --- libmime-tools-perl-5.504/lib/MIME/Body.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Body.pm 2013-11-14 15:15:04.000000000 +0000 @@ -141,7 +141,7 @@ use IO::File; ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; #------------------------------ @@ -218,7 +218,7 @@ close($fh); return $str; } -*data = \&as_string; ### silenty invoke preferred usage +*data = \&as_string; ### silently invoke preferred usage #------------------------------ diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder/Base64.pm libmime-tools-perl-5.505/lib/MIME/Decoder/Base64.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder/Base64.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder/Base64.pm 2013-11-14 15:15:04.000000000 +0000 @@ -60,7 +60,7 @@ @ISA = qw(MIME::Decoder); ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### How many bytes to encode at a time (must be a multiple of 3, and ### less than (76 * 0.75)! diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder/BinHex.pm libmime-tools-perl-5.505/lib/MIME/Decoder/BinHex.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder/BinHex.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder/BinHex.pm 2013-11-14 15:15:04.000000000 +0000 @@ -47,7 +47,7 @@ @ISA = qw(MIME::Decoder); # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; #------------------------------ diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder/Binary.pm libmime-tools-perl-5.505/lib/MIME/Decoder/Binary.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder/Binary.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder/Binary.pm 2013-11-14 15:15:04.000000000 +0000 @@ -47,7 +47,7 @@ @ISA = qw(MIME::Decoder); ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### Buffer length: my $BUFLEN = 8192; diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder/Gzip64.pm libmime-tools-perl-5.505/lib/MIME/Decoder/Gzip64.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder/Gzip64.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder/Gzip64.pm 2013-11-14 15:15:04.000000000 +0000 @@ -61,7 +61,7 @@ @ISA = qw(MIME::Decoder::Base64); # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; # How to compress stdin to stdout: $GZIP = "gzip -c"; diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder/NBit.pm libmime-tools-perl-5.505/lib/MIME/Decoder/NBit.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder/NBit.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder/NBit.pm 2013-11-14 15:15:04.000000000 +0000 @@ -98,7 +98,7 @@ @ISA = qw(MIME::Decoder); ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### How many bytes to decode at a time? my $DecodeChunkLength = 8 * 1024; diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder/QuotedPrint.pm libmime-tools-perl-5.505/lib/MIME/Decoder/QuotedPrint.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder/QuotedPrint.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder/QuotedPrint.pm 2013-11-14 15:15:04.000000000 +0000 @@ -58,7 +58,7 @@ @ISA = qw(MIME::Decoder); # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; #------------------------------ # If we have MIME::QuotedPrint 3.03 or later, use the three-argument diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder/UU.pm libmime-tools-perl-5.505/lib/MIME/Decoder/UU.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder/UU.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder/UU.pm 2013-11-14 15:15:04.000000000 +0000 @@ -48,7 +48,7 @@ @ISA = qw(MIME::Decoder); # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; #------------------------------ diff -Nru libmime-tools-perl-5.504/lib/MIME/Decoder.pm libmime-tools-perl-5.505/lib/MIME/Decoder.pm --- libmime-tools-perl-5.504/lib/MIME/Decoder.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Decoder.pm 2013-11-14 15:15:04.000000000 +0000 @@ -126,7 +126,7 @@ ); ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### Me: my $ME = 'MIME::Decoder'; diff -Nru libmime-tools-perl-5.504/lib/MIME/Entity.pm libmime-tools-perl-5.505/lib/MIME/Entity.pm --- libmime-tools-perl-5.504/lib/MIME/Entity.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Entity.pm 2013-11-14 15:15:03.000000000 +0000 @@ -245,7 +245,7 @@ #------------------------------ ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### Boundary counter: my $BCount = 0; @@ -1700,7 +1700,7 @@ I Print the entity to the given OUTSTREAM, or to the currently-selected filehandle if none given. OUTSTREAM can be a filehandle, or any object -that reponds to a print() message. +that responds to a print() message. The entity is output as a valid MIME stream! This means that the header is always output first, and the body data (if any) will be @@ -1779,7 +1779,7 @@ I Print the body of the entity to the given OUTSTREAM, or to the currently-selected filehandle if none given. OUTSTREAM can be a -filehandle, or any object that reponds to a print() message. +filehandle, or any object that responds to a print() message. The body is output for inclusion in a valid MIME stream; this means that the body data will be encoded if the header says that it should be. diff -Nru libmime-tools-perl-5.504/lib/MIME/Field/ConTraEnc.pm libmime-tools-perl-5.505/lib/MIME/Field/ConTraEnc.pm --- libmime-tools-perl-5.504/lib/MIME/Field/ConTraEnc.pm 2013-01-30 20:28:03.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Field/ConTraEnc.pm 2013-11-14 15:15:03.000000000 +0000 @@ -47,7 +47,7 @@ @ISA = qw(MIME::Field::ParamVal); # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; # Install it: bless([])->register('Content-transfer-encoding'); diff -Nru libmime-tools-perl-5.504/lib/MIME/Field/ContDisp.pm libmime-tools-perl-5.505/lib/MIME/Field/ContDisp.pm --- libmime-tools-perl-5.504/lib/MIME/Field/ContDisp.pm 2013-01-30 20:27:49.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Field/ContDisp.pm 2013-11-14 15:15:03.000000000 +0000 @@ -48,7 +48,7 @@ @ISA = qw(MIME::Field::ParamVal); # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; # Install it: bless([])->register('Content-disposition'); diff -Nru libmime-tools-perl-5.504/lib/MIME/Field/ContType.pm libmime-tools-perl-5.505/lib/MIME/Field/ContType.pm --- libmime-tools-perl-5.504/lib/MIME/Field/ContType.pm 2013-01-30 20:27:45.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Field/ContType.pm 2013-11-14 15:15:04.000000000 +0000 @@ -63,7 +63,7 @@ @ISA = qw(MIME::Field::ParamVal); # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; # Install it: bless([])->register('Content-type'); diff -Nru libmime-tools-perl-5.504/lib/MIME/Field/ParamVal.pm libmime-tools-perl-5.505/lib/MIME/Field/ParamVal.pm --- libmime-tools-perl-5.504/lib/MIME/Field/ParamVal.pm 2013-01-30 20:27:41.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Field/ParamVal.pm 2013-11-14 15:15:04.000000000 +0000 @@ -80,7 +80,7 @@ #------------------------------ # The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; #------------------------------ @@ -93,7 +93,7 @@ my $PARAMNAME = '[^\x00-\x1f\x80-\xff :=]+'; # Pattern to match the first value on the line: -my $FIRST = '[^\s\;\x00-\x1f\x80-\xff]+'; +my $FIRST = '[^\s\;\x00-\x1f\x80-\xff]*'; # Pattern to match an RFC 2045 token: # @@ -209,7 +209,7 @@ } sub rfc2231percent { - # Do percent-subsitution + # Do percent-substitution my($str) = @_; local $1; $str =~ s/%([0-9a-fA-F]{2})/pack("C", hex($1))/ge; diff -Nru libmime-tools-perl-5.504/lib/MIME/Head.pm libmime-tools-perl-5.505/lib/MIME/Head.pm --- libmime-tools-perl-5.504/lib/MIME/Head.pm 2013-01-30 20:27:38.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Head.pm 2013-11-14 15:15:04.000000000 +0000 @@ -138,7 +138,7 @@ #------------------------------ ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### Sanity (we put this test after our own version, for CPAN::): use Mail::Header 1.06 (); @@ -216,7 +216,7 @@ =item read FILEHANDLE I -This initiallizes a header object by reading it in from a FILEHANDLE, +This initializes a header object by reading it in from a FILEHANDLE, until the terminating blank line is encountered. A syntax error or end-of-stream will also halt processing. @@ -268,19 +268,19 @@ =item add TAG,TEXT,[INDEX] I -Add a new occurence of the field named TAG, given by TEXT: +Add a new occurrence of the field named TAG, given by TEXT: ### Add the trace information: $head->add('Received', 'from eryq.pr.mcs.net by gonzo.net with smtp'); -Normally, the new occurence will be I to the existing -occurences. However, if the optional INDEX argument is 0, then the -new occurence will be I. If you want to be I +Normally, the new occurrence will be I to the existing +occurrences. However, if the optional INDEX argument is 0, then the +new occurrence will be I. If you want to be I about appending, specify an INDEX of -1. -B: this method always adds new occurences; it doesn't overwrite -any existing occurences... so if you just want to I the value +B: this method always adds new occurrences; it doesn't overwrite +any existing occurrences... so if you just want to I the value of a field (creating it if necessary), then you probably B want to use this method: consider using C instead. @@ -305,7 +305,7 @@ =item count TAG I -Returns the number of occurences of a field; in a boolean context, this +Returns the number of occurrences of a field; in a boolean context, this tells you whether a given field exists: ### Was a "Subject:" field given? @@ -408,7 +408,7 @@ =item delete TAG,[INDEX] I -Delete all occurences of the field named TAG. +Delete all occurrences of the field named TAG. ### Remove some MIME information: $head->delete('MIME-Version'); @@ -444,7 +444,7 @@ I Get the contents of field TAG. -If a B is given, returns the occurence at that index, +If a B is given, returns the occurrence at that index, or undef if not present: ### Print the first and last 'Received:' entries (explicitly): @@ -458,7 +458,7 @@ my $most_recent = $head->get('received'); If B is given, and invoked in an B context, then -I occurences of the field are returned: +I occurrences of the field are returned: ### Get all 'Received:' entries: my @all_received = $head->get('received'); @@ -476,21 +476,21 @@ =item get_all FIELD I -Returns the list of I occurences of the field, or the +Returns the list of I occurrences of the field, or the empty list if the field is not present: ### How did it get here? @history = $head->get_all('Received'); B I had originally experimented with having C return all -occurences when invoked in an array context... but that causes a lot of +occurrences when invoked in an array context... but that causes a lot of accidents when you get careless and do stuff like this: print "\u$field: ", $head->get($field); It also made the intuitive behaviour unclear if the INDEX argument was given in an array context. So I opted for an explicit approach -to asking for all occurences. +to asking for all occurrences. =cut @@ -540,7 +540,7 @@ # set TAG,TEXT # # Instance method, DEPRECATED. -# Set the field named TAG to [the single occurence given by the TEXT. +# Set the field named TAG to [the single occurrence given by the TEXT. # sub set { my $self = shift; @@ -569,7 +569,7 @@ =item unfold [FIELD] I -Unfold (remove newlines in) the text of all occurences of the given FIELD. +Unfold (remove newlines in) the text of all occurrences of the given FIELD. If the FIELD is omitted, I fields are unfolded. Returns the "self" object. @@ -859,7 +859,7 @@ We could even make it a superclass of MIME::Head: that way, MIME::Head would have to implement its interface, I allow itself to be -initiallized from a MIME::Attrs object. +initialized from a MIME::Attrs object. However, when you read RFC 2045, you begin to see how much MIME information is organized by its presence in particular fields. I imagine that we'd @@ -868,7 +868,7 @@ having MIME::Head. -=item Why all this "occurence" and "index" jazz? Isn't every field unique? +=item Why all this "occurrence" and "index" jazz? Isn't every field unique? Aaaaaaaaaahh....no. @@ -876,7 +876,7 @@ store the fields as a hash of strings, one string per hash entry. Unfortunately, there's the little matter of the C field, which (unlike C, C, etc.) will often have multiple -occurences; e.g.: +occurrences; e.g.: Received: from gsfc.nasa.gov by eryq.pr.mcs.net with smtp (Linux Smail3.1.28.1 #5) id m0tStZ7-0007X4C; @@ -899,9 +899,9 @@ information. I also didn't want to make this a special case; after all, who -knows what other fields could have multiple occurences in the +knows what other fields could have multiple occurrences in the future? So, clearly, multiple entries had to somehow be stored -multiple times... and the different occurences had to be retrievable. +multiple times... and the different occurrences had to be retrievable. =back diff -Nru libmime-tools-perl-5.504/lib/MIME/Parser/Filer.pm libmime-tools-perl-5.505/lib/MIME/Parser/Filer.pm --- libmime-tools-perl-5.504/lib/MIME/Parser/Filer.pm 2011-10-19 17:25:36.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Parser/Filer.pm 2013-08-13 15:18:53.000000000 +0000 @@ -889,7 +889,7 @@ ### Invoke inherited method first! $self->SUPER::init_parse; - ### Determine the subdirectory of ther base to use: + ### Determine the subdirectory of their base to use: my $subdir = (defined($self->{MPFU_DirName}) ? $self->{MPFU_DirName} : ("msg-".scalar(time)."-$$-".$GSubdirNo++)); diff -Nru libmime-tools-perl-5.504/lib/MIME/Parser.pm libmime-tools-perl-5.505/lib/MIME/Parser.pm --- libmime-tools-perl-5.504/lib/MIME/Parser.pm 2013-01-30 20:27:34.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Parser.pm 2013-11-14 15:15:03.000000000 +0000 @@ -153,7 +153,7 @@ #------------------------------ ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### How to catenate: $CAT = '/bin/cat'; @@ -1118,7 +1118,7 @@ $io = IO::File->new($data, '<:'); } elsif( ref $data eq 'ARRAY' ) { # Passing arrays is deprecated now that we've nuked IO::ScalarArray - # but for backwards compatability we still support it by joining the + # but for backwards compatibility we still support it by joining the # array lines to a scalar and doing scalar IO on it. my $tmp_data = join('', @$data); $io = IO::File->new(\$tmp_data, '<:'); @@ -1791,7 +1791,7 @@ B It's much faster to use E$fooE than $foo-Egetline. -For backwards compatibilty, this module must continue to use +For backwards compatibility, this module must continue to use object-oriented I/O in most places, but if you use L with a "real" filehandle (string, globref, or subclass of IO::File) then MIME::Parser is able to perform some crucial optimizations. @@ -1903,11 +1903,11 @@ Some folks have asked for the ability to bypass this temp-file mechanism, I suppose because they assume it would slow down their application. -I considered accomodating this wish, but the temp-file +I considered accommodating this wish, but the temp-file approach solves a lot of thorny problems in parsing, and it also protects against hidden bugs in user applications (what if you've directed the encoded part into a scalar, and someone unexpectedly -sends you a 6 MB tar file?). Finally, I'm just not conviced that +sends you a 6 MB tar file?). Finally, I'm just not convinced that the temp-file use adds significant overhead. diff -Nru libmime-tools-perl-5.504/lib/MIME/Tools.pm libmime-tools-perl-5.505/lib/MIME/Tools.pm --- libmime-tools-perl-5.504/lib/MIME/Tools.pm 2013-01-30 20:27:30.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Tools.pm 2013-11-14 15:14:59.000000000 +0000 @@ -1,7 +1,7 @@ package MIME::Tools; #------------------------------ -# Because the POD documenation is pretty extensive, it follows +# Because the POD documentation is pretty extensive, it follows # the __END__ statement below... #------------------------------ @@ -28,7 +28,7 @@ Exporter::export_ok_tags('config', 'msgs', 'msgtypes', 'utils'); # The TOOLKIT version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; # Configuration (do NOT alter this directly)... # All legal CONFIG vars *must* be in here, even if only to be set to undef: @@ -421,7 +421,7 @@ sent C for reliability. See the section on encoding/decoding for more details, as well as -L<"A MIME PRIMER">. +L<"A MIME PRIMER"> below. =head2 Sending email @@ -438,7 +438,7 @@ The B class can be used to I as well; this is done when printing MIME entities. All the standard encodings are supported -(see L<"A MIME PRIMER"> for details): +(see L<"A MIME PRIMER"> below for details): Encoding: | Normally used when message contents are: ------------------------------------------------------------------- @@ -1036,4 +1036,11 @@ Please forgive me if I've accidentally left you out. Better yet, email me, and I'll put you in. +=head1 LICENSE + +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + +See the COPYING file for more details. + =cut diff -Nru libmime-tools-perl-5.504/lib/MIME/WordDecoder.pm libmime-tools-perl-5.505/lib/MIME/WordDecoder.pm --- libmime-tools-perl-5.504/lib/MIME/WordDecoder.pm 2011-02-17 16:53:01.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/WordDecoder.pm 2013-08-13 15:19:48.000000000 +0000 @@ -172,7 +172,7 @@ I If \@HANDLERS is given, then @HANDLERS is passed to handler() -to initiallize the internal map. +to initialize the internal map. =cut diff -Nru libmime-tools-perl-5.504/lib/MIME/Words.pm libmime-tools-perl-5.505/lib/MIME/Words.pm --- libmime-tools-perl-5.504/lib/MIME/Words.pm 2013-01-30 20:27:26.000000000 +0000 +++ libmime-tools-perl-5.505/lib/MIME/Words.pm 2013-11-14 15:15:03.000000000 +0000 @@ -94,7 +94,7 @@ #------------------------------ ### The package version, both in 1.23 style *and* usable by MakeMaker: -$VERSION = "5.504"; +$VERSION = "5.505"; ### Nonprintables (controls + x7F + 8bit): my $NONPRINT = "\\x00-\\x1F\\x7F-\\xFF"; diff -Nru libmime-tools-perl-5.504/t/02-kwalitee.t libmime-tools-perl-5.505/t/02-kwalitee.t --- libmime-tools-perl-5.504/t/02-kwalitee.t 2007-09-29 01:34:52.000000000 +0000 +++ libmime-tools-perl-5.505/t/02-kwalitee.t 2013-08-13 15:13:01.000000000 +0000 @@ -1,4 +1,9 @@ -use Test::More; +BEGIN { + use Test::More; + unless ($ENV{AUTHOR_TESTING}||$ENV{RELEASE_TESTING}) { + plan(skip_all => 'These tests are for author or release candidate testing'); + } +} eval { require Test::Kwalitee; Test::Kwalitee->import() }; plan( skip_all => 'Test::Kwalitee not installed; skipping' ) if $@; diff -Nru libmime-tools-perl-5.504/t/Smtpsend.t libmime-tools-perl-5.505/t/Smtpsend.t --- libmime-tools-perl-5.504/t/Smtpsend.t 2012-05-24 15:58:09.000000000 +0000 +++ libmime-tools-perl-5.505/t/Smtpsend.t 2013-08-13 14:53:36.000000000 +0000 @@ -3,6 +3,7 @@ use warnings; use Config; use Test::More; +$ENV{MAILDOMAIN}='example.com'; my $can_fork = $Config{d_fork} || $Config{d_pseudofork} || (($^O eq 'MSWin32' || $^O eq 'NetWare') and $Config{useithreads} and diff -Nru libmime-tools-perl-5.504/testmsgs/malformed-content-type-zip.msg libmime-tools-perl-5.505/testmsgs/malformed-content-type-zip.msg --- libmime-tools-perl-5.504/testmsgs/malformed-content-type-zip.msg 1970-01-01 00:00:00.000000000 +0000 +++ libmime-tools-perl-5.505/testmsgs/malformed-content-type-zip.msg 2013-10-10 17:46:41.000000000 +0000 @@ -0,0 +1,21 @@ +MIME-Version: 1.0 +To: someone@example.com +Subject: Payroll Received by Intuit +Content-Type: multipart/mixed; + boundary="----=_Part_67482_7396105824.6005753659145" + +------=_Part_67482_7396105824.6005753659145 +Content-Type: text/plain; charset=windows-1251; format=flowed +Content-Transfer-Encoding: 7bit + +Dear, We received your payroll on October 9, 2013 at 4:55 PM . + +------=_Part_67482_7396105824.6005753659145 +Content-Type: ; name="payroll_report_429047_10092013.zip" +Content-Transfer-Encoding: base64 +Content-Disposition: attachment; + name="payroll_report_409401_10092013.zip" + +Z290Y2hhCg== + +------=_Part_67482_7396105824.6005753659145--