Date: Sun, 20 May 2018 16:35:27 -0500 From: Larry Rosenman <ler@FreeBSD.org> To: Stefan Esser <se@freebsd.org> Cc: Antoine Brodin <antoine@freebsd.org>, Eitan Adler <eadler@freebsd.org>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org> Subject: Re: svn commit: r333919 - in head/contrib/file: . doc magic magic/Magdir python src tests Message-ID: <20180520213527.e3fhugq47mdlyt3x@ler-imac.local> In-Reply-To: <6a8368eb-5ceb-192d-043e-f71e13a5b61d@freebsd.org> References: <201805200506.w4K56gps088300@repo.freebsd.org> <CAALwa8kU61eUhmxdirf8qdatwWfmRVRLax75J27JPPmxepdh3g@mail.gmail.com> <6a8368eb-5ceb-192d-043e-f71e13a5b61d@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <eadler@freebsd.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180520213527.e3fhugq47mdlyt3x>