From 8b7ba19fdb241b855da4988a3da134cd7bc67584 Mon Sep 17 00:00:00 2001
From: OBS User jankara <null@suse.de>
Date: Fri, 22 Feb 2013 16:08:54 +0000
Subject: [PATCH] Update to 1.42.7

Rev filesystems/42 Md5 ddf1b3c47bbc4f9e71705b015b932599 2013-02-22 16:08:54 jankara 156128
---
 e2fsprogs-1.41.1-splash_support.patch | 34 +++++++++++++--------------
 e2fsprogs-1.42.6.tar.gz               |  3 ---
 e2fsprogs-1.42.7.tar.gz               |  3 +++
 e2fsprogs.changes                     | 13 ++++++++++
 e2fsprogs.spec                        |  2 +-
 5 files changed, 34 insertions(+), 21 deletions(-)
 delete mode 100644 e2fsprogs-1.42.6.tar.gz
 create mode 100644 e2fsprogs-1.42.7.tar.gz

diff --git a/e2fsprogs-1.41.1-splash_support.patch b/e2fsprogs-1.41.1-splash_support.patch
index 6b4357f..2caa28b 100644
--- a/e2fsprogs-1.41.1-splash_support.patch
+++ b/e2fsprogs-1.41.1-splash_support.patch
@@ -1,7 +1,7 @@
 Index: e2fsck/Makefile.in
 ===================================================================
---- e2fsck/Makefile.in.orig	2012-06-04 18:49:33.000000000 +0200
-+++ e2fsck/Makefile.in	2012-06-14 09:50:56.344425761 +0200
+--- e2fsck/Makefile.in.orig
++++ e2fsck/Makefile.in
 @@ -68,7 +68,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup
  	pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
  	dx_dirinfo.o ehandler.o problem.o message.o quota.o recovery.o \
@@ -29,8 +29,8 @@ Index: e2fsck/Makefile.in
   $(srcdir)/profile.h prof_err.h
 Index: e2fsck/splash.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsck/splash.c	2012-06-14 09:50:21.834048298 +0200
+--- /dev/null
++++ e2fsck/splash.c
 @@ -0,0 +1,100 @@
 +/*
 + * add support for switching the splash screen on boot
@@ -134,8 +134,8 @@ Index: e2fsck/splash.c
 +
 Index: e2fsck/splash.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsck/splash.h	2012-06-14 09:50:21.834048298 +0200
+--- /dev/null
++++ e2fsck/splash.h
 @@ -0,0 +1,13 @@
 +#ifndef _SPLASH_H
 +#define _SPLASH_H
@@ -152,8 +152,8 @@ Index: e2fsck/splash.h
 +
 Index: e2fsck/unix.c
 ===================================================================
---- e2fsck/unix.c.orig	2012-06-12 04:12:50.000000000 +0200
-+++ e2fsck/unix.c	2012-06-14 09:50:21.834048298 +0200
+--- e2fsck/unix.c.orig
++++ e2fsck/unix.c
 @@ -51,6 +51,7 @@ extern int optind;
  #include "e2p/e2p.h"
  #include "e2fsck.h"
@@ -162,15 +162,15 @@ Index: e2fsck/unix.c
  #include "../version.h"
  
  /* Command line options */
-@@ -1141,6 +1142,7 @@ int main (int argc, char *argv[])
- 	__u32 features[3];
- 	char *cp;
- 	int qtype;  /* quota type */
+@@ -1165,6 +1166,7 @@ int main (int argc, char *argv[])
+ 	e2fsck_t	ctx;
+ 	blk_t		orig_superblock;
+ 	struct problem_context pctx;
 +	struct splash_ops *sops;
- 
- 	clear_problem_context(&pctx);
- 	sigcatcher_setup();
-@@ -1172,6 +1174,7 @@ int main (int argc, char *argv[])
+ 	int flags, run_result;
+ 	int journal_size;
+ 	int sysval, sys_page_size = 4096;
+@@ -1203,6 +1205,7 @@ int main (int argc, char *argv[])
  		exit(FSCK_ERROR);
  	}
  	reserve_stdio_fds();
@@ -178,7 +178,7 @@ Index: e2fsck/unix.c
  
  	set_up_logging(ctx);
  	if (ctx->logf) {
-@@ -1548,6 +1551,7 @@ print_unsupp_features:
+@@ -1577,6 +1580,7 @@ print_unsupp_features:
  		fatal_error(ctx, 0);
  	check_if_skip(ctx);
  	check_resize_inode(ctx);
diff --git a/e2fsprogs-1.42.6.tar.gz b/e2fsprogs-1.42.6.tar.gz
deleted file mode 100644
index 1e2e281..0000000
--- a/e2fsprogs-1.42.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5
-size 5920183
diff --git a/e2fsprogs-1.42.7.tar.gz b/e2fsprogs-1.42.7.tar.gz
new file mode 100644
index 0000000..516f94d
--- /dev/null
+++ b/e2fsprogs-1.42.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345
+size 5981006
diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index 7374c4b..2af51b3 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Feb 22 15:46:21 UTC 2013 - jack@suse.cz
+
+- update to 1.42.7
+  * Fix various off-line resizing bugs
+  * New filefrag options to improve output formatting
+  * mke2fs improvements for bigalloc filesystems
+  * Fix e2fsck to properly detect corruption of internal extent tree nodes
+  * Improve CPU efficiency of e2fsck
+  * Various debugfs improvements
+  ...
+- refreshed e2fsprogs-1.41.1-splash_support.patch
+
 -------------------------------------------------------------------
 Fri Feb  8 12:49:06 UTC 2013 - fcrozat@suse.com
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 5ca955f..200031e 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -31,7 +31,7 @@ PreReq:         %install_info_prereq
 Obsoletes:      e2fsprogs-64bit
 %endif
 #
-Version:        1.42.6
+Version:        1.42.7
 Release:        0
 Summary:        Utilities for the Second Extended File System
 License:        GPL-2.0