From owner-svn-src-all@freebsd.org Sun May 20 21:35:29 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 694DBEF0D7B; Sun, 20 May 2018 21:35:29 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from smtp.freebsd.org (unknown [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 14F76720FB; Sun, 20 May 2018 21:35:29 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from ler-imac.local (unknown [IPv6:2600:1700:210:b18f:7c4e:eda6:79a2:421b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: ler) by smtp.freebsd.org (Postfix) with ESMTPSA id 8854C100CC; Sun, 20 May 2018 21:35:28 +0000 (UTC) (envelope-from ler@FreeBSD.org) Date: Sun, 20 May 2018 16:35:27 -0500 From: Larry Rosenman To: Stefan Esser Cc: Antoine Brodin , Eitan Adler , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers Subject: Re: svn commit: r333919 - in head/contrib/file: . doc magic magic/Magdir python src tests Message-ID: <20180520213527.e3fhugq47mdlyt3x@ler-imac.local> Mail-Followup-To: Stefan Esser , Antoine Brodin , Eitan Adler , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers References: <201805200506.w4K56gps088300@repo.freebsd.org> <6a8368eb-5ceb-192d-043e-f71e13a5b61d@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wqm577oznjbr5rfv" Content-Disposition: inline In-Reply-To: <6a8368eb-5ceb-192d-043e-f71e13a5b61d@freebsd.org> User-Agent: NeoMutt/20180512-4-fd97e5 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 21:35:29 -0000 --wqm577oznjbr5rfv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 20, 2018 at 10:44:54PM +0200, Stefan Esser wrote: > 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 > >=20 > > Hi, > >=20 > > This breaks the ports tree, please revert and request an exp-run. >=20 > This seems to be the cause of LIB_DEPENDS not being correctly checked. >=20 > I have fixed this locally with the following patch to find-lib.sh: >=20 > Index: Mk/Scripts/find-lib.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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=3D${libdir}/${lib} > - [ `file -b -L --mime-type ${libfile}` =3D "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 >=20 > This works for amd64 at least ... seems to work for me as well (also amd64).=20 --=20 Larry Rosenman https://people.FreeBSD.org/~ler/ Phone: +1 214-642-9640 E-Mail: ler@FreeBSD.org US Mail: 5708 Sabbia Drive, Round Rock, TX 78665-2106 --wqm577oznjbr5rfv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHBBAABCgCrFiEEHjgknedhWzvJgwVzaXyZsatIp30FAlsB6h8tFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3JnbGVyQEZyZWVCU0Qub3JnXxSAAAAAAC4AKGlz c3Vlci1mcHJAbm90YXRpb25zLm9wZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxRTM4 MjQ5REU3NjE1QjNCQzk4MzA1NzM2OTdDOTlCMUFCNDhBNzdEAAoJEGl8mbGrSKd9 mBcH/2qu6NO220DSTcLy0iNtzCIyKStond97cQtK3iAkciXHQAb/fRpT0T0/F8zR V/g1+cP4t/YU+cYGxdzQBNhYKK6lYUz+iukUFm02EcgU4USOzy0Dk5by+fkwoZW7 3Wcpz53poNs1NgbThq7vHzJvOsujZcdr/kBPInLhOycK7yAw++vnx0tLFqnKv56X YQSzFJkviy8ZQhBTNLa5W5FZeev2LUodmRggo6pl14Oq834hFXPn3pPOj0f4k+O+ 69PfgV9zV4c0/vWoMLlUhRHNqSRQdjK76injl6Md/sVWN/6LSMcVJKPL0xQiFkdE T+jXMRGGgaT3hHCyARnnvpTN60g= =vNuo -----END PGP SIGNATURE----- --wqm577oznjbr5rfv--