e2fsprogs: version bump 1.41.14 -> 1.42

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 10 insertions, 78 deletions

diff --git a/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch b/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
deleted file mode 100644
index 7322fb8bd..000000000
--- a/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sat, 29 Oct 2011 19:11:54 +0200
-Subject: [PATCH] fix linking problem
-
-libblkid gets the wrong linker path. This results in link errors for e2fsck.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- lib/blkid/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
-index e89318e..2e125b3 100644
---- a/lib/blkid/Makefile.in
-+++ b/lib/blkid/Makefile.in
-@@ -36,7 +36,7 @@ ELF_SO_VERSION = 1
- ELF_IMAGE = libblkid
- ELF_MYDIR = blkid
- ELF_INSTALL_DIR = $(root_libdir)
--ELF_OTHER_LIBS = -L../.. -luuid
-+ELF_OTHER_LIBS = ../../libuuid.so
- 
- BSDLIB_VERSION = 2.0
- BSDLIB_IMAGE = libblkid
diff --git a/patches/e2fsprogs-1.41.14/0003-Fix-compilation-on-Darwin.patch b/patches/e2fsprogs-1.41.14/0003-Fix-compilation-on-Darwin.patch
deleted file mode 100644
index cb58afd4c..000000000
--- a/patches/e2fsprogs-1.41.14/0003-Fix-compilation-on-Darwin.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Bernhard Walle <bernhard@bwalle.de>
-Date: Thu, 19 Jan 2012 22:31:46 +0100
-Subject: [PATCH] Fix compilation on Darwin
-
-The patch is inspired by the patch at
-http://sourceforge.net/tracker/?func=detail&aid=3140289&group_id=2406&atid=102406
-(bug tracker of the upstream project).
-
-Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
----
- lib/ext2fs/unix_io.c |   11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
-index 1df1fdd..cbd3d70 100644
---- a/lib/ext2fs/unix_io.c
-+++ b/lib/ext2fs/unix_io.c
-@@ -463,8 +463,10 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
- 	open_flags = (flags & IO_FLAG_RW) ? O_RDWR : O_RDONLY;
- 	if (flags & IO_FLAG_EXCLUSIVE)
- 		open_flags |= O_EXCL;
-+#ifdef O_DIRECT
- 	if (flags & IO_FLAG_DIRECT_IO)
- 		open_flags |= O_DIRECT;
-+#endif
- 	data->flags = flags;
- 
- #ifdef HAVE_OPEN64
-@@ -477,6 +479,15 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel)
- 		goto cleanup;
- 	}
- 
-+#if !defined(O_DIRECT) && defined(F_NOCACHE)
-+	if (flags & IO_FLAG_DIRECT_IO) {
-+		if (fcntl(data->dev, F_NOCACHE, 1) < 0) {
-+			retval = errno;
-+			goto cleanup;
-+		}
-+	}
-+#endif
-+
- #ifdef BLKSSZGET
- 	if (flags & IO_FLAG_DIRECT_IO) {
- 		if (ioctl(data->dev, BLKSSZGET, &data->align) != 0)
diff --git a/patches/e2fsprogs-1.41.14/series b/patches/e2fsprogs-1.41.14/series
deleted file mode 100644
index 44a543e99..000000000
--- a/patches/e2fsprogs-1.41.14/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fixed-bitops.h-for-Coldfire-V4E.patch
-0002-fix-linking-problem.patch
-0003-Fix-compilation-on-Darwin.patch
-# b3f719def2b2e0004e2d9a830ebc59d0  - git-ptx-patches magic
diff --git a/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
index 235ccd13c..f1bbd10aa 100644
--- a/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
+++ b/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
@@ -12,10 +12,10 @@ Signed-off-by: Carsten Schlote <schlote@vahanus.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
-index ce70539..7e05ec3 100644
+index 83a01e4..55c6782 100644
 --- a/lib/ext2fs/bitops.h
 +++ b/lib/ext2fs/bitops.h
-@@ -244,7 +244,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val)
+@@ -336,7 +336,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val)
  #endif	/* i386 */
  
  #if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \
diff --git a/patches/e2fsprogs-1.42/series b/patches/e2fsprogs-1.42/series
new file mode 100644
index 000000000..355f84659
--- /dev/null
+++ b/patches/e2fsprogs-1.42/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Fixed-bitops.h-for-Coldfire-V4E.patch
+# 51e935bcb2a32d87daadf80960d144b0  - git-ptx-patches magic
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index ee6cabf6d..f2c2801f1 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
 #
 # Paths and names
 #
-E2FSPROGS_VERSION	:= 1.41.14
-E2FSPROGS_MD5		:= 05f70470aea2ef7efbb0845b2b116720
+E2FSPROGS_VERSION	:= 1.42
+E2FSPROGS_MD5		:= a3c4ffd7352310ab5e9412965d575610
 E2FSPROGS		:= e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_SUFFIX	:= tar.gz
 E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
@@ -49,9 +49,11 @@ E2FSPROGS_CONF_OPT	:= \
 	--disable-testio-debug \
 	--disable-libuuid \
 	--disable-libblkid \
+	--disable-quota \
 	--disable-debugfs \
 	--$(call ptx/endis,PTXCONF_E2FSPROGS_IMAGER)-imager \
 	--$(call ptx/endis,PTXCONF_E2FSPROGS_RESIZER)-resizer \
+	--disable-defrag \
 	--$(call ptx/endis,PTXCONF_E2FSPROGS_INSTALL_E2FSCK)-fsck \
 	--disable-e2initrd-helper \
 	--disable-tls \