svn commit: r333944 - head/contrib/file/magic/Magdir

[Cy Schubert]

Thank you!

---
Sent using a tiny phone keyboard.
Apologies for any typos and autocorrect.
Also, this old phone only supports top post. Apologies.

Cy Schubert
<Cy.Schubert at cschubert.com> or <cy at freebsd.org>
The need of the many outweighs the greed of the few.
---

-----Original Message-----
From: Antoine Brodin
Sent: 20/05/2018 15:07
To: src-committers at freebsd.org; svn-src-all at freebsd.org; svn-src-head at freebsd.org
Subject: svn commit: r333944 - head/contrib/file/magic/Magdir

Author: antoine
Date: Sun May 20 22:07:44 2018
New Revision: 333944
URL: https://svnweb.freebsd.org/changeset/base/333944

Log:
  Revert last change to file/magic/Magdir/elf, it misidentifies most shared
  libraries installed from ports as pie executables instead of shared libraries,
  and consequently breaks ports.

Modified:
  head/contrib/file/magic/Magdir/elf

Modified: head/contrib/file/magic/Magdir/elf
==============================================================================
--- head/contrib/file/magic/Magdir/elf	Sun May 20 21:56:08 2018	(r333943)
+++ head/contrib/file/magic/Magdir/elf	Sun May 20 22:07:44 2018	(r333944)
@@ -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-sharedlib
 >16	leshort		4		core file
 !:mime	application/x-coredump
 # Core file detection is not reliable.