CVS commit: pkgsrc/sysutils/e2fsprogs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/e2fsprogs
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Tue, 21 Jan 2025 18:13:57 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Jan 21 18:13:57 UTC 2025

Modified Files:
        pkgsrc/sysutils/e2fsprogs: Makefile PLIST distinfo
        pkgsrc/sysutils/e2fsprogs/patches: patch-ab patch-ac patch-af patch-ao
            patch-as patch-aw patch-debugfs_debugfs.c patch-e2fsck_jfs__user.h
            patch-lib_ext2fs_bitops.c patch-lib_ext2fs_bitops.h
            patch-lib_ext2fs_ext2fs.h patch-lib_ext2fs_unix__io.c
            patch-lib_uuid_gen__uuid.c patch-misc_create__inode.c
Removed Files:
        pkgsrc/sysutils/e2fsprogs: options.mk

Log Message:
e2fsprogs: Update to 1.47.2

pkgsrc changes:
---------------
  + Remove nls option since it seems to not produce .mo files for at least
    four years. Actually, generate .mo files by stamping .po files needs
    CONFIGURE_ARGS+=    --enable-maintainer-mode
    Even if this option is enabled, the GETTEXT_MACRO_VERSION mismatches.
  + Remove useless options.mk file because the only option it contains breaks
    the installation process if it is enabled.

upstream changes:
-----------------
  + Main issues addresses: CVE-2022-1304, Debian Bug #98961
  + https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.47.2.txt
  + https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.47.1.txt
  + https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.47.0.txt
  + https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.46.6.txt
  + https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.46.5.txt
  + https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.46.4.txt
  + https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.46.3.txt


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/e2fsprogs/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/e2fsprogs/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/e2fsprogs/patches/patch-ab \
    pkgsrc/sysutils/e2fsprogs/patches/patch-as \
    pkgsrc/sysutils/e2fsprogs/patches/patch-aw
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/e2fsprogs/patches/patch-ac
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/e2fsprogs/patches/patch-af
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/e2fsprogs/patches/patch-ao \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c \
    pkgsrc/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h \
    pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.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.37 pkgsrc/sysutils/e2fsprogs/Makefile:1.38
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.37     Sat Aug  3 07:33:29 2024
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Tue Jan 21 18:13:56 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2024/08/03 07:33:29 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2025/01/21 18:13:56 triaxx Exp $
 
-DISTNAME=      e2fsprogs-1.46.4
-PKGREVISION=   3
+DISTNAME=      e2fsprogs-1.47.2
 CATEGORIES=    sysutils
 MASTER_SITES=  https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PKGVERSION_NOREV}/
 #MASTER_SITES+=        ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -12,7 +11,8 @@ HOMEPAGE=     http://e2fsprogs.sourceforge.n
 COMMENT=       Second extended file system (ext2fs) management programs
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2 AND modified-bsd AND mit
 
-USE_LANGUAGES=         c99
+USE_LANGUAGES=         c
+USE_CC_FEATURES=       c99
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake makeinfo pkg-config
 GNU_CONFIGURE=         yes
@@ -41,8 +41,6 @@ PKGCONFIG_OVERRIDE+=  lib/ss/ss.pc.in
 BUILDLINK_TRANSFORM+=  rm:-luuid
 .endif
 
-.include "options.mk"
-
 PLIST_VARS+=           shlib
 .if ${OBJECT_FMT} == "ELF"
 PLIST.shlib=           yes
@@ -81,6 +79,12 @@ SUBST_SED.man+=              -e '/mke2fs.conf/s,/etc
 SUBST_SED.man+=                -e '/e2fsck.conf/s,/etc,@root_sysconfdir@,'
 SUBST_SED.man+=                -e   '/blkid.tab/s,/etc,@root_sysconfdir@,'
 
+SUBST_CLASSES+=                sysconf
+SUBST_MESSAGE.sysconf= Fixing sysconfdir path
+SUBST_STAGE.sysconf=   pre-configure
+SUBST_FILES.sysconf=   lib/blkid/blkidP.h
+SUBST_VARS.sysconf=    PKG_SYSCONFDIR
+
 .if ${OPSYS} == "Linux"
 USE_TOOLS+=            bash:run
 REPLACE_BASH+=         scrub/e2scrub.in

