CVS commit: pkgsrc/sysutils/file

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Dec 27 23:25:08 UTC 2021

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

Log Message:
Adjust previous use of LD_PRELOAD to fix Solaris 11 build, hoping it'll
fix the SmartOS bulk build (which gave similar errors, but which I
couldn't reproduce on my SmartOS or Tribblix systems).

Does not break:
- macOS 12.1
- NetBSD 9.2 and -current
- OpenBSD 7.0
- FreeBSD 13.0
- Tribblix m25.1
- CentOS 7 and 8
- Debian 9, 10, and 11
- Devuan 4
- Ubuntu 14, 16, 18, and 20
- Void


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/file/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/file/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/file/patches/patch-magic_Makefile.in
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/file/patches/patch-magic_myfile

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/Makefile
diff -u pkgsrc/sysutils/file/Makefile:1.49 pkgsrc/sysutils/file/Makefile:1.50
--- pkgsrc/sysutils/file/Makefile:1.49  Thu Apr  8 10:40:43 2021
+++ pkgsrc/sysutils/file/Makefile       Mon Dec 27 23:25:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2021/04/08 10:40:43 nia Exp $
+# $NetBSD: Makefile,v 1.50 2021/12/27 23:25:08 schmonz Exp $
 
 DISTNAME=              file-5.40
 CATEGORIES=            sysutils
@@ -14,6 +14,11 @@ GNU_CONFIGURE=               yes
 CONFIGURE_ARGS+=       --enable-fsect-man5
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     magic/myfile
+SUBST_VARS.paths=      SH
+
 MESSAGE_SUBST+=                PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 TEST_TARGET=           check

Index: pkgsrc/sysutils/file/distinfo
diff -u pkgsrc/sysutils/file/distinfo:1.40 pkgsrc/sysutils/file/distinfo:1.41
--- pkgsrc/sysutils/file/distinfo:1.40  Sat Dec 18 12:07:50 2021
+++ pkgsrc/sysutils/file/distinfo       Mon Dec 27 23:25:08 2021
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.40 2021/12/18 12:07:50 schmonz Exp $
+$NetBSD: distinfo,v 1.41 2021/12/27 23:25:08 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-magic_Makefile.in) = 7870ab84573b2d2ce4b774083f073c620ba6f5d1
+SHA1 (patch-magic_myfile) = a977950ad98fd633aae6dec8357353a5b5ceee9d
 SHA1 (patch-src_fsmagic.c) = f862c5335bc3c6b0d39dfcdfd79e2d99407e40f5

Index: pkgsrc/sysutils/file/patches/patch-magic_Makefile.in
diff -u pkgsrc/sysutils/file/patches/patch-magic_Makefile.in:1.1 pkgsrc/sysutils/file/patches/patch-magic_Makefile.in:1.2
--- pkgsrc/sysutils/file/patches/patch-magic_Makefile.in:1.1    Sat Dec 18 12:07:50 2021
+++ pkgsrc/sysutils/file/patches/patch-magic_Makefile.in        Mon Dec 27 23:25:08 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-magic_Makefile.in,v 1.1 2021/12/18 12:07:50 schmonz Exp $
+$NetBSD: patch-magic_Makefile.in,v 1.2 2021/12/27 23:25:08 schmonz Exp $
 
 Use the just-built libmagic, not whatever might be already installed.
 
@@ -9,7 +9,7 @@ Use the just-built libmagic, not whateve
            fi; \
          fi)
 -      $(FILE_COMPILE) -C -m magic
-+      LD_PRELOAD=../src/.libs/libmagic.so ../src/.libs/file -C -m magic
++      chmod +x myfile && ./myfile magic
        @rm -fr magic
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

Added files:

Index: pkgsrc/sysutils/file/patches/patch-magic_myfile
diff -u /dev/null pkgsrc/sysutils/file/patches/patch-magic_myfile:1.1
--- /dev/null   Mon Dec 27 23:25:08 2021
+++ pkgsrc/sysutils/file/patches/patch-magic_myfile     Mon Dec 27 23:25:08 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-magic_myfile,v 1.1 2021/12/27 23:25:08 schmonz Exp $
+
+Use the just-built libmagic, not whatever might be already installed.
+
+--- magic/myfile.orig  2021-12-27 21:10:43.590323858 +0000
++++ magic/myfile
+@@ -0,0 +1,8 @@
++#!@SH@
++
++set -e
++
++magicdir=$(pwd)
++cd ../src/.libs
++LD_PRELOAD=./libmagic.so.1 ./file -C -m "${magicdir}/$1"
++cp magic.mgc ${magicdir}