diff --git a/_service b/_service index 4e4ad13..c757cc9 100644 --- a/_service +++ b/_service @@ -1,12 +1,7 @@ - http - http.debian.net - /debian/pool/main/s/strip-nondeterminism/strip-nondeterminism_0.029.orig.tar.gz - - - strip-nondeterminism_0.029.orig.tar.gz - sha256 - 1e6df1d0495c19859182c7746e6f5c189ca1494e7b6e6f143fb1bfecfd11de5c + https + reproducible-builds.org + /_lfs/releases/strip-nondeterminism/strip-nondeterminism-1.0.0.tar.bz2 diff --git a/strip-nondeterminism-0.029-fix-apk.patch b/strip-nondeterminism-0.029-fix-apk.patch index 5b6b5ac..32deddc 100644 --- a/strip-nondeterminism-0.029-fix-apk.patch +++ b/strip-nondeterminism-0.029-fix-apk.patch @@ -1,11 +1,13 @@ ---- strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm.orig 2016-12-22 10:52:33.000000000 +0000 -+++ strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm 2016-12-29 06:36:46.380730000 +0000 -@@ -70,7 +70,7 @@ +Index: strip-nondeterminism-1.0.0/lib/File/StripNondeterminism.pm +=================================================================== +--- strip-nondeterminism-1.0.0.orig/lib/File/StripNondeterminism.pm ++++ strip-nondeterminism-1.0.0/lib/File/StripNondeterminism.pm +@@ -61,7 +61,7 @@ sub get_normalizer_for_file($) { } # jar if (m/\.(jar|war|hpi|apk)$/ - && _get_file_type($_) =~ m/(Java|Zip) archive data/) { + && _get_file_type($_) =~ m/((Java|Zip) archive data)|(Microsoft OOXML)/) { - return \&File::StripNondeterminism::handlers::jar::normalize; + return _handler('jar'); } # javadoc diff --git a/strip-nondeterminism-0.029-zipfix.patch b/strip-nondeterminism-0.029-zipfix.patch deleted file mode 100644 index 6df77dc..0000000 --- a/strip-nondeterminism-0.029-zipfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 0ec2e898c1f2027a158d581a9fcd6d7f3fcf0b97 -Author: Bernhard M. Wiedemann -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 - diff --git a/strip-nondeterminism-1.0.0.tar.bz2 b/strip-nondeterminism-1.0.0.tar.bz2 new file mode 100644 index 0000000..cd3d69f --- /dev/null +++ b/strip-nondeterminism-1.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d51fc5be90e85f385737aa9b6482bbd7d8911f10e9bf5d8ccb0441fa8077d18c +size 221245 diff --git a/strip-nondeterminism-1.0.0.tar.bz2.asc b/strip-nondeterminism-1.0.0.tar.bz2.asc new file mode 100644 index 0000000..c09f4b8 --- /dev/null +++ b/strip-nondeterminism-1.0.0.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAlwJV6cACgkQHpU+J9Qx +Hljzpg//dTRYNeXikgQQEv00wutz6Sdb7RoPbAaUy+EMtWdlLGuFy+99etlIk1HM +BOF835uKqjPweSATASU22HKJTgJjxGLAEBchNkScEnrQ0dbva0l112v4GZXz8E/n +l22dlGXMgThO9N72FLD1B8iT7DULSC9VFxUYdHNn6vASRlZZKmkyeVihXcAaM/2K +ESGwDgm3L0bMNnX6SoxMvY6t8LL7asok0lfJW3FE7sgLI2te1vLUKJ6BsXUM2gRh +2pRRBZzhzbM2ImYN1RyXZnBjb6yGDQcOqkFxsqUoygWuhU6b4bdxbL7C6zNjV0wG +zPpc/qUNqd4UZbSw3VzKq1a0oJA9ZtKBXN1k1KxV24DWcGo/SpfVqvE0qqD6ZHil +RNtqcSIY2dsuFzjgSEaalsElDOAt9CmCTLZAVIex8wNXPLQpqwAp9aehT7pFTZuB +uK5gmi5LPIcs//+2WjpnLL7XPoFIHXnK5YkW7nwAg3SJ7e5/ixhl8nJYdxr9Mpvi +3qDEVb6woJF0hp6moZKFTUDv+xRegliBC3S2jCAzEvVAyQnvGX69q3xQTQWNdGnM +6KlPfzpS1LjYTp0fPiPMo0/ZrNTQgQUrgugvrXKhUzYKOrpU8hB8aJlFkWvdIX0s +bff8q2DsHyHfM71MWG36qA49ZJwpZc0hh+pbn9or7Ded8gEaf6I= +=TOk7 +-----END PGP SIGNATURE----- diff --git a/strip-nondeterminism.changes b/strip-nondeterminism.changes index 9205cf0..efd8d12 100644 --- a/strip-nondeterminism.changes +++ b/strip-nondeterminism.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 15 19:45:06 UTC 2018 - bwiedemann@suse.com + +- Update to version 1.0.0 + * Improvements for javadoc, zip, cpio and png handling + * Speed up startup time +- Drop upstream strip-nondeterminism-0.029-zipfix.patch + ------------------------------------------------------------------- Mon Jul 10 02:49:15 UTC 2017 - bwiedemann@suse.com diff --git a/strip-nondeterminism.keyring b/strip-nondeterminism.keyring new file mode 100644 index 0000000..45c5c27 --- /dev/null +++ b/strip-nondeterminism.keyring @@ -0,0 +1,76 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +xNfR +=P+OH +-----END PGP PUBLIC KEY BLOCK----- diff --git a/strip-nondeterminism.spec b/strip-nondeterminism.spec index a2e09d7..c0dde99 100644 --- a/strip-nondeterminism.spec +++ b/strip-nondeterminism.spec @@ -1,7 +1,7 @@ # # spec file for package strip-nondeterminism # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,31 +12,33 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: strip-nondeterminism -Version: 0.029 +Version: 1.0.0 Release: 0 Summary: A tool for stripping non-deterministic information -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/Perl 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 +Source: https://reproducible-builds.org/_lfs/releases/strip-nondeterminism/strip-nondeterminism-%{version}.tar.bz2 +Source1: https://reproducible-builds.org/_lfs/releases/strip-nondeterminism/strip-nondeterminism-%{version}.tar.bz2.asc Source2: rpmmacros Source3: strip-all-nondeterminism +Source4: %{name}.keyring # 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 BuildRequires: perl-macros +BuildRequires: perl(Archive::Cpio) BuildRequires: perl(Archive::Zip) Requires: perl-base Requires: perl(Archive::Zip) +Recommends: perl(Archive::Cpio) %{perl_requires} %description @@ -51,9 +53,7 @@ strip-nondeterminism contains the File::StripNondeterminism Perl module, and the strip-nondeterminism command line utility. %prep -%setup -q -c -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 -n %{name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -72,7 +72,8 @@ install -p %{SOURCE3} -m 755 %buildroot/%{_bindir}/ %files -f %{name}.files %defattr(-,root,root,755) -%doc README TODO COPYING +%doc README TODO +%license COPYING /etc/rpm/macros.strip-nondeterminism %changelog diff --git a/strip-nondeterminism_0.029.orig.tar.gz b/strip-nondeterminism_0.029.orig.tar.gz deleted file mode 100644 index 1babcc9..0000000 --- a/strip-nondeterminism_0.029.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e6df1d0495c19859182c7746e6f5c189ca1494e7b6e6f143fb1bfecfd11de5c -size 169883