5 files changed, 14 insertions, 116 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 0c8c46c3ddd0..b259ae30597e 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.42.10
+PORTVERSION=	1.42.12
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -12,6 +12,8 @@ COMMENT?=	Utilities & library to manipulate ext2/3/4 filesystems
 
 LICENSE=	GPLv2
 
+PORTSCOUT=	ignore	# cannot handle the version in the directory
+
 PATCH_STRIP=	-p1
 USES=		gmake pkgconfig tar:xz
 USE_CSTD=	gnu99
@@ -51,6 +53,10 @@ USES+=		gettext iconv:build
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 1100000
+BROKEN=		Segfaults and miscalculations observed on redports
+.endif
+
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB=	NLS=""
 . if empty(ICONV_LIB)
@@ -119,7 +125,9 @@ post-build:
 # There have been subtle failures induced by Linux-isms in the past.
 # -- Matthias Andree, package maintainer, 2007-09-18
 	@${ECHO_CMD} '===>  Running e2fsprogs self-test suite'
-	cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} check TMPDIR=${WRKDIR}/tmp \
+# do not add -j options 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 \
 	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
 
 post-install:
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 68d2bcd84260..a80cc52d96f8 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2fsprogs-1.42.10.tar.xz) = 1f3324e80b042e8b9c2791c5b5de57afa205989b170e5800764ea60cb3961599
-SIZE (e2fsprogs-1.42.10.tar.xz) = 4676804
+SHA256 (e2fsprogs-1.42.12.tar.xz) = 6dadcd3b759195150d20154ab9d6516e3b3cbb35d66d461f55ae94a2854e7de8
+SIZE (e2fsprogs-1.42.12.tar.xz) = 4777592
diff --git a/sysutils/e2fsprogs/files/patch-350897 b/sysutils/e2fsprogs/files/patch-350897
deleted file mode 100644
index ed221dcb95f4..000000000000
--- a/sysutils/e2fsprogs/files/patch-350897
+++ /dev/null
@@ -1,68 +0,0 @@
-http://patchwork.ozlabs.org/patch/350897/
-debugfs: fix string_to_time for MacOS strptime()
-
-The strptime() function does not update fields in struct tm that are
-not specified in the input format.  The glibc implementation sets the
-tm_yday field (%j) when any of the year (%Y), month (%m), or day (%d)
-fields are changed, but the MacOS strptime() does not set tm_yday in
-this case.  This caused string_to_time() to calculate the wrong Unix
-epoch on MacOS. If tm_yday is unset, compute it in string_to_time().
-
-Signed-off-by: Andreas Dilger <adilger@dilger.ca>
----
- debugfs/util.c                    | 14 ++++++++++++++
- tests/f_dup_resize/script         |  2 +-
- tests/f_uninit_last_uninit/script |  2 +-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/debugfs/util.c b/debugfs/util.c
-index 9ddfe0b..20c6c61 100644
---- a/debugfs/util.c
-+++ b/debugfs/util.c
-@@ -245,6 +245,20 @@ time_t string_to_time(const char *arg)
- 		ts.tm_mday = 0;
- #endif
- 	ts.tm_isdst = -1;
-+	/* strptime() may only update the specified fields, which does not
-+	 * necessarily include ts.tm_yday (%j).  Calculate this if unset:
-+	 *
-+	 * Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec
-+	 * 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-+	 *
-+	 * Start with 31 days per month.  Even months have only 30 days, but
-+	 * reverse in August, subtract one day for those months. February has
-+	 * only 28 days, not 30, subtract two days. Add day of month, minus
-+	 * one, since day is not finished yet.  Leap years handled afterward. */
-+	if (ts.tm_yday == 0)
-+		ts.tm_yday = (ts.tm_mon * 31) -
-+			((ts.tm_mon - (ts.tm_mon > 7)) / 2) -
-+			2 * (ts.tm_mon > 1) + ts.tm_mday - 1;
- 	ret = ts.tm_sec + ts.tm_min*60 + ts.tm_hour*3600 + ts.tm_yday*86400 +
- 		(ts.tm_year-70)*31536000 + ((ts.tm_year-69)/4)*86400 -
- 		((ts.tm_year-1)/100)*86400 + ((ts.tm_year+299)/400)*86400;
-diff --git a/tests/f_dup_resize/script b/tests/f_dup_resize/script
-index 659c92e..19fa120 100644
---- a/tests/f_dup_resize/script
-+++ b/tests/f_dup_resize/script
-@@ -12,7 +12,7 @@ freeb 4 4
- freeb 8195 4
- write $TEST_DATA debugfs
- set_current_time 20050411000000
--set_inode_field debugfs mtime 2005041100000000
-+set_inode_field debugfs mtime 20050411000000
- q
- EOF
- 
-diff --git a/tests/f_uninit_last_uninit/script b/tests/f_uninit_last_uninit/script
-index 2fe4f3a..376c978 100644
---- a/tests/f_uninit_last_uninit/script
-+++ b/tests/f_uninit_last_uninit/script
-@@ -5,7 +5,7 @@ SKIP_GUNZIP="true"
- touch $TMPFILE
- $MKE2FS -N 32 -F -o Linux -O uninit_bg -b 1024 $TMPFILE 10000 > /dev/null 2>&1 
- $DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
--set_current_time 200704102100
-+set_current_time 20070410210000
- set_super_value lastcheck 0
- set_super_value hash_seed null
- set_super_value mkfs_time 0
diff --git a/sysutils/e2fsprogs/files/patch-tests-md5sum b/sysutils/e2fsprogs/files/patch-tests-md5sum
deleted file mode 100644
index 5de19a4b39a0..000000000000
--- a/sysutils/e2fsprogs/files/patch-tests-md5sum
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/tests/u_mke2fs/script.orig	2008-08-25 06:19:56.000000000 +0200
-+++ b/tests/u_mke2fs/script	2008-09-16 01:45:10.000000000 +0200
-@@ -11,16 +11,16 @@
- 
- echo mke2fs -q -F -o Linux -b 1024 test.img  > $OUT
- $MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
--md5=`md5sum $TMPFILE | cut -d " " -f 1`
-+md5=$(md5 -q $TMPFILE)
- echo md5sum before mke2fs $md5 >> $OUT
- 
- echo using mke2fs to test e2undo >> $OUT
- $MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE  >> $OUT 2>&1
--new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
-+new_md5=$(md5 -q $TMPFILE)
- echo md5sum after mke2fs $new_md5 >> $OUT
- 
- $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
--new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
-+new_md5=$(md5 -q $TMPFILE)
- echo md5sum after e2undo $new_md5 >> $OUT
- 
- if [ $md5 = $new_md5 ]; then
---- a/tests/u_tune2fs/script.orig	2008-08-25 06:19:56.000000000 +0200
-+++ b/tests/u_tune2fs/script	2008-09-16 01:46:32.000000000 +0200
-@@ -11,16 +11,16 @@
- 
- echo mke2fs -q -F -o Linux -b 1024 $TMPFILE  > $OUT
- $MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
--md5=`md5sum $TMPFILE | cut -d " " -f 1`
-+md5=$(md5 -q $TMPFILE)
- echo md5sum before tune2fs $md5 >> $OUT
- 
- echo using tune2fs to test e2undo >> $OUT
- $TUNE2FS -I 256 $TMPFILE  >> $OUT 2>&1
--new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
-+new_md5=$(md5 -q $TMPFILE)
- echo md5sum after tune2fs $new_md5 >> $OUT
- 
- $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
--new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
-+new_md5=$(md5 -q $TMPFILE)
- echo md5sum after e2undo $new_md5 >> $OUT
- 
- if [ $md5 = $new_md5 ]; then
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index 5c118d77f779..01e66e5bd5b5 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -59,6 +59,7 @@ sbin/tune2fs
 %%NLS%%share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/cs/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/fr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/id/LC_MESSAGES/e2fsprogs.mo
@@ -67,5 +68,6 @@ sbin/tune2fs
 %%NLS%%share/locale/pl/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