- Update to 1.42.2:

* resize2fs uses much less CPU and is much faster for very large fs.
  * The seti and freei commands in debugfs can now take an optional length
    argument to set and clear a contiguous range of inodes.
  * E2fsck will now make explicit checks for the EOFBLOCKS_FL, since we
    plan to remove support for it from the kernel file system driver.
  * mke2fs can now use direct I/O via "mke2fs -D"
  * E2fsck was needlessly closing and re-opening the file system as a side
    effect of adding Multiple Mount Protection (MMP).  This isn't
    necessary for non-MMP file systems, so drop it.
  * E2fsck will now abort if there are memory allocation failures when
    the file system is initially opened and during the block group
    descriptor checks.
  * e2fsck will now report the incorrect and corrected checksum values
    for incorrect block groups.
  * e2fsck can now write log files containing the details of the problems
    that were found and fixed directly, via configuration parameters in
    /etc/e2fsck.conf.
  * The number of messages reported by e2fsck for a given problem type
    can be limited.
  * dumpe2fs, debugfs, and tune2fs now use rbtree bitmaps, which noticably
    reduces memory consumption for large file systems.
  * E2fsck now checks for extents with a zero length.
  * Fixed a number of bugs relating to discard.
  * E2fsck's CPU utilization in pass 5 has been optimized.
  * E2image will now skip copying uninitialized bitmap and inode table
    blocks.
  * Fixed mke2fs -S so it does not corrupt the first block group's
    information.
  * E2fsck will now check the new sysfs interface to determine if we are

Rev filesystems/27 Md5 9be97d5894175d896d99fd52bdf51da1 2012-04-23 10:15:04 psmt None

e2fsprogs-1.41.1-splash_support.patch

@@ -1,43 +1,36 @@
-diff -uNr e2fsprogs-1.42.orig/e2fsck/Makefile.in e2fsprogs-1.42/e2fsck/Makefile.in
+Index: e2fsck/Makefile.in
---- e2fsprogs-1.42.orig/e2fsck/Makefile.in	2011-09-18 17:10:03.000000000 -0400
+===================================================================
-+++ e2fsprogs-1.42/e2fsck/Makefile.in	2012-01-12 13:16:34.647198494 -0500
+--- e2fsck/Makefile.in.orig	2012-03-23 14:15:37.000000000 +0100
-@@ -68,7 +68,7 @@
++++ e2fsck/Makefile.in	2012-04-13 12:47:19.141499354 +0200
+@@ -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 \
  	region.o revoke.o ea_refcount.o rehash.o profile.o prof_err.o \
--	sigcatcher.o $(MTRACE_OBJ)
+-	logfile.o sigcatcher.o $(MTRACE_OBJ)
-+	sigcatcher.o splash.o $(MTRACE_OBJ)
++	logfile.o sigcatcher.o splash.o $(MTRACE_OBJ)
  
  PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
  	profiled/super.o profiled/pass1.o profiled/pass1b.o \
-@@ -78,7 +78,7 @@
+@@ -107,6 +107,7 @@ SRCS= $(srcdir)/e2fsck.c \
- 	profiled/message.o profiled/problem.o profiled/quota.o \
- 	profiled/recovery.o profiled/region.o profiled/revoke.o \
- 	profiled/ea_refcount.o profiled/rehash.o profiled/profile.o \
--	profiled/crc32.o profiled/prof_err.o profiled/sigcatcher.o
-+	profiled/crc32.o profiled/prof_err.o profiled/sigcatcher.o 
- 
- SRCS= $(srcdir)/e2fsck.c \
- 	$(srcdir)/crc32.c \
-@@ -106,6 +106,7 @@
  	$(srcdir)/rehash.c \
  	$(srcdir)/region.c \
  	$(srcdir)/profile.c \
 +	$(srcdir)/splash.c \
  	$(srcdir)/sigcatcher.c \
+ 	$(srcdir)/logfile.c \
  	prof_err.c \
