CVS commit: pkgsrc/sysutils/e2fsprogs

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug  3 07:33:29 UTC 2024

Modified Files:
        pkgsrc/sysutils/e2fsprogs: Makefile distinfo
Added Files:
        pkgsrc/sysutils/e2fsprogs/patches: patch-lib_ext2fs_ext2fsP.h
            patch-lib_ext2fs_unix__io.c

Log Message:
e2fsprogs: handle character devices on NetBSD like on FreeBSD

>From RVP in PR 58545.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fsP.h \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c

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.36 pkgsrc/sysutils/e2fsprogs/Makefile:1.37
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.36     Tue Dec 13 10:55:03 2022
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Sat Aug  3 07:33:29 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2022/12/13 10:55:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/03 07:33:29 wiz Exp $
 
 DISTNAME=      e2fsprogs-1.46.4
-PKGREVISION=   2
+PKGREVISION=   3
 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.27 pkgsrc/sysutils/e2fsprogs/distinfo:1.28
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.27     Tue Oct 26 11:19:33 2021
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Sat Aug  3 07:33:29 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2021/10/26 11:19:33 nia Exp $
+$NetBSD: distinfo,v 1.28 2024/08/03 07:33:29 wiz Exp $
 
 BLAKE2s (e2fsprogs-1.46.4.tar.xz) = 87ac05b6c50d2dee6271e09768e1551b442a5dc1860c68df11f0e478d4518bf2
 SHA512 (e2fsprogs-1.46.4.tar.xz) = 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
@@ -14,6 +14,8 @@ SHA1 (patch-e2fsck_jfs__user.h) = 2fd21c
 SHA1 (patch-lib_ext2fs_bitops.c) = 068cc0dfb6b2a6a185178479f20100917c7407c8
 SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
 SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
+SHA1 (patch-lib_ext2fs_ext2fsP.h) = 4ba2ef6c492dc61ae7c1e4b5b82a2406eea28a61
 SHA1 (patch-lib_ext2fs_tdb.c) = dd50993cd0beba0451cfb3422ca9f54700ee0e38
+SHA1 (patch-lib_ext2fs_unix__io.c) = 75f6eee01c125abb027d0dfde0a73538b2ed5cae
 SHA1 (patch-lib_uuid_gen__uuid.c) = 083ac45a8d2d30a5c272720fb9a6a1785c97eee2
 SHA1 (patch-misc_create__inode.c) = b3a9f313ea7cb55d9a40c7916a7862472e0aeaa8

Added files:

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fsP.h
diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fsP.h:1.1
--- /dev/null   Sat Aug  3 07:33:29 2024
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fsP.h        Sat Aug  3 07:33:29 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_ext2fs_ext2fsP.h,v 1.1 2024/08/03 07:33:29 wiz Exp $
+
+Handle character devices on NetBSD like on FreeBSD.
+PR 58545 by RVP.
+
+--- lib/ext2fs/ext2fsP.h.orig  2021-08-19 02:53:01.000000000 +0000
++++ lib/ext2fs/ext2fsP.h
+@@ -19,7 +19,7 @@
+ 
+ static inline int ext2fsP_is_disk_device(mode_t mode)
+ {
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+       return S_ISBLK(mode) || S_ISCHR(mode);
+ #else
+       return S_ISBLK(mode);
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c
diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c:1.1
--- /dev/null   Sat Aug  3 07:33:29 2024
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c       Sat Aug  3 07:33:29 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_ext2fs_unix__io.c,v 1.1 2024/08/03 07:33:29 wiz Exp $
+
+Handle character devices on NetBSD like on FreeBSD.
+PR 58545 by RVP.
+
+--- lib/ext2fs/unix_io.c.orig  2021-08-19 02:53:01.000000000 +0000
++++ lib/ext2fs/unix_io.c
+@@ -758,7 +758,7 @@ static errcode_t unix_open_channel(const
+               io->align = 512;
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+       if (io->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
+               int dio_align = ext2fs_get_dio_alignment(fd);
+