CVS commit: pkgsrc/sysutils/e2fsprogs

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 22 12:22:07 UTC 2025

Modified Files:
        pkgsrc/sysutils/e2fsprogs: Makefile distinfo
Added Files:
        pkgsrc/sysutils/e2fsprogs/patches: patch-scrub_Makefile.in

Log Message:
e2fsprogs: Build fixes for Linux.

Identified by drecklypkg ci on CentOS 7 and recent Ubuntu.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_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/e2fsprogs/Makefile
diff -u pkgsrc/sysutils/e2fsprogs/Makefile:1.38 pkgsrc/sysutils/e2fsprogs/Makefile:1.39
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.38     Tue Jan 21 18:13:56 2025
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Sat Mar 22 12:22:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2025/01/21 18:13:56 triaxx Exp $
+# $NetBSD: Makefile,v 1.39 2025/03/22 12:22:07 nia Exp $
 
 DISTNAME=      e2fsprogs-1.47.2
 CATEGORIES=    sysutils
@@ -30,6 +30,8 @@ CONFIGURE_ARGS+=      --sysconfdir=${PKG_SYSC
 INFO_FILES=            yes
 INSTALL_TARGET=                install install-libs
 
+CONFIGURE_ENV+=                with_crond_dir=no
+
 PKGCONFIG_OVERRIDE+=   lib/blkid/blkid.pc.in
 PKGCONFIG_OVERRIDE+=   lib/e2p/e2p.pc.in
 PKGCONFIG_OVERRIDE+=   lib/et/com_err.pc.in

Index: pkgsrc/sysutils/e2fsprogs/distinfo
diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.29 pkgsrc/sysutils/e2fsprogs/distinfo:1.30
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.29     Tue Jan 21 18:13:56 2025
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Sat Mar 22 12:22:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2025/01/21 18:13:56 triaxx Exp $
+$NetBSD: distinfo,v 1.30 2025/03/22 12:22:07 nia Exp $
 
 BLAKE2s (e2fsprogs-1.47.2.tar.xz) = 22ad92fbe4786671ff677cf218f1e9834fb7f52f241b35f04f36b37df67c06ca
 SHA512 (e2fsprogs-1.47.2.tar.xz) = a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8
@@ -19,3 +19,4 @@ SHA1 (patch-lib_ext2fs_tdb.c) = dd50993c
 SHA1 (patch-lib_ext2fs_unix__io.c) = 78dcc99e04a981727d71271b5f4c69b426c6ada9
 SHA1 (patch-lib_uuid_gen__uuid.c) = 2f679453457522a10b90c489ce52e59b6e3909c5
 SHA1 (patch-misc_create__inode.c) = 43a9a2d3d53bfe055be3fd47f5db2990594a9faa
+SHA1 (patch-scrub_Makefile.in) = cd31c6d42e21280b78f689eef0257dcd4bcf5ce8

Added files:

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in
diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in:1.1
--- /dev/null   Sat Mar 22 12:22:07 2025
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in   Sat Mar 22 12:22:07 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-scrub_Makefile.in,v 1.1 2025/03/22 12:22:07 nia Exp $
+
+Use INSTALL_SCRIPT instead of INSTALL_PROGRAM so that it doesn't
+attempt to strip sh scripts.
+
+--- scrub/Makefile.in.orig     2025-03-22 11:12:56.839342535 +0000
++++ scrub/Makefile.in
+@@ -121,7 +121,7 @@ install-crond: installdirs-crond
+ install-libprogs: $(LIBPROGS) installdirs-libprogs
+       $(Q) for i in $(LIBPROGS); do \
+               $(ES) " INSTALL $(pkglibdir)/$$i"; \
+-              $(INSTALL_PROGRAM) $$i $(DESTDIR)$(pkglibdir)/$$i; \
++              $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir)/$$i; \
+       done
+ 
+ install-systemd: $(SERVICE_FILES) installdirs-systemd
+@@ -135,7 +135,7 @@ install-strip: install
+ install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs $(INSTALL_TGT)
+       $(Q) for i in $(PROGS); do \
+               $(ES) " INSTALL $(root_sbindir)/$$i"; \
+-              $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
++              $(INSTALL_SCRIPT) $$i $(DESTDIR)$(root_sbindir)/$$i; \
+       done
+       $(Q) for i in $(MANPAGES); do \
+               for j in $(COMPRESS_EXT); do \