Merge branch 'maint' into next

Conflicts:
	RELEASE-NOTES
	e2fsck/Makefile.in
	lib/config.h.in
	version.h

diff --cc RELEASE-NOTES
index 20470d7f1bfb7d9dbb3671262b382c5f2f9bea6b,db4d02a52d13bfe33a766dbdf6d8c2ccc5d79972..6d662542e9d5fd5cc7c46938c39097ffde328f1c
--- 1/RELEASE-NOTES
--- 2/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@@ -1,23 -1,77 +1,97 @@@
- E2fsprogs 1.43-WIP (September 22, 2012)
++E2fsprogs 1.43-WIP (June 16, 2012)
 +=======================================
 +
 +Add support for the ext4 metadata checksum feature.
 +
 +Check to make sure file system features which can not be supported by
 +HURD are not enabled if the file system is created to be
 +HURD-compatible.
 +
 +
 +Programmer's Notes
 +------------------
 +
 +Reduce the use of libc functions in libext2fs that may not be present
 +in the boot loader environment, at least for those functions that are
 +needed by boot loadsers such as yaboot.
 +
 +Support for the MMP feature can now be disabled at compile time.
 +
 +
+ E2fsprogs 1.42.8 (June 16, 2013)
+ ================================
+ 
+ As a part of mke2fs's option parsing cleanup, the use of the -R option
+ will give a warning that it is depreated (it has been so documented
+ since 2005) and -E should be used instead.
+ 
+ Mke2fs will not give warnings about the bigalloc and quota options in
+ quiet mode.
+ 
+ Debugfs was erroneously giving spurious error messages for certain
+ extent_inode subcommands which take arguments (split_node,
+ replace_node, and insert_node).  This has been fixed.
+ 
+ Fix the parsing of the 's' (sectors) in parse_num_blocks2, which among
+ other programs is used by mke2fs.
+ 
+ Change mke2fs so that it does not set the root directory to the real
+ uid/gid of the mke2fs process.  Add the extended option root_owner to
+ override this behavior.
+ 
+ E2fsck will now detect and repair corrupted extent trees which contain
+ invalid extents at the end of the extent tree leaf block.
+ 
+ E2fsck will now longer complain about zero length extended attribute
+ values.
+ 
+ Fix a regression introduced in e2fsprogs v1.42 which caused e2image -s
+ to crash.
+ 
+ Add safety check so tune2fs will not attempt to set the inode size to
+ be larger than the block size.
+ 
+ Fix e2fsck so it can check a read-only root file system with an
+ external journal.  (Addresses Debian Bug: #707030
+ 
+ Fix off-line resizing of file systems with flex_bg && !resize_inode
+ (Addresses Debian Bug: #696746)
+ 
+ Fix e2image with large (> 32-bit) file systems (Addresses Debian Bug:
+ #703067)
+ 
+ Enhance chattr to allow clearing the extent flag if the kernel allows
+ migrating extent based files to use indirect blocks.
+ 
+ Update German translation.
+ 
+ Updated/fixed various man pages.  (Addresses Debian Bugs: #712429,
+ #712430, #707609)
+ 
+ Fixed various Debian Packaging Issues (Addresses Debian Bug #708307)
+ 
+ Programmer's Notes
+ ------------------
+ 
+ Use secure_getenv() in preference to __secure_getenv().
+ 
+ Optimize CPU utilization of ext2fs_bg_has_super().
+ 
+ Fix ext2fs_llseek() on 32-bit i386 systems to work correctly when
+ SEEK_CUR is used with large files.
+ 
+ The ext2fs_read_inode_full() function will no longer use
+ fs->read_inode() if the caller has requested more than the base 128
+ byte inode structure and the inode size is greater than 128 bytes.
+ 
+ Fix build failure with --enable-jbd-debug.
+ 
+ Clean up filtering of outputs for the regression tests by using a
+ common sed script.
+ 
+ Fix gcc -Wall and clang nits.
+ 
+ 
  E2fsprogs 1.42.7 (January 21, 2013)
  ===================================
  

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc e2fsck/Makefile.in
index 9395bf4f7a0822efb4eeeb07e1054fdbd1012413,eadd5eaa0169dc67004d2a9c52477cacfee4c44e..9c27571a49685f7e3d787979e742b75efb33a9f9
--- 1/e2fsck/Makefile.in
--- 2/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@@ -132,7 -134,17 +132,8 @@@ e2fsck.profiled: $(OBJS)  $(PROFILED_DE
        $(Q) $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
                $(PROFILED_LIBS) 
  
- tst_sigcatcher: $(srcdir)/sigcatcher.c
 -gen_crc32table: $(srcdir)/gen_crc32table.c
 -      $(E) "  CC $@"
 -      $(Q) $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gen_crc32table \
 -              $(srcdir)/gen_crc32table.c
 -
 -crc32table.h: gen_crc32table
 -      $(E) "  GEN32TABLE $@"
 -      $(Q) ./gen_crc32table > crc32table.h
 -
+ tst_sigcatcher: $(srcdir)/sigcatcher.c sigcatcher.o
+       $(E) "  CC $@"
        $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) $(RDYNAMIC) \
                $(srcdir)/sigcatcher.c -DDEBUG -o tst_sigcatcher
  

diff --cc e2fsck/sigcatcher.c
Simple merge

diff --cc lib/config.h.in
index eebb75d0c8ef0b41dbd6bff5a08869f02057220b,b500a2cb16a120d3aefb4974e99ffa6a4c74d8f0..fc65dde22273476039fb0fc1d90180bd0f7a2cc9
--- 1/lib/config.h.in
--- 2/lib/config.h.in
+++ b/lib/config.h.in
@@@ -29,12 -26,9 +29,15 @@@
  /* Define to 1 if using `alloca.c'. */
  #undef C_ALLOCA
  
+ /* Define to 1 to disable use of backtrace */
+ #undef DISABLE_BACKTRACE
+ 
 +/* Define to 1 to enable bitmap stats. */
 +#undef ENABLE_BMAP_STATS
 +
 +/* Define to 1 to enable bitmap stats. */
 +#undef ENABLE_BMAP_STATS_OPS
 +
  /* Define to 1 if ext2 compression enabled */
  #undef ENABLE_COMPRESSION
  

diff --cc lib/ext2fs/closefs.c
Simple merge

diff --cc lib/ext2fs/ext2fs.h
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc version.h
index 10be88dbac5d3fb07c0784ee829468116a7a7913,23728154e81b0eb9e539939e9f4abbffab3200a1..d22de654663ba9c0ce51540235a5c8e4f8cf0ff3
--- 1/version.h
--- 2/version.h
+++ b/version.h
@@@ -7,5 -7,5 +7,6 @@@
   * file may be redistributed under the GNU Public License v2.
   */
  
 -#define E2FSPROGS_VERSION "1.42.8"
 +#define E2FSPROGS_VERSION "1.43-WIP"
- #define E2FSPROGS_DATE "21-Jan-2013"
+ #define E2FSPROGS_DATE "16-Jun-2013"
++