r18003 - in /trunk/mime-tools: ./ debian/ inc/ lib/MIME/ lib/MIME/Decoder/ lib/MIME/Field/ t/ testin/
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Wed Mar 26 19:20:53 UTC 2008
Author: gregoa-guest
Date: Wed Mar 26 19:20:52 2008
New Revision: 18003
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18003
Log:
New upstream release.
Added:
trunk/mime-tools/inc/
- copied from r18002, branches/upstream/mime-tools/current/inc/
trunk/mime-tools/t/BodyPrint.t
- copied unchanged from r18002, branches/upstream/mime-tools/current/t/BodyPrint.t
trunk/mime-tools/t/WordEncoder.t
- copied unchanged from r18002, branches/upstream/mime-tools/current/t/WordEncoder.t
Removed:
trunk/mime-tools/MANIFEST.SKIP
Modified:
trunk/mime-tools/ChangeLog
trunk/mime-tools/MANIFEST
trunk/mime-tools/META.yml
trunk/mime-tools/Makefile.PL
trunk/mime-tools/debian/changelog
trunk/mime-tools/lib/MIME/Body.pm
trunk/mime-tools/lib/MIME/Decoder.pm
trunk/mime-tools/lib/MIME/Decoder/Base64.pm
trunk/mime-tools/lib/MIME/Decoder/BinHex.pm
trunk/mime-tools/lib/MIME/Decoder/Binary.pm
trunk/mime-tools/lib/MIME/Decoder/Gzip64.pm
trunk/mime-tools/lib/MIME/Decoder/NBit.pm
trunk/mime-tools/lib/MIME/Decoder/QuotedPrint.pm
trunk/mime-tools/lib/MIME/Decoder/UU.pm
trunk/mime-tools/lib/MIME/Entity.pm
trunk/mime-tools/lib/MIME/Field/ConTraEnc.pm
trunk/mime-tools/lib/MIME/Field/ContDisp.pm
trunk/mime-tools/lib/MIME/Field/ContType.pm
trunk/mime-tools/lib/MIME/Field/ParamVal.pm
trunk/mime-tools/lib/MIME/Head.pm
trunk/mime-tools/lib/MIME/Parser.pm
trunk/mime-tools/lib/MIME/Tools.pm
trunk/mime-tools/lib/MIME/Words.pm
trunk/mime-tools/t/Smtpsend.t
trunk/mime-tools/t/Words.t
trunk/mime-tools/testin/words.txt
Modified: trunk/mime-tools/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/ChangeLog?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/ChangeLog (original)
+++ trunk/mime-tools/ChangeLog Wed Mar 26 19:20:52 2008
@@ -1,3 +1,16 @@
+5.426 2008-03-07 Dave O'Neill <dmo at roaringpenguin.com>
+ * VERSION 5.426 RELEASED
+
+ * (bugfix) require File::Temp 0.18 or newer, as we need seek()
+ (RT#31032)
+
+ * (bugfix) Don't hang forever in t/Smtpsend.t (RT#31082)
+
+ * (bugfix) require Perl 5.8.0 or newer in Makefile.PL (RT#30927)
+
+ * (bugfix) encode_mimewords() no longer removes spaces between two
+ encoded words (RT#5462)
+
5.425 2007-11-17 Dave O'Neill <dmo at roaringpenguin.com>
* VERSION 5.425 RELEASED
@@ -29,12 +42,6 @@
This fixes test failures seen on Darwin.
* (bugfix) Clear filer's purgeable() before calling init_parse(). Fixes RT 7858.
-
-commit 005e387c42957f2a433464beaef1d2b416746963
-Author: Dave O'Neill <dmo at roaringpenguin.com>
-Date: Fri Sep 21 12:41:03 2007 -0400
-
- Add LICENSE item to Makefile.PL
5.421 2007-09-21 Dave O'Neill <dmo at roaringpenguin.com>
Modified: trunk/mime-tools/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/MANIFEST?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/MANIFEST (original)
+++ trunk/mime-tools/MANIFEST Wed Mar 26 19:20:52 2008
@@ -11,6 +11,17 @@
examples/mimesender
examples/mimetour
examples/README
+inc/Module/AutoInstall.pm
+inc/Module/Install.pm
+inc/Module/Install/AutoInstall.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Include.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
INSTALLING
lib/MIME/Body.pm
lib/MIME/Decoder.pm
@@ -36,7 +47,7 @@
lib/MIME/Words.pm
Makefile.PL
MANIFEST
-MANIFEST.SKIP
+META.yml
README
README-OR-DIE
README.system
@@ -45,6 +56,7 @@
t/02-pod.t
t/99-prepare.t
t/Body.t
+t/BodyPrint.t
t/Decoder.t
t/Entity.t
t/Gauntlet.t
@@ -57,6 +69,7 @@
t/Ref.t
t/Smtpsend.t
t/WordDecoder.t
+t/WordEncoder.t
t/Words.t
testin/ak-0696.msg
testin/andreas-1296.txt
@@ -161,4 +174,3 @@
testmsgs/uu-junk.ref
testmsgs/uu-zeegee.msg
testmsgs/uu-zeegee.ref
-META.yml Module meta-data (added by MakeMaker)
Modified: trunk/mime-tools/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/META.yml?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/META.yml (original)
+++ trunk/mime-tools/META.yml Wed Mar 26 19:20:52 2008
@@ -1,22 +1,31 @@
---- #YAML:1.0
-name: MIME-tools
-version: 5.425
-abstract: Tools to manipulate MIME messages
-license: perl
-generated_by: ExtUtils::MakeMaker version 6.32
-distribution_type: module
-requires:
- File::Path: 1
- File::Spec: 0.6
- File::Temp: 0.17
- IO::Stringy: 2.11
- Mail::Field: 1.05
- Mail::Header: 1.01
- Mail::Internet: 1.0203
- MIME::Base64: 2.2
- Test::More: 0
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
-author:
- - Eryq <eryq at zeegee.com>, David F. Skoll <dfs at roaringpenguin.com>, Dave O'Neill <dmo at roaringpenguin.com>
+---
+abstract: Tools to manipulate MIME messages
+author: Eryq <eryq at zeegee.com>, David F. Skoll <dfs at roaringpenguin.com>, Dave O'Neill <dmo at roaringpenguin.com>
+build_requires:
+ Test::More: 0
+distribution_type: module
+generated_by: Module::Install version 0.67
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
+name: MIME-tools
+no_index:
+ directory:
+ - inc
+ - t
+recommends:
+ MIME::Base64: 3.03
+requires:
+ File::Path: 1
+ File::Spec: 0.6
+ File::Temp: 0.18
+ IO::File: 0
+ IO::Handle: 0
+ IO::Stringy: 2.11
+ MIME::Base64: 2.2
+ Mail::Field: 1.05
+ Mail::Header: 1.01
+ Mail::Internet: 1.0203
+ perl: 5.8.0
+version: 5.426
Modified: trunk/mime-tools/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/Makefile.PL?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/Makefile.PL (original)
+++ trunk/mime-tools/Makefile.PL Wed Mar 26 19:20:52 2008
@@ -1,94 +1,34 @@
-#!/usr/bin/perl
-use ExtUtils::MakeMaker;
+use strict;
+use warnings;
+use inc::Module::Install;
-# Do our own prerequisite checking
-# Stolen from Net::FTPServer which stole from libwww-perl
-my %modules =
-(
- 'Mail::Header' => { min_version => "1.01" },
- 'Mail::Internet' => { min_version => "1.0203" },
- 'Mail::Field' => { min_version => "1.05" },
- 'MIME::Base64' => { min_version => "2.20",
- rec_version => "3.03" },
- 'IO::Stringy' => { min_version => "2.110" },
- 'File::Spec' => { min_version => "0.6" },
- 'File::Path' => { min_version => "1" },
- 'File::Temp' => { min_version => "0.17" },
- );
+name 'MIME-tools';
+version_from 'lib/MIME/Tools.pm';
+author q{Eryq <eryq at zeegee.com>, David F. Skoll <dfs at roaringpenguin.com>, Dave O'Neill <dmo at roaringpenguin.com>};
+abstract 'Tools to manipulate MIME messages';
+license 'perl';
-my($m, $foundit, $foundrec, @missing);
- at missing = ();
-foreach $m (sort keys %modules) {
- $foundit = 0;
- $foundrec = 0;
- my $min_ver = $modules{$m}{min_version};
- my $rec_ver = $modules{$m}{rec_version};
- if (defined($rec_ver)) {
- print "Checking for module $m (version $rec_ver)... ";
- my $eval = "require $m; $m->VERSION >= $rec_ver;";
- my $r = eval($eval);
- if ($@ || !$r) {
- print "not found.\n --- Fallback: ";
- } else {
- $foundit = 1;
- $foundrec = 1;
- print "ok.\n";
- }
- }
- if (!$foundit) {
- print "Checking for module $m (version $min_ver)... ";
- my $eval = "require $m; $m->VERSION >= $min_ver;";
- my $r = eval($eval);
- if ($@ || !$r) {
- print "not found.\n";
- } else {
- $foundit = 1;
- print "ok.\n";
- }
- }
- if (defined($rec_ver) and $foundit and !$foundrec) {
- print "\n *** Warning: We can work with version $min_ver of $m, but\n *** we recommend that you upgrade to version $rec_ver.\n\n";
- if ($m eq "MIME::Base64") {
- print " *** Note that if you type 'make test', then tests\n *** 4, 5 and 7-11 of t/Misc.t may fail because of the old version\n *** of $m\n";
- }
- }
+# We require 5.8.x, for PerlIO support of "in memory" filehandles opened on scalars
+perl_version '5.008';
- push @missing, "$m: At least version $min_ver" unless $foundit;
-}
+# Runtime deps
+requires 'Mail::Header' => 1.01;
+requires 'Mail::Internet' => 1.0203;
+requires 'Mail::Field' => 1.05;
-if ($#missing >= 0) {
- print "\n\n *** The following required modules are missing:\n";
- foreach $m (@missing) {
- print "$m\n";
- }
- print " *** Please install them before attempting to use MIME::Tools.\n";
-}
+# We prefer 3.03, but can work with 2.20
+requires 'MIME::Base64' => 2.20;
+recommends 'MIME::Base64' => 3.03;
-# Why the PREREQ_PM below? For automated tools like CPAN that try to be
-# smart about following dependencies.
-WriteMakefile(
- NAME => "MIME-tools",
- VERSION_FROM => "lib/MIME/Tools.pm",
- PREREQ_PM => {"Mail::Header" => 1.01,
- "Mail::Internet" => 1.0203,
- "Mail::Field" => 1.05,
- "MIME::Base64" => 2.20,
- "IO::Stringy" => 2.110,
- "File::Spec" => 0.6,
- "File::Path" => 1,
- "File::Temp" => 0.17,
- "Test::More" => 0,
- },
- LICENSE => 'perl',
- AUTHOR => q{Eryq <eryq at zeegee.com>, David F. Skoll <dfs at roaringpenguin.com>, Dave O'Neill <dmo at roaringpenguin.com>},
- ABSTRACT => 'Tools to manipulate MIME messages',
- 'dist' => {
- COMPRESS =>'gzip -f',
- SUFFIX =>'gz',
- },
-);
+requires 'IO::File';
+requires 'IO::Handle';
+requires 'IO::Stringy' => 2.110;
+requires 'File::Spec' => 0.6;
+requires 'File::Path' => 1;
+requires 'File::Temp' => 0.18;
+# Build deps
+build_requires 'Test::More';
-
-
-
+auto_install;
+WriteAll;
Modified: trunk/mime-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/debian/changelog?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/debian/changelog (original)
+++ trunk/mime-tools/debian/changelog Wed Mar 26 19:20:52 2008
@@ -1,3 +1,9 @@
+mime-tools (5.426-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Wed, 26 Mar 2008 20:18:21 +0100
+
mime-tools (5.425-2) unstable; urgency=low
[ MartÃn Ferrari ]
Modified: trunk/mime-tools/lib/MIME/Body.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Body.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Body.pm (original)
+++ trunk/mime-tools/lib/MIME/Body.pm Wed Mar 26 19:20:52 2008
@@ -1,5 +1,4 @@
package MIME::Body;
-
=head1 NAME
@@ -139,9 +138,10 @@
### System modules:
use Carp;
+use IO::File;
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
#------------------------------
Modified: trunk/mime-tools/lib/MIME/Decoder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder.pm Wed Mar 26 19:20:52 2008
@@ -125,7 +125,7 @@
);
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### Me:
my $ME = 'MIME::Decoder';
Modified: trunk/mime-tools/lib/MIME/Decoder/Base64.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder/Base64.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder/Base64.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder/Base64.pm Wed Mar 26 19:20:52 2008
@@ -55,7 +55,7 @@
@ISA = qw(MIME::Decoder);
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### How many bytes to encode at a time (must be a multiple of 3, and
### less than (76 * 0.75)!
Modified: trunk/mime-tools/lib/MIME/Decoder/BinHex.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder/BinHex.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder/BinHex.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder/BinHex.pm Wed Mar 26 19:20:52 2008
@@ -42,7 +42,7 @@
@ISA = qw(MIME::Decoder);
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
#------------------------------
Modified: trunk/mime-tools/lib/MIME/Decoder/Binary.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder/Binary.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder/Binary.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder/Binary.pm Wed Mar 26 19:20:52 2008
@@ -41,7 +41,7 @@
@ISA = qw(MIME::Decoder);
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### Buffer length:
my $BUFLEN = 8192;
Modified: trunk/mime-tools/lib/MIME/Decoder/Gzip64.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder/Gzip64.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder/Gzip64.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder/Gzip64.pm Wed Mar 26 19:20:52 2008
@@ -58,7 +58,7 @@
@ISA = qw(MIME::Decoder::Base64);
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
# How to compress stdin to stdout:
$GZIP = "gzip -c";
Modified: trunk/mime-tools/lib/MIME/Decoder/NBit.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder/NBit.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder/NBit.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder/NBit.pm Wed Mar 26 19:20:52 2008
@@ -92,7 +92,7 @@
@ISA = qw(MIME::Decoder);
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### How many bytes to decode at a time?
my $DecodeChunkLength = 8 * 1024;
Modified: trunk/mime-tools/lib/MIME/Decoder/QuotedPrint.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder/QuotedPrint.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder/QuotedPrint.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder/QuotedPrint.pm Wed Mar 26 19:20:52 2008
@@ -53,7 +53,7 @@
@ISA = qw(MIME::Decoder);
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
#------------------------------
# If we have MIME::QuotedPrint 3.03 or later, use the three-argument
Modified: trunk/mime-tools/lib/MIME/Decoder/UU.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Decoder/UU.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Decoder/UU.pm (original)
+++ trunk/mime-tools/lib/MIME/Decoder/UU.pm Wed Mar 26 19:20:52 2008
@@ -44,7 +44,7 @@
@ISA = qw(MIME::Decoder);
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
#------------------------------
Modified: trunk/mime-tools/lib/MIME/Entity.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Entity.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Entity.pm (original)
+++ trunk/mime-tools/lib/MIME/Entity.pm Wed Mar 26 19:20:52 2008
@@ -246,7 +246,7 @@
#------------------------------
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### Boundary counter:
my $BCount = 0;
Modified: trunk/mime-tools/lib/MIME/Field/ConTraEnc.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Field/ConTraEnc.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Field/ConTraEnc.pm (original)
+++ trunk/mime-tools/lib/MIME/Field/ConTraEnc.pm Wed Mar 26 19:20:52 2008
@@ -44,7 +44,7 @@
@ISA = qw(MIME::Field::ParamVal);
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
# Install it:
bless([])->register('Content-transfer-encoding');
Modified: trunk/mime-tools/lib/MIME/Field/ContDisp.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Field/ContDisp.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Field/ContDisp.pm (original)
+++ trunk/mime-tools/lib/MIME/Field/ContDisp.pm Wed Mar 26 19:20:52 2008
@@ -45,7 +45,7 @@
@ISA = qw(MIME::Field::ParamVal);
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
# Install it:
bless([])->register('Content-disposition');
Modified: trunk/mime-tools/lib/MIME/Field/ContType.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Field/ContType.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Field/ContType.pm (original)
+++ trunk/mime-tools/lib/MIME/Field/ContType.pm Wed Mar 26 19:20:52 2008
@@ -63,7 +63,7 @@
@ISA = qw(MIME::Field::ParamVal);
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
# Install it:
bless([])->register('Content-type');
Modified: trunk/mime-tools/lib/MIME/Field/ParamVal.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Field/ParamVal.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Field/ParamVal.pm (original)
+++ trunk/mime-tools/lib/MIME/Field/ParamVal.pm Wed Mar 26 19:20:52 2008
@@ -80,7 +80,7 @@
#------------------------------
# The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
#------------------------------
Modified: trunk/mime-tools/lib/MIME/Head.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Head.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Head.pm (original)
+++ trunk/mime-tools/lib/MIME/Head.pm Wed Mar 26 19:20:52 2008
@@ -114,6 +114,7 @@
use vars qw($VERSION @ISA @EXPORT_OK);
### System modules:
+use IO::File;
### Other modules:
use Mail::Header 1.09 ();
@@ -137,7 +138,7 @@
#------------------------------
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### Sanity (we put this test after our own version, for CPAN::):
use Mail::Header 1.06 ();
Modified: trunk/mime-tools/lib/MIME/Parser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Parser.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Parser.pm (original)
+++ trunk/mime-tools/lib/MIME/Parser.pm Wed Mar 26 19:20:52 2008
@@ -180,7 +180,7 @@
#------------------------------
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### How to catenate:
$CAT = '/bin/cat';
Modified: trunk/mime-tools/lib/MIME/Tools.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Tools.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Tools.pm (original)
+++ trunk/mime-tools/lib/MIME/Tools.pm Wed Mar 26 19:20:52 2008
@@ -11,7 +11,7 @@
require Exporter;
use IO::File;
-use File::Temp ();
+use File::Temp 0.18 ();
use Carp;
$ME = "MIME-tools";
@@ -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.425";
+$VERSION = "5.426";
# Configuration (do NOT alter this directly)...
# All legal CONFIG vars *must* be in here, even if only to be set to undef:
Modified: trunk/mime-tools/lib/MIME/Words.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/lib/MIME/Words.pm?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/lib/MIME/Words.pm (original)
+++ trunk/mime-tools/lib/MIME/Words.pm Wed Mar 26 19:20:52 2008
@@ -94,7 +94,7 @@
#------------------------------
### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "5.425";
+$VERSION = "5.426";
### Nonprintables (controls + x7F + 8bit):
my $NONPRINT = "\\x00-\\x1F\\x7F-\\xFF";
@@ -117,7 +117,7 @@
# almost, but not exactly, quoted-printable. :-P
sub _encode_Q {
my $str = shift;
- $str =~ s{([_\?\=$NONPRINT])}{sprintf("=%02X", ord($1))}eog;
+ $str =~ s{([ _\?\=$NONPRINT])}{sprintf("=%02X", ord($1))}eog;
$str;
}
@@ -307,15 +307,16 @@
my $encoding = lc($params{Encoding} || 'q');
### Encode any "words" with unsafe characters.
- ### We limit such words to 18 characters, to guarantee that the
+ ### We limit such words to 18 characters, to guarantee that the
### worst-case encoding give us no more than 54 + ~10 < 75 characters
my $word;
- $rawstr =~ s{([a-zA-Z0-9\x7F-\xFF]{1,18})}{ ### get next "word"
+ $rawstr =~ s{([ a-zA-Z0-9\x7F-\xFF]{1,18})}{ ### get next "word"
$word = $1;
- (($word !~ /[$NONPRINT]/o)
+ (($word !~ /(?:[$NONPRINT])|(?:^\s+$)/o)
? $word ### no unsafe chars
: encode_mimeword($word, $encoding, $charset)); ### has unsafe chars
}xeg;
+ $rawstr =~ s/\?==\?/?= =?/g;
$rawstr;
}
Modified: trunk/mime-tools/t/Smtpsend.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/t/Smtpsend.t?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/t/Smtpsend.t (original)
+++ trunk/mime-tools/t/Smtpsend.t Wed Mar 26 19:20:52 2008
@@ -13,6 +13,7 @@
LocalPort => 5225,
ReuseAddr => 1,
Type => SOCK_STREAM,
+ Timeout => 10,
Proto => 'tcp');
die("can't create socket: $!") unless $sock;
@@ -40,6 +41,11 @@
# In the parent
my $s = $sock->accept();
+if (!$s) {
+ kill(9, $pid);
+ die("accept failed: $!");
+}
+
$s->print("220 Go ahead\n");
$s->flush();
my $line = $s->getline();
Modified: trunk/mime-tools/t/Words.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/t/Words.t?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/t/Words.t (original)
+++ trunk/mime-tools/t/Words.t Wed Mar 26 19:20:52 2008
@@ -1,10 +1,10 @@
#!/usr/bin/perl -w
use strict;
use warnings;
-use Test::More tests => 18;
+use Test::More tests => 19;
use MIME::QuotedPrint qw(decode_qp);
-use MIME::Words qw(decode_mimewords);
+use MIME::Words qw( :all );
{
local($/) = '';
@@ -26,4 +26,12 @@
}
}
close WORDS;
-}
+}
+
+# Test case for ticket 5462
+{
+ my $source = 'hé hé';
+ my $encoded = encode_mimewords($source, ('Encode' => 'Q', 'Charset' => 'iso-8859-1'));
+ my $decoded = decode_mimewords($encoded);
+ is( $decoded, $source, 'encode/decode of string with spaces matches original');
+}
Modified: trunk/mime-tools/testin/words.txt
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/mime-tools/testin/words.txt?rev=18003&op=diff
==============================================================================
--- trunk/mime-tools/testin/words.txt (original)
+++ trunk/mime-tools/testin/words.txt Wed Mar 26 19:20:52 2008
@@ -39,6 +39,3 @@
GOOD
"_-_"
=?ISO-8859-1?Q?=5F-=5F?=
-
-
-
More information about the Pkg-perl-cvs-commits
mailing list