From owner-svn-ports-all@freebsd.org Fri Sep 16 19:50:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7779BDD94B; Fri, 16 Sep 2016 19:50:53 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 787E8E5C; Fri, 16 Sep 2016 19:50:53 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8GJoqX8081390; Fri, 16 Sep 2016 19:50:52 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8GJopSO081380; Fri, 16 Sep 2016 19:50:51 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201609161950.u8GJopSO081380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 16 Sep 2016 19:50:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422268 - in branches/2016Q3: misc/e2fsprogs-libblkid sysutils/e2fsprogs sysutils/e2fsprogs/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Sep 2016 19:50:53 -0000 Author: mandree Date: Fri Sep 16 19:50:51 2016 New Revision: 422268 URL: https://svnweb.freebsd.org/changeset/ports/422268 Log: MFH: r418578 r418755 r418756 r418815 r418816 r418844 r418901 r419254 r421716 r421726 r421812 r421966 Since e2fsprogs 1.42.x and in fact anything before 1.43.3_3 in terms of FreeBSD's ports head/ trunk, and its full patch-lib_ext2fs_unix__io.c in particular, is deemed unsafe and can cause data corruption on FreeBSD 11 and newer (10.3 and older are deemed safe): Update to new upstream release 1.43.3, with a few additional fixes to the bounce-buffer I/O needed on FreeBSD 11 and newer where malloc() does not normally return page-aligned memory. Make set of self-tests configurable. Add Perl and GNU dd to build dependency list when needed so tests can pass in a poudriere build. Assorted other tweaks. Upstream's change log (please read all the way to and including 1.43): http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.3 While here, refresh patches, and time-limit programs in self-test suite to 60 s CPU time each, to avoid runaway processes from stalling the self-tests for too long. Ignore SIGINFO during self-tests: In the FreeBSD-specific patch, when the environment variable e2fsprogs_inhibit_SIGINFO exists (whatever its content, even if empty), do NOT install the SIGINFO handler. Leverage this when running the self-tests. This is to avoid false negatives during the self-tests due to interspersed SIGINFO output redirected from stderr to the log files. Insist (by setting BROKEN conditionally) on anything that is FreeBSD 11 or newer, or non-i386/non-amd64, that the user runs at least the small self-tests. Revise option descriptions a bit. Approved by: ports-secteam (feld) Added: branches/2016Q3/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c - copied, changed from r421812, head/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c Deleted: branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c branches/2016Q3/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c branches/2016Q3/sysutils/e2fsprogs/files/patch-misc__tune2fs.c branches/2016Q3/sysutils/e2fsprogs/files/patch-zzz-f449486d Modified: branches/2016Q3/misc/e2fsprogs-libblkid/Makefile branches/2016Q3/sysutils/e2fsprogs/Makefile branches/2016Q3/sysutils/e2fsprogs/distinfo branches/2016Q3/sysutils/e2fsprogs/files/patch-e2fsck__unix.c branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c branches/2016Q3/sysutils/e2fsprogs/files/patch-misc__Makefile.in branches/2016Q3/sysutils/e2fsprogs/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/misc/e2fsprogs-libblkid/Makefile ============================================================================== --- branches/2016Q3/misc/e2fsprogs-libblkid/Makefile Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/misc/e2fsprogs-libblkid/Makefile Fri Sep 16 19:50:51 2016 (r422268) @@ -1,7 +1,7 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libblkid @@ -12,7 +12,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-l CONFIGURE_ARGS= --enable-elf-shlibs MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs -MAKE_ARGS= LIB_SUBDIRS=lib/blkid +MAKE_ARGS= LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib USE_LDCONFIG= yes ALL_TARGET= libs INSTALL_TARGET= install install-shlibs Modified: branches/2016Q3/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2016Q3/sysutils/e2fsprogs/Makefile Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/sysutils/e2fsprogs/Makefile Fri Sep 16 19:50:51 2016 (r422268) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.42.13 -PORTREVISION?= 0 +PORTVERSION= 1.43.3 +PORTREVISION?= 3 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -20,7 +20,6 @@ USE_CSTD= gnu99 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \ - --enable-quota \ --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' @@ -30,7 +29,19 @@ MAKE_ENV+= CHECK_CMD=@true OPTIONS_DEFINE= DOCS NLS OPTIONS_EXCLUDE+= EXAMPLES -PORTDOCS= COPYING RELEASE-NOTES +BUILD_DEPENDS+= gdd:sysutils/coreutils + +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) post-extract: @${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \ @@ -50,6 +61,11 @@ MAKE_ARGS+= V=1 USES+= gettext iconv:build .endif +.if empty(PORT_OPTIONS:MNOTESTS) && ${MASTERDIR} == ${.CURDIR} +USES+= perl5 +USE_PERL5= build +.endif + .include .if ${PORT_OPTIONS:MNLS} @@ -65,25 +81,84 @@ 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/" ${WRKSRC}/tests/[a-t]_*/script + -e "s/ == 0/ = 0/" -e "s/tar x$$/tar xf -/" -e "s/\/gdd/" \ + ${WRKSRC}/tests/[a-z]_*/script @${REINPLACE_CMD} -e 's///' ${WRKSRC}/*/*.c -# disable f_mmp_garbage, fails on FreeBSD, and the resize*big_expand tests, -# which are too unwieldy to run automatically (need too much free space). -# f_extent_oobounds appears to have differences in screen output, reason -# unclear. -.for i in f_mmp_garbage m_bigjournal r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand f_extent_oobounds +.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 +# m_rootdir behaves erratically on 9.x and fails randomly, +# but may succeed when run again. Disable for now. +.if ${OSVERSION} < 1000000 +.for i in m_rootdir + @${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} >= 1100000 || ((${ARCH} != i386) && (${ARCH} != amd64))) +BROKEN=e2fsprogs has not been 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}/e2fsck && ${DO_MAKE_BUILD} prof_err.h + 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 @@ -94,16 +169,15 @@ post-build: && ${MAKE_CMD} e2fsck \ STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ ../lib/libblkid.a ../lib/libuuid.a" \ - LIBINTL=${libintl} + 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 beyond libc and libgcc: " + @${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/libgcc(_s)?\.so\.' \ - | ${GREP} -v '^/lib/libc\.so\.' || :)"; \ + | ${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 @@ -120,11 +194,15 @@ post-build: # 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 to ${MAKE_CMD} below, this might break +# do not add -j options unconditionally to ${MAKE_CMD} below, this might break # due to excessive disk space use. - cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} check TMPDIR=${WRKDIR}/tmp \ + cd ${WRKSRC}/tests && ulimit -t 60 && ${MKDIR} ${WRKDIR}/tmp && ${SETENV} e2fsprogs_inhibit_SIGINFO=1 ${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} -f ${STAGEDIR}${PREFIX}/sbin/uuidd @@ -136,6 +214,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif +# # the next line closes .if ${MASTERDIR} == ${.CURDIR} .endif Modified: branches/2016Q3/sysutils/e2fsprogs/distinfo ============================================================================== --- branches/2016Q3/sysutils/e2fsprogs/distinfo Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/sysutils/e2fsprogs/distinfo Fri Sep 16 19:50:51 2016 (r422268) @@ -1,2 +1,3 @@ -SHA256 (e2fsprogs-1.42.13.tar.xz) = e16474b5a3a30f9197160c4b91bd48d5a463583049c0fcc405b6f0f7075aa0c7 -SIZE (e2fsprogs-1.42.13.tar.xz) = 4802740 +TIMESTAMP = 1473526034 +SHA256 (e2fsprogs-1.43.3.tar.xz) = 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37 +SIZE (e2fsprogs-1.43.3.tar.xz) = 5220304 Modified: branches/2016Q3/sysutils/e2fsprogs/files/patch-e2fsck__unix.c ============================================================================== --- branches/2016Q3/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Fri Sep 16 19:50:51 2016 (r422268) @@ -1,4 +1,4 @@ ---- e2fsck/unix.c.orig 2014-08-12 18:19:37 UTC +--- e2fsck/unix.c.orig 2016-09-02 04:17:32 UTC +++ e2fsck/unix.c @@ -9,8 +9,6 @@ * %End-Header% @@ -9,7 +9,7 @@ #include "config.h" #include #ifdef HAVE_STDLIB_H -@@ -37,7 +35,7 @@ +@@ -37,7 +35,7 @@ extern int optind; #include #endif #ifdef HAVE_MALLOC_H @@ -18,7 +18,7 @@ #endif #ifdef HAVE_SYS_TYPES_H #include -@@ -590,6 +588,24 @@ +@@ -593,6 +591,24 @@ static int e2fsck_update_progress(e2fsck return 0; } @@ -43,7 +43,7 @@ #define PATH_SET "PATH=/sbin" /* -@@ -622,6 +638,17 @@ +@@ -625,6 +641,17 @@ static void signal_progress_on(int sig E ctx->progress = e2fsck_update_progress; } @@ -61,12 +61,14 @@ static void signal_progress_off(int sig EXT2FS_ATTR((unused))) { e2fsck_t ctx = e2fsck_global_ctx; -@@ -1001,6 +1028,8 @@ +@@ -1062,6 +1089,10 @@ static errcode_t PRS(int argc, char *arg sigaction(SIGUSR1, &sa, 0); sa.sa_handler = signal_progress_off; sigaction(SIGUSR2, &sa, 0); + sa.sa_handler = signal_progress_now; -+ sigaction(SIGINFO, &sa, 0); ++ if (!getenv("e2fsprogs_inhibit_SIGINFO")) { ++ sigaction(SIGINFO, &sa, 0); ++ } #endif /* Update our PATH to include /sbin if we need to run badblocks */ Modified: branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c ============================================================================== --- branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c Fri Sep 16 19:50:51 2016 (r422268) @@ -1,6 +1,6 @@ ---- lib/ext2fs/tst_bitops.c.orig 2014-06-25 19:19:15 UTC +--- lib/ext2fs/tst_bitops.c.orig 2014-10-16 00:29:23 UTC +++ lib/ext2fs/tst_bitops.c -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ int main(int argc, char **argv) bigarray = malloc(1 << 29); if (!bigarray) { fprintf(stderr, "Failed to allocate scratch memory!\n"); Modified: branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c ============================================================================== --- branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Fri Sep 16 19:50:51 2016 (r422268) @@ -1,6 +1,6 @@ ---- lib/uuid/gen_uuid.c.orig 2014-07-03 14:33:48 UTC +--- lib/uuid/gen_uuid.c.orig 2016-09-02 04:17:32 UTC +++ lib/uuid/gen_uuid.c -@@ -91,6 +91,7 @@ +@@ -92,6 +92,7 @@ #ifdef HAVE_SYS_RESOURCE_H #include #endif @@ -8,7 +8,7 @@ #include "uuidP.h" #include "uuidd.h" -@@ -300,6 +301,28 @@ +@@ -301,6 +302,28 @@ static int get_node_id(unsigned char *no } } close(sd); Copied and modified: branches/2016Q3/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c (from r421812, head/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c) ============================================================================== --- head/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c Sun Sep 11 10:26:24 2016 (r421812, copy source) +++ branches/2016Q3/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c Fri Sep 16 19:50:51 2016 (r422268) @@ -1,19 +1,56 @@ -commit d6cad379eb6c86ca58bf5b83a586577de412a2e6 -Author: Theodore Ts'o -Date: Sun Sep 11 00:25:48 2016 -0400 - - libext2fs: fix unaligned, multiblock writes in the unix_io handler - - The read-modify-write code for the unaligned fallback code wasn't - working for multi-block writes. This was unmasked by FreeBSD 11-rc2, - since its malloc() is returning unaligned memory regions for large - memory regions. - - Signed-off-by: Theodore Ts'o - --- lib/ext2fs/unix_io.c.orig 2016-09-02 04:17:32 UTC +++ lib/ext2fs/unix_io.c -@@ -300,6 +300,7 @@ static errcode_t raw_write_blk(io_channe +@@ -188,16 +188,24 @@ static errcode_t raw_read_blk(io_channel + * The buffer or size which we're trying to read isn't aligned + * to the O_DIRECT rules, so we need to do this the hard way... + */ +- while (size > 0) { +- actual = read(data->dev, data->bounce, channel->block_size); +- if (actual != channel->block_size) +- goto short_read; +- actual = size; +- if (size > channel->block_size) +- actual = channel->block_size; +- memcpy(buf, data->bounce, actual); +- size -= actual; +- buf += actual; ++ { ++ ssize_t really_read = 0; ++ while (size > 0) { ++ actual = read(data->dev, data->bounce, channel->block_size); ++ if (actual != channel->block_size) { ++ actual = really_read; ++ buf -= really_read; ++ size += really_read; ++ goto short_read; ++ } ++ actual = size; ++ if (size > channel->block_size) ++ actual = channel->block_size; ++ memcpy(buf, data->bounce, actual); ++ really_read += actual; ++ size -= actual; ++ buf += actual; ++ } + } + return 0; + +@@ -283,8 +291,12 @@ static errcode_t raw_write_blk(io_channe + actual = read(data->dev, data->bounce, + channel->block_size); + if (actual != channel->block_size) { +- retval = EXT2_ET_SHORT_READ; +- goto error_out; ++ if (actual >= 0) { ++ memset(data->bounce + actual, 0, channel->block_size - actual); ++ } else { ++ retval = EXT2_ET_SHORT_READ; ++ goto error_out; ++ } + } + } + actual = size; +@@ -300,6 +312,7 @@ static errcode_t raw_write_blk(io_channe goto short_write; size -= actual; buf += actual; Modified: branches/2016Q3/sysutils/e2fsprogs/files/patch-misc__Makefile.in ============================================================================== --- branches/2016Q3/sysutils/e2fsprogs/files/patch-misc__Makefile.in Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/sysutils/e2fsprogs/files/patch-misc__Makefile.in Fri Sep 16 19:50:51 2016 (r422268) @@ -1,27 +1,28 @@ ---- misc/Makefile.in.orig 2014-08-02 23:41:18 UTC +--- misc/Makefile.in.orig 2016-09-02 04:52:46 UTC +++ misc/Makefile.in -@@ -28,15 +28,15 @@ +@@ -34,16 +34,16 @@ INSTALL = @INSTALL@ SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ $(E2IMAGE_PROG) @FSCK_PROG@ e2undo --USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG) -+USPROGS= mklost+found e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG) +-USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \ ++USPROGS= mklost+found e2freefrag $(UUIDD_PROG) \ + $(E4DEFRAG_PROG) $(E4CRYPT_PROG) $(FUSE_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) @FSCK_MAN@ +- $(UUIDD_MAN) $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ + logsave.8 e2freefrag.8 e2undo.8 \ -+ $(E4DEFRAG_MAN) @FSCK_MAN@ ++ $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ FMANPAGES= mke2fs.conf.5 ext4.5 -UPROGS= chattr lsattr @UUID_CMT@ uuidgen -UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1 +UPROGS= chattr lsattr +UMANPAGES= chattr.1 lsattr.1 + UMANPAGES+= @FUSE_CMT@ fuse2fs.1 LPROGS= @E2INITRD_PROG@ - -@@ -127,14 +127,14 @@ +@@ -144,14 +144,14 @@ profiled: mke2fs.conf: $(srcdir)/mke2fs.conf.in if test -f $(srcdir)/mke2fs.conf.custom.in ; then \ @@ -37,9 +38,9 @@ - $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf \ + $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf.dist \ > default_profile.c - profile.o: - $(E) " CC $<" -@@ -515,34 +515,9 @@ + findsuper: findsuper.o + $(E) " LD $@" +@@ -577,34 +577,9 @@ install: all $(SMANPAGES) $(UMANPAGES) i (cd $(DESTDIR)$(man5dir); \ $(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \ done Modified: branches/2016Q3/sysutils/e2fsprogs/pkg-plist ============================================================================== --- branches/2016Q3/sysutils/e2fsprogs/pkg-plist Fri Sep 16 19:47:10 2016 (r422267) +++ branches/2016Q3/sysutils/e2fsprogs/pkg-plist Fri Sep 16 19:50:51 2016 (r422268) @@ -63,10 +63,12 @@ sbin/tune2fs %%NLS%%share/locale/eo/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/fr/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/nl/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/pl/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