pool/file
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo upstream commit 24c9c0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=212
This commit is contained in:
Dr. Werner Fink 2020-05-04 13:53:02 +00:00 committed by Git OBS Bridge
parent 4c2b7d7d80
commit 93f738d0dd
4 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
file.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 4 13:51:18 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add temporary patch undo-24c9c0.patch to undo commit 24c9c0 (boo#1169192)
-------------------------------------------------------------------
Tue Apr 14 20:36:31 UTC 2020 - Andreas Schwab <schwab@linux-m68k.org>

4
file.spec
View File

@ -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

2
python-magic.spec
View File

@ -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

32
undo-24c9c0.patch Normal file
View File

@ -0,0 +1,32 @@
From 028a15617a7f2c9172e3ac2d903af0f03010c8b4 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
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: