svn commit: r474369 - in head: devel/e2fsprogs-libss misc/e2fsprogs-libuuid sysutils/e2fsprogs sysutils/e2fsprogs/files
Matthias Andree
mandree at FreeBSD.org
Tue Jul 10 13:48:34 UTC 2018
Author: mandree
Date: Tue Jul 10 13:48:31 2018
New Revision: 474369
URL: https://svnweb.freebsd.org/changeset/ports/474369
Log:
Update to new upstream release 1.44.3.
* several features for debugfs added
* there is a new e2mmpstatus command
* there are several bug fixes, among them endianness fixes and robustness
fixes against corrupted input.
* add hashmap.h header file, for libext2fs users
* a few type fixes for format strings,
found while building for MIPS, ARM, or i386
* add new option SLOWTESTS which prevents skipping of slow tests
* add new option BASHTESTS which enables tests that require bash
(currently affects only the test f_large_dir that is also marked
as slow)
Full release notes:
<http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.44.3>
Reset PORTREVISION in slave ports, e2fsprogs{-libss,-libuuid} now
that we have bumped PORTVERSION.
MFH: 2018Q3
Added:
head/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c (contents, props changed)
head/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c (contents, props changed)
head/sysutils/e2fsprogs/files/patch-tests_Makefile.in (contents, props changed)
Modified:
head/devel/e2fsprogs-libss/Makefile
head/misc/e2fsprogs-libuuid/Makefile
head/sysutils/e2fsprogs/Makefile
head/sysutils/e2fsprogs/distinfo
head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
head/sysutils/e2fsprogs/files/patch-misc__Makefile.in
head/sysutils/e2fsprogs/files/patch-tests_r__inline__xattr_script
head/sysutils/e2fsprogs/pkg-plist
Modified: head/devel/e2fsprogs-libss/Makefile
==============================================================================
--- head/devel/e2fsprogs-libss/Makefile Tue Jul 10 13:47:01 2018 (r474368)
+++ head/devel/e2fsprogs-libss/Makefile Tue Jul 10 13:48:31 2018 (r474369)
@@ -1,7 +1,7 @@
# Created by: Ben Kaduk <kaduk at mit.edu>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= devel
PKGNAMESUFFIX= -libss
Modified: head/misc/e2fsprogs-libuuid/Makefile
==============================================================================
--- head/misc/e2fsprogs-libuuid/Makefile Tue Jul 10 13:47:01 2018 (r474368)
+++ head/misc/e2fsprogs-libuuid/Makefile Tue Jul 10 13:48:31 2018 (r474369)
@@ -1,7 +1,7 @@
# Created by: Matthias Andree <matthias.andree at gmx.de>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= misc devel
PKGNAMESUFFIX= -libuuid
Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile Tue Jul 10 13:47:01 2018 (r474368)
+++ head/sysutils/e2fsprogs/Makefile Tue Jul 10 13:48:31 2018 (r474369)
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= e2fsprogs
-PORTVERSION= 1.44.2
+# XXX if bumping PORTVERSION, check/adjust pre-configure!
+PORTVERSION= 1.44.3
PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -51,7 +52,7 @@ MAKE_ENV+= CHECK_CMD=@true
.if !defined(MASTERDIR)
INSTALL_TARGET= install install-libs
-OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS
+OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS
OPTIONS_EXCLUDE+= EXAMPLES
OPTIONS_SUB= yes
@@ -64,10 +65,13 @@ NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCO
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
FUSEFS_CONFIGURE_ENABLE= fuse2fs
BUILD_DEPENDS+= gdd:sysutils/coreutils
+BASHTEST_BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid
LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss
@@ -121,7 +125,7 @@ post-patch::
${WRKSRC}/tests/[a-z]_*/script
@${REINPLACE_CMD} -e 's/<malloc\.h>/<stdlib.h>/' ${WRKSRC}/*/*.c
.if empty(PORT_OPTIONS:MALLTESTS)
-.for i in \
+. for i in \
d_fallocate_blkmap \
f_baddir \
f_bbfile \
@@ -158,10 +162,22 @@ post-patch::
u_dryrun \
u_mke2fs_opt_offset
@${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i}
-.endfor
+. 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
+pre-configure::
+ ${REINPLACE_CMD} -e 's/July/Jul/' ${WRKSRC}/version.h
+
+##############################################################
# 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.
@@ -180,10 +196,29 @@ _CHECK_JOBS=${_MAKE_JOBS}
_CHECK_JOBS=
.endif
+.if ${PORT_OPTIONS:MBASHTESTS}
+_CHECK_SHELL=${SHELL}
+.else
+_CHECK_SHELL=${LOCALBASE}/bin/bash
+.endif
+
+_checkaddargs=
.if !defined(TMPDIR)
-_checkaddargs=TMPDIR=${WRKDIR}/tmp
+_checkaddargs+=TMPDIR=${WRKDIR}/tmp
.endif
+.if ${PORT_OPTIONS:MBASHTESTS}
+_checkaddargs+=--eval SHELL:=${LOCALBASE}/bin/bash
+.endif
+
+.if ${PORT_OPTIONS:MSLOWTESTS}
+_check_target=SKIP_SLOW_TESTS= check
+_check_timeout=7200
+.else
+_check_target=check
+_check_timeout=180
+.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,
@@ -222,7 +257,11 @@ post-build:
@${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} \
+ 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!)'
Modified: head/sysutils/e2fsprogs/distinfo
==============================================================================
--- head/sysutils/e2fsprogs/distinfo Tue Jul 10 13:47:01 2018 (r474368)
+++ head/sysutils/e2fsprogs/distinfo Tue Jul 10 13:48:31 2018 (r474369)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526665210
-SHA256 (e2fsprogs-1.44.2.tar.xz) = 8324cf0b6e81805a741d94087b00e99f7e16144f1ee5a413709a1fa6948b126c
-SIZE (e2fsprogs-1.44.2.tar.xz) = 5349784
+TIMESTAMP = 1531207325
+SHA256 (e2fsprogs-1.44.3.tar.xz) = 5d899f7d30f481cc0c6a049ebe26ebe145f1b524182ea1ecde4086162d4e4bb6
+SIZE (e2fsprogs-1.44.3.tar.xz) = 5364552
Modified: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Tue Jul 10 13:47:01 2018 (r474368)
+++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Tue Jul 10 13:48:31 2018 (r474369)
@@ -1,4 +1,4 @@
---- e2fsck/unix.c.orig 2018-03-25 02:42:47 UTC
+--- e2fsck/unix.c.orig 2018-07-10 05:14:26 UTC
+++ e2fsck/unix.c
@@ -9,8 +9,6 @@
* %End-Header%
@@ -18,7 +18,7 @@
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -595,6 +593,24 @@ static int e2fsck_update_progress(e2fsck
+@@ -601,6 +599,24 @@ static int e2fsck_update_progress(e2fsck
return 0;
}
@@ -43,7 +43,7 @@
#define PATH_SET "PATH=/sbin"
/*
-@@ -627,6 +643,17 @@ static void signal_progress_on(int sig E
+@@ -633,6 +649,17 @@ static void signal_progress_on(int sig E
ctx->progress = e2fsck_update_progress;
}
@@ -61,7 +61,7 @@
static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
{
e2fsck_t ctx = e2fsck_global_ctx;
-@@ -1091,6 +1118,10 @@ static errcode_t PRS(int argc, char *arg
+@@ -1103,6 +1130,10 @@ static errcode_t PRS(int argc, char *arg
sigaction(SIGUSR1, &sa, 0);
sa.sa_handler = signal_progress_off;
sigaction(SIGUSR2, &sa, 0);
Modified: head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Tue Jul 10 13:47:01 2018 (r474368)
+++ head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Tue Jul 10 13:48:31 2018 (r474369)
@@ -37,3 +37,12 @@
#endif
return 0;
}
+@@ -408,7 +431,7 @@ try_again:
+ rewind(state_f);
+ len = fprintf(state_f,
+ "clock: %04x tv: %016lu %08lu adj: %08d\n",
+- clock_seq, last.tv_sec, (long)last.tv_usec,
++ clock_seq, (unsigned long)last.tv_sec, (unsigned long)last.tv_usec,
+ adjustment);
+ fflush(state_f);
+ if (ftruncate(state_fd, len) < 0) {
Added: head/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c Tue Jul 10 13:48:31 2018 (r474369)
@@ -0,0 +1,11 @@
+--- lib/uuid/tst_uuid.c.orig 2018-07-10 05:14:26 UTC
++++ lib/uuid/tst_uuid.c
+@@ -144,7 +144,7 @@ main(int argc ATTR((unused)) , char **ar
+ tv.tv_usec = 0;
+ time_reg = uuid_time(buf, &tv);
+ printf("UUID generated at %lu reports %lu (%ld.%ld)\n",
+- time_gen, time_reg, tv.tv_sec, (long)tv.tv_usec);
++ (unsigned long)time_gen, (unsigned long)time_reg, (long)tv.tv_sec, (long)tv.tv_usec);
+ /* allow 1s margin in case of rollover between sampling
+ * the current time and when the UUID is generated. */
+ if (time_reg > time_gen + 1) {
Added: head/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c Tue Jul 10 13:48:31 2018 (r474369)
@@ -0,0 +1,11 @@
+--- lib/uuid/uuid_time.c.orig 2018-07-10 05:14:26 UTC
++++ lib/uuid/uuid_time.c
+@@ -165,7 +165,7 @@ main(int argc, char **argv)
+ printf("Warning: not a time-based UUID, so UUID time "
+ "decoding will likely not work!\n");
+ }
+- printf("UUID time is: (%ld, %ld): %s\n", tv.tv_sec, (long)tv.tv_usec,
++ printf("UUID time is: (%ld, %ld): %s\n", (long)tv.tv_sec, (long)tv.tv_usec,
+ ctime(&time_reg));
+
+ return 0;
Modified: head/sysutils/e2fsprogs/files/patch-misc__Makefile.in
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Tue Jul 10 13:47:01 2018 (r474368)
+++ head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Tue Jul 10 13:48:31 2018 (r474369)
@@ -1,6 +1,6 @@
---- misc/Makefile.in.orig 2018-03-25 02:42:47 UTC
+--- misc/Makefile.in.orig 2018-07-10 05:14:26 UTC
+++ misc/Makefile.in
-@@ -34,16 +34,16 @@ INSTALL = @INSTALL@
+@@ -34,17 +34,17 @@ INSTALL = @INSTALL@
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
@@ -10,9 +10,10 @@
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@
+- $(UUIDD_MAN) $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ \
+ logsave.8 e2freefrag.8 e2undo.8 \
-+ $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@
++ $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ \
+ e2mmpstatus.8
FMANPAGES= mke2fs.conf.5 ext4.5
-UPROGS= chattr lsattr @UUID_CMT@ uuidgen
@@ -22,7 +23,7 @@
UMANPAGES+= @FUSE_CMT@ fuse2fs.1
LPROGS= @E2INITRD_PROG@
-@@ -145,14 +145,14 @@ profiled:
+@@ -146,14 +146,14 @@ profiled:
mke2fs.conf: $(srcdir)/mke2fs.conf.in
if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
@@ -40,7 +41,7 @@
> default_profile.c
findsuper: findsuper.o
$(E) " LD $@"
-@@ -593,34 +593,9 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+@@ -600,34 +600,9 @@ install: all $(SMANPAGES) $(UMANPAGES) i
(cd $(DESTDIR)$(man5dir); \
$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
done
Added: head/sysutils/e2fsprogs/files/patch-tests_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/e2fsprogs/files/patch-tests_Makefile.in Tue Jul 10 13:48:31 2018 (r474369)
@@ -0,0 +1,11 @@
+--- tests/Makefile.in.orig 2018-07-10 05:14:26 UTC
++++ tests/Makefile.in
+@@ -16,7 +16,7 @@ all:: @DO_TEST_SUITE@ test_one test_scri
+ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
+ @echo "Creating test_one script..."
+ @[ -f test_one ] && chmod u+w test_one || true
+- @echo "#!/bin/sh" > test_one
++ @echo "#!${SHELL}" > test_one
+ @echo "HTREE=y" >> test_one
+ @echo "QUOTA=y" >> test_one
+ @echo "SRCDIR=@srcdir@" >> test_one
Modified: head/sysutils/e2fsprogs/files/patch-tests_r__inline__xattr_script
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-tests_r__inline__xattr_script Tue Jul 10 13:47:01 2018 (r474368)
+++ head/sysutils/e2fsprogs/files/patch-tests_r__inline__xattr_script Tue Jul 10 13:48:31 2018 (r474369)
@@ -1,20 +1,20 @@
---- tests/r_inline_xattr/script.orig 2018-03-25 02:42:47 UTC
+--- tests/r_inline_xattr/script.orig 2018-07-10 05:14:26 UTC
+++ tests/r_inline_xattr/script
-@@ -11,7 +11,7 @@ echo "resize2fs test" > $OUT
+@@ -14,7 +14,7 @@ echo "resize2fs test" > $OUT.new
# Look at existing inline extended attribute
- echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT
--$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT
-+$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep -E "^Inode|in inode body|user.name \(" >> $OUT
+ echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT.new
+-$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT.new
++$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep -E "^Inode|in inode body|user.name \(" >> $OUT.new
status=$?
- echo Exit status is $status >> $OUT
+ echo Exit status is $status >> $OUT.new
-@@ -24,7 +24,7 @@ sed -f $cmd_dir/filter.sed -e "s;$TMPFIL
+@@ -26,7 +26,7 @@ echo Exit status is $status >> $OUT.new
# Look at inline extended attribute in resized fs
- echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT
--$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT
-+$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep -E "^Inode|in inode body|user.name \(" >> $OUT
+ echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|user.name (''" >> $OUT.new
+-$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|user.name (" >> $OUT.new
++$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep -E "^Inode|in inode body|user.name \(" >> $OUT.new
status=$?
- echo Exit status is $status >> $OUT
+ echo Exit status is $status >> $OUT.new
Modified: head/sysutils/e2fsprogs/pkg-plist
==============================================================================
--- head/sysutils/e2fsprogs/pkg-plist Tue Jul 10 13:47:01 2018 (r474368)
+++ head/sysutils/e2fsprogs/pkg-plist Tue Jul 10 13:48:31 2018 (r474369)
@@ -13,6 +13,7 @@ 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
lib/e2fsprogs/libcom_err.so
@@ -44,6 +45,7 @@ man/man8/dumpe2fs.8.gz
man/man8/e2fsck.8.gz
man/man8/e2image.8.gz
man/man8/e2label.8.gz
+man/man8/e2mmpstatus.8.gz
man/man8/e2undo.8.gz
man/man8/mke2fs.8.gz
man/man8/mklost+found.8.gz
@@ -68,6 +70,7 @@ sbin/e2freefrag
sbin/e2fsck
sbin/e2image
sbin/e2label
+sbin/e2mmpstatus
sbin/e2undo
sbin/findfs
sbin/fsck.ext2
More information about the svn-ports-all
mailing list