svn commit: r507688 - in branches/2019Q3/sysutils/e2fsprogs: . files
Matthias Andree
mandree at FreeBSD.org
Wed Jul 31 01:01:40 UTC 2019
Author: mandree
Date: Wed Jul 31 01:01:39 2019
New Revision: 507688
URL: https://svnweb.freebsd.org/changeset/ports/507688
Log:
MFH: r507631 sysutils/e2fsprogs:
Fix f_pre_1970_date_encoding on all 32-bit architectures but i386.
e2fsck would misparse the E2FSCK_TIME environment variable on architectures
where sizeof(long) < sizeof(time_t), i. e. all 32-bit architectures but i386.
This led to f_pre_1970_date_encoding test failures.
Note that I haven't tested the change for lack of respective hardware
or qemu rigs, and prior to receiving the reporter feedback, but
it would appear the fix is safe and plausible in itself.
Bump PORTREVISION as this changes the code on all architectures,
and to trigger version-based rebuild attempts where needed.
(For the MFH, bump all the way to PORTREVISION?=2 to align with
the SVN trunk, portrev. 1 was just to chase GCC updates on the trunk.)
See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932906
Reported by: Thorsten Glaser <tg at mirbsd.de> against Debian
Reported by: Stanislav S. Grinkin (privately) against FreeBSD
Reported by: prior fall-out and BROKEN_<ARCH> tags
Obtained from: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=a368e0cbfb33d3050dcccccf0bf5a5539d3dac39
Approved by: ports-secteam (joneum)
Added:
branches/2019Q3/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c
- copied unchanged from r507631, head/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c
Modified:
branches/2019Q3/sysutils/e2fsprogs/Makefile
branches/2019Q3/sysutils/e2fsprogs/files/patch-tests_Makefile.in
Directory Properties:
branches/2019Q3/ (props changed)
Modified: branches/2019Q3/sysutils/e2fsprogs/Makefile
==============================================================================
--- branches/2019Q3/sysutils/e2fsprogs/Makefile Wed Jul 31 00:19:14 2019 (r507687)
+++ branches/2019Q3/sysutils/e2fsprogs/Makefile Wed Jul 31 01:01:39 2019 (r507688)
@@ -3,7 +3,7 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.45.3
-PORTREVISION?= 0
+PORTREVISION?= 2
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
Copied: branches/2019Q3/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c (from r507631, head/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q3/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c Wed Jul 31 01:01:39 2019 (r507688, copy of r507631, head/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c)
@@ -0,0 +1,21 @@
+commit a368e0cbfb33d3050dcccccf0bf5a5539d3dac39
+Author: Theodore Ts'o <tytso at mit.edu>
+Date: Wed Jul 24 22:25:11 2019 -0400
+
+ e2fsck: set E2FSCK_TIME correctly on a 32-bit arch with a 64-bit time_t
+
+ Addresses-Debian-Bug: #932906
+
+ Signed-off-by: Theodore Ts'o <tytso at mit.edu>
+
+--- e2fsck/e2fsck.c.orig 2019-07-15 01:03:14 UTC
++++ e2fsck/e2fsck.c
+@@ -37,7 +37,7 @@ errcode_t e2fsck_allocate_context(e2fsck_t *ret)
+
+ time_env = getenv("E2FSCK_TIME");
+ if (time_env)
+- context->now = strtoul(time_env, NULL, 0);
++ context->now = (time_t) strtoull(time_env, NULL, 0);
+ else {
+ context->now = time(0);
+ if (context->now < 1262322000) /* January 1 2010 */
Modified: branches/2019Q3/sysutils/e2fsprogs/files/patch-tests_Makefile.in
==============================================================================
--- branches/2019Q3/sysutils/e2fsprogs/files/patch-tests_Makefile.in Wed Jul 31 00:19:14 2019 (r507687)
+++ branches/2019Q3/sysutils/e2fsprogs/files/patch-tests_Makefile.in Wed Jul 31 01:01:39 2019 (r507688)
@@ -1,7 +1,7 @@
---- tests/Makefile.in.orig 2018-07-10 05:14:26 UTC
+--- tests/Makefile.in.orig 2019-07-15 01:03:14 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
+@@ -16,7 +16,7 @@ all:: @DO_TEST_SUITE@ test_one test_script
+ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf test_data.tmp
@echo "Creating test_one script..."
@[ -f test_one ] && chmod u+w test_one || true
- @echo "#!/bin/sh" > test_one
More information about the svn-ports-all
mailing list