Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2020-05-11 13:25:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Mon May 11 13:25:45 2020 rev:119 rq:800076 version:5.38 Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2020-04-25 20:07:23.175431692 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.2738/file.changes 2020-05-11 13:25:47.795160873 +0200 @@ -1,0 +2,5 @@ +Mon May 4 13:51:18 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Add temporary patch undo-24c9c0.patch to undo commit 24c9c0 (boo#1169192) + +------------------------------------------------------------------- New: ---- undo-24c9c0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.WzOVVw/_old 2020-05-11 13:25:49.267163958 +0200 +++ /var/tmp/diff_new_pack.WzOVVw/_new 2020-05-11 13:25:49.271163967 +0200 @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2020 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,6 +66,7 @@ Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif Patch40: file-5.38-allow-readlinkat.dif +Patch41: undo-24c9c0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -131,6 +132,7 @@ %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs %patch40 -p1 -b .readlinkat +%patch41 -p0 -b .undo %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.WzOVVw/_old 2020-05-11 13:25:49.287164000 +0200 +++ /var/tmp/diff_new_pack.WzOVVw/_new 2020-05-11 13:25:49.287164000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2020 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ undo-24c9c0.patch ++++++ >From 028a15617a7f2c9172e3ac2d903af0f03010c8b4 Mon Sep 17 00:00:00 2001 From: Christos Zoulas <[email protected]> Date: Sun, 26 Apr 2020 17:43:13 +0000 Subject: [PATCH] PR/93: Undo previous: There are dynamic objects (shared libraries for example) that don't have interpeters and should not be counted as static. We need to figure out what to do with static-pie and gcc-9 separately. --- src/readelf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/readelf.c src/readelf.c index 9d1d1ad5..517b3aec 100644 --- src/readelf.c +++ src/readelf.c @@ -1646,6 +1646,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, switch (xph_type) { case PT_DYNAMIC: doread = 1; + linking_style = "dynamically"; break; case PT_NOTE: if (sh_num) /* Did this through section headers */ @@ -1660,7 +1661,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, } /*FALLTHROUGH*/ case PT_INTERP: - linking_style = "dynamically"; doread = 1; break; default:
