Author: emaste
Date: Mon Jun 29 13:30:48 2020
New Revision: 362782
URL: https://svnweb.freebsd.org/changeset/base/362782
Log:
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
Modified:
head/contrib/file/magic/Magdir/elf
Modified: head/contrib/file/magic/Magdir/elf
==============================================================================
--- head/contrib/file/magic/Magdir/elf Mon Jun 29 13:08:40 2020
(r362781)
+++ head/contrib/file/magic/Magdir/elf Mon Jun 29 13:30:48 2020
(r362782)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
