diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2025-07-09 12:29:09 +0200 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2025-07-09 12:57:26 +0200 |
| commit | e7dbea9695a77b637f6ab9ef22f72dfaa6f278c8 (patch) | |
| tree | 2511b3236f9eacf63bdb9607f66437ce621ea6f7 /filesystems/e2fsprogs-core | |
| parent | sysutils/p5-MogileFS-*: take (diff) | |
filesystems/e2fsprogs*: update to v1.47.3 release
ChangeLog: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.3
Note that the metadata (extattr and API) copying on FreeBSD does not
work as on Linux because our APIs for POSIX extended attributes is
different and e2fsprogs uses it to also copy ACLs, so we do not have
those mkfs parts in place.
MFH: 2025Q3 (after 14 days)
Diffstat (limited to 'filesystems/e2fsprogs-core')
| -rw-r--r-- | filesystems/e2fsprogs-core/Makefile | 27 | ||||
| -rw-r--r-- | filesystems/e2fsprogs-core/distinfo | 6 | ||||
| -rw-r--r-- | filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script | 11 | ||||
| -rw-r--r-- | filesystems/e2fsprogs-core/files/patch-tests_m__offset_script | 11 | ||||
| -rw-r--r-- | filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script | 19 | ||||
| -rw-r--r-- | filesystems/e2fsprogs-core/pkg-plist | 1 |
6 files changed, 12 insertions, 63 deletions
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile index 3635f56a551c..00857d9497ca 100644 --- a/filesystems/e2fsprogs-core/Makefile +++ b/filesystems/e2fsprogs-core/Makefile @@ -1,6 +1,6 @@ PORTNAME= e2fsprogs -PORTVERSION= 1.47.2 -PORTREVISION?= 4 # 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. @@ -41,8 +41,7 @@ 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 +CFLAGS+= -Wno-unused-command-line-argument PORTSCOUT= ignore:1 # cannot handle the version in the directory @@ -68,13 +67,13 @@ NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCOURAGED) 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 -SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT) +SMALLTESTS_DESC=Run tests that need <500 MB disk space BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash BASH_CMD= ${LOCALBASE}/bin/bash FUSEFS_USES= fuse:3 -FUSEFS_CONFIGURE_ENABLE= fuse2fs +FUSEFS_CONFIGURE_ENABLE=fuse2fs # we can't use FUSEFS_CFLAGS, see below for workaround FUSEFS_LDFLAGS= -L${LOCALBASE}/lib FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread @@ -116,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 @@ -145,9 +137,6 @@ 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) @@ -239,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 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-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/pkg-plist b/filesystems/e2fsprogs-core/pkg-plist index 9968e202315e..441e2c46023a 100644 --- a/filesystems/e2fsprogs-core/pkg-plist +++ b/filesystems/e2fsprogs-core/pkg-plist @@ -108,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 |
