Package: release.debian.org User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org
Dear Release Team, Please consider unblocking strip-nondetermism 0.034-1: strip-nondeterminism (0.034-1) unstable; urgency=medium [ Chris Lamb ] * Only print log messages by default if the file was actually modified rather than if we merely identified a file (see 0.033-1). This was not only noisy in-of itself and somewhat misleading, it moreover defeated the point of adding these log messages in the first place - ie. identifying normalizers we can start to remove from strip-nondeterminism. (Closes: #863033) [ Bernhard M. Wiedemann ] * zip: make sure we have permissions on extracted file * Add function prototypes. -- Chris Lamb <la...@debian.org> Sat, 20 May 2017 15:19:52 +0200 The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
diffstat for strip-nondeterminism-0.033 strip-nondeterminism-0.034 bin/dh_strip_nondeterminism | 4 ++-- debian/changelog | 16 ++++++++++++++++ lib/File/StripNondeterminism.pm | 10 +++++----- lib/File/StripNondeterminism/Common.pm | 2 +- lib/File/StripNondeterminism/handlers/gettext.pm | 2 +- lib/File/StripNondeterminism/handlers/jar.pm | 6 +++--- lib/File/StripNondeterminism/handlers/javadoc.pm | 2 +- lib/File/StripNondeterminism/handlers/javaproperties.pm | 4 ++-- lib/File/StripNondeterminism/handlers/pearregistry.pm | 2 +- lib/File/StripNondeterminism/handlers/png.pm | 8 ++++---- lib/File/StripNondeterminism/handlers/zip.pm | 11 ++++++----- 11 files changed, 42 insertions(+), 25 deletions(-) diff -Nru strip-nondeterminism-0.033/bin/dh_strip_nondeterminism strip-nondeterminism-0.034/bin/dh_strip_nondeterminism --- strip-nondeterminism-0.033/bin/dh_strip_nondeterminism 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/bin/dh_strip_nondeterminism 2017-05-20 15:16:18.000000000 +0200 @@ -83,8 +83,8 @@ foreach (@nondeterministic_files) { my ($path, $normalize) = @$_; - nonquiet_print("Normalizing $path"); - eval { $normalize->($path); 1 } + verbose_print("Normalizing $path"); + eval { $normalize->($path) or nonquiet_print("Normalized $path"); 1; } or error("$path: $@"); } } diff -Nru strip-nondeterminism-0.033/debian/changelog strip-nondeterminism-0.034/debian/changelog --- strip-nondeterminism-0.033/debian/changelog 2017-05-08 11:52:36.000000000 +0200 +++ strip-nondeterminism-0.034/debian/changelog 2017-05-20 15:19:52.000000000 +0200 @@ -1,3 +1,19 @@ +strip-nondeterminism (0.034-1) unstable; urgency=medium + + [ Chris Lamb ] + * Only print log messages by default if the file was actually modified + rather than if we merely identified a file (see 0.033-1). This was not + only noisy in-of itself and somewhat misleading, it moreover defeated the + point of adding these log messages in the first place - ie. identifying + normalizers we can start to remove from strip-nondeterminism. + (Closes: #863033) + + [ Bernhard M. Wiedemann ] + * zip: make sure we have permissions on extracted file + * Add function prototypes. + + -- Chris Lamb <la...@debian.org> Sat, 20 May 2017 15:19:52 +0200 + strip-nondeterminism (0.033-2) unstable; urgency=medium * Correct temmporary -> temporary typo in package long description. Thanks diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/Common.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/Common.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/Common.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/Common.pm 2017-05-20 15:16:18.000000000 +0200 @@ -35,7 +35,7 @@ # 2. This function simulates file editing of "$to_path". # 3. After this function, "$to_path" would be a file associated with # a copied "data" from "from_path" and a "inode" from "$to_path". -sub copy_data { +sub copy_data($$) { my $from_path = shift; my $to_path = shift; diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/gettext.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/gettext.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/gettext.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/gettext.pm 2017-05-20 15:16:18.000000000 +0200 @@ -24,7 +24,7 @@ use strict; use warnings; -sub read_file { +sub read_file($) { my $filename = shift; local $/ = undef; diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/jar.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/jar.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/jar.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/jar.pm 2017-05-20 15:16:18.000000000 +0200 @@ -40,7 +40,7 @@ return $a cmp $b; } -sub _jar_normalize_manifest { +sub _jar_normalize_manifest($) { my ($filename) = @_; open(my $fh, '<', $filename) @@ -67,7 +67,7 @@ return $modified; } -sub _jar_normalize_member { +sub _jar_normalize_member($) { my ($member) = @_; # $member is a ref to an Archive::Zip::Member return if $member->isDirectory(); @@ -98,7 +98,7 @@ return 1; } -sub _jar_archive_filter { +sub _jar_archive_filter($) { my ($zip) = @_; # Don't normalize signed JARs, since our modifications will break the diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/javadoc.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/javadoc.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/javadoc.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/javadoc.pm 2017-05-20 15:16:18.000000000 +0200 @@ -27,7 +27,7 @@ use File::Basename; use POSIX qw(strftime); -sub is_javadoc_file { +sub is_javadoc_file($) { my ($filename) = @_; # If this is a javadoc file, '<!-- Generated by javadoc' should appear diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/javaproperties.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/javaproperties.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/javaproperties.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/javaproperties.pm 2017-05-20 15:16:18.000000000 +0200 @@ -26,13 +26,13 @@ use File::Temp; use File::Basename; -sub is_java_properties_header { +sub is_java_properties_header($) { my ($contents) = @_; return $contents =~ /#Generated by( Apache)? Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties|#.* runtime configuration/; } -sub is_java_properties_file { +sub is_java_properties_file($) { my ($filename) = @_; # If this is a java properties file, '#Generated by Maven', '#Build diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/pearregistry.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/pearregistry.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/pearregistry.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/pearregistry.pm 2017-05-20 15:16:18.000000000 +0200 @@ -25,7 +25,7 @@ use File::Temp; use File::Basename; -sub is_registry_file { +sub is_registry_file($) { my ($filename) = @_; # Registry files will always start with "a:" diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/png.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/png.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/png.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/png.pm 2017-05-20 15:16:18.000000000 +0200 @@ -27,24 +27,24 @@ use POSIX qw/strftime/; use List::Util qw/min/; -sub crc { +sub crc($) { my ($data) = @_; return Archive::Zip::computeCRC32($data); } -sub chunk { +sub chunk($$) { my ($type, $data) = @_; return pack('Na4a*N', length($data), $type, $data, crc($type . $data)); } -sub time_chunk { +sub time_chunk($) { my ($seconds) = @_; my ($sec, $min, $hour, $mday, $mon, $year) = gmtime($seconds); return chunk('tIME', pack('nCCCCC', 1900+$year, $mon+1, $mday, $hour, $min, $sec)); } -sub text_chunk { +sub text_chunk($$) { my ($keyword, $data) = @_; return chunk('tEXt', pack('Z*a*', $keyword, $data)); } diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/zip.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/zip.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism/handlers/zip.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism/handlers/zip.pm 2017-05-20 15:16:18.000000000 +0200 @@ -31,7 +31,7 @@ use constant SAFE_EPOCH => 315576060; # Extract and return the first $nbytes of $member (an Archive::Zip::Member) -sub peek_member { +sub peek_member($$) { my ($member, $nbytes) = @_; my $original_size = $member->compressedSize(); my $old_compression_method @@ -48,7 +48,7 @@ } # Normalize the contents of $member (an Archive::Zip::Member) with $normalizer -sub normalize_member { +sub normalize_member($$) { my ($member, $normalizer) = @_; # Extract the member to a temporary file. @@ -56,6 +56,7 @@ my $filename = "$tempdir/member"; my $original_size = $member->compressedSize(); $member->extractToFileNamed($filename); + chmod(0600, $filename); $member->{'compressedSize'} = $original_size ; # Work around https://github.com/redhotpenguin/perl-Archive-Zip/issues/11 @@ -79,7 +80,7 @@ LOCAL_HEADER => 1 }; -sub unixtime_to_winnt { +sub unixtime_to_winnt($) { my $unixtime = shift || 0; # WinNT epoch is 01-Jan-1601 00:00:00 UTC @@ -89,7 +90,7 @@ return $unixtime + $secondsdiff; } -sub normalize_extra_fields { +sub normalize_extra_fields($$) { # See http://sources.debian.net/src/zip/3.0-6/proginfo/extrafld.txt for extra field documentation # $header_type is CENTRAL_HEADER or LOCAL_HEADER. # WARNING: some fields have a different format depending on the header type @@ -157,7 +158,7 @@ return $result; } -sub try { +sub try(&$) { my ($sub, $errors) = @_; @$errors = (); my $old_error_handler diff -Nru strip-nondeterminism-0.033/lib/File/StripNondeterminism.pm strip-nondeterminism-0.034/lib/File/StripNondeterminism.pm --- strip-nondeterminism-0.033/lib/File/StripNondeterminism.pm 2017-05-07 19:31:07.000000000 +0200 +++ strip-nondeterminism-0.034/lib/File/StripNondeterminism.pm 2017-05-20 15:16:18.000000000 +0200 @@ -34,14 +34,14 @@ our($VERSION, $canonical_time, $clamp_time); -$VERSION = '0.033'; # 0.033 +$VERSION = '0.034'; # 0.034 -sub init { +sub init() { $ENV{'TZ'} = 'UTC'; tzset(); } -sub _get_file_type { +sub _get_file_type($) { my $file=shift; open(FILE, '-|') # handle all filenames safely || exec('file', $file) @@ -51,7 +51,7 @@ return $type; } -sub get_normalizer_for_file { +sub get_normalizer_for_file($) { $_ = shift; return undef if -d $_; # Skip directories @@ -118,7 +118,7 @@ javaproperties => \&File::StripNondeterminism::handlers::javaproperties::normalize, zip => \&File::StripNondeterminism::handlers::zip::normalize, ); -sub get_normalizer_by_name { +sub get_normalizer_by_name($) { $_ = shift; return $typemap{$_}; }