Accepting request 36548 from filesystems

Copy from filesystems/e2fsprogs based on submit request 36548 from user jankara

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

e2fsprogs-1.41.11.tar.bz2

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

e2fsprogs-1.41.9-fixsuper.patch

@@ -1,32 +0,0 @@
-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);

e2fsprogs-1.41.9.tar.bz2

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

e2fsprogs-fdleak.patch

@@ -1,14 +0,0 @@
-diff --git a/misc/ismounted.c b/misc/ismounted.c
-index 6d4b878..50b4140 100644
---- a/misc/ismounted.c
-+++ b/misc/ismounted.c
-@@ -86,9 +86,6 @@ static errcode_t check_mntent_file(const char *mtab_file, const char *file,
- 	char		buf[1024], *device = 0, *mnt_dir = 0, *cp;
- 
- 	*mount_flags = 0;
--	if ((f = fopen(mtab_file, "r")) == NULL)
--		return errno;
--
- 	if ((f = setmntent (mtab_file, "r")) == NULL)
- 		return errno;
- 	if (stat(file, &st_buf) == 0) {

e2fsprogs.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Mar 18 10:53:13 UTC 2010 - jack@suse.cz
+
+- update to 1.41.11:
+ * E2fsck will correctly fix directories that are have an inaccurate i_size as
+   well as other problems in a single pass, instead of requiring two e2fsck
+   runs before the file system is fully fixed.
+ * Fix e2fsck so it will correctly find and detect duplicate directory entries
+   for non-indexed directories
+ * Mke2fs will use BLKDISCARD to pre-discard all blocks on an SSD or
+   thinly-provisioned storage device. This can be disabled using the -K option.
+ * Mke2fs now will obtain get device topology information from blkid and use it
+   to populate the superblock stride and stripe sizes. It will also warn if the
+   block device is misaligned
+  see more changes in RELEASE-NOTES
+
 -------------------------------------------------------------------
 Sun Dec 13 19:26:14 CET 2009 - jengelh@medozas.de
 

e2fsprogs.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package e2fsprogs (Version 1.41.9)
+# spec file for package e2fsprogs (Version 1.41.11)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,8 +30,8 @@ AutoReqProv:    on
 Obsoletes:      e2fsprogs-64bit
 %endif
 #
-Version:        1.41.9
+Version:        1.41.11
-Release:        4
+Release:        1
 Summary:        Utilities for the Second Extended File System
 Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
@@ -42,12 +42,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
-Patch36:        e2fsprogs-fdleak.patch
 # Do not suppress make commands
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -126,13 +122,10 @@ 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
 cp %{SOURCE2} .
 cp %{S:6} po/de.po
-%patch36 -p1
 
 %build
 autoreconf --force --install

libcom_err-readline.patch

@@ -1,13 +0,0 @@
-Index: e2fsprogs-1.41.7/lib/ss/get_readline.c
-===================================================================
---- e2fsprogs-1.41.7.orig/lib/ss/get_readline.c
-+++ e2fsprogs-1.41.7/lib/ss/get_readline.c
-@@ -36,7 +36,7 @@ static void ss_release_readline(ss_data
- }
- 
- /* Libraries we will try to use for readline/editline functionality */
--#define DEFAULT_LIBPATH "libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
-+#define DEFAULT_LIBPATH "libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
- 
- void ss_get_readline(int sci_idx)
- {