From f4391a9bed9d69f33d8dc5dc8be92bb39699e0cb7cc196c961e210e336c23942 Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Wed, 30 Oct 2019 09:57:14 +0000 Subject: [PATCH 1/2] Accepting request 743819 from home:dimstar:Factory - Update to version 1.6.1 Fixes build in Staging O against new perl-Archive-Zip OBS-URL: https://build.opensuse.org/request/show/743819 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/strip-nondeterminism?expand=0&rev=15 --- _service | 7 ------- strip-nondeterminism-1.0.0.tar.bz2 | 3 --- strip-nondeterminism-1.0.0.tar.bz2.asc | 16 ---------------- strip-nondeterminism-1.6.1.tar.bz2 | 3 +++ strip-nondeterminism-1.6.1.tar.bz2.asc | 16 ++++++++++++++++ strip-nondeterminism.changes | 26 +++++++++++++++++++++++++- strip-nondeterminism.spec | 7 +++---- 7 files changed, 47 insertions(+), 31 deletions(-) delete mode 100644 _service delete mode 100644 strip-nondeterminism-1.0.0.tar.bz2 delete mode 100644 strip-nondeterminism-1.0.0.tar.bz2.asc create mode 100644 strip-nondeterminism-1.6.1.tar.bz2 create mode 100644 strip-nondeterminism-1.6.1.tar.bz2.asc diff --git a/_service b/_service deleted file mode 100644 index c757cc9..0000000 --- a/_service +++ /dev/null @@ -1,7 +0,0 @@ - - - https - reproducible-builds.org - /_lfs/releases/strip-nondeterminism/strip-nondeterminism-1.0.0.tar.bz2 - - diff --git a/strip-nondeterminism-1.0.0.tar.bz2 b/strip-nondeterminism-1.0.0.tar.bz2 deleted file mode 100644 index cd3d69f..0000000 --- a/strip-nondeterminism-1.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index c09f4b8..0000000 --- a/strip-nondeterminism-1.0.0.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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-1.6.1.tar.bz2 b/strip-nondeterminism-1.6.1.tar.bz2 new file mode 100644 index 0000000..b7da2e8 --- /dev/null +++ b/strip-nondeterminism-1.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3efa1a41494303c88749e538fb7f9e751a6303654300f8e16a58e52978f6c67 +size 276727 diff --git a/strip-nondeterminism-1.6.1.tar.bz2.asc b/strip-nondeterminism-1.6.1.tar.bz2.asc new file mode 100644 index 0000000..550ee2c --- /dev/null +++ b/strip-nondeterminism-1.6.1.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAl2mJGwACgkQHpU+J9Qx +Hli0aBAAg2pnPSsY+YoIDcjrKRfhgb8iS1xCRhCjXZhEVn7BNnPD0B1Gsb4Oa1a7 +MIbBKQsEaDyiyhvMM5gF7jhRih/z3TALsHV6pO7SxG8aAVRmu4chtarbV6D2TlEj +dK2Ydy6+9UTW10ammtUztKL6v9X/lMc/tNWIvpjKoR0jzXYGahWMofjOWrx/lxP4 +4DggghmazWv3AyDKXnLEj1GYRMGepppxmQxFKcOMnZgVQ/4N6gME7KEMe77hJxf1 +DNKSJHg0ATWcLNBQbXNch+rV+vrEtycUQhx7QY5EDhWYHSzNzfEwmFrUIwTTLTTQ +RMobEI/S0LgrA2khwzwL4HzIyOGqtPFVmBnk5c6djABF1pRJHJKyMZZaNheJ6ImA +HJUgElUT5yEawLDrk3D2+lIpR3oT7s+r/xu7EGgM4x+p2fbuwvj5NNhHOc6+I6uX +Nid04t80xSxZEa4AynZniEHWVm6rjo1giiKoaI3RDHgGk+KfWnRjobn9cl5AjQID +NxQEjdvWbw05dzRB99LMib4ZGQHdG2CKsxD8ihsIN37Aj2rYqWRynzat0BUwgnDQ +UWhMIoaVTOJiSMvERJ0kXX4h7+pGGFHQti6TxmE4HAsG2iJpRvDuROcvM7CTQt5V +3LPJQmN0hav/0slQd0cGmOkq2yxYK0e+QF6ydcNUH3uYXA36XCs= +=1E+U +-----END PGP SIGNATURE----- diff --git a/strip-nondeterminism.changes b/strip-nondeterminism.changes index efd8d12..3f1b039 100644 --- a/strip-nondeterminism.changes +++ b/strip-nondeterminism.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Oct 29 11:54:17 UTC 2019 - Dominique Leuenberger + +- Update to version 1.6.1: + + Parallelise dh_strip_nondeterminism script. + + Correct indentation level of .zip file field format comment. + + dh_strip_nondeterminism: Deduplicate hardlinks via stat(2) to + avoid issues. + + Call file(1) with the "--" argument placeholder to fix + normalisation of files. + + Check the return status from Archive::Zip when writing file to + disk. + + Workaround Archive::Zip's incorrect handling of the + localExtraField field. + + Support timestamp clamping of "tIME" chunks in .png files. + + Drop the t/fixtures/zip/bug_803503.zip test fixtures as they + are no longer compatible with Archive::Zip >= 1.66. +- Drop strip-nondeterminism-0.029-fix-apk.patch: test suite passes + without this. +- BuildRequire perl(Sub::Override): new dependency. +- Drop _service file: it only has a download_url defined, which is + also transparently extracted from the spec file. So this service + essentially serves no purpose. + ------------------------------------------------------------------- Sat Dec 15 19:45:06 UTC 2018 - bwiedemann@suse.com @@ -11,7 +35,7 @@ Mon Jul 10 02:49:15 UTC 2017 - bwiedemann@suse.com - 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 + to handle files without permissions in .zip files ------------------------------------------------------------------- Sun May 7 09:47:22 UTC 2017 - bwiedemann@suse.com diff --git a/strip-nondeterminism.spec b/strip-nondeterminism.spec index c0dde99..9173543 100644 --- a/strip-nondeterminism.spec +++ b/strip-nondeterminism.spec @@ -1,7 +1,7 @@ # # spec file for package strip-nondeterminism # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -17,7 +17,7 @@ Name: strip-nondeterminism -Version: 1.0.0 +Version: 1.6.1 Release: 0 Summary: A tool for stripping non-deterministic information License: GPL-3.0-or-later @@ -28,14 +28,13 @@ Source1: https://reproducible-builds.org/_lfs/releases/strip-nondetermini 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 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl-base BuildRequires: perl-macros BuildRequires: perl(Archive::Cpio) BuildRequires: perl(Archive::Zip) +BuildRequires: perl(Sub::Override) Requires: perl-base Requires: perl(Archive::Zip) Recommends: perl(Archive::Cpio) From 49e42ee85f76f342c922eeeb2d3716a1811ee51c0fba77b3dda8b511ab709449 Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Wed, 30 Oct 2019 18:24:04 +0000 Subject: [PATCH 2/2] drop unused patch require new Sub::Override module at runtime OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/strip-nondeterminism?expand=0&rev=16 --- strip-nondeterminism-0.029-fix-apk.patch | 13 ------------- strip-nondeterminism.spec | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 strip-nondeterminism-0.029-fix-apk.patch diff --git a/strip-nondeterminism-0.029-fix-apk.patch b/strip-nondeterminism-0.029-fix-apk.patch deleted file mode 100644 index 32deddc..0000000 --- a/strip-nondeterminism-0.029-fix-apk.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 _handler('jar'); - } - # javadoc diff --git a/strip-nondeterminism.spec b/strip-nondeterminism.spec index 9173543..f116b3b 100644 --- a/strip-nondeterminism.spec +++ b/strip-nondeterminism.spec @@ -37,6 +37,7 @@ BuildRequires: perl(Archive::Zip) BuildRequires: perl(Sub::Override) Requires: perl-base Requires: perl(Archive::Zip) +Requires: perl(Sub::Override) Recommends: perl(Archive::Cpio) %{perl_requires}