summaryrefslogtreecommitdiff
path: root/filesystems/e2fsprogs-core
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/e2fsprogs-core')
-rw-r--r--filesystems/e2fsprogs-core/Makefile57
-rw-r--r--filesystems/e2fsprogs-core/files/patch-misc__Makefile.in17
-rw-r--r--filesystems/e2fsprogs-core/files/unwanted8
-rw-r--r--filesystems/e2fsprogs-core/pkg-plist4
4 files changed, 41 insertions, 45 deletions
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
index 9b978fd773fd..74fc7d58dc0f 100644
--- a/filesystems/e2fsprogs-core/Makefile
+++ b/filesystems/e2fsprogs-core/Makefile
@@ -1,6 +1,6 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.47.2
-PORTREVISION?= 1 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
+PORTREVISION?= 3 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
CATEGORIES?= filesystems sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -26,24 +26,22 @@ USE_LDCONFIG= ${PREFIX}/lib/e2fsprogs
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-# while we use the system blkid, we need to --enable-libblkid
-# so that the tools get built:
CONFIGURE_ARGS?=--disable-fsck \
--disable-e2initrd-helper \
--disable-libuuid \
--disable-uuidd \
- --enable-libblkid \
+ --disable-libblkid \
--enable-elf-shlibs \
--libdir='${PREFIX}/lib/e2fsprogs/' \
--includedir='${PREFIX}/include/e2fsprogs/' \
--with-root-prefix='${PREFIX}' \
LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs'
CONFIGURE_ENV?= LIBS='-Wl,--as-needed ${LIBS} -lexecinfo -lelf'
-CPPFLAGS+= ${_FUSEFS_CFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include
-CFLAGS+= -Wno-unused-command-line-argument # -D_FILE_OFFSET_BITS=64 # the latter for fuse-libs
MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'
MAKE_ENV+= CHECK_CMD=@true
+CPPFLAGS+= ${_FUSEFS_CFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include
+CFLAGS+= -Wno-unused-command-line-argument # -D_FILE_OFFSET_BITS=64 # the latter for fuse-libs
PIE_UNSAFE= yes
PORTSCOUT= ignore:1 # cannot handle the version in the directory
@@ -53,43 +51,44 @@ CPPFLAGS+= -D__GNUC_PREREQ\(a,b\)=1
INSTALL_TARGET= install install-libs
-OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS LIBUNWIND
-OPTIONS_EXCLUDE+= EXAMPLES
-OPTIONS_SUB= yes
+PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
+OPTIONS_DEFINE= DOCS NLS BASHTESTS FUSEFS PARALLELTESTS SLOWTESTS LIBUNWIND
+OPTIONS_DEFAULT= FUSEFS ALLTESTS
OPTIONS_SINGLE= SELFTEST
OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS
-OPTIONS_DEFAULT= SMALLTESTS
+OPTIONS_EXCLUDE+= EXAMPLES
+OPTIONS_SUB= yes
+
+ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space)
+BASHTESTS_DESC= Enable tests that require the GNU bash shell
FUSEFS_DESC= Build user-land ext2/3/4 FUSE module (slow!)
-SELFTEST_DESC= Choose which set of self-tests to run
+LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCOURAGED)
-SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT)
-ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space)
PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space)
+SELFTEST_DESC= Choose which set of self-tests to run
SLOWTESTS_DESC= Enable slow tests that are skipped by default
-BASHTESTS_DESC= Enable tests that require the GNU bash shell
-LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
+SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT)
+
+BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash
+BASH_CMD= ${LOCALBASE}/bin/bash
-FUSEFS_CONFIGURE_ENABLE= fuse2fs
FUSEFS_USES= fuse:3
+FUSEFS_CONFIGURE_ENABLE= fuse2fs
# we can't use FUSEFS_CFLAGS, see below for workaround
-FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread
FUSEFS_LDFLAGS= -L${LOCALBASE}/lib
+FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread
-NLS_USES= gettext iconv:build
-
-BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash
-BASH_CMD= ${LOCALBASE}/bin/bash
-
-LIB_DEPENDS+= libblkid.so:filesystems/e2fsprogs-libblkid
-LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS+= libblkid.so:filesystems/libblkid \
+ libuuid.so:misc/libuuid
LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind
-LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind
LIBUNWIND_LDFLAGS+= -rdynamic
+LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind
LIBUNWIND_EXTRA_PATCHES=${FILESDIR}/extrapatch-e2fsck_sigcatcher.c
-PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
+NLS_USES= gettext iconv:build
+
.endif
# even under DEVELOPER, no REINPLACE_CMD warnings desired
@@ -150,6 +149,7 @@ post-extract: # the symlink RELEASE-NOTES is stale in v1.47.1 and v1.47.2 tarbal
${RLN} ${WRKSRC}/doc/RelNotes/v1.47.2.txt ${WRKSRC}/RELEASE-NOTES
post-patch::
+ ${TOUCH} ${WRKSRC}/tests/r_corrupt_fs/is_slow_test
.if !empty(DISTFILES)
@${REINPLACE_CMD} -e 's/<malloc\.h>/<stdlib.h>/' ${WRKSRC}/*/*.c
@${REINPLACE_CMD} -e 's,/etc/blkid.tab,${ETCDIR}/blkid.tab,' ${WRKSRC}/misc/blkid* ${WRKSRC}/lib/blkid/blkidP.h
@@ -243,7 +243,7 @@ _check_target=SKIP_SLOW_TESTS= check
_check_timeout=7200
.else
_check_target=check
-_check_timeout=180
+_check_timeout=600
.endif
.if ${PORT_OPTIONS:MLIBUNWIND}
@@ -316,9 +316,6 @@ post-install:
.endfor
.endif
# remove or relocate files installed by other ports already, or shadowing system files:
- cd ${STAGEDIR}${PREFIX} && \
- ${XARGS} <${FILESDIR}/unwanted ${RM} && \
- ${RMDIR} include/e2fsprogs/blkid
${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1
${MKDIR} ${STAGEDIR}${DATADIR}/et/
diff --git a/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
index ec0ff218a622..99de5bdc575b 100644
--- a/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
+++ b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
@@ -1,6 +1,15 @@
---- misc/Makefile.in.orig 2021-01-29 22:02:31 UTC
+--- misc/Makefile.in.orig 2024-05-21 02:52:47 UTC
+++ misc/Makefile.in
-@@ -38,17 +38,17 @@ MKDIR_P = @MKDIR_P@
+@@ -31,24 +31,24 @@ MKDIR_P = @MKDIR_P@
+ @BLKID_CMT@BLKID_STATIC= blkid.static
+ @BLKID_CMT@BLKID_MAN= blkid.8
+
+-@BLKID_CMT@FINDFS_LINK= findfs
+-@BLKID_CMT@FINDFS_MAN= findfs.8
++FINDFS_LINK= findfs
++FINDFS_MAN= findfs.8
+
+ @FUSE_CMT@FUSE_PROG= fuse2fs
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
@@ -23,7 +32,7 @@
UMANPAGES+= @FUSE_CMT@ fuse2fs.1
LPROGS= @E2INITRD_PROG@
-@@ -154,14 +154,14 @@ profiled:
+@@ -156,14 +156,14 @@ mke2fs.conf: $(srcdir)/mke2fs.conf.in
mke2fs.conf: $(srcdir)/mke2fs.conf.in
if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
@@ -41,7 +50,7 @@
> default_profile.c
findsuper: findsuper.o
$(E) " LD $@"
-@@ -612,34 +612,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
+@@ -624,34 +624,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
(cd $(DESTDIR)$(man5dir); \
$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
done
diff --git a/filesystems/e2fsprogs-core/files/unwanted b/filesystems/e2fsprogs-core/files/unwanted
deleted file mode 100644
index 693deb364915..000000000000
--- a/filesystems/e2fsprogs-core/files/unwanted
+++ /dev/null
@@ -1,8 +0,0 @@
-include/e2fsprogs/blkid/blkid.h
-include/e2fsprogs/blkid/blkid_types.h
-lib/e2fsprogs/libblkid.a
-lib/e2fsprogs/libblkid.so
-lib/e2fsprogs/libblkid.so.1
-lib/e2fsprogs/libblkid.so.1.0
-libdata/pkgconfig/blkid.pc
-man/man3/libblkid.3
diff --git a/filesystems/e2fsprogs-core/pkg-plist b/filesystems/e2fsprogs-core/pkg-plist
index 369ce002d590..aa62bd55cd74 100644
--- a/filesystems/e2fsprogs-core/pkg-plist
+++ b/filesystems/e2fsprogs-core/pkg-plist
@@ -59,6 +59,7 @@ share/man/man8/e2image.8.gz
share/man/man8/e2label.8.gz
share/man/man8/e2mmpstatus.8.gz
share/man/man8/e2undo.8.gz
+share/man/man8/findfs.8.gz
share/man/man8/mke2fs.8.gz
share/man/man8/mklost+found.8.gz
share/man/man8/resize2fs.8.gz
@@ -69,13 +70,10 @@ share/man/man8/fsck.ext4.8.gz
share/man/man8/mkfs.ext2.8.gz
share/man/man8/mkfs.ext3.8.gz
share/man/man8/mkfs.ext4.8.gz
-share/man/man8/findfs.8.gz
-share/man/man8/blkid.8.gz
share/man/man8/logsave.8.gz
share/man/man8/fsck_ext2fs.8.gz
share/man/man8/e2freefrag.8.gz
sbin/badblocks
-sbin/blkid
sbin/debugfs
sbin/dumpe2fs
sbin/e2freefrag
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 04:44:57 +0000