r5444 - in /packages/libarchive-tar-perl/branches/upstream/current: ./ lib/Archive/ lib/Archive/Tar/ t/ t/src/ t/src/long/ t/src/short/

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Fri May 18 21:30:10 UTC 2007


Author: gwolf
Date: Fri May 18 21:30:10 2007
New Revision: 5444

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=5444
Log:
[svn-upgrade] Integrating new upstream version, libarchive-tar-perl (1.31)

Added:
    packages/libarchive-tar-perl/branches/upstream/current/t/src/
    packages/libarchive-tar-perl/branches/upstream/current/t/src/long/
    packages/libarchive-tar-perl/branches/upstream/current/t/src/long/b
    packages/libarchive-tar-perl/branches/upstream/current/t/src/long/bar.tar   (with props)
    packages/libarchive-tar-perl/branches/upstream/current/t/src/long/foo.tgz   (with props)
    packages/libarchive-tar-perl/branches/upstream/current/t/src/short/
    packages/libarchive-tar-perl/branches/upstream/current/t/src/short/b
    packages/libarchive-tar-perl/branches/upstream/current/t/src/short/bar.tar   (with props)
    packages/libarchive-tar-perl/branches/upstream/current/t/src/short/foo.tgz   (with props)
Removed:
    packages/libarchive-tar-perl/branches/upstream/current/t/00_setup.t
    packages/libarchive-tar-perl/branches/upstream/current/t/99_clean.t
Modified:
    packages/libarchive-tar-perl/branches/upstream/current/CHANGES
    packages/libarchive-tar-perl/branches/upstream/current/MANIFEST
    packages/libarchive-tar-perl/branches/upstream/current/META.yml
    packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar.pm
    packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar/File.pm
    packages/libarchive-tar-perl/branches/upstream/current/t/02_methods.t

Modified: packages/libarchive-tar-perl/branches/upstream/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/CHANGES?rev=5444&op=diff
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/CHANGES (original)
+++ packages/libarchive-tar-perl/branches/upstream/current/CHANGES Fri May 18 21:30:10 2007
@@ -1,3 +1,17 @@
+* important changes in version 1.31 18/5/2007:
+-   No longer use the t/setup.t and t/cleanup.t files but just bundle 
+    the binary files; this was done for core integration, but the new 
+    uupacktool.pl script means we dont have to do this anymore
+_   Apply core perl Change 30997 by rgs at stcosmo on 2007/04/20 15:03:57
+-   Address: #27124: Unneeded warning sent when checking for file
+    inclusion contains_file() will no longer warn to STDERR when a file 
+    is not contained in an archive and $WARN is set to 'true'.
+-   Address #26492: Dangling symlinks not preserved: Archive::Tar used 
+    to complain about dangling symlinks, unlike standard gnu tar, which 
+    would add them silently. This patch brings A::T's behaviour in line 
+    with gnu tar
+-   Minor pod fixes
+
 * important changes in version 1.30 8/2/2006:
 -   applied bleadperl patch: Subject: Change 27416: 
     Cleanup Archive-Tar temporary test files

Modified: packages/libarchive-tar-perl/branches/upstream/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/MANIFEST?rev=5444&op=diff
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/MANIFEST (original)
+++ packages/libarchive-tar-perl/branches/upstream/current/MANIFEST Fri May 18 21:30:10 2007
@@ -7,11 +7,15 @@
 Makefile.PL
 MANIFEST			This list of files
 README
-t/00_setup.t
 t/01_use.t
 t/02_methods.t
 t/03_file.t
 t/04_resolved_issues.t
-t/99_clean.t
 t/99_pod.t
+t/src/long/b
+t/src/long/bar.tar
+t/src/long/foo.tgz
+t/src/short/b
+t/src/short/bar.tar
+t/src/short/foo.tgz
 META.yml                                 Module meta-data (added by MakeMaker)

Modified: packages/libarchive-tar-perl/branches/upstream/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/META.yml?rev=5444&op=diff
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/META.yml (original)
+++ packages/libarchive-tar-perl/branches/upstream/current/META.yml Fri May 18 21:30:10 2007
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Archive-Tar
-version:      1.30
+version:      1.31
 version_from: lib/Archive/Tar.pm
 installdirs:  site
 requires:

