From owner-svn-src-all@freebsd.org Sun May 20 20:45:09 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B24BEEED4C; Sun, 20 May 2018 20:45:09 +0000 (UTC) (envelope-from se@freebsd.org) Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mailout00.t-online.de", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0C9B96F6F5; Sun, 20 May 2018 20:45:08 +0000 (UTC) (envelope-from se@freebsd.org) Received: from fwd38.aul.t-online.de (fwd38.aul.t-online.de [172.20.26.138]) by mailout11.t-online.de (Postfix) with SMTP id 76137424BEB2; Sun, 20 May 2018 22:45:01 +0200 (CEST) Received: from Stefans-MacBook-Pro-10.local (SgphFsZaghWhTh1d0Cml63LcHI-Rruh2ZZ+T6990upEspUwgd-0Mx3RgNiwFVukQ8X@[84.154.105.176]) by fwd38.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1fKVCI-1TGJMm0; Sun, 20 May 2018 22:44:54 +0200 Subject: Re: svn commit: r333919 - in head/contrib/file: . doc magic magic/Magdir python src tests To: Antoine Brodin , Eitan Adler Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201805200506.w4K56gps088300@repo.freebsd.org> From: Stefan Esser Openpgp: preference=signencrypt Autocrypt: addr=se@freebsd.org; prefer-encrypt=mutual; keydata= xsBNBFVxiRIBCADOLNOZBsqlplHUQ3tG782FNtVT33rQli9EjNt2fhFERHIo4NxHlWBpHLnU b0s4L/eItx7au0i7Gegv01A9LUMwOnAc9EFAm4EW3Wmoa6MYrcP7xDClohg/Y69f7SNpEs3x YATBy+L6NzWZbJjZXD4vqPgZSDuMcLU7BEdJf0f+6h1BJPnGuwHpsSdnnMrZeIM8xQ8PPUVQ L0GZkVojHgNUngJH6e21qDrud0BkdiBcij0M3TCP4GQrJ/YMdurfc8mhueLpwGR2U1W8TYB7 4UY+NLw0McThOCLCxXflIeF/Y7jSB0zxzvb/H3LWkodUTkV57yX9IbUAGA5RKRg9zsUtABEB AAHNKVN0ZWZhbiBFw59lciAoWWFob28hKSA8c3QuZXNzZXJAeWFob28uZGU+wsCWBBMBCgBA AhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AWIQSjceplnAvsyCtxUxNH67XvWv31RAUC WvLvqwUJCyUBEwAKCRBH67XvWv31REySCACc6vqcSFQCRyBRc2CV5ZBjbbnTy7VBoXbUS3/c 4Hn8I0YQ39q7//2z8vYsgLeM1mMXL4PUIU/0f0dBAFBLpxV7bntGzyCJls6SeGS/qcQKhqaI 6I7NcWg8OkIJIhUL6q238cS1ql9pU65fyHe0PP8JS08m81PDpX2/4wTE6h2jgYUy55eXRzoF MEjr1S8SSnidsBem27o7iWu9ltJsUtE86071iZlLzbuHv2nvucrjAV9cK9tHrxYT/YiY8QhT L48iWj2xIjLjg1ebmgIFZ2k881we/KTIoUugqOOR1gDSc4qwM8CA388cN3frjtl98CwhAT5T UV8tIDqri+/Z1AKwzsBNBFVxiRIBCACxI/aglzGVbnI6XHd0MTP05VK/fJub4hHdc+LQpz1M kVnCAhFbY9oecTB/togdKtfiloavjbFrb0nJhJnx57K+3SdSuu+znaQ4SlWiZOtXnkbpRWNU eMm+gtTDMSvloGAfr76RtFHskdDOLgXsHD70bKuMhlBxUCrSwGzHaD00q8iQPhJZ5itb3WPq z3B4IjiDAWTO2obD1wtAvSuHuUj/XJRsiKDKW3x13cfavkad81bZW4cpNwUv8XHLv/vaZPSA ly+hkY7NrDZydMMXVNQ7AJQufWuTJ0q7sImRcEZ5EIa98esJPey4O7C0vY405wjeyxpVZkpq ThDMurqtQFn1ABEBAAHCwHwEGAEKACYCGwwWIQSjceplnAvsyCtxUxNH67XvWv31RAUCWvLv qwUJCyUBGQAKCRBH67XvWv31RLnrB/9gzcRlpx71sDMosoZULWn7wysBJ/8AIEfIByRaHQe3 pn/KwE57pB+zFbbQqB7YzeZb7/UUgR4zU2ZbOcEfwDZcHUbj0B3fGRsS3t0uiLlAd8w0sBZb SxrqzjdpDjIbOZkxssqUmvrsN67UG1AFWH9aD24keBS7YjPBS8hLxPeYV+Xz6vUL8fRZje/Z JgiBMIwyj6g2lH/zkdnxBdC0iG1xxJOLTaghMMeQyCdH6ef8+VMyAlAJsMckbOTvx63tY8z7 DFcrnTJfbe1EziRilVsEaK8tTzJzhcTfos+f3eBYWEilxe5HzIhYKJeC7lmsSUcGwa6+9VRg a0ctmi9Z8OgX Message-ID: <6a8368eb-5ceb-192d-043e-f71e13a5b61d@freebsd.org> Date: Sun, 20 May 2018 22:44:54 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Language: de-CH Content-Transfer-Encoding: 7bit X-ID: SgphFsZaghWhTh1d0Cml63LcHI-Rruh2ZZ+T6990upEspUwgd-0Mx3RgNiwFVukQ8X X-TOI-MSGID: d1817515-3623-408e-8301-382c4de12ff8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 May 2018 20:45:09 -0000 Am 20.05.18 um 22:30 schrieb Antoine Brodin: > On Sun, May 20, 2018 at 7:06 AM, Eitan Adler wrote: >> Author: eadler >> Date: Sun May 20 05:06:42 2018 >> New Revision: 333919 >> URL: https://svnweb.freebsd.org/changeset/base/333919 >> >> Log: >> MFV: file 5.33 >> >> Merge the latest file(1) in. >> >> Relevent Changelog: >> - extend the support for ${x?:} expansions for magic descriptions >> - add support for ${x?:} in mime types to handle pie binaries. >> - add support for negative offsets (offsets from the end of file) >> - close the file on error when writing magic >> >> Relnotes: yes > > Hi, > > This breaks the ports tree, please revert and request an exp-run. This seems to be the cause of LIB_DEPENDS not being correctly checked. I have fixed this locally with the following patch to find-lib.sh: Index: Mk/Scripts/find-lib.sh =================================================================== --- Mk/Scripts/find-lib.sh (Revision 470484) +++ Mk/Scripts/find-lib.sh (Arbeitskopie) @@ -27,7 +27,9 @@ for libdir in ${dirs} ; do test -f ${libdir}/${lib} || continue libfile=${libdir}/${lib} - [ `file -b -L --mime-type ${libfile}` = "application/x-sharedlib" ] || continue - echo $libfile - break + case `file -b -L --mime-type ${libfile}` in + application/x-pie-executable|application/x-sharedlib) + echo $libfile + break ;; + esac done This works for amd64 at least ... Regards, STefan