From owner-svn-src-all@freebsd.org  Wed Jun 17 10:11:54 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id A33DF34A096;
 Wed, 17 Jun 2020 10:11:54 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49n17t3t44z4Z4q;
 Wed, 17 Jun 2020 10:11:54 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8037D1E5FD;
 Wed, 17 Jun 2020 10:11:54 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05HABs2Q061358;
 Wed, 17 Jun 2020 10:11:54 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05HABsxP061357;
 Wed, 17 Jun 2020 10:11:54 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <202006171011.05HABsxP061357@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 17 Jun 2020 10:11:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r362261 - head/contrib/file/magic/Magdir
X-SVN-Group: head
X-SVN-Commit-Author: antoine
X-SVN-Commit-Paths: head/contrib/file/magic/Magdir
X-SVN-Commit-Revision: 362261
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2020 10:11:54 -0000

Author: antoine
Date: Wed Jun 17 10:11:54 2020
New Revision: 362261
URL: https://svnweb.freebsd.org/changeset/base/362261

Log:
  Re-apply r333944 to unbreak ports

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

Modified: head/contrib/file/magic/Magdir/elf
==============================================================================
--- head/contrib/file/magic/Magdir/elf	Wed Jun 17 08:35:35 2020	(r362260)
+++ head/contrib/file/magic/Magdir/elf	Wed Jun 17 10:11:54 2020	(r362261)
@@ -50,9 +50,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
 # OS-specific