Resolves: #1581343 - do not classify shared libraries as pie executables in MIME output
This commit is contained in:
parent
87dddb46bd
commit
2ac456e80c
@ -4,25 +4,31 @@ Date: Tue, 22 May 2018 18:18:06 +0200
|
||||
Subject: [PATCH] Revert "add a conditional in description"
|
||||
|
||||
Upstream-commit: 6876ebadcdf27224b3ffa9dfa4343127aa97c9b2
|
||||
|
||||
... and partially revert upstream commit
|
||||
7dbecfe406a6bb2de1fe7ec2fe413dcd8871ac74
|
||||
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
magic/Magdir/elf | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
magic/Magdir/elf | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/magic/Magdir/elf b/magic/Magdir/elf
|
||||
index 7fd5de1..dba5a73 100644
|
||||
--- a/magic/Magdir/elf
|
||||
+++ b/magic/Magdir/elf
|
||||
@@ -48,8 +48,7 @@
|
||||
@@ -48,9 +48,8 @@
|
||||
!:mime application/x-object
|
||||
>16 leshort 2 executable,
|
||||
!:mime application/x-executable
|
||||
->16 leshort 3 ${x?pie executable:shared object}
|
||||
-
|
||||
-!:mime application/x-${x?pie-executable:sharedlib}
|
||||
+>16 leshort 3 shared object,
|
||||
!:mime application/x-${x?pie-executable:sharedlib}
|
||||
+!:mime application/x-sharedlib
|
||||
>16 leshort 4 core file
|
||||
!:mime application/x-coredump
|
||||
# Core file detection is not reliable.
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
Summary: A utility for determining file types
|
||||
Name: file
|
||||
Version: 5.33
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: BSD
|
||||
Group: Applications/File
|
||||
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
|
||||
@ -204,6 +204,9 @@ cd %{py3dir}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu May 24 2018 Kamil Dudka <kdudka@redhat.com> - 5.33-5
|
||||
- do not classify shared libraries as pie executables in MIME output (#1581343)
|
||||
|
||||
* Tue May 22 2018 Kamil Dudka <kdudka@redhat.com> - 5.33-4
|
||||
- do not classify shared libraries as pie executables (#1581343)
|
||||
- seccomp: fix build failure due to missing syscalls
|
||||
|
||||
Loading…
Reference in New Issue
Block a user