From 87dddb46bd8f4a55105c906139903c8d0a9c1485 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 22 May 2018 18:15:54 +0200 Subject: [PATCH] Resolves: #1581343 - do not classify shared libraries as pie executables --- file-5.33-pie-executable-revert.patch | 28 +++++++++++++++++++++++++++ file.spec | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 file-5.33-pie-executable-revert.patch diff --git a/file-5.33-pie-executable-revert.patch b/file-5.33-pie-executable-revert.patch new file mode 100644 index 0000000..5f62f00 --- /dev/null +++ b/file-5.33-pie-executable-revert.patch @@ -0,0 +1,28 @@ +From 719116b196fd873f5a463dfdb0fd6258cee51591 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Tue, 22 May 2018 18:18:06 +0200 +Subject: [PATCH] Revert "add a conditional in description" + +Upstream-commit: 6876ebadcdf27224b3ffa9dfa4343127aa97c9b2 +Signed-off-by: Kamil Dudka +--- + magic/Magdir/elf | 3 +-- + 1 file changed, 1 insertion(+), 2 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 @@ + !:mime application/x-object + >16 leshort 2 executable, + !:mime application/x-executable +->16 leshort 3 ${x?pie executable:shared object} +- ++>16 leshort 3 shared object, + !:mime application/x-${x?pie-executable:sharedlib} + >16 leshort 4 core file + !:mime application/x-coredump +-- +2.14.3 + diff --git a/file.spec b/file.spec index a7b133e..eb1c7b4 100644 --- a/file.spec +++ b/file.spec @@ -31,6 +31,9 @@ Patch2: file-5.04-volume_key.patch Patch3: file-5.33-gif.patch Patch4: file-5.33-seccomp.patch +# do not classify shared libraries as pie executables (#1581343) +Patch5: file-5.33-pie-executable-revert.patch + URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -202,6 +205,7 @@ cd %{py3dir} %changelog * Tue May 22 2018 Kamil Dudka - 5.33-4 +- do not classify shared libraries as pie executables (#1581343) - seccomp: fix build failure due to missing syscalls * Mon Apr 30 2018 Miro HronĨok - 5.33-3