CVS commit: pkgsrc/sysutils/e2fsprogs

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May 10 09:28:12 UTC 2026

Modified Files:
        pkgsrc/sysutils/e2fsprogs: Makefile PLIST distinfo
Removed Files:
        pkgsrc/sysutils/e2fsprogs/patches: patch-lib_et_Makefile.in

Log Message:
e2fsprogs: add conflict with mit-krb (partially revert last commit)0

e2fsprogs ships its own version of the com_err library (alongside
related headers and binaries) which conflicts with that provided by
mit-krb5. This is a known issue:
* https://github.com/chromebrew/chromebrew/issues/5820
* https://github.com/openwrt/openwrt/issues/5829
* https://lists.freebsd.org/archives/freebsd-ports/2022-January/001289.html

Other software distributions have addressed the issue by patching krb5
to use e2fsprogs com_err, or the other way round. Since on pkgsrc we
can't assume to have krb5 installed (we might be using heimdal), this
seems impractical. The problem needs to be sorted out elsewhere,
most likely by renaming files installed by e2fsprogs, and instructing
any package requiring e2fsprogs to use the renamed library/headers.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/e2fsprogs/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_et_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.42 pkgsrc/sysutils/e2fsprogs/Makefile:1.43
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.42     Sun May 10 08:20:29 2026
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Sun May 10 09:28:12 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2026/05/10 08:20:29 vins Exp $
+# $NetBSD: Makefile,v 1.43 2026/05/10 09:28:12 vins Exp $
 
 DISTNAME=      e2fsprogs-1.47.4
-PKGREVISION=   1
+PKGREVISION=   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,6 +12,8 @@ HOMEPAGE=     https://e2fsprogs.sourceforge.
 COMMENT=       Second extended file system (ext2fs) management programs
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2 AND modified-bsd AND mit
 
+CONFLICTS=     mit-krb5-[0-9]*         # com_err
+
 USE_LANGUAGES=         c
 USE_CC_FEATURES=       c99
 USE_LIBTOOL=           yes

Index: pkgsrc/sysutils/e2fsprogs/PLIST
diff -u pkgsrc/sysutils/e2fsprogs/PLIST:1.14 pkgsrc/sysutils/e2fsprogs/PLIST:1.15
--- pkgsrc/sysutils/e2fsprogs/PLIST:1.14        Sun May 10 08:20:29 2026
+++ pkgsrc/sysutils/e2fsprogs/PLIST     Sun May 10 09:28:12 2026
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.14 2026/05/10 08:20:29 vins Exp $
+@comment $NetBSD: PLIST,v 1.15 2026/05/10 09:28:12 vins Exp $
 bin/chattr
-bin/e2compile_et
+bin/compile_et
 bin/lsattr
 bin/mk_cmds
 include/com_err.h
@@ -42,7 +42,7 @@ lib/pkgconfig/e2p.pc
 lib/pkgconfig/ext2fs.pc
 lib/pkgconfig/ss.pc
 man/man1/chattr.1
-man/man1/e2compile_et.1
+man/man1/compile_et.1
 man/man1/lsattr.1
 man/man1/mk_cmds.1
 man/man3/com_err.3

Index: pkgsrc/sysutils/e2fsprogs/distinfo
diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.34 pkgsrc/sysutils/e2fsprogs/distinfo:1.35
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.34     Sun May 10 08:20:29 2026
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Sun May 10 09:28:12 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2026/05/10 08:20:29 vins Exp $
+$NetBSD: distinfo,v 1.35 2026/05/10 09:28:12 vins Exp $
 
 BLAKE2s (e2fsprogs-1.47.4.tar.xz) = c58f55a108f0e71f4b67076d45a58a85b9e03a8789bfe7e52471e1bb5dafbdd0
 SHA512 (e2fsprogs-1.47.4.tar.xz) = c316ce38d73786fb45b3728cd31991fe81b14a1e61dae645f3471c3f35983c4394e4606b47194c3e607897b7ae5a5ef1d376adb204383afa8c4219db8617d970
@@ -11,7 +11,6 @@ SHA1 (patch-as) = 6cf4a28a194d452c465137
 SHA1 (patch-aw) = 5046ba1d36046150b16292d4c24edf55c3e6fca6
 SHA1 (patch-debugfs_debugfs.c) = 791ce440216a15bf7711c022032e9c837dca0b8b
 SHA1 (patch-e2fsck_jfs__user.h) = a54b1a597d1d0b4526d8ba0e4c442e4705fb93be
-SHA1 (patch-lib_et_Makefile.in) = 1a2d7b4cef8ea3cc75a6b227fb3e4881c2071a2e
 SHA1 (patch-lib_ext2fs_bitops.c) = f641da9106c6a7e4314122d4b1f9d4067fc07f10
 SHA1 (patch-lib_ext2fs_bitops.h) = 4dd18ad892dbf91437e4996e7fcb7fd3a61758e8
 SHA1 (patch-lib_ext2fs_ext2fs.h) = 597435441fc537ec20f79d191181876ecdaa7b21