diff --git a/sysutils/e2fsprogs-core/Makefile b/sysutils/e2fsprogs-core/Makefile index c180a563b874..a71b125694e9 100644 --- a/sysutils/e2fsprogs-core/Makefile +++ b/sysutils/e2fsprogs-core/Makefile @@ -1,322 +1,331 @@ PORTNAME= e2fsprogs -PORTVERSION= 1.47.0 -PORTREVISION?= 1 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile! +PORTVERSION= 1.47.1 +PORTREVISION?= 0 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile! 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 WWW= https://e2fsprogs.sourceforge.net/ 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 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 \ --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' -# apparently HAVE_PTHREAD_H checks go missing if the FUSEFS option is unset, force it: -CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS -CFLAGS+= -Wno-unused-command-line-argument +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 PORTSCOUT= ignore:1 # cannot handle the version in the directory .if !defined(MASTERDIR) 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 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 -FUSEFS_USES= fuse +FUSEFS_USES= fuse:3 +# we can't use FUSEFS_CFLAGS, see below for workaround +FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread +FUSEFS_LDFLAGS= -L${LOCALBASE}/lib NLS_USES= gettext iconv:build BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash BASH_CMD= ${LOCALBASE}/bin/bash LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid 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 ${MASTERDIR} == ${.CURDIR} PKGNAMESUFFIX= -core .endif +.if !empty(PORT_OPTIONS:MFUSEFS) +# this dance is required becuse the -I must go before the default -I${LOCALBASE}/include, so we can't use FUSEFS_CFLAGS +_FUSEFS_CFLAGS= -I${LOCALBASE}/include/fuse3 +.else +_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 .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 post-patch:: .if !empty(DISTFILES) @${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 .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} >= 1400000 || ((${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/ss && _ET_DIR_OVERRIDE=../et ../et/compile_et ss_err.et \ && ${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h 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: ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/ ${LN} -fs e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext2 ${LN} -fs e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext3 ${LN} -fs e2fsck ${STAGEDIR}${PREFIX}/sbin/fsck.ext4 # now the remainder of the usual post-install jobs: ${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/share/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 ${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/ ${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 ${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 # # the next line closes .if ${MASTERDIR} == ${.CURDIR} .endif .include diff --git a/sysutils/e2fsprogs-core/distinfo b/sysutils/e2fsprogs-core/distinfo index 1af95baa8677..fba31cb081b8 100644 --- a/sysutils/e2fsprogs-core/distinfo +++ b/sysutils/e2fsprogs-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675890715 -SHA256 (e2fsprogs-1.47.0.tar.xz) = 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db -SIZE (e2fsprogs-1.47.0.tar.xz) = 7059372 +TIMESTAMP = 1717066777 +SHA256 (e2fsprogs-1.47.1.tar.xz) = 5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1 +SIZE (e2fsprogs-1.47.1.tar.xz) = 7271444 diff --git a/sysutils/e2fsprogs-core/files/patch-e2fsck__unix.c b/sysutils/e2fsprogs-core/files/patch-e2fsck__unix.c index 19e4659d2d9b..fe98d8988b57 100644 --- a/sysutils/e2fsprogs-core/files/patch-e2fsck__unix.c +++ b/sysutils/e2fsprogs-core/files/patch-e2fsck__unix.c @@ -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 22:02:31 UTC +--- e2fsck/unix.c.orig 2024-05-21 02:52:47 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 +@@ -608,6 +606,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 +@@ -641,6 +657,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; -@@ -1120,6 +1147,10 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t +@@ -1127,6 +1154,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 */ diff --git a/sysutils/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c b/sysutils/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c index f9d65b3597c6..13e7b8c2f6b5 100644 --- a/sysutils/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c +++ b/sysutils/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c @@ -1,57 +1,57 @@ ---- lib/uuid/gen_uuid.c.orig 2020-03-21 04:24:04 UTC +--- lib/uuid/gen_uuid.c.orig 2024-05-21 02:52:47 UTC +++ lib/uuid/gen_uuid.c -@@ -94,6 +94,7 @@ +@@ -92,6 +92,7 @@ #ifdef HAVE_SYS_RESOURCE_H #include #endif +#include #include "uuidP.h" #include "uuidd.h" -@@ -300,6 +301,28 @@ static int get_node_id(unsigned char *node_id) +@@ -288,6 +289,28 @@ static int get_node_id(unsigned char *node_id) } } close(sd); +#else + struct ifaddrs *ifaddrsp, *ifaddrp; + unsigned char *a; + + if (getifaddrs(&ifaddrsp) < 0) + return -1; + for (ifaddrp = ifaddrsp; ifaddrp != NULL; ifaddrp = ifaddrp->ifa_next) + { + if (ifaddrp->ifa_addr == NULL) + continue; + if (ifaddrp->ifa_addr->sa_family != AF_LINK) + continue; + a = LLADDR((struct sockaddr_dl *)ifaddrp->ifa_addr); + if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5]) + continue; + if (node_id) { + memcpy(node_id, a, 6); + freeifaddrs(ifaddrsp); + return 1; + } + } + freeifaddrs(ifaddrsp); #endif return 0; } -@@ -484,7 +507,7 @@ static void close_all_fds(void) +@@ -472,7 +495,7 @@ static void close_all_fds(void) } #endif /* defined(USE_UUIDD) && defined(HAVE_SYS_UN_H) */ -#if __GNUC_PREREQ (4, 6) +#if __GNUC_PREREQ__ (4, 6) #pragma GCC diagnostic push #if !defined(USE_UUIDD) || !defined(HAVE_SYS_UN_H) #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -572,7 +595,7 @@ fail: +@@ -560,7 +583,7 @@ fail: #endif return -1; } -#if __GNUC_PREREQ (4, 6) +#if __GNUC_PREREQ__ (4, 6) #pragma GCC diagnostic pop #endif diff --git a/sysutils/e2fsprogs-core/files/patch-lib_support_sort__r.h b/sysutils/e2fsprogs-core/files/patch-lib_support_sort__r.h index 499a385bc1a3..c01a084feb6b 100644 --- a/sysutils/e2fsprogs-core/files/patch-lib_support_sort__r.h +++ b/sysutils/e2fsprogs-core/files/patch-lib_support_sort__r.h @@ -1,24 +1,13 @@ ---- lib/support/sort_r.h.orig 2021-12-30 05:54:33 UTC +--- lib/support/sort_r.h.orig 2024-05-21 02:52:47 UTC +++ lib/support/sort_r.h -@@ -234,10 +234,6 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s +@@ -238,10 +238,6 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s #if defined _SORT_R_BSD - /* Ensure qsort_r is defined */ - extern void qsort_r(void *base, size_t nel, size_t width, void *thunk, - int (*compar)(void *_thunk, - const void *_a, const void *_b)); #endif -@@ -262,10 +258,6 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s - - #if defined _SORT_R_LINUX - -- typedef int(* __compar_d_fn_t)(const void *, const void *, void *); -- extern void qsort_r(void *base, size_t nel, size_t width, -- __compar_d_fn_t __compar, void *arg) -- __attribute__((nonnull (1, 4))); - - #endif - diff --git a/sysutils/e2fsprogs-core/pkg-plist b/sysutils/e2fsprogs-core/pkg-plist index 71ab4cd1d662..369ce002d590 100644 --- a/sysutils/e2fsprogs-core/pkg-plist +++ b/sysutils/e2fsprogs-core/pkg-plist @@ -1,126 +1,127 @@ bin/chattr bin/e2fsprogs-compile_et %%FUSEFS%%bin/fuse2fs bin/lsattr bin/mk_cmds etc/mke2fs.conf.dist include/e2fsprogs/com_err.h include/e2fsprogs/e2p/e2p.h include/e2fsprogs/et/com_err.h include/e2fsprogs/ext2fs/bitops.h include/e2fsprogs/ext2fs/ext2_err.h include/e2fsprogs/ext2fs/ext2_ext_attr.h include/e2fsprogs/ext2fs/ext2_fs.h include/e2fsprogs/ext2fs/ext2_io.h include/e2fsprogs/ext2fs/ext2_types.h include/e2fsprogs/ext2fs/ext2fs.h include/e2fsprogs/ext2fs/ext3_extents.h include/e2fsprogs/ext2fs/hashmap.h include/e2fsprogs/ext2fs/qcow2.h include/e2fsprogs/ext2fs/tdb.h include/e2fsprogs/ss/ss.h include/e2fsprogs/ss/ss_err.h lib/e2fsprogs/libcom_err.a lib/e2fsprogs/libcom_err.so lib/e2fsprogs/libcom_err.so.2 lib/e2fsprogs/libcom_err.so.2.1 lib/e2fsprogs/libe2p.a lib/e2fsprogs/libe2p.so lib/e2fsprogs/libe2p.so.2 lib/e2fsprogs/libe2p.so.2.3 lib/e2fsprogs/libext2fs.a lib/e2fsprogs/libext2fs.so lib/e2fsprogs/libext2fs.so.2 lib/e2fsprogs/libext2fs.so.2.4 lib/e2fsprogs/libss.so.2.0 lib/e2fsprogs/libss.so lib/e2fsprogs/libss.a lib/e2fsprogs/libss.so.2 libdata/pkgconfig/com_err.pc libdata/pkgconfig/e2p.pc libdata/pkgconfig/ext2fs.pc libdata/pkgconfig/ss.pc share/man/man1/chattr.1.gz share/man/man1/e2fsprogs-compile_et.1.gz %%FUSEFS%%share/man/man1/fuse2fs.1.gz share/man/man1/lsattr.1.gz share/man/man1/mk_cmds.1.gz share/man/man3/e2fsprogs-com_err.3.gz share/man/man5/e2fsck.conf.5.gz share/man/man5/mke2fs.conf.5.gz share/man/man5/ext2.5.gz share/man/man5/ext3.5.gz share/man/man5/ext4.5.gz share/man/man8/badblocks.8.gz share/man/man8/debugfs.8.gz share/man/man8/dumpe2fs.8.gz share/man/man8/e2fsck.8.gz 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/mke2fs.8.gz share/man/man8/mklost+found.8.gz share/man/man8/resize2fs.8.gz share/man/man8/tune2fs.8.gz share/man/man8/fsck.ext2.8.gz share/man/man8/fsck.ext3.8.gz 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 sbin/e2fsck sbin/e2image sbin/e2label sbin/e2mmpstatus sbin/e2undo sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 sbin/fsck_ext2fs sbin/logsave sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 sbin/mkfs.ext4 sbin/mklost+found sbin/resize2fs sbin/tune2fs %%DATADIR%%/et/et_c.awk %%DATADIR%%/et/et_h.awk %%PORTDOCS%%share/info/libext2fs.info.gz %%NLS%%share/locale/ca/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/cs/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/da/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/de/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/eo/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/fi/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/fr/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/fur/LC_MESSAGES/e2fsprogs.mo %%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/ms/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/pt/LC_MESSAGES/e2fsprogs.mo +%%NLS%%share/locale/ro/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/sr/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/uk/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo share/ss/ct_c.awk share/ss/ct_c.sed diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index ed7eaaf3965f..4c00a386ca64 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -1,21 +1,21 @@ PORTNAME= e2fsprogs CATEGORIES= sysutils -PORTVERSION= 1.47.0 -PORTREVISION= 1 +PORTVERSION= 1.47.1 +PORTREVISION= 0 BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:sysutils/e2fsprogs-core RUN_DEPENDS= ${BUILD_DEPENDS} DISTFILES= # empty NO_BUILD= yes LICENSE= GPLv2+ USES= cpe CPE_VENDOR= e2fsprogs_project MAINTAINER= mandree@FreeBSD.org COMMENT= Wrapper to install e2fsprogs into /sbin do-install: ${MKDIR} ${STAGEDIR}/sbin ${CP} -p ${LOCALBASE}/sbin/fsck_ext2fs ${STAGEDIR}/sbin ${CP} -p ${LOCALBASE}/sbin/e2fsck ${STAGEDIR}/sbin .include