From 240275739eafafc52f85c08844c0522cf6c91200 Mon Sep 17 00:00:00 2001
From: OBS User jankara <null@suse.de>
Date: Tue, 25 Sep 2012 22:37:44 +0000
Subject: [PATCH] - update to 1.42.6   * Fixed a potential seg fault in e2fsck
 when there is an I/O error while reading the superblock   * Various resize2fs
 fixes   * Various quota related fixes   * Fixed filefrag so that it correctly
 reports the number of extents   * Fixed filefrag so it will not crash with a
 segfault on files from a virtual file system such as /proc   * Fixed a
 problem if e2fsck where if the root file system is mounted read-only, e2fsck
 would not clear an error indication in the journal superblock.   * Fixed a
 bug in how e2fsck would uniquify directory entry names   * Manpage updates  
 ...

Rev filesystems/37 Md5 1fa438d2b8eb4bda23eb4f56e21753b4 2012-09-25 22:37:44 jankara 136012
---
 e2fsprogs-1.42-voidreturn_value_declared.patch | 15 ---------------
 e2fsprogs-1.42.4.tar.gz                        |  3 ---
 e2fsprogs-1.42.6.tar.gz                        |  3 +++
 e2fsprogs.changes                              | 14 ++++++++++++++
 e2fsprogs.spec                                 |  4 +---
 5 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 e2fsprogs-1.42-voidreturn_value_declared.patch
 delete mode 100644 e2fsprogs-1.42.4.tar.gz
 create mode 100644 e2fsprogs-1.42.6.tar.gz

diff --git a/e2fsprogs-1.42-voidreturn_value_declared.patch b/e2fsprogs-1.42-voidreturn_value_declared.patch
deleted file mode 100644
index d30ba75..0000000
--- a/e2fsprogs-1.42-voidreturn_value_declared.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: lib/quota/quotaio.c
-===================================================================
---- lib/quota/quotaio.c.orig	2012-03-18 19:18:33.000000000 +0100
-+++ lib/quota/quotaio.c	2012-04-13 12:57:21.261673322 +0200
-@@ -142,8 +142,8 @@ errcode_t quota_inode_truncate(ext2_fils
- 		return err;
- 
- 	inode.i_dtime = fs->now ? fs->now : time(0);
--	if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
--		return 0;
-+	if (!(err = ext2fs_inode_has_valid_blocks2(fs, &inode)) )
-+		return err;
- 
- 	ext2fs_block_iterate3(fs, ino, BLOCK_FLAG_READ_ONLY, NULL,
- 			      release_blocks_proc, NULL);
diff --git a/e2fsprogs-1.42.4.tar.gz b/e2fsprogs-1.42.4.tar.gz
deleted file mode 100644
index 685b99b..0000000
--- a/e2fsprogs-1.42.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3946f347842a7b892b23476e231da21e572f9db828cb02a38bc57beb25db905e
-size 5873284
diff --git a/e2fsprogs-1.42.6.tar.gz b/e2fsprogs-1.42.6.tar.gz
new file mode 100644
index 0000000..1e2e281
--- /dev/null
+++ b/e2fsprogs-1.42.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5
+size 5920183
diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index b3660d1..51575fd 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Sep 25 22:06:09 UTC 2012 - jack@suse.cz
+
+- update to 1.42.6
+  * Fixed a potential seg fault in e2fsck when there is an I/O error while reading the superblock
+  * Various resize2fs fixes
+  * Various quota related fixes
+  * Fixed filefrag so that it correctly reports the number of extents
+  * Fixed filefrag so it will not crash with a segfault on files from a virtual file system such as /proc
+  * Fixed a problem if e2fsck where if the root file system is mounted read-only, e2fsck would not clear an error indication in the journal superblock.
+  * Fixed a bug in how e2fsck would uniquify directory entry names
+  * Manpage updates
+  ...
+
 -------------------------------------------------------------------
 Tue Sep 11 12:00:55 UTC 2012 - coolo@suse.com
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 6edba9f..3bb645d 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -31,7 +31,7 @@ PreReq:         %install_info_prereq
 Obsoletes:      e2fsprogs-64bit
 %endif
 #
-Version:        1.42.4
+Version:        1.42.6
 Release:        0
 Summary:        Utilities for the Second Extended File System
 License:        GPL-2.0
@@ -49,7 +49,6 @@ Source4:        e2fsck.conf
 Patch1:         e2fsprogs-1.41.1-splash_support.patch
 # libcom_err patches
 Patch2:         libcom_err-compile_et_permissions.patch
-Patch3:         e2fsprogs-1.42-voidreturn_value_declared.patch
 Patch4:         e2fsprogs-1.42-implicit_fortify_decl.patch
 Patch5:         e2fsprogs-1.42-ext2fsh_implicit.patch
 # Do not suppress make commands
@@ -131,7 +130,6 @@ Development files for the com_err error message display library.
 %patch1
 # libcom_err patches
 %patch2 -p1
-%patch3
 %patch4
 %patch5
 cp %{SOURCE2} .