- 	$(srcdir)/quota.c \
+@@ -516,6 +517,7 @@ region.o: $(srcdir)/region.c $(top_build
-@@ -487,6 +488,7 @@
   $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
   $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \
   $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h
 +splash.o: $(srcdir)/splash.c $(srcdir)/splash.h
  profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \
-  $(top_srcdir)/lib/et/com_err.h $(srcdir)/profile.h prof_err.h
+  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
- sigcatcher.o: $(srcdir)/sigcatcher.c $(top_builddir)/lib/config.h \
+  $(srcdir)/profile.h prof_err.h
-diff -uNr e2fsprogs-1.42.orig/e2fsck/splash.c e2fsprogs-1.42/e2fsck/splash.c
+Index: e2fsck/splash.c
---- e2fsprogs-1.42.orig/e2fsck/splash.c	1969-12-31 19:00:00.000000000 -0500
+===================================================================
-+++ e2fsprogs-1.42/e2fsck/splash.c	2012-01-12 13:33:24.418574614 -0500
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ e2fsck/splash.c	2012-04-13 12:44:50.144165421 +0200
 @@ -0,0 +1,100 @@
 +/*
 + * add support for switching the splash screen on boot
@@ -139,9 +132,10 @@ diff -uNr e2fsprogs-1.42.orig/e2fsck/splash.c e2fsprogs-1.42/e2fsck/splash.c
 +	verbose = 1;
 +}
 +
-diff -uNr e2fsprogs-1.42.orig/e2fsck/splash.h e2fsprogs-1.42/e2fsck/splash.h
+Index: e2fsck/splash.h
---- e2fsprogs-1.42.orig/e2fsck/splash.h	1969-12-31 19:00:00.000000000 -0500
+===================================================================
-+++ e2fsprogs-1.42/e2fsck/splash.h	2012-01-12 13:33:24.418574614 -0500
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ e2fsck/splash.h	2012-04-13 12:44:50.144165421 +0200
 @@ -0,0 +1,13 @@
 +#ifndef _SPLASH_H
 +#define _SPLASH_H
@@ -156,10 +150,11 @@ diff -uNr e2fsprogs-1.42.orig/e2fsck/splash.h e2fsprogs-1.42/e2fsck/splash.h
 +
 +#endif /* _SPLASH_H */
 +
-diff -uNr e2fsprogs-1.42.orig/e2fsck/unix.c e2fsprogs-1.42/e2fsck/unix.c
+Index: e2fsck/unix.c
---- e2fsprogs-1.42.orig/e2fsck/unix.c	2011-11-14 10:55:54.000000000 -0500
+===================================================================
-+++ e2fsprogs-1.42/e2fsck/unix.c	2012-01-12 13:20:01.726609643 -0500
+--- e2fsck/unix.c.orig	2012-03-23 14:15:37.000000000 +0100
-@@ -54,6 +54,7 @@
++++ e2fsck/unix.c	2012-04-13 12:48:05.260364377 +0200
+@@ -54,6 +54,7 @@ extern int optind;
  #include "e2p/e2p.h"
  #include "e2fsck.h"
  #include "problem.h"
@@ -167,7 +162,7 @@ diff -uNr e2fsprogs-1.42.orig/e2fsck/unix.c e2fsprogs-1.42/e2fsck/unix.c
  #include "../version.h"
  
  /* Command line options */
-@@ -1108,6 +1109,7 @@
+@@ -1140,6 +1141,7 @@ int main (int argc, char *argv[])
  	int old_bitmaps;
  	__u32 features[3];
  	char *cp;
@@ -175,15 +170,15 @@ diff -uNr e2fsprogs-1.42.orig/e2fsck/unix.c e2fsprogs-1.42/e2fsck/unix.c
  
  	clear_problem_context(&pctx);
  	sigcatcher_setup();
-@@ -1139,6 +1141,7 @@
+@@ -1171,6 +1173,7 @@ int main (int argc, char *argv[])
  		exit(FSCK_ERROR);
  	}
  	reserve_stdio_fds();
 +	splash_init(&sops);
  
