svn commit: r333919 - in head/contrib/file: . doc magic magic/Magdir python src tests

[Stefan Esser]

Am 20.05.18 um 22:30 schrieb Antoine Brodin:
> On Sun, May 20, 2018 at 7:06 AM, Eitan Adler <eadler at 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
> 
> 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