From 4fe3dd6271d8d5e09af076e3bbebc560102bc02f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 16 Sep 2009 20:16:59 +0000 Subject: [PATCH] Copy from Base:System/e2fsprogs based on submit request 20384 from user hennevogel Rev openSUSE:Factory/48 Md5 28f3009b0dbe0249f3c6bca9b0066d1d 2009-09-16 20:16:59 autobuild None --- e2fsprogs-1.41.9-fixsuper.patch | 32 ++++++++++++++++++++++++++++++++ e2fsprogs.changes | 6 ++++++ e2fsprogs.spec | 5 ++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 e2fsprogs-1.41.9-fixsuper.patch diff --git a/e2fsprogs-1.41.9-fixsuper.patch b/e2fsprogs-1.41.9-fixsuper.patch new file mode 100644 index 0000000..fb758ac --- /dev/null +++ b/e2fsprogs-1.41.9-fixsuper.patch @@ -0,0 +1,32 @@ +See http://marc.info/?t=125258740600003&r=1&w=2 + +diff --git a/e2fsck/super.c b/e2fsck/super.c +index 2202967..76390af 100644 +--- a/e2fsck/super.c ++++ b/e2fsck/super.c +@@ -821,9 +821,9 @@ void check_super_block(e2fsck_t ctx) + */ + if (fs->super->s_mtime > (__u32) ctx->now) { + pctx.num = fs->super->s_mtime; +- problem = PR_0_FUTURE_SB_LAST_MOUNT; +- if (fs->super->s_mtime <= (__u32) ctx->now + ctx->time_fudge) +- problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED; ++ problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED; ++ if (ctx->time_fudge && fs->super->s_mtime > (__u32) ctx->now + ctx->time_fudge) ++ problem = PR_0_FUTURE_SB_LAST_MOUNT; + if (fix_problem(ctx, problem, &pctx)) { + fs->super->s_mtime = ctx->now; + ext2fs_mark_super_dirty(fs); +@@ -831,9 +831,9 @@ void check_super_block(e2fsck_t ctx) + } + if (fs->super->s_wtime > (__u32) ctx->now) { + pctx.num = fs->super->s_wtime; +- problem = PR_0_FUTURE_SB_LAST_WRITE; +- if (fs->super->s_wtime <= (__u32) ctx->now + ctx->time_fudge) +- problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED; ++ problem = PR_0_FUTURE_SB_LAST_WRITE_FUDGED; ++ if (ctx->time_fudge && fs->super->s_wtime > (__u32) ctx->now + ctx->time_fudge) ++ problem = PR_0_FUTURE_SB_LAST_WRITE; + if (fix_problem(ctx, problem, &pctx)) { + fs->super->s_wtime = ctx->now; + ext2fs_mark_super_dirty(fs); diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 74dd4f7..83dff19 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 10 15:16:55 CEST 2009 - coolo@novell.com + +- fix the super block even if someone mounted the file system + in wrong timezone in between (bnc#537542) + ------------------------------------------------------------------- Thu Sep 3 10:23:38 CEST 2009 - coolo@novell.com diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 0168c5a..dab0e6a 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -31,7 +31,7 @@ Obsoletes: e2fsprogs-64bit %endif # Version: 1.41.9 -Release: 1 +Release: 2 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -41,6 +41,8 @@ Source6: %{name}-1.41.4.de.po # e2fsprogs patches # Patch7: e2fsprogs-1.41.1-splash_support.patch +# UPSTREAM +Patch8: e2fsprogs-1.41.9-fixsuper.patch # libcom_err patches Patch34: libcom_err-compile_et_permissions.patch Patch35: libcom_err-readline.patch @@ -122,6 +124,7 @@ Development files for the com_err error message display library. %setup -q # e2fsprogs patches %patch7 -p1 +%patch8 -p1 # libcom_err patches %patch34 -p1 %patch35 -p1