CVS commit: pkgsrc/sysutils/file

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Dec 18 12:07:50 UTC 2021

Modified Files:
        pkgsrc/sysutils/file: distinfo
Added Files:
        pkgsrc/sysutils/file/patches: patch-magic_Makefile.in

Log Message:
On some Linux systems with a sufficiently old sysutils/file installed,
we get this error, followed by a bunch of warnings attempting to compile
magic anyway:

"lt-file: Compiled magic version [540] does not match with shared library magic version [538]"

Instead of using whatever libmagic might already be installed, use the
just-built libmagic. (There's probably a less hacky way.)


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/sysutils/file/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/file/patches/patch-magic_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/file/distinfo
diff -u pkgsrc/sysutils/file/distinfo:1.39 pkgsrc/sysutils/file/distinfo:1.40
--- pkgsrc/sysutils/file/distinfo:1.39  Tue Oct 26 11:19:35 2021
+++ pkgsrc/sysutils/file/distinfo       Sat Dec 18 12:07:50 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 11:19:35 nia Exp $
+$NetBSD: distinfo,v 1.40 2021/12/18 12:07:50 schmonz Exp $
 
 BLAKE2s (file-5.40.tar.gz) = 81709bb3abd39d4eea0e8d93966f162496d89e5bfc7f9e88d6be31b86dd5ed75
 SHA512 (file-5.40.tar.gz) = 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
 Size (file-5.40.tar.gz) = 1004214 bytes
 SHA1 (patch-aa) = df1206c65ebbffca766ad77f7d98f8caa26a8b1c
+SHA1 (patch-magic_Makefile.in) = ef956a9970ced035ad7f4241c66e56b2d07dddb0
 SHA1 (patch-src_fsmagic.c) = f862c5335bc3c6b0d39dfcdfd79e2d99407e40f5

Added files:

Index: pkgsrc/sysutils/file/patches/patch-magic_Makefile.in
diff -u /dev/null pkgsrc/sysutils/file/patches/patch-magic_Makefile.in:1.1
--- /dev/null   Sat Dec 18 12:07:50 2021
+++ pkgsrc/sysutils/file/patches/patch-magic_Makefile.in        Sat Dec 18 12:07:50 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-magic_Makefile.in,v 1.1 2021/12/18 12:07:50 schmonz Exp $
+
+Use the just-built libmagic, not whatever might be already installed.
+
+--- magic/Makefile.in.orig     2021-03-31 00:22:07.000000000 +0000
++++ magic/Makefile.in
+@@ -850,7 +850,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D
+               exit 1; \
+           fi; \
+         fi)
+-      $(FILE_COMPILE) -C -m magic
++      LD_PRELOAD=../src/.libs/libmagic.so ../src/.libs/file -C -m magic
+       @rm -fr magic
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.