From 73f6147cc4d8a1258a2352d44b0d7296d6592444d0042eaf316fb6f628f00c88 Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Wed, 11 Jan 2023 12:48:05 +0000 Subject: [PATCH] Accepting request 1057770 from home:dimstar:Factory - Add f1017c67.patch: Support the magic format as returned by file 5.44 (plus commit dc71304b). OBS-URL: https://build.opensuse.org/request/show/1057770 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/strip-nondeterminism?expand=0&rev=21 --- f1017c67.patch | 25 +++++++++++++++++++++++++ strip-nondeterminism.changes | 6 ++++++ strip-nondeterminism.spec | 3 ++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 f1017c67.patch diff --git a/f1017c67.patch b/f1017c67.patch new file mode 100644 index 0000000..d1ed630 --- /dev/null +++ b/f1017c67.patch @@ -0,0 +1,25 @@ +From f1017c675abea533bd60272f1bedfbccf759b9c9 Mon Sep 17 00:00:00 2001 +From: FC Stegerman +Date: Sun, 1 Jan 2023 22:14:22 +0100 +Subject: [PATCH] update pyzip regex for latest file(1) + +--- + lib/File/StripNondeterminism.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/File/StripNondeterminism.pm b/lib/File/StripNondeterminism.pm +index fc5451e..338a514 100644 +--- a/lib/File/StripNondeterminism.pm ++++ b/lib/File/StripNondeterminism.pm +@@ -111,7 +111,7 @@ sub get_normalizer_for_file($) { + } + + # pyzip - check last due to call to file(1) +- if (_get_file_type($_) =~ m/python3 script executable \(binary data\)/) { ++ if (_get_file_type($_) =~ m/python3 script executable \((Zip archive|binary data)\)/) { + my $handler = _handler('pyzip'); + return $handler + if File::StripNondeterminism::handlers::pyzip::is_pyzip_file($_); +-- +GitLab + diff --git a/strip-nondeterminism.changes b/strip-nondeterminism.changes index f25bd89..d7a1abd 100644 --- a/strip-nondeterminism.changes +++ b/strip-nondeterminism.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 11 11:53:54 UTC 2023 - Dominique Leuenberger + +- Add f1017c67.patch: Support the magic format as returned by file + 5.44 (plus commit dc71304b). + ------------------------------------------------------------------- Mon Jun 14 10:21:07 UTC 2021 - Bernhard Wiedemann diff --git a/strip-nondeterminism.spec b/strip-nondeterminism.spec index 29f46b8..b9eae53 100644 --- a/strip-nondeterminism.spec +++ b/strip-nondeterminism.spec @@ -1,7 +1,7 @@ # # spec file for package strip-nondeterminism # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source1: https://reproducible-builds.org/_lfs/releases/strip-nondetermini Source2: rpmmacros Source3: strip-all-nondeterminism Source4: %{name}.keyring +Patch0: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/commit/f1017c67.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl-base