Index: head/sysutils/e2fsprogs/Makefile =================================================================== --- head/sysutils/e2fsprogs/Makefile (revision 564227) +++ head/sysutils/e2fsprogs/Makefile (revision 564228) @@ -1,333 +1,334 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.45.7 +PORTVERSION= 1.46.0 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} MAINTAINER?= mandree@FreeBSD.org COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems LICENSE?= GPLv2+ .if !defined(_no_license_file) LICENSE_FILE?= ${WRKSRC}/NOTICE .endif LICENSE_DISTFILES_GPLv2+ = ${DISTNAME}${EXTRACT_SUFX} USES= cpe gmake makeinfo pkgconfig tar:xz CPE_VENDOR= e2fsprogs_project USE_CSTD= gnu99 # 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. .if !defined(PKGNAMESUFFIX) USE_LDCONFIG= ${PREFIX}/lib/e2fsprogs .endif GNU_CONFIGURE= yes # 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 \ --enable-elf-shlibs \ --libdir='${PREFIX}/lib/e2fsprogs/' \ --includedir='${PREFIX}/include/e2fsprogs/' \ --with-root-prefix='${PREFIX}' \ --without-included-gettext \ LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs' CONFIGURE_ENV?= LIBS='-Wl,--as-needed ${LIBS} -lexecinfo -lelf' -CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS +# apparently HAVE_PTHREAD_H checks go missing if the FUSEFS option is unset, force it: +CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include -DHAVE_PTHREAD_H # -D_EXT2_USE_C_VERSIONS MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig' MAKE_ENV+= CHECK_CMD=@true PORTSCOUT= ignore # cannot handle the version in the directory .if !defined(MASTERDIR) INSTALL_TARGET= install install-libs OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS LIBUNWIND OPTIONS_EXCLUDE+= EXAMPLES OPTIONS_SUB= yes OPTIONS_SINGLE= SELFTEST OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS OPTIONS_DEFAULT= SMALLTESTS FUSEFS_DESC= Build user-land ext2/3/4 FUSE module (slow!) SELFTEST_DESC= Choose which set of self-tests to run 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) 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}!) FUSEFS_CONFIGURE_ENABLE= fuse2fs BUILD_DEPENDS+= gdd:sysutils/coreutils BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash BASH_CMD= ${LOCALBASE}/bin/bash LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind LIBUNWIND_LDFLAGS+= -rdynamic LIBUNWIND_EXTRA_PATCHES=${FILESDIR}/extrapatch-e2fsck_sigcatcher.c PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES .endif # even under DEVELOPER, no REINPLACE_CMD warnings desired # it simply makes no sense to warn about dozens of files # for systematic edits that run over files that don't need the edits. # a "warn if nothing was edited by one command" would be acceptable, # but until we have that in the framework, just # avoid Tools/scripts/sed_checked altogether: REINPLACE_CMD= ${SED} ${REINPLACE_ARGS} PKGDEINSTALL= ${PKGINSTALL} MAKE_ARGS+= V=1 .include . 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 ${PORT_OPTIONS:MFUSEFS} USES+= fuse .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext iconv:build .endif .if empty(PORT_OPTIONS:MNOTESTS) && ${MASTERDIR} == ${.CURDIR} USES+= perl5 USE_PERL5= build .endif .include .if ${PORT_OPTIONS:MNLS} . if empty(ICONV_LIB) libintl= ${LOCALBASE}/lib/libintl.a . else libintl= ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a . endif .else CONFIGURE_ARGS+=--disable-nls libintl= .endif .if ${MASTERDIR} == ${.CURDIR} && (${ARCH} == "aarch64" || ${ARCH} == "riscv64") EXTRA_PATCHES+= ${FILESDIR}/extrapatch-no-sbrk .endif # d_fallocate_blkmap appears to fail on some systems for unknown reasons. post-patch:: @${REINPLACE_CMD} -E -e 's/md5sum ([^ ]*)/printf "%s %s\\n" $$(md5 -q \1) \1/' \ -e "s/ == 0/ = 0/" -e "s/tar x$$/tar xf -/" -e "s/\/gdd/" \ ${WRKSRC}/tests/[a-z]_*/script @${REINPLACE_CMD} -e 's///' ${WRKSRC}/*/*.c @${REINPLACE_CMD} -e 's,/etc/blkid.tab,${ETCDIR}/blkid.tab,' ${WRKSRC}/misc/blkid* ${WRKSRC}/lib/blkid/blkidP.h @${REINPLACE_CMD} -E -e 's/__GNUC_PREREQ\>/__GNUC_PREREQ__/' ${WRKSRC}/*/*/*.[ch] ${WRKSRC}/*/*.c .if empty(PORT_OPTIONS:MALLTESTS) . for i in \ d_fallocate_blkmap \ f_baddir \ f_bbfile \ f_convert_bmap \ f_detect_junk \ f_inode_ea_collision \ f_lpffile \ f_no_cache_corrupt_inode \ f_opt_extent \ j_corrupt_descr_csum \ m_bigjournal \ m_hugefile_slack \ m_offset \ m_raid_opt \ r_32to64bit \ r_32to64bit_expand_full \ r_32to64bit_meta \ r_32to64bit_move_itable \ r_64to32bit \ r_64to32bit_meta \ r_expand_full \ r_min_itable \ t_change_uuid_mounted \ t_dangerous \ t_disable_changed_csum_seed_mounted \ t_disable_mcsum \ t_disable_mcsum_noinitbg \ t_disable_mcsum_yesinitbg \ t_enable_mcsum \ t_enable_mcsum_initbg \ t_iexpand_full \ t_iexpand_mcsum \ t_uninit_bg_rm \ u_dryrun \ u_mke2fs_opt_offset @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} . endfor .endif .if ${PORT_OPTIONS:MBASHTESTS} ${REINPLACE_CMD} -e 's}^SHELL *=.*}SHELL = ${_CHECK_SHELL}}' ${WRKSRC}/MCONFIG.in .else . for i in f_large_dir @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} . endfor .endif ############################################################## # Master port stuff that is not to be seen by the slave ports. ############################################################## .if ${MASTERDIR} == ${.CURDIR} # NOTE: The previous .if block goes all the way to the end of the file. .if !empty(PORT_OPTIONS:MNOTESTS) && (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1200000 || ((${ARCH} != i386) && (${ARCH} != amd64))) BROKEN= it was not tested on your system by the maintainer; you must run self-tests .endif pre-build: # fix up Makefile ordering for parallel builds cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et cd ${WRKSRC}/lib/support && ${DO_MAKE_BUILD} prof_err.h .if ${PORT_OPTIONS:MPARALLELTESTS} _CHECK_JOBS=${_MAKE_JOBS} .else _CHECK_JOBS= .endif _checkaddargs= .if ${PORT_OPTIONS:MBASHTESTS} _CHECK_SHELL=${LOCALBASE}/bin/bash _checkaddargs+=--eval SHELL:=${BASH_CMD} .else _CHECK_SHELL=${SH} .endif .if !defined(TMPDIR) _checkaddargs+=TMPDIR=${WRKDIR}/tmp .endif .if ${PORT_OPTIONS:MSLOWTESTS} _check_target=SKIP_SLOW_TESTS= check _check_timeout=7200 .else _check_target=check _check_timeout=180 .endif .if ${PORT_OPTIONS:MLIBUNWIND} _staticlibs+=${LOCALBASE}/lib/libunwind.a /usr/lib/liblzma.a /usr/lib/libmd.a .endif post-build: # Relink e2fsck statically - We need to make sure that tools for the root file # system are statically linked against anything that is outside the root fs, # else we're in trouble if e2fsck is needed for boot: # (we don't use e2fsck.static, since we can link libc.so dynamically) # NOTE: we need to link libgcc statically, it might be under /usr/local! # => do not add a -Bdynamic - but instead list the dynamic libraries # before the -Bstatic cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \ && ${MAKE_CMD} e2fsck V=1 \ LIBS="-static-libgcc -lc -Bstatic ../lib/libsupport.a ../lib/libext2fs.a ../lib/libcom_err.a \ ${_staticlibs} /usr/lib/libexecinfo.a /usr/lib/libelf.a \ ${LOCALBASE}/lib/libblkid.a ${LOCALBASE}/lib/libuuid.a ${libintl} ../lib/libe2p.a " \ && ${STRIP_CMD} e2fsck # Regression check: avoid a port (not upstream!) regression from 1.40.5, # check that e2fsck isn't dynalinked against anything but libc.so: @${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects outside /lib: " @a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \ | ${GREP} -v 'not a dynamic executable' \ | ${GREP} '=>' \ | ${AWK} '{print $$3;}' \ | ${EGREP} -v '^/lib/lib.*\.so\.' || :)"; \ if test "x$$a" = "x" ; then echo 'PASS' ; else \ echo 'FAIL' ; echo '===> e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi # Update translation binary files .if ${PORT_OPTIONS:MNLS} cd ${WRKSRC}/po && ${MAKE_CMD} update-gmo .endif # Build fsck(8) wrapper ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \ -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c # While the ${MAKE} check can take a minute on an end user's system, the # correctness of tools such as e2fsck is critical to the health of the # file systems. The upstream is not using any *BSD as his development # system, and therefore let's exercise due diligence in running the self- # test on each and every system and not just package building hosts. # There have been subtle failures induced by Linux-isms in the past. # -- Matthias Andree, package maintainer, 2007-09-18 .if empty(PORT_OPTIONS:MNOTESTS) @${ECHO_CMD} '===> Running e2fsprogs self-test suite' # do not add -j options unconditionally to ${MAKE_CMD} below, this might break # due to excessive disk space use. cd ${WRKSRC}/tests && \ ulimit -t ${_check_timeout} && \ ${MKDIR} ${WRKDIR}/tmp && \ ${SETENV} e2fsprogs_inhibit_SIGINFO=1 BLKID_FILE=${WRKDIR}/tmp/blkid.tab SHELL=${_CHECK_SHELL} \ ${MAKE_CMD} ${_check_target} ${_CHECK_JOBS} ${_checkaddargs} \ || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; } .else @${ECHO_CMD} '===> SKIPPING e2fsprogs self-test suite (DISCOURAGED!)' .endif post-install: # pkg workaround time again; # the whole purpose of this dance is to move the necessities for # /etc/fstab fsck'ing into /sbin, and symlink to these guys # in the regular hierarchy, normally $PREFIX/sbin. Hard links may # crash the install if /usr[/local] is a separate file system from /, # and pkg 1.15.4 can't automatically unroll or install relative symlinks. ${MKDIR} ${STAGEDIR}/sbin ${MV} -f ${STAGEDIR}${PREFIX}/sbin/e2fsck ${STAGEDIR}/sbin/ # from INSTALL_TARGET ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}/sbin/ # from port # according to TPH 6.1.1 Handling Symbolic Links, these are to be absolute, # yet stage-qa warns about these on 2020-09-16: ${LN} -fs /sbin/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/ ${LN} -fs /sbin/e2fsck ${STAGEDIR}${PREFIX}/sbin/ # these are made hardlinks to symlinks - -P avoids following them to /sbin: ${LN} -fP ${STAGEDIR}${PREFIX}/sbin/e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext2 ${LN} -fP ${STAGEDIR}${PREFIX}/sbin/e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext3 ${LN} -fP ${STAGEDIR}${PREFIX}/sbin/e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext4 # now the remainder of the usual post-install jobs: ${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/man/man8/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .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 include/e2fsprogs/ss share/ss ${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et ${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1 ${MKDIR} ${STAGEDIR}${DATADIR}/et/ ${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/ ${REINPLACE_CMD} -e 's}^DIR=.*$$}DIR=${DATADIR}/et}' -i '' ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et ${RMDIR} ${STAGEDIR}${PREFIX}/share/et # # the next line closes .if ${MASTERDIR} == ${.CURDIR} .endif .include Index: head/sysutils/e2fsprogs/distinfo =================================================================== --- head/sysutils/e2fsprogs/distinfo (revision 564227) +++ head/sysutils/e2fsprogs/distinfo (revision 564228) @@ -1,3 +1,3 @@ -TIMESTAMP = 1612301930 -SHA256 (e2fsprogs-1.45.7.tar.xz) = 62d49c86d9d4becf305093edd65464484dc9ea41c6ff9ae4f536e4a341b171a2 -SIZE (e2fsprogs-1.45.7.tar.xz) = 5570052 +TIMESTAMP = 1612477988 +SHA256 (e2fsprogs-1.46.0.tar.xz) = 91d61cef9a251a18e49a700be0028a8d35b0549a25d2bc263af6fa5d9f7c7d13 +SIZE (e2fsprogs-1.46.0.tar.xz) = 7007144 Index: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c =================================================================== --- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c (revision 564227) +++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c (revision 564228) @@ -1,78 +1,78 @@ // SIGINFO is a Berkeley extension, so we need to // remove the #define _XOPEN_SOURCE 600 // It would hide all non-POSIX declarations, including SIGINFO. ---- e2fsck/unix.c.orig 2021-01-29 05:51:02 UTC +--- e2fsck/unix.c.orig 2021-01-29 22:02:31 UTC +++ e2fsck/unix.c @@ -9,8 +9,6 @@ * %End-Header% */ -#define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */ - #include "config.h" #include #ifdef HAVE_STDLIB_H @@ -37,7 +35,7 @@ extern int optind; #include #endif #ifdef HAVE_MALLOC_H -#include +#include #endif #ifdef HAVE_SYS_TYPES_H #include @@ -602,6 +600,24 @@ static int e2fsck_update_progress(e2fsck_t ctx, int pa return 0; } +static int e2fsck_progress_once(e2fsck_t ctx, int pass, unsigned long cur, unsigned long max) +{ + char buf[80]; + float percent; + + if (pass == 0) + return 0; + + percent = calc_percent(&e2fsck_tbl, pass, cur, max); + e2fsck_simple_progress(ctx, ctx->device_name, + percent, 0); + + printf("\n"); + ctx->progress = 0; + return 0; +} + + #define PATH_SET "PATH=/sbin" /* @@ -635,6 +651,17 @@ static void signal_progress_on(int sig EXT2FS_ATTR((un ctx->progress = e2fsck_update_progress; } +static void signal_progress_now(int sig EXT2FS_ATTR((unused))) +{ + e2fsck_t ctx = e2fsck_global_ctx; + + if (!ctx) + return; + + ctx->progress = e2fsck_progress_once; + ctx->progress_fd = 0; +} + static void signal_progress_off(int sig EXT2FS_ATTR((unused))) { e2fsck_t ctx = e2fsck_global_ctx; -@@ -1111,6 +1138,10 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t +@@ -1120,6 +1147,10 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t sigaction(SIGUSR1, &sa, 0); sa.sa_handler = signal_progress_off; sigaction(SIGUSR2, &sa, 0); + sa.sa_handler = signal_progress_now; + if (!getenv("e2fsprogs_inhibit_SIGINFO")) { + sigaction(SIGINFO, &sa, 0); + } #endif /* Update our PATH to include /sbin if we need to run badblocks */ Index: head/sysutils/e2fsprogs/files/patch-e2fsck_rehash.c =================================================================== --- head/sysutils/e2fsprogs/files/patch-e2fsck_rehash.c (nonexistent) +++ head/sysutils/e2fsprogs/files/patch-e2fsck_rehash.c (revision 564228) @@ -0,0 +1,32 @@ +e2fsprogs is developed on GNU/Linux and with glibc in particular, +which uses a qsort_r() function interface differing from FreeBSD's, +both WRT argument ordering on qsort_r() itself, as well as +the thunk argument on hash_cmp() is first on FreeBSD, last on glibc. +This applies to FreeBSD 11 and 12 and might change on FreeBSD 13. + +Watch https://reviews.freebsd.org/D17083 + +--- e2fsck/rehash.c.orig 2021-01-29 22:02:31 UTC ++++ e2fsck/rehash.c +@@ -305,7 +305,7 @@ static EXT2_QSORT_TYPE name_cf_cmp(const struct name_c + } + + /* Used for sorting the hash entry */ +-static EXT2_QSORT_TYPE hash_cmp(const void *a, const void *b, void *arg) ++static EXT2_QSORT_TYPE hash_cmp(void *arg, const void *a, const void *b) + { + const struct name_cmp_ctx *ctx = (struct name_cmp_ctx *) arg; + const struct hash_entry *he_a = (const struct hash_entry *) a; +@@ -1049,10 +1049,10 @@ retry_nohash: + resort: + if (fd.compress && fd.num_array > 1) + qsort_r(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry), +- hash_cmp, &name_cmp_ctx); ++ &name_cmp_ctx, hash_cmp); + else + qsort_r(fd.harray, fd.num_array, sizeof(struct hash_entry), +- hash_cmp, &name_cmp_ctx); ++ &name_cmp_ctx, hash_cmp); + + /* + * Look for duplicates Property changes on: head/sysutils/e2fsprogs/files/patch-e2fsck_rehash.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c =================================================================== --- head/sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c (nonexistent) +++ head/sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c (revision 564228) @@ -0,0 +1,36 @@ +--- lib/ext2fs/blkmap64_rb.c.orig 2021-01-29 22:02:31 UTC ++++ lib/ext2fs/blkmap64_rb.c +@@ -12,6 +12,7 @@ + #include "config.h" + #include + #include ++#include + #if HAVE_UNISTD_H + #include + #endif +@@ -907,7 +908,7 @@ static void rb_print_stats(ext2fs_generic_bitmap_64 bi + struct ext2fs_rb_private *bp; + struct rb_node *node = NULL; + struct bmap_rb_extent *ext; +- __u64 count = 0; ++ unsigned long long count = 0; + __u64 max_size = 0; + __u64 min_size = ULONG_MAX; + __u64 size = 0, avg_size = 0; +@@ -951,12 +952,12 @@ static void rb_print_stats(ext2fs_generic_bitmap_64 bi + fprintf(stderr, "%16llu extents (%llu bytes)\n", + count, ((count * sizeof(struct bmap_rb_extent)) + + sizeof(struct ext2fs_rb_private))); +- fprintf(stderr, "%16llu bits minimum size\n", ++ fprintf(stderr, "%16" PRIu64 " bits minimum size\n", + min_size); +- fprintf(stderr, "%16llu bits maximum size\n" +- "%16llu bits average size\n", ++ fprintf(stderr, "%16" PRIu64 " bits maximum size\n" ++ "%16" PRIu64 " bits average size\n", + max_size, avg_size); +- fprintf(stderr, "%16llu bits set in bitmap (out of %llu)\n", size, ++ fprintf(stderr, "%16" PRIu64 " bits set in bitmap (out of %" PRIu64 ")\n", size, + bitmap->real_end - bitmap->start); + fprintf(stderr, + "%16.4lf memory / bitmap bit memory ratio (bitarray = 1)\n", Property changes on: head/sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/e2fsprogs/files/patch-misc__Makefile.in =================================================================== --- head/sysutils/e2fsprogs/files/patch-misc__Makefile.in (revision 564227) +++ head/sysutils/e2fsprogs/files/patch-misc__Makefile.in (revision 564228) @@ -1,81 +1,81 @@ ---- misc/Makefile.in.orig 2021-01-29 05:51:02 UTC +--- misc/Makefile.in.orig 2021-01-29 22:02:31 UTC +++ misc/Makefile.in -@@ -35,17 +35,17 @@ MKDIR_P = @MKDIR_P@ +@@ -38,17 +38,17 @@ MKDIR_P = @MKDIR_P@ SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ $(E2IMAGE_PROG) @FSCK_PROG@ e2undo -USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \ +USPROGS= mklost+found e2freefrag $(UUIDD_PROG) \ $(E4DEFRAG_PROG) $(E4CRYPT_PROG) SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \ e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \ - logsave.8 filefrag.8 e2freefrag.8 e2undo.8 \ - $(UUIDD_MAN) $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ \ + logsave.8 e2freefrag.8 e2undo.8 \ + $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ \ e2mmpstatus.8 FMANPAGES= mke2fs.conf.5 ext4.5 -UPROGS= chattr lsattr $(FUSE_PROG) @UUID_CMT@ uuidgen -UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1 +UPROGS= chattr lsattr $(FUSE_PROG) +UMANPAGES= chattr.1 lsattr.1 UMANPAGES+= @FUSE_CMT@ fuse2fs.1 LPROGS= @E2INITRD_PROG@ -@@ -148,14 +148,14 @@ profiled: +@@ -154,14 +154,14 @@ profiled: mke2fs.conf: $(srcdir)/mke2fs.conf.in if test -f $(srcdir)/mke2fs.conf.custom.in ; then \ - cp $(srcdir)/mke2fs.conf.custom.in mke2fs.conf; \ + cp $(srcdir)/mke2fs.conf.custom.in mke2fs.conf.dist; \ else \ - cp $(srcdir)/mke2fs.conf.in mke2fs.conf; \ + cp $(srcdir)/mke2fs.conf.in mke2fs.conf.dist; \ fi default_profile.c: mke2fs.conf $(srcdir)/profile-to-c.awk $(E) " PROFILE_TO_C mke2fs.conf" - $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf \ + $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf.dist \ > default_profile.c findsuper: findsuper.o $(E) " LD $@" -@@ -606,34 +606,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs +@@ -612,34 +612,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs (cd $(DESTDIR)$(man5dir); \ $(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \ done - $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \ - if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \ - mke2fs.conf; then \ - true; \ - else \ - if grep -q ext4dev $(DESTDIR)$(root_sysconfdir)/mke2fs.conf ; then \ - $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - $(INSTALL_DATA) mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new; \ - echo "Warning: installing mke2fs.conf in $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - echo "Check to see if you need to update your $(root_sysconfdir)/mke2fs.conf"; \ - else \ - $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ - mv $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old; \ - $(INSTALL_DATA) mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ - echo "Your mke2fs.conf is too old. Backing up old version in"; \ - echo "$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old. Please check to see"; \ - echo "if you have any local customizations that you wish to preserve."; \ - fi; \ - echo " "; \ - fi; \ - else \ - $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ - $(INSTALL_DATA) mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ - fi + $(Q) $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ + $(INSTALL_DATA) mke2fs.conf.dist \ + $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist install-strip: install $(Q) for i in $(SPROGS); do \