From 4e22eafc994140e0c0ddfb5688258ad819e1078e Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 29 Jun 2020 13:30:48 +0000 Subject: [PATCH] Revert r362261, "Re-apply r333944 to unbreak ports" A file update in 2018 broke many ports as it misidentified shared libraries as PIE binaries. r333944 reverted part of the change, restoring ports builds but misidentifying objects in the opposite direction. Earlier this month file 5.39 was imported, and then the change originally from r333944 was recommitted as r362261. However, the issue was fixed upstream, so r362261 serves no purpose. PR: 246960, 247461 [exp-run] Sponsored by: The FreeBSD Foundation --- contrib/file/magic/Magdir/elf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/file/magic/Magdir/elf b/contrib/file/magic/Magdir/elf index 5a9ee2e0ebf0..7cf8600f861a 100644 --- a/contrib/file/magic/Magdir/elf +++ b/contrib/file/magic/Magdir/elf @@ -50,8 +50,9 @@ !:mime application/x-object >16 leshort 2 executable, !:mime application/x-executable ->16 leshort 3 shared object, -!:mime application/x-sharedlib +>16 leshort 3 ${x?pie executable:shared object}, + +!:mime application/x-${x?pie-executable:sharedlib} >16 leshort 4 core file, !:mime application/x-coredump # OS-specific