From dcac20b8ccfec585e2fecc9746e8c721d80b2ad4 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen(a)redhat.com>
Date: Thu, 30 Apr 2015 20:30:26 -0500
Subject: Don't force fsck within time-fudge window
diff --git a/e2fsprogs-1.42.12-time-fudge.patch b/e2fsprogs-1.42.12-time-fudge.patch
new file mode 100644
index 0000000..c97fc09
--- /dev/null
+++ b/e2fsprogs-1.42.12-time-fudge.patch
@@ -0,0 +1,39 @@
+From f096708126412c0569e40cfbd5740729976bf12a Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso(a)mit.edu>
+Date: Sat, 28 Mar 2015 21:39:54 -0400
+Subject: e2fsck: use PROMPT_NONE for FUTURE_SB_LAST_*_FUDGED problems
+
+This allows us to print a message warning the user that there is
+something funny going on with their hardware clock (probably time zone
+issues caused by trying to be compatible with legacy OS's such as
+Windows), without triggering a full file system check.
+
+Signed-off-by: Theodore Ts'o <tytso(a)mit.edu>
+
+diff --git a/e2fsck/problem.c b/e2fsck/problem.c
+index 12cf836..f442a33 100644
+--- a/e2fsck/problem.c
++++ b/e2fsck/problem.c
+@@ -386,14 +386,14 @@ static struct e2fsck_problem problem_table[] = {
+ /* Last mount time is in the future (fudged) */
+ { PR_0_FUTURE_SB_LAST_MOUNT_FUDGED,
+ N_("@S last mount time is in the future.\n\t(by less than a day, "
+- "probably due to the hardware clock being incorrectly set) "),
+- PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
++ "probably due to the hardware clock being incorrectly set)\n"),
++ PROMPT_NONE, PR_PREEN_OK | PR_NO_OK },
+
+ /* Last write time is in the future (fudged) */
+ { PR_0_FUTURE_SB_LAST_WRITE_FUDGED,
+ N_("@S last write time is in the future.\n\t(by less than a day, "
+- "probably due to the hardware clock being incorrectly set). "),
+- PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
++ "probably due to the hardware clock being incorrectly set)\n"),
++ PROMPT_NONE, PR_PREEN_OK | PR_NO_OK },
+
+ /* Block group checksum (latch question) is invalid. */
+ { PR_0_GDT_CSUM_LATCH,
+--
+cgit v0.10.2
+
+
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 21daa0b..a8de165 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,7 +1,7 @@
Summary: Utilities for managing ext2, ext3, and ext4 filesystems
Name: e2fsprogs
Version: 1.42.12
-Release: 3%{?dist}
+Release: 4%{?dist}
# License tags based on COPYING file distinctions for various components
License: GPLv2
@@ -15,6 +15,7 @@ Patch2: e2fsprogs-1.42.12-use-after-free-fix.patch
Patch3: e2fsprogs-1.42.12-closefs-cve.patch
Patch4: e2fsprogs-1.42.12-dumpe2fs-segfault.patch
Patch5: e2fsprogs-1.42.12-resize2fs-fsck.patch
+Patch6: e2fsprogs-1.42.12-time-fudge.patch
Url:
http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -158,6 +159,7 @@ It was originally inspired by the Multics SubSystem library.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -339,6 +341,9 @@ exit 0
%{_libdir}/pkgconfig/ss.pc
%changelog
+* Thu Apr 30 2015 Eric Sandeen <sandeen(a)redhat.com> 1.42.12-4
+- Don't trigger full check within time fudge window (#1202024)
+
* Tue Feb 24 2015 Eric Sandeen <sandeen(a)redhat.com> 1.42.12-3
- Fix potential buffer overflow in closefs (#1193947, CVE-2015-1572)
- Fix dumpe2fs segfault with no arguments (#1194063)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/e2fsprogs.git/commit/?h=f22&id=dca...