diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-24 14:49:06 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-24 14:49:06 +0000 |
commit | 736f6d995402c1b0e8c5af37ae0645b6c68ab6ba (patch) | |
tree | 5d93a257811656a4b263cd570668e22fb21689f1 /gnu/usr.bin | |
parent | 5f731fa3c9a0975248b25dba3d420459f58ef9c1 (diff) |
Perl 5.12.2 from CPAN
Diffstat (limited to 'gnu/usr.bin')
5 files changed, 21 insertions, 148 deletions
diff --git a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/01version.t b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/01version.t index 46200bc9a97..1eccbd350a4 100755 --- a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/01version.t +++ b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/01version.t @@ -25,14 +25,11 @@ BEGIN # Check zlib_version and ZLIB_VERSION are the same. -SKIP: { - skip "TEST_SKIP_VERSION_CHECK is set", 1 - if $ENV{TEST_SKIP_VERSION_CHECK}; - my $zlib_h = ZLIB_VERSION ; - my $libz = Compress::Raw::Zlib::zlib_version; +my $zlib_h = ZLIB_VERSION ; +my $libz = Compress::Raw::Zlib::zlib_version; - is($zlib_h, $libz, "ZLIB_VERSION ($zlib_h) matches Compress::Raw::Zlib::zlib_version") - or diag <<EOM; +is($zlib_h, $libz, "ZLIB_VERSION ($zlib_h) matches Compress::Raw::Zlib::zlib_version") + or diag <<EOM; The version of zlib.h does not match the version of libz @@ -42,5 +39,4 @@ You have zlib.h version $zlib_h You probably have two versions of zlib installed on your system. Try removing the one you don't want to use and rebuild. EOM -} diff --git a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/09limitoutput.t b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/09limitoutput.t index 2532f9c6926..a98b18f0c72 100755 --- a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/09limitoutput.t +++ b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/09limitoutput.t @@ -20,7 +20,7 @@ BEGIN $extra = 1 if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - plan tests => 107 + $extra ; + plan tests => 98 + $extra ; use_ok('Compress::Raw::Zlib', 2) ; } @@ -127,33 +127,3 @@ sub getit } -{ - title "regression test for #92521: Z_OK instead of Z_BUF_ERROR"; - - # 1M "aaa..." - my $in = 'a' x 100000; - my ($deflate, $err) = Compress::Raw::Zlib::Deflate->new(WindowBits => -15, - MemLevel => 8); - ok $deflate ; - cmp_ok $err, '==', Z_OK, " status is Z_OK" ; - - my $status = $deflate->deflate($in, my $zip); - cmp_ok $status, '==', Z_OK, " status is Z_OK" ; - - cmp_ok $deflate->flush($zip, Z_SYNC_FLUSH), "==", Z_OK; - - # Compression should stop after 10K "aaa..." with Z_BUF_ERROR - my $inflate; - ($inflate, $err) = Compress::Raw::Zlib::Inflate->new( Bufsize => 10000, - LimitOutput => 1, WindowBits => -15 ); - ok $inflate ; - cmp_ok $err, '==', Z_OK, " status is Z_OK" ; - - $status = $inflate->inflate($zip, my $out); - - cmp_ok length($out), ">=", 10000; - #warn 'RESULT: ', length($out), ' of ', length($in), "\n"; - cmp_ok $status, '==', Z_BUF_ERROR, " status is Z_BUF_ERROR" ; - -} - diff --git a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/18lvalue.t b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/18lvalue.t index 3b102c799e9..860c50cda62 100755 --- a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/18lvalue.t +++ b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/18lvalue.t @@ -38,12 +38,8 @@ EOM my $len = length $hello ; # Check zlib_version and ZLIB_VERSION are the same. -SKIP: { - skip "TEST_SKIP_VERSION_CHECK is set", 1 - if $ENV{TEST_SKIP_VERSION_CHECK}; - is Compress::Raw::Zlib::zlib_version, ZLIB_VERSION, - "ZLIB_VERSION matches Compress::Raw::Zlib::zlib_version" ; -} +is Compress::Raw::Zlib::zlib_version, ZLIB_VERSION, + "ZLIB_VERSION matches Compress::Raw::Zlib::zlib_version" ; { diff --git a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/compress/CompTestUtils.pm b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/compress/CompTestUtils.pm index c506632f90e..f21045d2598 100644 --- a/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/compress/CompTestUtils.pm +++ b/gnu/usr.bin/perl/cpan/Compress-Raw-Zlib/t/compress/CompTestUtils.pm @@ -25,14 +25,6 @@ sub like_eval like $@, @_ ; } -BEGIN { - eval { - require File::Temp; - } ; - -} - - { package LexFile ; @@ -44,9 +36,8 @@ BEGIN { my $self = shift ; foreach (@_) { - Carp::croak "NO!!!!" if defined $_; - # autogenerate the name if none supplied - $_ = "tst" . $$ . "X" . $index ++ . ".tmp" + # autogenerate the name unless if none supplied + $_ = "tst" . $index ++ . ".tmp" unless defined $_; } chmod 0777, @_; @@ -67,79 +58,19 @@ BEGIN { package LexDir ; use File::Path; - - our ($index); - $index = '00000'; - our ($useTempFile); - our ($useTempDir); - sub new { my $self = shift ; - - if ( $useTempDir) - { - foreach (@_) - { - Carp::croak "NO!!!!" if defined $_; - $_ = File::Temp->newdir(DIR => '.'); - # Subsequent manipulations assume Unix syntax, metacharacters, etc. - if ($^O eq 'VMS') - { - $_->{DIRNAME} = VMS::Filespec::unixify($_->{DIRNAME}); - $_->{DIRNAME} =~ s/\/$//; - } - } - bless [ @_ ], $self ; - } - elsif ( $useTempFile) - { - foreach (@_) - { - Carp::croak "NO!!!!" if defined $_; - $_ = File::Temp::tempdir(DIR => '.', CLEANUP => 1); - # Subsequent manipulations assume Unix syntax, metacharacters, etc. - if ($^O eq 'VMS') - { - $_ = VMS::Filespec::unixify($_); - $_ =~ s/\/$//; - } - } - bless [ @_ ], $self ; - } - else - { - foreach (@_) - { - Carp::croak "NO!!!!" if defined $_; - # autogenerate the name if none supplied - $_ = "tmpdir" . $$ . "X" . $index ++ . ".tmp" ; - } - foreach (@_) - { - rmtree $_, {verbose => 0, safe => 1} - if -d $_; - mkdir $_, 0777 - } - bless [ @_ ], $self ; - } - + foreach (@_) { rmtree $_ } + bless [ @_ ], $self ; } sub DESTROY { - if (! $useTempFile) - { - my $self = shift ; - foreach (@$self) - { - rmtree $_, {verbose => 0, safe => 1} - if -d $_ ; - } - } + my $self = shift ; + foreach (@$self) { rmtree $_ } } } - sub readFile { my $f = shift ; @@ -395,17 +326,6 @@ my %TOP = ( Raw => 0, }, - 'IO::Compress::Lzip' => { Inverse => 'IO::Uncompress::UnLzip', - Error => 'LzipError', - TopLevel => 'lzip', - Raw => 0, - }, - 'IO::Uncompress::UnLzip' => { Inverse => 'IO::Compress::Lzip', - Error => 'UnLzipError', - TopLevel => 'unlzip', - Raw => 0, - }, - 'IO::Compress::PPMd' => { Inverse => 'IO::Uncompress::UnPPMd', Error => 'PPMdError', TopLevel => 'ppmd', @@ -416,16 +336,6 @@ my %TOP = ( TopLevel => 'unppmd', Raw => 0, }, - 'IO::Compress::Zstd' => { Inverse => 'IO::Uncompress::UnZstd', - Error => 'ZstdError', - TopLevel => 'zstd', - Raw => 0, - }, - 'IO::Uncompress::UnZstd' => { Inverse => 'IO::Compress::Zstd', - Error => 'UnZstdError', - TopLevel => 'unzstd', - Raw => 0, - }, 'IO::Compress::DummyComp' => { Inverse => 'IO::Uncompress::DummyUnComp', Error => 'DummyCompError', @@ -515,7 +425,7 @@ sub compressBuffer our ($AnyUncompressError); BEGIN { - eval ' use IO::Uncompress::AnyUncompress qw(anyuncompress $AnyUncompressError); '; + eval ' use IO::Uncompress::AnyUncompress qw($AnyUncompressError); '; } sub anyUncompress @@ -576,6 +486,7 @@ sub anyUncompress if $o->error() ; return $out ; + } sub getHeaders @@ -738,7 +649,7 @@ sub getMultiValues { my $class = shift ; - return (0,0) if $class =~ /lzf|lzma|zstd/i; + return (0,0) if $class =~ /lzf|lzma/i; return (1,0); } diff --git a/gnu/usr.bin/perl/cpan/MIME-Base64/QuotedPrint.pm b/gnu/usr.bin/perl/cpan/MIME-Base64/QuotedPrint.pm index d0c71d10439..aee13d6256b 100644 --- a/gnu/usr.bin/perl/cpan/MIME-Base64/QuotedPrint.pm +++ b/gnu/usr.bin/perl/cpan/MIME-Base64/QuotedPrint.pm @@ -7,7 +7,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(encode_qp decode_qp); -$VERSION = "3.13"; +$VERSION = "3.08"; use MIME::Base64; # will load XS version of {en,de}code_qp() @@ -44,11 +44,11 @@ The following functions are provided: =over 4 -=item encode_qp( $str) +=item encode_qp($str) -=item encode_qp( $str, $eol) +=item encode_qp($str, $eol) -=item encode_qp( $str, $eol, $binmode ) +=item encode_qp($str, $eol, $binmode) This function returns an encoded version of the string ($str) given as argument. @@ -72,7 +72,7 @@ An $eol of "" (the empty string) is special. In this case, no "soft line breaks" are introduced and binary mode is effectively enabled so that any "\n" in the original data is encoded as well. -=item decode_qp( $str ) +=item decode_qp($str); This function returns the plain text version of the string given as argument. The lines of the result are "\n" terminated, even if |