Hello community,
here is the log from the commit of package strip-nondeterminism for
openSUSE:Factory checked in at 2017-07-11 08:23:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/strip-nondeterminism (Old)
and /work/SRC/openSUSE:Factory/.strip-nondeterminism.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "strip-nondeterminism"
Tue Jul 11 08:23:23 2017 rev:3 rq:509062 version:0.029
Changes:
--------
---
/work/SRC/openSUSE:Factory/strip-nondeterminism/strip-nondeterminism.changes
2017-05-09 18:03:18.807506312 +0200
+++
/work/SRC/openSUSE:Factory/.strip-nondeterminism.new/strip-nondeterminism.changes
2017-07-11 08:23:25.895874127 +0200
@@ -1,0 +2,7 @@
+Mon Jul 10 02:49:15 UTC 2017 - [email protected]
+
+- Add strip-all-nondeterminism script to make this easier to use correctly
+- Add strip-nondeterminism-0.029-zipfix.patch
+ to handle files without permissions in .zip files
+
+-------------------------------------------------------------------
New:
----
strip-all-nondeterminism
strip-nondeterminism-0.029-zipfix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ strip-nondeterminism.spec ++++++
--- /var/tmp/diff_new_pack.oaMRQ2/_old 2017-07-11 08:23:26.735755674 +0200
+++ /var/tmp/diff_new_pack.oaMRQ2/_new 2017-07-11 08:23:26.739755110 +0200
@@ -25,8 +25,11 @@
Url:
https://anonscm.debian.org/git/reproducible/strip-nondeterminism.git
Source:
http://http.debian.net/debian/pool/main/s/strip-nondeterminism/strip-nondeterminism_%{version}.orig.tar.gz
Source2: rpmmacros
+Source3: strip-all-nondeterminism
# PATCH-FIX-OPENSUSE - apk files misdetected as OOXML
Patch0: strip-nondeterminism-0.029-fix-apk.patch
+# PATCH-FIX-UPSTREAM
https://github.com/ReproducibleBuilds/strip-nondeterminism/pull/4
+Patch1: strip-nondeterminism-0.029-zipfix.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl-base
@@ -50,6 +53,7 @@
%prep
%setup -q -c -n %{name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -59,8 +63,9 @@
%{__make} test
%install
-mkdir -p %buildroot/etc/rpm/
+mkdir -p %buildroot/etc/rpm/ %buildroot/%{_bindir}/
install -p %{SOURCE2} %buildroot/etc/rpm/macros.strip-nondeterminism
+install -p %{SOURCE3} -m 755 %buildroot/%{_bindir}/
%perl_make_install
%perl_process_packlist
%perl_gen_filelist
++++++ rpmmacros ++++++
--- /var/tmp/diff_new_pack.oaMRQ2/_old 2017-07-11 08:23:26.799746649 +0200
+++ /var/tmp/diff_new_pack.oaMRQ2/_new 2017-07-11 08:23:26.803746085 +0200
@@ -7,5 +7,5 @@
%have_strip_nondeterminism 1
%strip_all_nondeterminism() \
- find '(' -name '*.zip' -o -name '*.jar' -o -name '*.xpi' -o -name '*.pk3' -o
-name '*.mo' -o -name '*.html' -o -name '*.gz' -o -name '*.png' ')' -print0 |
xargs -0 --no-run-if-empt strip-nondeterminism \
+ strip-all-nondeterminism \
%{nil}
++++++ strip-all-nondeterminism ++++++
#!/bin/sh
dir=${1:-.}
find "$dir" -type f '(' -name '*.zip' -o -name '*.jar' -o -name '*.xpi' -o
-name '*.pk3' -o -name '*.mo' -o -name '*.html' -o -name '*.gz' -o -name
'*.png' ')' -print0 |\
xargs -0 --no-run-if-empty strip-nondeterminism
--timestamp=${SOURCE_DATE_EPOCH:-1494270000} --clamp-timestamp
++++++ strip-nondeterminism-0.029-zipfix.patch ++++++
commit 0ec2e898c1f2027a158d581a9fcd6d7f3fcf0b97
Author: Bernhard M. Wiedemann <[email protected]>
Date: Wed May 10 15:21:28 2017 +0200
zip: make sure we have permissions on extracted file
an imageconversion.jar had
-rw-rw-rw- 2.0 unx 3215 b- defN 99-Sep-06 10:58
com/ibm/imageconversion/IndexColorTable.class
?--------- 2.0 unx 7004 b- defN 99-Sep-06 10:58 META-INF/MANIFEST.MF
and thus generated an error like
strip-nondeterminism: ./imageconversion.jar: Unable to open
/tmp/3F14xYUtK0/member for reading: Permission denied at
/usr/lib/perl5/vendor_perl/5.24.0/File/StripNondeterminism/handlers/jar.pm line
46.
diff --git a/lib/File/StripNondeterminism/handlers/zip.pm
b/lib/File/StripNondeterminism/handlers/zip.pm
index 6bbce66..c25ec39 100644
--- a/lib/File/StripNondeterminism/handlers/zip.pm
+++ b/lib/File/StripNondeterminism/handlers/zip.pm
@@ -56,6 +56,7 @@ sub normalize_member {
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
