diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 930d3af81995..a680ed061c49 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -3,7 +3,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.45.3 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} diff --git a/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c b/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c new file mode 100644 index 000000000000..c40e19ec1810 --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c @@ -0,0 +1,21 @@ +commit a368e0cbfb33d3050dcccccf0bf5a5539d3dac39 +Author: Theodore Ts'o +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 + +--- 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 */ diff --git a/sysutils/e2fsprogs/files/patch-tests_Makefile.in b/sysutils/e2fsprogs/files/patch-tests_Makefile.in index 3ed4f24b8732..b265f8124a28 100644 --- a/sysutils/e2fsprogs/files/patch-tests_Makefile.in +++ b/sysutils/e2fsprogs/files/patch-tests_Makefile.in @@ -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