- 	init_resource_track(&ctx->global_rtrack, NULL);
+ 	set_up_logging(ctx);
- 	if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
+ 	if (ctx->logf) {
-@@ -1484,6 +1487,7 @@
+@@ -1545,6 +1548,7 @@ print_unsupp_features:
  		fatal_error(ctx, 0);
  	check_if_skip(ctx);
  	check_resize_inode(ctx);

e2fsprogs-1.41.14.de.po.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8a1dd717b4eb696ab050ff1c397e62e6f631ca04c4c7ab6d602a56d6a499967
-size 32130

e2fsprogs-1.42-e2fsck_mmp.patch

@@ -1,34 +0,0 @@
-commit 24c91184d6577271f7387962c90626c973389f00
-Author: Theodore Ts'o <tytso@mit.edu>
-Date:   Fri Dec 16 15:36:40 2011 -0500
-
-    e2fsck: fix use of uninitialized value in the MMP code
-    
-    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-
-diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
-index 00e46d0..d225026 100644
---- a/e2fsck/pass1.c
-+++ b/e2fsck/pass1.c
-@@ -545,7 +545,7 @@ void e2fsck_pass1(e2fsck_t ctx)
- 	int	i;
- 	__u64	max_sizes;
- 	ext2_filsys fs = ctx->fs;
--	ext2_ino_t	ino;
-+	ext2_ino_t	ino = 0;
- 	struct ext2_inode *inode;
- 	ext2_inode_scan	scan;
- 	char		*block_buf;
-diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
-index f7ce8e4..a9eecd2 100644
---- a/e2fsck/pass1b.c
-+++ b/e2fsck/pass1b.c
-@@ -267,7 +267,7 @@ struct process_block_struct {
- static void pass1b(e2fsck_t ctx, char *block_buf)
- {
- 	ext2_filsys fs = ctx->fs;
--	ext2_ino_t ino;
-+	ext2_ino_t ino = 0;
- 	struct ext2_inode inode;
- 	ext2_inode_scan	scan;
- 	struct process_block_struct pb;

e2fsprogs-1.42-voidreturn_value_declared.patch

@@ -1,11 +1,13 @@
---- lib/quota/quotaio.c.orig	2012-01-12 20:39:27.146300136 -0500
+Index: lib/quota/quotaio.c
-+++ lib/quota/quotaio.c	2012-01-12 20:39:41.591119555 -0500
+===================================================================
-@@ -142,8 +142,8 @@
+--- 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;
+-		return 0;
 +	if (!(err = ext2fs_inode_has_valid_blocks2(fs, &inode)) )
 +		return err;
  

e2fsprogs-1.42.2.de.po.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbb0c696f3e1e3a3c2c415edcfa76c63e925c5fea46d0a307186746ced69f28e
+size 39053

e2fsprogs-1.42.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d36fec5e34ac285f59dff3851d6f4ca9f0b964ddd7e8fe00f1f920b091cb8be
+size 5753009

e2fsprogs-1.42.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
-size 5709827

e2fsprogs.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Fri Apr 13 13:01:47 CEST 2012 - pth@suse.de
+
+- Update to 1.42.2:
+  * resize2fs uses much less CPU and is much faster for very large fs.
+  * The seti and freei commands in debugfs can now take an optional length
+    argument to set and clear a contiguous range of inodes.
+  * E2fsck will now make explicit checks for the EOFBLOCKS_FL, since we
+    plan to remove support for it from the kernel file system driver.
+  * mke2fs can now use direct I/O via "mke2fs -D"
+  * E2fsck was needlessly closing and re-opening the file system as a side
+    effect of adding Multiple Mount Protection (MMP).  This isn't
+    necessary for non-MMP file systems, so drop it.
+  * E2fsck will now abort if there are memory allocation failures when
+    the file system is initially opened and during the block group
+    descriptor checks.
+  * e2fsck will now report the incorrect and corrected checksum values
+    for incorrect block groups.
+  * e2fsck can now write log files containing the details of the problems
+    that were found and fixed directly, via configuration parameters in
+    /etc/e2fsck.conf.
+  * The number of messages reported by e2fsck for a given problem type
+    can be limited.
+  * dumpe2fs, debugfs, and tune2fs now use rbtree bitmaps, which noticably
+    reduces memory consumption for large file systems.
+  * E2fsck now checks for extents with a zero length.
+  * Fixed a number of bugs relating to discard.
+  * E2fsck's CPU utilization in pass 5 has been optimized.
+  * E2image will now skip copying uninitialized bitmap and inode table
+    blocks.
+  * Fixed mke2fs -S so it does not corrupt the first block group's
+    information.
+  * E2fsck will now check the new sysfs interface to determine if we are
+    using the battery or AC mains.
+- Add up-to-date german messages
+  
+-------------------------------------------------------------------
+Fri Apr 13 12:22:25 CEST 2012 - pth@suse.de
+
+- Remove the obsolete german messages.
+
 -------------------------------------------------------------------
 Wed Apr 11 21:14:32 UTC 2012 - rschweikert@suse.com
 

e2fsprogs.spec

@@ -28,7 +28,7 @@ PreReq:         %install_info_prereq
 Obsoletes:      e2fsprogs-64bit
 %endif
 #
-Version:        1.42
+Version:        1.42.2
 Release:        0
 Summary:        Utilities for the Second Extended File System
 License:        GPL-2.0
@@ -37,8 +37,8 @@ Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.gz
 Source2:        README.SUSE
 Source3:        baselibs.conf
-#Added for 1.41.14; can be removed with the next release
+#Added for 1.42.2. With next version either remove or update
-Source4:        e2fsprogs-1.41.14.de.po.bz2
+Source4:        e2fsprogs-1.42.2.de.po.bz2
 #
 # e2fsprogs patches
 #
@@ -49,7 +49,6 @@ Patch3:         e2fsprogs-1.42-voidreturn_value_declared.patch
 Patch4:         e2fsprogs-1.42-implicit_fortify_decl.patch
 Patch5:         e2fsprogs-1.42-ext2fsh_implicit.patch
 Patch6:         e2fsprogs-1.42-quotaio_implicit.patch
-Patch7:         e2fsprogs-1.42-e2fsck_mmp.patch
 # Do not suppress make commands
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -126,16 +125,15 @@ Development files for the com_err error message display library.
 %prep
 %setup -q
 # e2fsprogs patches
-%patch1 -p1
+%patch1
 # libcom_err patches
 %patch2 -p1
 %patch3
 %patch4
 %patch5
 %patch6
-%patch7 -p1
 cp %{SOURCE2} .
-bunzip2 -dc %{S:4} > po/de.po
+bunzip2 -c %{S:4} > po/de.po
 
 %build
 autoreconf --force --install