Accepting request 125024 from filesystems

- update to 1.42.4
  * Fix 64-bit block number bugs in e2fsck, dumpe2fs, and debugfs which
    could corrupt file systems
  * Fixed e2fsck's handling of how errors propagate from the journal to
    the file system superblock
  * Fixed a false positive complaint from e2fsck if all of the extents
    in the last extent block are uninitialized and located after the
    end of the file.
  * dumpe2fs will display the journal's error indicator in the
    superblock if it is set
  * Fixed a  bug which caused e2fsck to incorrectly use O_EXCLUSIVE in
    some corner cases.
  * Fix truncation of extent-mapped inodes in e2fsck and libext2fs
  * Fixed i_blocks accounting in bigalloc file systems.
  * Add support for btrfs's No_COW flag to lsattr and chattr
  * Debugfs interprets the date strings of the form "@ddd" as ddd
    seconds after the epoch
  * Updated/fixed various man pages  (Closes: #674453, #674694) (forwarded request 124987 from coolo)

OBS-URL: https://build.opensuse.org/request/show/125024
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=71

e2fsprogs-1.41.1-splash_support.patch

@@ -1,7 +1,7 @@
 Index: e2fsck/Makefile.in
 ===================================================================
---- e2fsck/Makefile.in.orig
+--- e2fsck/Makefile.in.orig	2012-06-04 18:49:33.000000000 +0200
-+++ e2fsck/Makefile.in
++++ e2fsck/Makefile.in	2012-06-14 09:50:56.344425761 +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 \
@@ -19,18 +19,18 @@ Index: e2fsck/Makefile.in
  	$(srcdir)/sigcatcher.c \
  	$(srcdir)/logfile.c \
  	prof_err.c \
-@@ -516,6 +517,7 @@ region.o: $(srcdir)/region.c $(top_build
+@@ -539,6 +540,7 @@ region.o: $(srcdir)/region.c $(top_build
-  $(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
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.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_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
   $(srcdir)/profile.h prof_err.h
 Index: e2fsck/splash.c
 ===================================================================
---- /dev/null
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsck/splash.c
++++ e2fsck/splash.c	2012-06-14 09:50:21.834048298 +0200
 @@ -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
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsck/splash.h
++++ e2fsck/splash.h	2012-06-14 09:50:21.834048298 +0200
 @@ -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
+--- e2fsck/unix.c.orig	2012-06-12 04:12:50.000000000 +0200
-+++ e2fsck/unix.c
++++ e2fsck/unix.c	2012-06-14 09:50:21.834048298 +0200
 @@ -51,6 +51,7 @@ extern int optind;
  #include "e2p/e2p.h"
  #include "e2fsck.h"
@@ -162,7 +162,7 @@ Index: e2fsck/unix.c
  #include "../version.h"
  
  /* Command line options */
-@@ -1138,6 +1139,7 @@ int main (int argc, char *argv[])
+@@ -1141,6 +1142,7 @@ int main (int argc, char *argv[])
  	__u32 features[3];
  	char *cp;
  	int qtype;  /* quota type */
@@ -170,7 +170,7 @@ Index: e2fsck/unix.c
  
  	clear_problem_context(&pctx);
  	sigcatcher_setup();
-@@ -1169,6 +1171,7 @@ int main (int argc, char *argv[])
+@@ -1172,6 +1174,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) {
-@@ -1543,6 +1546,7 @@ print_unsupp_features:
+@@ -1548,6 +1551,7 @@ print_unsupp_features:
  		fatal_error(ctx, 0);
  	check_if_skip(ctx);
  	check_resize_inode(ctx);

e2fsprogs-1.42-ext2fsh_implicit.patch

@@ -1,10 +1,12 @@
---- lib/ext2fs/ext2fs.h.orig	2012-01-12 21:38:40.769873730 -0500
+Index: lib/ext2fs/ext2fs.h
-+++ lib/ext2fs/ext2fs.h	2012-01-12 21:39:38.197155791 -0500
+===================================================================
-@@ -60,6 +60,7 @@
+--- lib/ext2fs/ext2fs.h.orig	2012-06-04 18:42:23.000000000 +0200
- #include <sys/types.h>
++++ lib/ext2fs/ext2fs.h	2012-06-14 09:53:19.190709779 +0200
- #include <sys/stat.h>
+@@ -53,6 +53,7 @@ extern "C" {
- #include <fcntl.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
 +#include <unistd.h>
  
- #ifndef __USE_XOPEN2K
+ #if EXT2_FLAT_INCLUDES
- /* If the "#define _XOPEN_SOURCE 600" didn't succeed in declaring
+ #include "e2_types.h"

e2fsprogs-1.42-quotaio_implicit.patch

@@ -1,10 +0,0 @@
---- lib/quota/quotaio.c.orig	2012-01-12 20:39:27.146300136 -0500
-+++ lib/quota/quotaio.c	2012-01-12 22:40:33.162462437 -0500
-@@ -14,6 +14,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/file.h>
-+#include <time.h>
- 
- #include "common.h"
- #include "quotaio.h"

e2fsprogs-1.42.3.tar.gz

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

e2fsprogs-1.42.4.tar.gz

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

e2fsprogs.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jun 14 07:47:40 UTC 2012 - coolo@suse.com
+
+- update to 1.42.4
+  * Fix 64-bit block number bugs in e2fsck, dumpe2fs, and debugfs which
+    could corrupt file systems
+  * Fixed e2fsck's handling of how errors propagate from the journal to
+    the file system superblock
+  * Fixed a false positive complaint from e2fsck if all of the extents
+    in the last extent block are uninitialized and located after the
+    end of the file.
+  * dumpe2fs will display the journal's error indicator in the
+    superblock if it is set
+  * Fixed a  bug which caused e2fsck to incorrectly use O_EXCLUSIVE in
+    some corner cases.
+  * Fix truncation of extent-mapped inodes in e2fsck and libext2fs
+  * Fixed i_blocks accounting in bigalloc file systems.
+  * Add support for btrfs's No_COW flag to lsattr and chattr
+  * Debugfs interprets the date strings of the form "@ddd" as ddd
+    seconds after the epoch
+  * Updated/fixed various man pages  (Closes: #674453, #674694)
+
 -------------------------------------------------------------------
 Wed May 23 20:49:09 UTC 2012 - jack@suse.cz
 

e2fsprogs.spec

@@ -28,15 +28,15 @@ PreReq:         %install_info_prereq
 Obsoletes:      e2fsprogs-64bit
 %endif
 #
-Version:        1.42.3
+Version:        1.42.4
 Release:        0
 Summary:        Utilities for the Second Extended File System
 License:        GPL-2.0
 Group:          System/Filesystems
 Url:            http://e2fsprogs.sourceforge.net
-Requires:       libext2fs2 >= %{version}
 Requires:       libcom_err2 >= %{version}
-Source:         %{name}-%{version}.tar.gz
+Requires:       libext2fs2 >= %{version}
+Source:         http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.gz
 Source2:        README.SUSE
 Source3:        baselibs.conf
 #
@@ -48,7 +48,6 @@ 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
-Patch6:         e2fsprogs-1.42-quotaio_implicit.patch
 # Do not suppress make commands
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -131,7 +130,6 @@ Development files for the com_err error message display library.
 %patch3
 %patch4
 %patch5
-%patch6
 cp %{SOURCE2} .
 
 %build