Index: head/sysutils/e2fsprogs/Makefile =================================================================== --- head/sysutils/e2fsprogs/Makefile (revision 449578) +++ head/sysutils/e2fsprogs/Makefile (revision 449579) @@ -1,217 +1,217 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.43.5 -PORTREVISION?= 1 +PORTVERSION= 1.43.6 +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} PORTSCOUT= ignore # cannot handle the version in the directory USES= cpe gmake pkgconfig tar:xz CPE_VENDOR= e2fsprogs_project USE_CSTD= gnu99 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \ --with-root-prefix='${PREFIX}' CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' pkgconfigdir='${PREFIX}/libdata/pkgconfig' MAKE_ENV+= CHECK_CMD=@true .if !defined(MASTERDIR) OPTIONS_DEFINE= DOCS NLS OPTIONS_EXCLUDE+= EXAMPLES BUILD_DEPENDS+= gdd:sysutils/coreutils BROKEN_aarch64= fails to link: missing sbrk #BROKEN_armv6= fails self-tests: Running e2fsprogs test suite...failed: f_pre_1970_date_encoding #BROKEN_mips= fails self-tests: Running e2fsprogs test suite...failed: f_pre_1970_date_encoding #BROKEN_mips64= fails self-tests: Running e2fsprogs test suite...failed: f_pre_1970_date_encoding #BROKEN_powerpc64= fails self-tests: Running e2fsprogs test suite...Signal (11) SIGSEGV PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES OPTIONS_DEFINE= PARALLELTESTS OPTIONS_SINGLE= SELFTEST OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS OPTIONS_DEFAULT= SMALLTESTS SELFTEST_DESC= Choose which set of self-tests to run NOTESTS_DESC= Do not run any self-tests (only Tier-1 & DISCOURAGED) SMALLTESTS_DESC=Run tests that fit into 500 MB disk space (DEFAULT) ALLTESTS_DESC= Run most self-tests (requires more RAM & disk space) PARALLELTESTS_DESC= Run self-tests in parallel (requires more disk space) .endif PKGDEINSTALL= ${PKGINSTALL} MAKE_ARGS+= V=1 .include .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} PLIST_SUB= NLS="" . 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 PLIST_SUB= NLS="@comment " libintl= .endif # d_fallocate_blkmap appears to fail on some systems for unknown reasons. post-patch:: # don't build/install libext2fs.info @${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in @${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 .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 # 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 .if !defined(TMPDIR) _checkaddargs=TMPDIR=${WRKDIR}/tmp .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) cd ${WRKSRC}/e2fsck && ${RM} e2fsck \ && ${MAKE_CMD} e2fsck \ STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ ../lib/libblkid.a ../lib/libuuid.a" \ LIBINTL=${libintl} LIBMAGIC=/usr/lib/libmagic.a\ -lz # 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 60 && ${MKDIR} ${WRKDIR}/tmp && ${SETENV} e2fsprogs_inhibit_SIGINFO=1 BLKID_FILE=${WRKDIR}/tmp/blkid.tab ${MAKE_CMD} check ${_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: ${RM} ${STAGEDIR}${PREFIX}/sbin/uuidd ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/ ${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 # # the next line closes .if ${MASTERDIR} == ${.CURDIR} .endif .include Index: head/sysutils/e2fsprogs/distinfo =================================================================== --- head/sysutils/e2fsprogs/distinfo (revision 449578) +++ head/sysutils/e2fsprogs/distinfo (revision 449579) @@ -1,3 +1,3 @@ -TIMESTAMP = 1502496004 -SHA256 (e2fsprogs-1.43.5.tar.xz) = 261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17 -SIZE (e2fsprogs-1.43.5.tar.xz) = 5301436 +TIMESTAMP = 1505057223 +SHA256 (e2fsprogs-1.43.6.tar.xz) = c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402 +SIZE (e2fsprogs-1.43.6.tar.xz) = 5288388 Index: head/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c =================================================================== --- head/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c (revision 449578) +++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c (nonexistent) @@ -1,19 +0,0 @@ -commit 649dbee84cf208244db7195d40e7fe57ddbea57a -Author: Matthias Andree -Date: Sun Aug 27 14:09:52 2017 +0200 - - Always obtain alignment on FreeBSD. - -diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c -index 64141954..65f237ef 100644 ---- ./lib/ext2fs/unix_io.c -+++ ./lib/ext2fs/unix_io.c -@@ -636,7 +636,7 @@ static errcode_t unix_open_channel(const char *name, int fd, - #endif - - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -- if (io->flags & CHANNEL_FLAGS_BLOCK_DEVICE) { -+ { - int dio_align = ext2fs_get_dio_alignment(fd); - - if (io->align < dio_align) Property changes on: head/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c =================================================================== --- head/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c (revision 449578) +++ head/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c (nonexistent) @@ -1,21 +0,0 @@ ---- lib/support/mkquota.c.orig 2017-07-24 19:15:39 UTC -+++ lib/support/mkquota.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include "ext2fs/ext2_fs.h" - #include "ext2fs/ext2fs.h" -@@ -523,8 +524,8 @@ static int scan_dquots_callback(struct d - if (dq->dq_dqb.dqb_curspace != dquot->dq_dqb.dqb_curspace || - dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) { - scan_data->usage_is_inconsistent = 1; -- fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:" -- "actual (%ld, %ld) != expected (%ld, %ld)\n", -+ fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %" PRIu32 ":" -+ "actual (%" PRId64 ", %" PRId64 ") != expected (%" PRId64 ", %" PRId64 ")\n", - dq->dq_id, dq->dq_dqb.dqb_curspace, - dq->dq_dqb.dqb_curinodes, - dquot->dq_dqb.dqb_curspace, Property changes on: head/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property