From owner-svn-src-head@freebsd.org Mon Jun 29 13:30:49 2020 Return-Path: Delivered-To: svn-src-head@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 57A2D3499E9; Mon, 29 Jun 2020 13:30:49 +0000 (UTC) (envelope-from emaste@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 49wSzs0qFSz3Y9k; Mon, 29 Jun 2020 13:30:49 +0000 (UTC) (envelope-from emaste@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 0038027FF7; Mon, 29 Jun 2020 13:30:49 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05TDUmlk027917; Mon, 29 Jun 2020 13:30:48 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05TDUmTZ027916; Mon, 29 Jun 2020 13:30:48 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202006291330.05TDUmTZ027916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 29 Jun 2020 13:30:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362782 - head/contrib/file/magic/Magdir X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/file/magic/Magdir X-SVN-Commit-Revision: 362782 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2020 13:30:49 -0000 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