CVS commit: pkgsrc/sysutils/e2fsprogs

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May 10 07:52:13 UTC 2026

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

Log Message:
sysutils/e2fsprogs: update to 1.47.4

Changelog too long. Refer to
https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.4


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_getsectsize.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
cvs rdiff -u -r1.2 -r1.3 \
    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.40 pkgsrc/sysutils/e2fsprogs/Makefile:1.41
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.40     Mon Nov 17 11:01:25 2025
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Sun May 10 07:52:13 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2025/11/17 11:01:25 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2026/05/10 07:52:13 vins Exp $
 
-DISTNAME=      e2fsprogs-1.47.2
+DISTNAME=      e2fsprogs-1.47.4
 CATEGORIES=    sysutils
 MASTER_SITES=  https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PKGVERSION_NOREV}/
 #MASTER_SITES+=        ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}

Index: pkgsrc/sysutils/e2fsprogs/distinfo
diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.32 pkgsrc/sysutils/e2fsprogs/distinfo:1.33
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.32     Sun Mar 30 21:10:47 2025
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Sun May 10 07:52:13 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.32 2025/03/30 21:10:47 wiz Exp $
+$NetBSD: distinfo,v 1.33 2026/05/10 07:52:13 vins Exp $
 
-BLAKE2s (e2fsprogs-1.47.2.tar.xz) = 22ad92fbe4786671ff677cf218f1e9834fb7f52f241b35f04f36b37df67c06ca
-SHA512 (e2fsprogs-1.47.2.tar.xz) = a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8
-Size (e2fsprogs-1.47.2.tar.xz) = 7299932 bytes
+BLAKE2s (e2fsprogs-1.47.4.tar.xz) = c58f55a108f0e71f4b67076d45a58a85b9e03a8789bfe7e52471e1bb5dafbdd0
+SHA512 (e2fsprogs-1.47.4.tar.xz) = c316ce38d73786fb45b3728cd31991fe81b14a1e61dae645f3471c3f35983c4394e4606b47194c3e607897b7ae5a5ef1d376adb204383afa8c4219db8617d970
+Size (e2fsprogs-1.47.4.tar.xz) = 7337236 bytes
 SHA1 (patch-ab) = 364f7b0692b8085ad9d4323f2702bdd26e5652d3
 SHA1 (patch-ac) = 474e733c4c4fda8a48ea4285c62a56f31846fc94
 SHA1 (patch-af) = 91a694ca53c2bbfa77e7e4edbde4a892cb6ca62a
@@ -15,7 +15,8 @@ SHA1 (patch-lib_ext2fs_bitops.c) = f641d
 SHA1 (patch-lib_ext2fs_bitops.h) = 4dd18ad892dbf91437e4996e7fcb7fd3a61758e8
 SHA1 (patch-lib_ext2fs_ext2fs.h) = 597435441fc537ec20f79d191181876ecdaa7b21
 SHA1 (patch-lib_ext2fs_ext2fsP.h) = 4ba2ef6c492dc61ae7c1e4b5b82a2406eea28a61
+SHA1 (patch-lib_ext2fs_getsectsize.c) = ad319070d5594f689c540cee0eac245f989a26ed
 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) = 76080c14fa8590a3c350ce241d62cc9da356146b
+SHA1 (patch-misc_create__inode.c) = 034113a52f5264c41ff2b44040b3f5a4f011a289
+SHA1 (patch-scrub_Makefile.in) = 775654768521adc8aeb0cdf97d3b1bd64e79ae33

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.3 pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.4
--- pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.3    Tue Jan 21 18:13:57 2025
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c        Sun May 10 07:52:13 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-misc_create__inode.c,v 1.3 2025/01/21 18:13:57 triaxx Exp $
+$NetBSD: patch-misc_create__inode.c,v 1.4 2026/05/10 07:52:13 vins Exp $
 
 Fix build on SunOS.
 
---- misc/create_inode.c.orig   2017-10-16 05:45:45.000000000 +0000
+--- misc/create_inode.c.orig   2026-03-06 17:17:36.000000000 +0000
 +++ misc/create_inode.c
 @@ -30,6 +30,9 @@
  #ifdef HAVE_SYS_SYSMACROS_H
@@ -11,6 +11,6 @@ Fix build on SunOS.
 +#ifdef __sun
 +#include <sys/mkdev.h>
 +#endif
- 
- #include <ext2fs/ext2fs.h>
- #include <ext2fs/ext2_types.h>
+ #if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
+ #include <linux/fsverity.h>
+ #include <linux/fs.h>

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in:1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in:1.3
--- pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in:1.2       Sun Mar 23 07:03:32 2025
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in   Sun May 10 07:52:13 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-scrub_Makefile.in,v 1.2 2025/03/23 07:03:32 wiz Exp $
+$NetBSD: patch-scrub_Makefile.in,v 1.3 2026/05/10 07:52:13 vins Exp $
 
 Use INSTALL_SCRIPT instead of INSTALL_PROGRAM so that it doesn't
 attempt to strip sh scripts.
 
---- scrub/Makefile.in.orig     2025-01-01 06:24:42.000000000 +0000
+--- scrub/Makefile.in.orig     2026-03-06 17:17:36.000000000 +0000
 +++ scrub/Makefile.in
-@@ -126,7 +126,7 @@ install-crond: installdirs-crond
+@@ -126,7 +126,7 @@ install-crond: $(CRONTABS) installdirs-c
  install-libprogs: $(LIBPROGS) installdirs-libprogs
        $(Q) for i in $(LIBPROGS); do \
                $(ES) " INSTALL $(pkglibexecdir)/$$i"; \
@@ -15,7 +15,7 @@ attempt to strip sh scripts.
  
  install-systemd: $(SERVICE_FILES) installdirs-systemd
 @@ -140,7 +140,7 @@ install-strip: install
- install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs $(INSTALL_TGT)
+ install: $(PROGS) $(MANPAGES) $(CONFFILES) $(MANPAGES) installdirs $(INSTALL_TGT)
        $(Q) for i in $(PROGS); do \
                $(ES) " INSTALL $(root_sbindir)/$$i"; \
 -              $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \

Added files:

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_getsectsize.c
diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_getsectsize.c:1.1
--- /dev/null   Sun May 10 07:52:13 2026
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_getsectsize.c    Sun May 10 07:52:13 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_ext2fs_getsectsize.c,v 1.1 2026/05/10 07:52:13 vins Exp $
+
+Fix implicit declaration of ioctl on *BSD. 
+
+--- lib/ext2fs/getsectsize.c.orig      2026-05-10 07:22:00.580778643 +0000
++++ lib/ext2fs/getsectsize.c
+@@ -29,8 +29,10 @@
+ #ifdef HAVE_SYS_DISK_H
+ #include <sys/disk.h>
+ #endif
+-#ifdef HAVE_LINUX_FD_H
++#ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
++#endif
++#ifdef HAVE_LINUX_FD_H
+ #include <linux/fd.h>
+ #endif
+