Merge branch 'maint' into next

README

@@ -1,4 +1,4 @@
-	This is the new version (1.42.12) of the second extended file
+	This is the new version (1.42.13) of the second extended file
 system management programs.
 
 	From time to time, I release new versions of e2fsprogs, to fix

RELEASE-NOTES

@@ -7,7 +7,6 @@ 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
 ------------------
 
@@ -17,6 +16,71 @@ needed by boot loadsers such as yaboot.
 
 Support for the MMP feature can now be disabled at compile time.
 
+
+E2fsprogs 1.42.13 (May 17, 2015)
+================================
+
+Fixed a potential buffer overflow while closing a file system in
+libext2fs.  (CVE-2015-1572, Addresses Debian Bug: #778948)
+
+Fixed a bug which could cause e2fsck to corrupt Hurd file systems.
+(Addresses Debian Bug: #760275)
+
+Fixed a deadlock which occurs when using systemd and e2fsck.conf's
+logging feature.  (Addresses Debian Bug: #775234)
+
+Fixed a bug which could cause programs using libext2's inode table
+scanning functions from crashing on certain corrupted file systems.
+(Addresses Debian Bug: #773795)
+
+Fixed dumpe2fs so it won't crash if the user doesn't specify a block
+device (file system).  (Addresses Debian Bug: #764293)
+
+Fixed e2fsck so if it notices unexpected HTREE blocks in pass 2, it
+will report the correct directory inode containing the inconsistency.
+
+If e2fsck fails to grow the dir_info structure due realloc(3) not
+having enough memory, it will now fail with explanatory message
+instead of staggering on failing with a confusing internal error
+messages.
+
+The tune2fs program will zero out the superblock journal backup
+information when removing a journal from a file system.
+
+The mke2fs program now enables the large_file feature by default.
+
+Fixed a bug which could cause badblocks to crash if there are millions
+and millions of bad blocks.
+
+Fixed some use-after-free bug in resize2fs and e2fsck.
+
+Fixed a memory leak in tune2fs.
+
+Fixed some bigendian bugs that had crept into both indirect and extent
+handling inside libext2fs.
+
+Updated/fixed various man pages.
+
+Update Esperanto, German, and Spanish translations.  Added Danish
+translation.
+
+Programmer's Notes
+------------------
+
+Fixed coverity, sparce gcc -Wall, and clang warnings/nits.
+
+Clean up some build system problems (build failures with various
+configure options, fix Posix portability issues, etc.)
+
+The functions ext2fs_inode_alloc_stats[2]() and
+ext2fs_block_alloc_stats[2]() now check the inode and block numbers
+passed to them, to avoid crashes caused by buggy callers.
+
+The libext2fs directory iterator will now check for an invalid
+directory entry length instead of possibly walking off the end of the
+directory buffer.
+
+
 E2fsprogs 1.42.12 (August 25, 2014)
 ===================================
 

debian/changelog

@@ -1,3 +1,36 @@
+e2fsprogs (1.42.13-1) unstable; urgency=low
+
+  * New upstream version
+  * NMU acknowledge (Closes: #778948)
+  * Fixed a bug which could cause e2fsck to corrupt Hurd file systems.
+    (Closes: #760275)
+  * Fixed a deadlock which occurs when using systemd and e2fsck.conf's
+    logging feature.  (Closes: #775234)
+  * Fixed a bug which could cause programs using libext2's inode table
+    scanning functions from crashing on certain corrupted file systems.
+    (Closes: #773795)
+  * Fixed dumpe2fs so it won't crash if the user doesn't specify a block
+    device (file system).  (Closes: #764293)
+  * Fixed e2fsck so if it notices unexpected HTREE blocks in pass 2, it
+    will report the correct directory inode containing the inconsistency.
+  * If e2fsck fails to grow the dir_info structure due realloc(3) not
+    having enough memory, it will now fail with explanatory message
+    instead of staggering on failing with a confusing internal error
+    messages.
+  * The tune2fs program will zero out the superblock journal backup
+    information when removing a journal from a file system.
+  * The mke2fs program now enables the large_file feature by default.
+  * Fixed a bug which could cause badblocks to crash if there are millions
+    and millions of bad blocks.
+  * Fixed some use-after-free bug in resize2fs and e2fsck.
+  * Fixed some bigendian bugs that had crept into both indirect and extent
+    handling inside libext2fs.
+  * Updated/fixed various man pages.
+  * Update Esperanto, German, and Spanish translations.  Added Danish
+    translation.
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 17 May 2015 20:38:27 -0400
+
 e2fsprogs (1.43~WIP-2015-03-29-1) unstable; urgency=low
 
   * Merge in updates from the maint branch (changes from 1.42.12-1)
@@ -8,6 +41,13 @@ e2fsprogs (1.43~WIP-2015-03-29-1) unstable; urgency=low
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 14 Dec 2014 22:49:03 -0500
 
+e2fsprogs (1.42.12-1.1) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Fix CVE-2015-1572: incomplete fix for CVE-2015-0247 (closes: #778948).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 22 Feb 2015 01:50:57 +0000
+
 e2fsprogs (1.42.12-1) unstable; urgency=low
 
   * New upstream version

debian/control.in

@@ -10,7 +10,7 @@ Section: admin
 Priority: required
 Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
 Build-Depends: gettext, texinfo, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://e2fsprogs.sourceforge.net
 
 ifdef(`E2FSCK_STATIC',``

doc/libext2fs.texinfo

@@ -1,7 +1,7 @@
 \input texinfo    @c -*-texinfo-*-
 @c %**start of header
 @setfilename libext2fs.info
-@settitle The EXT2FS Library (version 1.42.12)
+@settitle The EXT2FS Library (version 1.42.13)
 @synindex tp fn
 @comment %**end of header
 
@@ -60,8 +60,8 @@ by the author.
 
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
-@subtitle Version 1.42.12
-@subtitle August 2014
+@subtitle Version 1.42.13
+@subtitle May 2015
 
 @author by Theodore Ts'o
 
@@ -101,7 +101,7 @@ by the Foundation.
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.42.12.
+This manual documents the EXT2FS Library, version 1.42.13.
 
 @menu
 * Introduction to the EXT2FS Library::  

e2fsprogs.lsm

@@ -1,17 +1,17 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.42.12
-Entered-date:   2014-08-29
+Version:        1.42.13
+Entered-date:   2015-05-17
 Description:    The filesystem utilities for the EXT2, EXT3, and EXT4
 		filesystems, including e2fsck, mke2fs, dumpe2fs, and others.
 Keywords:       utilities, filesystem, Ext2fs, ext3, ext4
 Author:         tytso@mit.edu (Theodore Tso)
 Maintained-by:  tytso@mit.edu (Theodore Tso)
 Primary-site:   ftp.kernel.org /pub/linux/kernel/people/tytso/e2fsprogs
-                6236kB e2fsprogs-1.42.12.tar.gz
-                592kB  e2fsprogs-libs-1.42.12.tar.gz
-                1kB    e2fsprogs-1.42.12.lsm
+                6360kB e2fsprogs-1.42.13.tar.gz
+                592kB  e2fsprogs-libs-1.42.13.tar.gz
+                1kB    e2fsprogs-1.42.13.lsm
 Alternate-site: download.sourceforge.net /pub/sourceforge/e2fsprogs
-Platforms:	linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x
+Platforms:	linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x/4.x
 Copying-policy: GPL-2/LGPL-2
 End

po/LINGUAS

@@ -1 +1 @@
-ca cs de eo es fr id it nl pl sv tr uk vi zh_CN
+ca cs da de eo es fr id it nl pl sv tr uk vi zh_CN