Index: branches/2017Q1/misc/e2fsprogs-libblkid/Makefile =================================================================== --- branches/2017Q1/misc/e2fsprogs-libblkid/Makefile (revision 433474) +++ branches/2017Q1/misc/e2fsprogs-libblkid/Makefile (revision 433475) @@ -1,33 +1,33 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= misc devel PKGNAMESUFFIX= -libblkid COMMENT= Blkid library from e2fsprogs package LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid CONFIGURE_ARGS= --enable-elf-shlibs MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib USE_LDCONFIG= yes ALL_TARGET= libs INSTALL_TARGET= install install-shlibs INSTALL_WRKSRC= ${WRKSRC}/lib/blkid PKGDIR= ${.CURDIR} BROKEN_aarch64= Fails to build: No targets specified and no makefile found pre-build: ${MKDIR} ${WRKSRC}/lib/blkid/elfshared cd ${WRKSRC}/util && ${MAKE_CMD} subst post-build: cd ${WRKSRC}/lib/uuid && ${MAKE_CMD} cd ${INSTALL_WRKSRC} && ${MAKE_CMD} check .include "${MASTERDIR}/Makefile" Index: branches/2017Q1/misc/e2fsprogs-libuuid/Makefile =================================================================== --- branches/2017Q1/misc/e2fsprogs-libuuid/Makefile (revision 433474) +++ branches/2017Q1/misc/e2fsprogs-libuuid/Makefile (revision 433475) @@ -1,47 +1,47 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= misc devel PKGNAMESUFFIX= -libuuid COMMENT= UUID library from e2fsprogs package CONFIGURE_ARGS= --enable-elf-shlibs OPTIONS_EXCLUDE= NLS MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/uuid USE_LDCONFIG= yes ALL_TARGET= libs INSTALL_TARGET= install install-shlibs INSTALL_WRKSRC= ${WRKSRC}/lib/uuid FILESDIR= ${.CURDIR}/files USE_RC_SUBR= uuidd PKGDIR= ${.CURDIR} post-patch:: ${REINPLACE_CMD} -e 's,/var/lib/libuuid,/var/run/libuuid,g' \ -e 's,/usr/sbin/uuidd,${PREFIX}/sbin/uuidd,' \ ${WRKSRC}/lib/uuid/*.[ch] pre-build: ${MKDIR} ${WRKSRC}/lib/uuid/elfshared cd ${WRKSRC}/util && ${MAKE_CMD} subst # ulimit guards against runaway tests # failure to launch uuidd is fine (one might be running, or we may lack # privileges); if it works, it'll quit after 50 seconds post-build: cd ${WRKSRC}/misc && ${MAKE_CMD} uuidgen uuidgen.1 uuidd uuidd.8 cd ${INSTALL_WRKSRC} && ( ulimit -t 5 && ${MAKE_CMD} check ) post-install: ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidgen ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/misc/uuidgen.1 ${STAGEDIR}${MAN8PREFIX}/man/man1/ ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidd ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_MAN} ${WRKSRC}/misc/uuidd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ ${MKDIR} ${STAGEDIR}/var/run/libuuid .include "${MASTERDIR}/Makefile" Index: branches/2017Q1/sysutils/e2fsprogs/Makefile =================================================================== --- branches/2017Q1/sysutils/e2fsprogs/Makefile (revision 433474) +++ branches/2017Q1/sysutils/e2fsprogs/Makefile (revision 433475) @@ -1,216 +1,216 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.43.3 -PORTREVISION?= 3 +PORTVERSION= 1.43.4 +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 PORTSCOUT= ignore # cannot handle the version in the directory BROKEN_aarch64= Fails to link: missing sbrk 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 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 # 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= 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 ${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: branches/2017Q1/sysutils/e2fsprogs/distinfo =================================================================== --- branches/2017Q1/sysutils/e2fsprogs/distinfo (revision 433474) +++ branches/2017Q1/sysutils/e2fsprogs/distinfo (revision 433475) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473526034 -SHA256 (e2fsprogs-1.43.3.tar.xz) = 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37 -SIZE (e2fsprogs-1.43.3.tar.xz) = 5220304 +TIMESTAMP = 1486335180 +SHA256 (e2fsprogs-1.43.4.tar.xz) = 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24 +SIZE (e2fsprogs-1.43.4.tar.xz) = 5265788 Index: branches/2017Q1/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c =================================================================== --- branches/2017Q1/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c (revision 433474) +++ branches/2017Q1/sysutils/e2fsprogs/files/patch-lib_ext2fs_unix__io.c (nonexistent) @@ -1,60 +0,0 @@ ---- lib/ext2fs/unix_io.c.orig 2016-09-02 04:17:32 UTC -+++ lib/ext2fs/unix_io.c -@@ -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; -+ location += actual; - } - return 0; - Property changes on: branches/2017Q1/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: branches/2017Q1/sysutils/e2fsprogs/pkg-plist =================================================================== --- branches/2017Q1/sysutils/e2fsprogs/pkg-plist (revision 433474) +++ branches/2017Q1/sysutils/e2fsprogs/pkg-plist (revision 433475) @@ -1,76 +1,74 @@ bin/chattr bin/lsattr etc/mke2fs.conf.dist man/man1/chattr.1.gz man/man1/lsattr.1.gz man/man5/e2fsck.conf.5.gz man/man5/mke2fs.conf.5.gz man/man5/ext2.5.gz man/man5/ext3.5.gz man/man5/ext4.5.gz man/man8/badblocks.8.gz man/man8/debugfs.8.gz man/man8/dumpe2fs.8.gz man/man8/e2fsck.8.gz man/man8/e2image.8.gz man/man8/e2label.8.gz man/man8/e2undo.8.gz man/man8/mke2fs.8.gz man/man8/mklost+found.8.gz man/man8/resize2fs.8.gz man/man8/tune2fs.8.gz man/man8/fsck.ext2.8.gz man/man8/fsck.ext3.8.gz man/man8/fsck.ext4.8.gz -man/man8/fsck.ext4dev.8.gz man/man8/mkfs.ext2.8.gz man/man8/mkfs.ext3.8.gz man/man8/mkfs.ext4.8.gz -man/man8/mkfs.ext4dev.8.gz man/man8/findfs.8.gz man/man8/blkid.8.gz man/man8/logsave.8.gz man/man8/fsck_ext2fs.8.gz man/man8/e2freefrag.8.gz sbin/badblocks sbin/blkid sbin/debugfs sbin/dumpe2fs sbin/e2freefrag sbin/e2fsck sbin/e2image sbin/e2label sbin/e2undo sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 -sbin/fsck.ext4dev sbin/fsck_ext2fs sbin/logsave sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 sbin/mkfs.ext4 -sbin/mkfs.ext4dev sbin/mklost+found sbin/resize2fs sbin/tune2fs %%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 +share/locale/fi/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 +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/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 Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 433474) +++ branches/2017Q1 (revision 433475) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r433466