Modified: packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar.pm?rev=5444&op=diff
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar.pm (original)
+++ packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar.pm Fri May 18 21:30:10 2007
@@ -14,7 +14,7 @@
 $DEBUG              = 0;
 $WARN               = 1;
 $FOLLOW_SYMLINK     = 0;
-$VERSION            = "1.30";
+$VERSION            = "1.31";
 $CHOWN              = 1;
 $CHMOD              = 1;
 $DO_NOT_USE_PREFIX  = 0;
@@ -303,7 +303,7 @@
 
             if ( $entry->is_file && !$entry->validate ) {
                 ### sometimes the chunk is rather fux0r3d and a whole 512
-                ### bytes ends p in the ->name area.
+                ### bytes ends up in the ->name area.
                 ### clean it up, if need be
                 my $name = $entry->name;
                 $name = substr($name, 0, 100) if length $name > 100;
@@ -328,7 +328,7 @@
             }
 
             ### throw away trailing garbage ###
-            substr ($$data, $entry->size) = "";
+            substr ($$data, $entry->size) = "" if defined $$data;
 
             ### part II of the @LongLink munging -- need to do /after/
             ### the checksum check.
@@ -408,6 +408,9 @@
     my $self = shift;
     my $full = shift or return;
 
+    ### don't warn if the entry isn't there.. that's what this function
+    ### is for after all.
+    local $WARN = 0;
     return 1 if $self->_find_entry($full);
     return;
 }
@@ -565,6 +568,17 @@
             $self->_error( qq[Could not create directory '$dir': $@] );
             return;
         }
+        
+        ### XXX chown here? that might not be the same as in the archive
+        ### as we're only chown'ing to the owner of the file we're extracting
+        ### not to the owner of the directory itself, which may or may not
+        ### be another entry in the archive
+        ### Answer: no, gnu tar doesn't do it either, it'd be the wrong
+        ### way to go.
+        #if( $CHOWN && CAN_CHOWN ) {
+        #    chown $entry->uid, $entry->gid, $dir or
+        #        $self->_error( qq[Could not set uid/gid on '$dir'] );
+        #}
     }
 
     ### we're done if we just needed to create a dir ###
