diff --git a/file.changes b/file.changes index 16f4c64..698a434 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 4 13:51:18 UTC 2020 - Dr. Werner Fink + +- Add temporary patch undo-24c9c0.patch to undo commit 24c9c0 (boo#1169192) + ------------------------------------------------------------------- Tue Apr 14 20:36:31 UTC 2020 - Andreas Schwab diff --git a/file.spec b/file.spec index 0a01da7..345affd 100644 --- a/file.spec +++ b/file.spec @@ -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 @@ Patch34: file-5.23-endian.patch 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 @@ to develop applications that require the magic "file" interface. %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 diff --git a/python-magic.spec b/python-magic.spec index a9c821c..e1a2e55 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -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 diff --git a/undo-24c9c0.patch b/undo-24c9c0.patch new file mode 100644 index 0000000..e598281 --- /dev/null +++ b/undo-24c9c0.patch @@ -0,0 +1,32 @@ +From 028a15617a7f2c9172e3ac2d903af0f03010c8b4 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +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: