This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository libarchive-zip-perl.

commit 149bec7a2a412889b491e55c22457036b4478155
Author: Niko Tyni <nt...@debian.org>
Date:   Mon Jun 15 22:46:22 2015 +0300

    Drop fix for deflated empty files, fixed in a different way upstream
---
 ...cpan.org-73797-deflated-empty-file-direct.patch | 35 ----------------------
 1 file changed, 35 deletions(-)

diff --git 
a/debian/patches/0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch
 
b/debian/patches/0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch
deleted file mode 100644
index 3a5008e..0000000
--- 
a/debian/patches/0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 92b2b67dd4728d10b053f172063be6ad1d14da8f Mon Sep 17 00:00:00 2001
-From: Niko Tyni <nt...@debian.org>
-Date: Wed, 11 Jan 2012 21:47:46 +0200
-Subject: [PATCH 3/3] Fix for [rt.cpan.org #73797]: deflated empty file /
- directory gets corrupted
-
-The output header needs to be refreshed also in the case where
-uncompressed size is 0 but the compressed size is > 0 (deflation
-of an empty file.)
----
- lib/Archive/Zip/Member.pm |    2 +-
- t/17_bug_73797.t          |    3 ---
- 2 files changed, 1 insertions(+), 4 deletions(-)
-
---- a/lib/Archive/Zip/Member.pm
-+++ b/lib/Archive/Zip/Member.pm
-@@ -1044,7 +1044,7 @@
-     # I need to do this if I can't refresh the header
-     # and I don't know compressed size or crc32 fields.
-     my $headerFieldsUnknown = (
--        ($self->uncompressedSize() > 0)
-+        ($self->uncompressedSize() > 0 or $self->compressedSize > 0)
-           and ($self->compressionMethod() == COMPRESSION_STORED
-             or $self->desiredCompressionMethod() == COMPRESSION_DEFLATED));
- 
---- a/t/17_bug_73797.t
-+++ b/t/17_bug_73797.t
-@@ -20,7 +20,4 @@
- my ($status, $zipout) = testZip();
- # STDERR->print("status= $status, out=$zipout\n");
- skip( "test zip doesn't work", 1 ) if $testZipDoesntWork;
--TODO: {
--    local $TODO = "deflated empty files/directories corrupt the output";
- is( $status, 0, "output zip isn't corrupted" );
--}

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libarchive-zip-perl.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to