Index: pkgsrc/sysutils/e2fsprogs/PLIST
diff -u pkgsrc/sysutils/e2fsprogs/PLIST:1.12 pkgsrc/sysutils/e2fsprogs/PLIST:1.13
--- pkgsrc/sysutils/e2fsprogs/PLIST:1.12        Thu Dec  2 08:16:51 2021
+++ pkgsrc/sysutils/e2fsprogs/PLIST     Tue Jan 21 18:13:56 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2021/12/02 08:16:51 pho Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/01/21 18:13:56 triaxx Exp $
 bin/chattr
 bin/compile_et
 bin/lsattr
@@ -98,26 +98,5 @@ sbin/tune2fs
 share/et/et_c.awk
 share/et/et_h.awk
 share/examples/ext2fs/mke2fs.conf
-${PLIST.nls}share/locale/ca/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/cs/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/da/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/de/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/eo/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/es/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/fi/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/fr/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/hu/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/id/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/it/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/ms/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/nl/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/pl/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/pt/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/sr/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/sv/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/tr/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/uk/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/vi/LC_MESSAGES/e2fsprogs.mo
-${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
 share/ss/ct_c.awk
 share/ss/ct_c.sed

Index: pkgsrc/sysutils/e2fsprogs/distinfo
diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.28 pkgsrc/sysutils/e2fsprogs/distinfo:1.29
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.28     Sat Aug  3 07:33:29 2024
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Tue Jan 21 18:13:56 2025
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.28 2024/08/03 07:33:29 wiz Exp $
+$NetBSD: distinfo,v 1.29 2025/01/21 18:13:56 triaxx Exp $
 
-BLAKE2s (e2fsprogs-1.46.4.tar.xz) = 87ac05b6c50d2dee6271e09768e1551b442a5dc1860c68df11f0e478d4518bf2
-SHA512 (e2fsprogs-1.46.4.tar.xz) = 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
-Size (e2fsprogs-1.46.4.tar.xz) = 7035200 bytes
-SHA1 (patch-ab) = 9b686655a75239279a456dc8889113be06519cd7
-SHA1 (patch-ac) = 1a7faec14d69cb1d317908297e5500c0cb72aa4f
-SHA1 (patch-af) = bcda43bb14afdbf6a98dfedd949af4d1aff443d6
-SHA1 (patch-ao) = a8fcacf506b003bf40ecadd5260ff0a6628ad2e6
-SHA1 (patch-as) = be316e404840a47422edbee65177bf6a9c94b335
-SHA1 (patch-aw) = d864c60c302230acdbdb1e33436883ad594c6808
-SHA1 (patch-debugfs_debugfs.c) = 085d29bc53e616dbeb08f4f48fd9d94e1d837e80
-SHA1 (patch-e2fsck_jfs__user.h) = 2fd21cedabc4356a0d76a6caa1dbf73461750800
-SHA1 (patch-lib_ext2fs_bitops.c) = 068cc0dfb6b2a6a185178479f20100917c7407c8
-SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
-SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
+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
+SHA1 (patch-ab) = 364f7b0692b8085ad9d4323f2702bdd26e5652d3
+SHA1 (patch-ac) = 474e733c4c4fda8a48ea4285c62a56f31846fc94
+SHA1 (patch-af) = 91a694ca53c2bbfa77e7e4edbde4a892cb6ca62a
+SHA1 (patch-ao) = 33973866ce11d4acc37fed7c9d25d01ff35b426d
+SHA1 (patch-as) = 6cf4a28a194d452c4651373803e57b5b46e3d886
+SHA1 (patch-aw) = 5046ba1d36046150b16292d4c24edf55c3e6fca6
+SHA1 (patch-debugfs_debugfs.c) = 791ce440216a15bf7711c022032e9c837dca0b8b
+SHA1 (patch-e2fsck_jfs__user.h) = a54b1a597d1d0b4526d8ba0e4c442e4705fb93be
+SHA1 (patch-lib_ext2fs_bitops.c) = f641da9106c6a7e4314122d4b1f9d4067fc07f10
+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_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
+SHA1 (patch-lib_ext2fs_unix__io.c) = 78dcc99e04a981727d71271b5f4c69b426c6ada9
+SHA1 (patch-lib_uuid_gen__uuid.c) = 2f679453457522a10b90c489ce52e59b6e3909c5
+SHA1 (patch-misc_create__inode.c) = 43a9a2d3d53bfe055be3fd47f5db2990594a9faa

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-ab
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-ab:1.4 pkgsrc/sysutils/e2fsprogs/patches/patch-ab:1.5
--- pkgsrc/sysutils/e2fsprogs/patches/patch-ab:1.4      Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-ab  Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-ab,v 1.5 2025/01/21 18:13:57 triaxx Exp $
 
 DragonFly support
 
 --- lib/ext2fs/getsize.c.orig  2014-08-03 05:26:22.000000000 +0900
 +++ lib/ext2fs/getsize.c       2014-12-10 20:45:18.000000000 +0900
-@@ -33,6 +33,9 @@
+@@ -37,6 +37,9 @@
  #ifdef HAVE_SYS_DISKLABEL_H
  #include <sys/disklabel.h>
  #endif
@@ -14,7 +14,7 @@ DragonFly support
  #ifdef HAVE_SYS_DISK_H
  #include <sys/disk.h>
  #endif
-@@ -198,7 +201,11 @@ errcode_t ext2fs_get_device_size2(const 
+@@ -204,7 +207,11 @@ errcode_t ext2fs_get_device_size2(const 
  #ifdef HAVE_SYS_DISKLABEL_H
        {
                int part;
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-as
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-as:1.4 pkgsrc/sysutils/e2fsprogs/patches/patch-as:1.5
--- pkgsrc/sysutils/e2fsprogs/patches/patch-as:1.4      Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-as  Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.4 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-as,v 1.5 2025/01/21 18:13:57 triaxx Exp $
 
 Give correct path for short help
 
 --- misc/blkid.c.orig  2009-08-13 01:39:57.000000000 +0000
 +++ misc/blkid.c
-@@ -52,7 +52,7 @@ static void usage(int error)
+@@ -53,7 +53,7 @@ static void usage(int error)
        fprintf(out,
                "usage:\t%s [-c <file>] [-ghlLv] [-o format] "
                "[-s <tag>] [-t <token>]\n    [-w <file>] [dev ...]\n"
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-aw
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-aw:1.4 pkgsrc/sysutils/e2fsprogs/patches/patch-aw:1.5
--- pkgsrc/sysutils/e2fsprogs/patches/patch-aw:1.4      Fri Dec  8 08:12:58 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-aw  Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-aw,v 1.4 2017/12/08 08:12:58 adam Exp $
+$NetBSD: patch-aw,v 1.5 2025/01/21 18:13:57 triaxx Exp $
 
 Don't gzip info file
 
 --- doc/Makefile.in.orig       2017-10-16 05:45:45.000000000 +0000
 +++ doc/Makefile.in
-@@ -27,8 +27,6 @@ install-doc-libs: libext2fs.info libext2
+@@ -28,8 +28,6 @@ install-doc-libs: libext2fs.info libext2
                echo "  INSTALL_DATA $(infodir)/$$i" ; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
        done

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-ac
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-ac:1.6 pkgsrc/sysutils/e2fsprogs/patches/patch-ac:1.7
--- pkgsrc/sysutils/e2fsprogs/patches/patch-ac:1.6      Fri Dec  8 08:12:58 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-ac  Tue Jan 21 18:13:57 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2017/12/08 08:12:58 adam Exp $
+$NetBSD: patch-ac,v 1.7 2025/01/21 18:13:57 triaxx Exp $
 
 DragonFly Support
 
@@ -14,7 +14,7 @@ DragonFly Support
  #ifdef HAVE_SYS_DISK_H
  #include <sys/disk.h>
  #endif
-@@ -134,8 +137,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
+@@ -137,8 +140,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
  #if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO)
        {
                int part = -1;
@@ -28,7 +28,7 @@ DragonFly Support
                char ch;
                struct stat st;
  
-@@ -151,8 +159,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
+@@ -154,8 +162,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
                if (fstat(fd, &st) >= 0 &&
                    blkidP_is_disk_device(st.st_mode))
                        part = st.st_rdev & 7;

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-af
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-af:1.8 pkgsrc/sysutils/e2fsprogs/patches/patch-af:1.9
--- pkgsrc/sysutils/e2fsprogs/patches/patch-af:1.8      Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-af  Tue Jan 21 18:13:57 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.8 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-af,v 1.9 2025/01/21 18:13:57 triaxx Exp $
 
 Add a patch to use struct statvfs on NetBSD 2.0F and newer.  Fixes PR 25891
 by Andreas Wiese.
@@ -6,7 +6,7 @@ Upate __NetBSD_Version__ statvfs check f
 
 --- lib/ext2fs/ismounted.c.orig        2010-05-18 03:04:39.000000000 +0000
 +++ lib/ext2fs/ismounted.c
-@@ -198,7 +198,11 @@ static errcode_t check_mntent(const char
+@@ -260,7 +260,11 @@ static errcode_t check_mntent(const char
  static errcode_t check_getmntinfo(const char *file, int *mount_flags,
                                  char *mtpt, int mtlen)
  {

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-ao
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-ao:1.3 pkgsrc/sysutils/e2fsprogs/patches/patch-ao:1.4
--- pkgsrc/sysutils/e2fsprogs/patches/patch-ao:1.3      Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-ao  Tue Jan 21 18:13:57 2025
@@ -1,16 +1,16 @@
-$NetBSD: patch-ao,v 1.3 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-ao,v 1.4 2025/01/21 18:13:57 triaxx Exp $
 
 Where to find the config file
 
 --- lib/blkid/blkidP.h.orig    2009-08-13 01:39:57.000000000 +0000
 +++ lib/blkid/blkidP.h
-@@ -104,7 +104,11 @@ struct blkid_struct_cache
+@@ -113,7 +113,11 @@ struct blkid_struct_cache
  extern char *blkid_strdup(const char *s);
  extern char *blkid_strndup(const char *s, const int length);
  
 -#define BLKID_CACHE_FILE "/etc/blkid.tab"
 +#ifndef ETC_DIR
-+#define ETC_DIR "/etc"                /* Where to find the config file */
++#define ETC_DIR "@PKG_SYSCONFDIR@"    /* Where to find the config file */
 +#endif
 +
 +#define BLKID_CACHE_FILE ETC_DIR "/blkid.tab"
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c:1.3 pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c:1.4
--- pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c:1.3     Fri Dec  8 08:12:58 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_ext2fs_bitops.c,v 1.3 2017/12/08 08:12:58 adam Exp $
+$NetBSD: patch-lib_ext2fs_bitops.c,v 1.4 2025/01/21 18:13:57 triaxx Exp $
 
 Avoid conflict with popcountXX().
 
 --- lib/ext2fs/bitops.c.orig   2016-09-02 13:17:32.000000000 +0900
 +++ lib/ext2fs/bitops.c        2017-02-03 21:44:49.000000000 +0900
-@@ -116,14 +116,14 @@ int ext2fs_test_bit64(__u64 nr, const vo
+@@ -106,14 +106,14 @@ int ext2fs_test_bit64(__u64 nr, const vo
        return (mask & *ADDR);
  }
  
@@ -21,7 +21,7 @@ Avoid conflict with popcountXX().
  {
        unsigned int res = w - ((w >> 1) & 0x55555555);
        res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
-@@ -139,19 +139,19 @@ unsigned int ext2fs_bitcount(const void 
+@@ -129,19 +129,19 @@ unsigned int ext2fs_bitcount(const void 
        unsigned int res = 0;
  
        while (((((uintptr_t) cp) & 3) != 0) && (nbytes > 0)) {

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c:1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c:1.3
--- pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c:1.2       Fri Dec  8 08:12:58 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c   Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-debugfs_debugfs.c,v 1.2 2017/12/08 08:12:58 adam Exp $
+$NetBSD: patch-debugfs_debugfs.c,v 1.3 2025/01/21 18:13:57 triaxx Exp $
 
 Fix build on SunOS.
 
 --- debugfs/debugfs.c.orig     2017-10-16 05:45:45.000000000 +0000
 +++ debugfs/debugfs.c
-@@ -29,6 +29,9 @@ extern char *optarg;
+@@ -30,6 +30,9 @@ extern char *optarg;
  #ifdef HAVE_SYS_SYSMACROS_H
  #include <sys/sysmacros.h>
  #endif
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h:1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h:1.3
--- pkgsrc/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h:1.2      Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h  Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-e2fsck_jfs__user.h,v 1.2 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-e2fsck_jfs__user.h,v 1.3 2025/01/21 18:13:57 triaxx Exp $
 
 Force GNU inline semantic.
 
 --- e2fsck/jfs_user.h.orig     2014-07-06 13:13:18.000000000 +0900
 +++ e2fsck/jfs_user.h  2014-12-10 21:09:03.000000000 +0900
-@@ -93,7 +93,7 @@ extern size_t journal_tag_bytes(journal_
+@@ -133,7 +133,7 @@ extern size_t journal_tag_bytes(journal_
  #define _INLINE_ inline
  #else /* not C99 */
  #ifdef __GNUC__
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h:1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h:1.3
--- pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h:1.2     Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_ext2fs_bitops.h,v 1.2 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-lib_ext2fs_bitops.h,v 1.3 2025/01/21 18:13:57 triaxx Exp $
 
 Force GNU inline semantic.
 
 --- lib/ext2fs/bitops.h.orig   2014-07-03 23:33:48.000000000 +0900
 +++ lib/ext2fs/bitops.h        2014-12-10 21:10:47.000000000 +0900
-@@ -238,7 +238,7 @@ extern errcode_t ext2fs_find_first_set_g
+@@ -232,7 +232,7 @@ extern errcode_t ext2fs_find_first_set_g
  #define _INLINE_ inline
  #else /* not C99 */
  #ifdef __GNUC__
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h:1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h:1.3
--- pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h:1.2     Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_ext2fs_ext2fs.h,v 1.2 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-lib_ext2fs_ext2fs.h,v 1.3 2025/01/21 18:13:57 triaxx Exp $
 
 Force GNU inline semantic.
 
 --- lib/ext2fs/ext2fs.h.orig   2014-08-03 05:26:22.000000000 +0900
 +++ lib/ext2fs/ext2fs.h        2014-12-10 21:03:40.000000000 +0900
-@@ -1529,7 +1529,7 @@ extern __u64 ext2fs_div64_ceil(__u64 a, 
+@@ -1983,7 +1983,7 @@ extern __u64 ext2fs_div64_ceil(__u64 a, 
  #define _INLINE_ inline
  #else
  #ifdef __GNUC__
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.3
--- pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.2    Fri Dec  8 08:12:58 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c        Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-misc_create__inode.c,v 1.2 2017/12/08 08:12:58 adam Exp $
+$NetBSD: patch-misc_create__inode.c,v 1.3 2025/01/21 18:13:57 triaxx Exp $
 
 Fix build on SunOS.
 
 --- misc/create_inode.c.orig   2017-10-16 05:45:45.000000000 +0000
 +++ misc/create_inode.c
-@@ -25,6 +25,9 @@
+@@ -30,6 +30,9 @@
  #ifdef HAVE_SYS_SYSMACROS_H
  #include <sys/sysmacros.h>
  #endif

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c:1.1 pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c:1.2
--- pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c:1.1   Sat Aug  3 07:33:29 2024
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix__io.c       Tue Jan 21 18:13:57 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_ext2fs_unix__io.c,v 1.1 2024/08/03 07:33:29 wiz Exp $
+$NetBSD: patch-lib_ext2fs_unix__io.c,v 1.2 2025/01/21 18:13:57 triaxx 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
+@@ -780,7 +780,7 @@ static errcode_t unix_open_channel(const
                io->align = 512;
  #endif
  
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c:1.1 pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c:1.2
--- pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c:1.1    Thu Sep 21 09:48:56 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c        Tue Jan 21 18:13:57 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_uuid_gen__uuid.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $
+$NetBSD: patch-lib_uuid_gen__uuid.c,v 1.2 2025/01/21 18:13:57 triaxx Exp $
 
 Fix build on SunOS.
 
 --- lib/uuid/gen_uuid.c.orig   2016-09-02 04:17:32.000000000 +0000
 +++ lib/uuid/gen_uuid.c
-@@ -267,7 +267,7 @@ static int get_node_id(unsigned char *no
+@@ -254,7 +254,7 @@ static int get_node_id(unsigned char *no
        for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
                ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
                strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);

Prev by Date: CVS commit: pkgsrc/mk
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/mk
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index