From 85d93089820c350e88c135c3ea703eabc7b5de75 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 25 Jul 2019 17:11:16 -0400 Subject: [PATCH] debian/patches: update for 1.45.3-3 release Signed-off-by: Theodore Ts'o --- debian/patches/series | 1 + ...ME-correctly-on-a-32-bit-arch-with-64bit-time_t | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 debian/patches/set-E2FSCK_TIME-correctly-on-a-32-bit-arch-with-64bit-time_t diff --git a/debian/patches/series b/debian/patches/series index 56ef4b2..c56dee6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ po-update-pl.po-from-translationproject.org po-update-pt.po-from-translationproject.org po-update-sv.po-from-translationproject.org po-update-uk.po-from-translationproject.org +set-E2FSCK_TIME-correctly-on-a-32-bit-arch-with-64bit-time_t diff --git a/debian/patches/set-E2FSCK_TIME-correctly-on-a-32-bit-arch-with-64bit-time_t b/debian/patches/set-E2FSCK_TIME-correctly-on-a-32-bit-arch-with-64bit-time_t new file mode 100644 index 0000000..539d165 --- /dev/null +++ b/debian/patches/set-E2FSCK_TIME-correctly-on-a-32-bit-arch-with-64bit-time_t @@ -0,0 +1,29 @@ +From a368e0cbfb33d3050dcccccf0bf5a5539d3dac39 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Wed, 24 Jul 2019 22:25:11 -0400 +Subject: [PATCH] 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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c +index 3770bfcb..929bd78d 100644 +--- a/e2fsck/e2fsck.c ++++ b/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 */ +-- +2.22.0 + -- 1.8.3.1