summaryrefslogtreecommitdiff
path: root/filesystems/e2fsprogs-core
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/e2fsprogs-core')
-rw-r--r--filesystems/e2fsprogs-core/Makefile77
-rw-r--r--filesystems/e2fsprogs-core/distinfo6
-rw-r--r--filesystems/e2fsprogs-core/files/patch-misc__Makefile.in17
-rw-r--r--filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script11
-rw-r--r--filesystems/e2fsprogs-core/files/patch-tests_m__offset_script11
-rw-r--r--filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script19
-rw-r--r--filesystems/e2fsprogs-core/files/unwanted8
-rw-r--r--filesystems/e2fsprogs-core/pkg-plist5
8 files changed, 49 insertions, 105 deletions
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
index 7242cd276287..00857d9497ca 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!
+PORTVERSION= 1.47.3
+PORTREVISION?= 0 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
CATEGORIES?= filesystems sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -14,9 +14,9 @@ LICENSE_FILE?= ${WRKSRC}/NOTICE
.endif
LICENSE_DISTFILES_GPLv2+ = ${DISTNAME}${EXTRACT_SUFX}
-USES= cpe gmake makeinfo pkgconfig tar:xz
+USES= compiler:c11 cpe gmake makeinfo pkgconfig tar:xz
CPE_VENDOR= e2fsprogs_project
-USE_CSTD= gnu99
+USE_CSTD= gnu11
# this seems a bit redundant to the --rpath below, but
# the latter should be more robust in case someone needs
# to deal with the file systems from a system not yet fully booted.
@@ -26,25 +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
-PIE_UNSAFE= yes
+CPPFLAGS+= ${_FUSEFS_CFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include
+CFLAGS+= -Wno-unused-command-line-argument
PORTSCOUT= ignore:1 # cannot handle the version in the directory
@@ -53,43 +50,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
+
+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
@@ -117,13 +115,6 @@ _FUSEFS_CFLAGS= -I${LOCALBASE}/include/fuse3
_FUSEFS_CFLAGS=
.endif
-. if ! empty(ARCH:Mpowerpc*)
-# Fix powerpc64/powerpc SIGSEGV,
-# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231570 (ppc64)
-# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242798 (ppc32 - untested)
-USES+= compiler:c11
-. endif
-
.if empty(PORT_OPTIONS:MNOTESTS) && ${MASTERDIR} == ${.CURDIR}
USES+= perl5
USE_PERL5= build
@@ -146,10 +137,8 @@ libintl=
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-no-sbrk
.endif
-post-extract: # the symlink RELEASE-NOTES is stale in v1.47.1 and v1.47.2 tarballs, fix:
- ${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
@@ -177,7 +166,6 @@ post-patch::
r_64to32bit \
r_64to32bit_meta \
r_expand_full \
- r_corrupt_fs \
r_min_itable \
t_change_uuid_mounted \
t_dangerous \
@@ -240,7 +228,7 @@ _checkaddargs+=TMPDIR=${WRKDIR}/tmp
.endif
.if ${PORT_OPTIONS:MSLOWTESTS}
-_check_target=SKIP_SLOW_TESTS= check
+_check_target=fullcheck
_check_timeout=7200
.else
_check_target=check
@@ -317,10 +305,8 @@ 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
+ ${RM} ${STAGEDIR}${PREFIX}/sbin/findfs
${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1
${MKDIR} ${STAGEDIR}${DATADIR}/et/
${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/
@@ -329,6 +315,7 @@ post-install:
${MV} -f ${STAGEDIR}${PREFIX}/share/man/man3/com_err.3 \
${STAGEDIR}${PREFIX}/share/man/man3/e2fsprogs-com_err.3
${RM} ${STAGEDIR}${PREFIX}/share/man/man3/libblkid.3
+ ${RM} ${STAGEDIR}${PREFIX}/share/man/man8/findfs.8
#
# the next line closes .if ${MASTERDIR} == ${.CURDIR}
diff --git a/filesystems/e2fsprogs-core/distinfo b/filesystems/e2fsprogs-core/distinfo
index be95528f7e1a..7e9ca88cb575 100644
--- a/filesystems/e2fsprogs-core/distinfo
+++ b/filesystems/e2fsprogs-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736350272
-SHA256 (e2fsprogs-1.47.2.tar.xz) = 08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c
-SIZE (e2fsprogs-1.47.2.tar.xz) = 7299932
+TIMESTAMP = 1752044663
+SHA256 (e2fsprogs-1.47.3.tar.xz) = 857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329
+SIZE (e2fsprogs-1.47.3.tar.xz) = 7321540
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/patch-tests_f__detect__junk_script b/filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script
deleted file mode 100644
index 45b544cf691d..000000000000
--- a/filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/f_detect_junk/script.orig 2023-02-07 03:31:53 UTC
-+++ tests/f_detect_junk/script
-@@ -9,7 +9,7 @@ FSCK_OPT=-fn
- IMAGE=$test_dir/image.bz2
-
- bzip2 -d < $IMAGE > $TMPFILE
--$DD if=/dev/zero of=$TMPFILE conv=notrunc oflag=append bs=1024k count=16 > /dev/null 2>&1
-+$DD if=/dev/zero of=$TMPFILE conv=notrunc bs=1024k count=16 2>/dev/null >>$TMPFILE
-
- # Run fsck to fix things?
- if [ -x $DEBUGFS_EXE ]; then
diff --git a/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script b/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script
deleted file mode 100644
index 9cc4232eec3a..000000000000
--- a/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/m_offset/script.orig 2023-02-02 15:57:32 UTC
-+++ tests/m_offset/script
-@@ -13,7 +13,7 @@ $MKE2FS -F -b 1024 -E offset=524288 "$TMPFILE" 1024 >>
- # compute crc of the first and last 512 1k blocks
- crc_first2=`$DD if="$TMPFILE" bs=1k count=512 2>/dev/null | $CRCSUM`
- crc_last2=`$DD if="$TMPFILE" bs=1k count=512 skip=1536 2>/dev/null | $CRCSUM`
--crc_exp=`yes a | $DD bs=1k count=512 2>/dev/null | $CRCSUM`
-+crc_exp=`yes a | $DD bs=1k count=512 iflag=fullblock 2>/dev/null | $CRCSUM`
- # a warning should be only emitted by the first mke2fs call
- warning=`grep -c "offset specified without an explicit file system size." \
- "$OUT"`
diff --git a/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script b/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script
deleted file mode 100644
index 77fd70e4ccf2..000000000000
--- a/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script
+++ /dev/null
@@ -1,19 +0,0 @@
---- tests/t_mmp_fail/script.orig 2023-02-07 03:31:53 UTC
-+++ tests/t_mmp_fail/script
-@@ -10,14 +10,14 @@ fi
-
- $TUNE2FS -O project $TMPFILE >> $test_name.log 2>&1
- status=$?
--if [ "$status" == 0 ] ; then
-+if [ "$status" = 0 ] ; then
- echo "'tune2fs -O project' succeeded on small inode" > $test_name.failed
- echo "$test_name: $test_description: failed"
- return 1
- fi
- $TUNE2FS -o bad_option $TMPFILE >> $test_name.log 2>&1
- status=$?
--if [ "$status" == 0 ] ; then
-+if [ "$status" = 0 ] ; then
- echo "'tune2fs -o bad_option' succeeded" > $test_name.failed
- echo "$test_name: $test_description: failed"
- return 1
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..441e2c46023a 100644
--- a/filesystems/e2fsprogs-core/pkg-plist
+++ b/filesystems/e2fsprogs-core/pkg-plist
@@ -69,13 +69,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
@@ -84,7 +81,6 @@ sbin/e2image
sbin/e2label
sbin/e2mmpstatus
sbin/e2undo
-sbin/findfs
sbin/fsck.ext2
sbin/fsck.ext3
sbin/fsck.ext4
@@ -112,6 +108,7 @@ sbin/tune2fs
%%NLS%%share/locale/hu/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/id/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/ms/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 22:29:44 +0000