@@ -1116,7 +1130,7 @@
 
     my @rv;
     for my $file ( @files ) {
-        unless( -e $file ) {
+        unless( -e $file || -l $file ) {
             $self->_error( qq[No such file: '$file'] );
             next;
         }
@@ -1595,6 +1609,10 @@
 C<$Archive::Tar::DO_NOT_USE_PREFIX> variable to C<true>. See the 
 C<GLOBAL VARIABLES> section for details on this variable.
 
+Note that GNU tar earlier than version 1.14 does not cope well with
+the C<POSIX header prefix>. If you use such a version, consider setting
+the C<$Archive::Tar::DO_NOT_USE_PREFIX> variable to C<true>.
+
 =item How do I extract only files that have property X from an archive?
 
 Sometimes, you might not wish to extract a complete archive, just
@@ -1704,8 +1722,9 @@
 
 =head1 AUTHOR
 
-This module by
-Jos Boumans E<lt>kane at cpan.orgE<gt>.
+This module by Jos Boumans E<lt>kane at cpan.orgE<gt>.
+
+Please reports bugs to E<lt>bug-archive-tar at rt.cpan.orgE<gt>.
 
 =head1 ACKNOWLEDGEMENTS
 
@@ -1714,12 +1733,10 @@
 
 =head1 COPYRIGHT
 
-This module is
-copyright (c) 2002 Jos Boumans E<lt>kane at cpan.orgE<gt>.
-All rights reserved.
-
-This library is free software;
-you may redistribute and/or modify it under the same
-terms as Perl itself.
-
-=cut
+This module is copyright (c) 2002 - 2007 Jos Boumans 
+E<lt>kane at cpan.orgE<gt>. All rights reserved.
+
+This library is free software; you may redistribute and/or modify 
+it under the same terms as Perl itself.
+
+=cut

Modified: packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar/File.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar/File.pm?rev=5444&op=diff
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar/File.pm (original)
+++ packages/libarchive-tar-perl/branches/upstream/current/lib/Archive/Tar/File.pm Fri May 18 21:30:10 2007
@@ -237,7 +237,7 @@
     my $type        = __PACKAGE__->_filetype($path);
     my $data        = '';
 
-    unless ($type == DIR) {
+    unless ($type == DIR || $type == SYMLINK) {
         my $fh = IO::File->new;
         $fh->open($path) or return;
 

Modified: packages/libarchive-tar-perl/branches/upstream/current/t/02_methods.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/t/02_methods.t?rev=5444&op=diff
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/t/02_methods.t (original)
+++ packages/libarchive-tar-perl/branches/upstream/current/t/02_methods.t Fri May 18 21:30:10 2007
@@ -65,8 +65,11 @@
                     && length( cwd(). $LONG_FILE ) > 247;
 
 ### warn if we are going to skip long file names
-$TOO_LONG ? diag("No long filename support - long filename extraction disabled")
-          : ( push @EXPECT_NORMAL, [ [], $LONG_FILE, qr/^hello\s*$/] ) ;
+if ($TOO_LONG) {
+    diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
+} else {
+    push @EXPECT_NORMAL, [ [], $LONG_FILE, qr/^hello\s*$/];
+}
 
 my @ROOT        = grep { length }   'src', $TOO_LONG ? 'short' : 'long';
 
@@ -131,6 +134,18 @@
     ### check if ->error eq $error
     is( $tar->error, $Archive::Tar::error,
                                     '$error matches error() method' );
+                     
+    ### check that 'contains_file' doesn't warn about missing files.                     
+    {   ### turn on warnings in general!
+        local $Archive::Tar::WARN  = 1;
+
+        my $warnings = '';
+        local $SIG{__WARN__} = sub { $warnings .= "@_" };
+        
+        my $rv = $tar->contains_file( $$ );
+        ok( !$rv,                   "Does not contain file '$$'" );
+        is( $warnings, '',          "   No warnings issued during lookup" );
+    }        
 }
 
 ### read tests ###

Added: packages/libarchive-tar-perl/branches/upstream/current/t/src/long/b
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/t/src/long/b?rev=5444&op=file
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/t/src/long/b (added)
+++ packages/libarchive-tar-perl/branches/upstream/current/t/src/long/b Fri May 18 21:30:10 2007
@@ -1,0 +1,1 @@
+bbbbbbbbbbb

Added: packages/libarchive-tar-perl/branches/upstream/current/t/src/long/bar.tar
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/t/src/long/bar.tar?rev=5444&op=file
==============================================================================
Binary file - no diff available.

Propchange: packages/libarchive-tar-perl/branches/upstream/current/t/src/long/bar.tar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: packages/libarchive-tar-perl/branches/upstream/current/t/src/long/foo.tgz
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/t/src/long/foo.tgz?rev=5444&op=file
==============================================================================
Binary file - no diff available.

Propchange: packages/libarchive-tar-perl/branches/upstream/current/t/src/long/foo.tgz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: packages/libarchive-tar-perl/branches/upstream/current/t/src/short/b
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/t/src/short/b?rev=5444&op=file
==============================================================================
--- packages/libarchive-tar-perl/branches/upstream/current/t/src/short/b (added)
+++ packages/libarchive-tar-perl/branches/upstream/current/t/src/short/b Fri May 18 21:30:10 2007
@@ -1,0 +1,1 @@
+bbbbbbbbbbb

Added: packages/libarchive-tar-perl/branches/upstream/current/t/src/short/bar.tar
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/t/src/short/bar.tar?rev=5444&op=file
==============================================================================
Binary file - no diff available.

Propchange: packages/libarchive-tar-perl/branches/upstream/current/t/src/short/bar.tar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: packages/libarchive-tar-perl/branches/upstream/current/t/src/short/foo.tgz
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libarchive-tar-perl/branches/upstream/current/t/src/short/foo.tgz?rev=5444&op=file
==============================================================================
Binary file - no diff available.

Propchange: packages/libarchive-tar-perl/branches/upstream/current/t/src/short/foo.tgz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream




More information about the Pkg-perl-cvs-commits mailing list