Update Release Notes, Changelogs, version.h, etc. for 1.42.4 releasev1.42.4

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

7 files changed, 221 insertions, 113 deletions

diff --git a/README b/README
index a84dee4e..3dab06ec 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-	This is the new version (1.42.3) of the second extended file
+	This is the new version (1.42.4) of the second extended file
 system management programs.
 
 	From time to time, I release new versions of e2fsprogs, to fix
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a1bdefc..119e6a43 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,83 @@
+E2fsprogs 1.42.4 (June 12, 2012)
+================================
+
+Fixed more 64-bit block number bugs (which could end up corrupting
+file systems!) in e2fsck, debugfs, and libext2fs.
+
+Fixed e2fsck's handling of the journal's s_errno field.  E2fsck was
+not properly propagating the journal's s_errno field to the superblock
+field; it was not checking this field if the journal had already been
+replayed, and if the journal *was* being replayed, the "error bit"
+wasn't getting flushed out to disk.
+
+Fixed a false positive complaint by e2fsck if all of the extents in
+the last extent tree block are uninitalized and located after the end
+of the file as defined by i_size.
+
+The dumpe2fs will now display the journal's s_errno field if it is
+non-zero, and it will also display the journal's 64-bit feature flag
+if present.
+
+Fix e2fsck so that it always opens the device file in exclusive mode
+when it might need to modify the file system, and never if the -n
+option is specified.  (Previously, there were a few corner cases where
+it might get things wrong in either direction.)
+
+E2fsck now correctly truncates or deallocates extent-mapped inodes on
+the orphan list.  The root cause was a bug in libext2fs's block
+iterator which could end up skipping an extent when the last block in
+an extent is removed, causing the current extent to be removed from
+the extent tree.
+
+E2fsck now correctly sets the global free block and inode counts when
+truncating or removing inodes on the orphan list in preen mode.
+Previously, it would leave these values would be set incorrectly,
+which is largely a cosmetic issue since the kernel no longer pays
+attention to those fields, but it can cause spurious complaints in
+subsequent e2fsck runs.
+
+Fix i_blocks accounting when the libext2fs library needs to add or
+remove an extent tree block  on bigalloc file systems.
+
+The lsattr and chattr programs now support the No_COW flag for the
+benefit of btrfs.
+
+Debugfs now interprets date strings of the form @ddd as ddd seconds
+after the beginning of the epoch.  This is handy when setting an inode
+number into the d_time field when debugging orphan list handling.
+
+Fix a precedence bug with built-in quota support which might result in
+e2fsck paying attention to the quota inode field even if the built-in
+quota feature flag is not set.  Fortunately, in practice that
+superblock field should be zero for non-built-in quota file systems,
+so it's unlikely this bug would have caused problems.
+
+Updated/fixed various man pages.  (Addresses Debian Bugs: #674453,
+#674694)
+
+Programmer's Notes
+------------------
+
+The regression test suite can now run the integration tests in the
+tests directory in parallel, via "make -jN check".
+
+Add new test, f_zero_extent_length which tests e2fsck's handling of
+the case where all of the extents in the last extent tree block are
+uninitialized extents after i_size.
+
+Add a new test, f_jnl_errno, which checks handling of an error
+indication set in the journal superblock.
+
+Fix the test f_jnl_64bit so that it properly checks e2fsck's handling
+of a 64-bit journal.
+
+Add two tests, f_orphan_indirect_inode and f_orphan_extent_inode which
+tests e2fsck's handling of orphan inodes in preen mode, and truncation
+of extent inodes on the orphan list.
+    
+Fixed more OS X portability issues.
+    
+
 E2fsprogs 1.42.3 (May 14, 2012)
 ===============================
 
diff --git a/debian/changelog b/debian/changelog
index 45204c9a..296bc504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+e2fsprogs (1.42.4-1) unstable; urgency=medium
+
+  * New upstream version
+  * 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)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 12 Jun 2012 18:20:55 -0400
+
 e2fsprogs (1.42.3-1) unstable; urgency=low
 
   * New upstream version
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 9dea8908..9abf289d 100644
--- a/doc/libext2fs.texinfo
+++ b/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.3)
+@settitle The EXT2FS Library (version 1.42.4)
 @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.3
-@subtitle May 2012
+@subtitle Version 1.42.4
+@subtitle June 2012
 
 @author by Theodore Ts'o
 
@@ -102,7 +102,7 @@ by the Foundation.
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.42.3.
+This manual documents the EXT2FS Library, version 1.42.4.
 
 @end ifinfo
 
diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index 6b37e5a5..18c9bdf9 100644
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,16 +1,16 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.42.3
-Entered-date:   14May2012
+Version:        1.42.4
+Entered-date:   12June2012
 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:   download.sourceforge.net /pub/sourceforge/e2fsprogs
-		5684kB e2fsprogs-1.42.3.tar.gz
-		508kB e2fsprogs-libs-1.42.3.tar.gz
-                1kB   e2fsprogs-1.42.3.lsm
+                5736kB e2fsprogs-1.42.4.tar.gz
+                504kB  e2fsprogs-libs-1.42.4.tar.gz
+                1kB    e2fsprogs-1.42.4.lsm
 Alternate-site: 
 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
 Copying-policy: GPL-2/LGPL-2
diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index 7c5bfe56..029e50cc 100644
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -66,9 +66,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: e2fsprogs 1.42.3\n"
+"Project-Id-Version: e2fsprogs 1.42.4\n"
 "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
-"POT-Creation-Date: 2012-05-14 14:39-0400\n"
+"POT-Creation-Date: 2012-06-12 14:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,9 +91,9 @@ msgid "while reading the bad blocks inode"
 msgstr ""
 
 #: e2fsck/badblocks.c:72 e2fsck/iscan.c:110 e2fsck/scantest.c:107
-#: e2fsck/unix.c:1293 e2fsck/unix.c:1381 misc/badblocks.c:1214
+#: e2fsck/unix.c:1298 e2fsck/unix.c:1386 misc/badblocks.c:1214
 #: misc/badblocks.c:1222 misc/badblocks.c:1236 misc/badblocks.c:1248
-#: misc/dumpe2fs.c:585 misc/e2image.c:1189 misc/e2image.c:1307
+#: misc/dumpe2fs.c:588 misc/e2image.c:1189 misc/e2image.c:1307
 #: misc/e2image.c:1320 misc/mke2fs.c:192 misc/tune2fs.c:1907 resize/main.c:303
 #, c-format
 msgid "while trying to open %s"
@@ -188,12 +188,12 @@ msgstr ""
 msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
 msgstr ""
 
-#: e2fsck/iscan.c:81 e2fsck/unix.c:927
+#: e2fsck/iscan.c:81 e2fsck/unix.c:930
 #, c-format
 msgid "while opening %s for flushing"
 msgstr ""
 
-#: e2fsck/iscan.c:86 e2fsck/unix.c:933 resize/main.c:276
+#: e2fsck/iscan.c:86 e2fsck/unix.c:936 resize/main.c:276
 #, c-format
 msgid "while trying to flush %s"
 msgstr ""
@@ -211,31 +211,31 @@ msgstr ""
 msgid "%u inodes scanned.\n"
 msgstr ""
 
-#: e2fsck/journal.c:511
+#: e2fsck/journal.c:512
 msgid "reading journal superblock\n"
 msgstr ""
 
-#: e2fsck/journal.c:568
+#: e2fsck/journal.c:569
 #, c-format
 msgid "%s: no valid journal superblock found\n"
 msgstr ""
 
-#: e2fsck/journal.c:577
+#: e2fsck/journal.c:578
 #, c-format
 msgid "%s: journal too short\n"
 msgstr ""
 
-#: e2fsck/journal.c:864
+#: e2fsck/journal.c:870
 #, c-format
 msgid "%s: recovering journal\n"
 msgstr ""
 
-#: e2fsck/journal.c:866
+#: e2fsck/journal.c:872
 #, c-format
 msgid "%s: won't do journal recovery while read-only\n"
 msgstr ""
 
-#: e2fsck/journal.c:893
+#: e2fsck/journal.c:899
 #, c-format
 msgid "while trying to re-open %s"
 msgstr ""
@@ -2435,21 +2435,21 @@ msgstr ""
 msgid "while doing inode scan"
 msgstr ""
 
-#: e2fsck/super.c:187
+#: e2fsck/super.c:188
 #, c-format
 msgid "while calling ext2fs_block_iterate for inode %d"
 msgstr ""
 
-#: e2fsck/super.c:210
+#: e2fsck/super.c:211
 #, c-format
 msgid "while calling ext2fs_adjust_ea_refcount2 for inode %d"
 msgstr ""
 
-#: e2fsck/super.c:269
+#: e2fsck/super.c:272
 msgid "Truncating"
 msgstr ""
 
-#: e2fsck/super.c:270
+#: e2fsck/super.c:273
 msgid "Clearing"
 msgstr ""
 
@@ -2628,21 +2628,21 @@ msgstr ""
 
 #: e2fsck/unix.c:230
 #, c-format
-msgid "Warning!  %s is mounted.\n"
+msgid "Warning!  %s is %s.\n"
 msgstr ""
 
-#: e2fsck/unix.c:235
+#: e2fsck/unix.c:237
 #, c-format
-msgid "%s is mounted.  "
+msgid "%s is %s.\n"
 msgstr ""
 
-#: e2fsck/unix.c:237
+#: e2fsck/unix.c:240
 msgid ""
 "Cannot continue, aborting.\n"
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:239
+#: e2fsck/unix.c:242
 msgid ""
 "\n"
 "\n"
@@ -2651,134 +2651,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:244
+#: e2fsck/unix.c:247
 msgid "Do you really want to continue"
 msgstr ""
 
-#: e2fsck/unix.c:246
+#: e2fsck/unix.c:249
 #, c-format
 msgid "check aborted.\n"
 msgstr ""
 
-#: e2fsck/unix.c:336
+#: e2fsck/unix.c:339
 msgid " contains a file system with errors"
 msgstr ""
 
-#: e2fsck/unix.c:338
+#: e2fsck/unix.c:341
 msgid " was not cleanly unmounted"
 msgstr ""
 
-#: e2fsck/unix.c:340
+#: e2fsck/unix.c:343
 msgid " primary superblock features different from backup"
 msgstr ""
 
-#: e2fsck/unix.c:344
+#: e2fsck/unix.c:347
 #, c-format
 msgid " has been mounted %u times without being checked"
 msgstr ""
 
-#: e2fsck/unix.c:351
+#: e2fsck/unix.c:354
 msgid " has filesystem last checked time in the future"
 msgstr ""
 
-#: e2fsck/unix.c:357
+#: e2fsck/unix.c:360
 #, c-format
 msgid " has gone %u days without being checked"
 msgstr ""
 
-#: e2fsck/unix.c:366
+#: e2fsck/unix.c:369
 msgid ", check forced.\n"
 msgstr ""
 
-#: e2fsck/unix.c:399
+#: e2fsck/unix.c:402
 #, c-format
 msgid "%s: clean, %u/%u files, %llu/%llu blocks"
 msgstr ""
 
-#: e2fsck/unix.c:418
+#: e2fsck/unix.c:421
 msgid " (check deferred; on battery)"
 msgstr ""
 
-#: e2fsck/unix.c:421
+#: e2fsck/unix.c:424
 msgid " (check after next mount)"
 msgstr ""
 
-#: e2fsck/unix.c:423
+#: e2fsck/unix.c:426
 #, c-format
 msgid " (check in %ld mounts)"
 msgstr ""
 
-#: e2fsck/unix.c:573
+#: e2fsck/unix.c:576
 #, c-format
 msgid "ERROR: Couldn't open /dev/null (%s)\n"
 msgstr ""
 
-#: e2fsck/unix.c:642
+#: e2fsck/unix.c:645
 #, c-format
 msgid "Invalid EA version.\n"
 msgstr ""
 
-#: e2fsck/unix.c:669
+#: e2fsck/unix.c:672
 #, c-format
 msgid "Unknown extended option: %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:694
+#: e2fsck/unix.c:697
 #, c-format
 msgid ""
 "Syntax error in e2fsck config file (%s, line #%d)\n"
 "\t%s\n"
 msgstr ""
 
-#: e2fsck/unix.c:763
+#: e2fsck/unix.c:766
 #, c-format
 msgid "Error validating file descriptor %d: %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:767
+#: e2fsck/unix.c:770
 msgid "Invalid completion information file descriptor"
 msgstr ""
 
-#: e2fsck/unix.c:782
+#: e2fsck/unix.c:785
 msgid "Only one of the options -p/-a, -n or -y may be specified."
 msgstr ""
 
-#: e2fsck/unix.c:803
+#: e2fsck/unix.c:806
 #, c-format
 msgid "The -t option is not supported on this version of e2fsck.\n"
 msgstr ""
 
-#: e2fsck/unix.c:834 e2fsck/unix.c:906 misc/tune2fs.c:811 misc/tune2fs.c:1100
+#: e2fsck/unix.c:837 e2fsck/unix.c:909 misc/tune2fs.c:811 misc/tune2fs.c:1100
 #: misc/tune2fs.c:1118
 #, c-format
 msgid "Unable to resolve '%s'"
 msgstr ""
 
-#: e2fsck/unix.c:885
+#: e2fsck/unix.c:888
 msgid "The -n and -D options are incompatible."
 msgstr ""
 
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:893
 msgid "The -n and -c options are incompatible."
 msgstr ""
 
-#: e2fsck/unix.c:895
+#: e2fsck/unix.c:898
 msgid "The -n and -l/-L options are incompatible."
 msgstr ""
 
-#: e2fsck/unix.c:940
+#: e2fsck/unix.c:943
 #, c-format
 msgid "The -c and the -l/-L options may not be both used at the same time.\n"
 msgstr ""
 
-#: e2fsck/unix.c:988
+#: e2fsck/unix.c:991
 #, c-format
 msgid ""
 "E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:997
+#: e2fsck/unix.c:1000
 #, c-format
 msgid ""
 "\n"
@@ -2786,194 +2786,194 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1086
+#: e2fsck/unix.c:1089
 #, c-format
 msgid ""
 "MMP interval is %u seconds and total wait time is %u seconds. Please "
 "wait...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1103 e2fsck/unix.c:1108
+#: e2fsck/unix.c:1106 e2fsck/unix.c:1111
 msgid "while checking MMP block"
 msgstr ""
 
-#: e2fsck/unix.c:1110 misc/tune2fs.c:1912
+#: e2fsck/unix.c:1113 misc/tune2fs.c:1912
 msgid ""
 "If you are sure the filesystem is not in use on any node, run:\n"
 "'tune2fs -f -E clear_mmp {device}'\n"
 msgstr ""
 
-#: e2fsck/unix.c:1160
+#: e2fsck/unix.c:1163
 #, c-format
 msgid "Error: ext2fs library version out of date!\n"
 msgstr ""
 
-#: e2fsck/unix.c:1168
+#: e2fsck/unix.c:1171
 msgid "while trying to initialize program"
 msgstr ""
 
-#: e2fsck/unix.c:1191
+#: e2fsck/unix.c:1194
 #, c-format
 msgid "\tUsing %s, %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1203
+#: e2fsck/unix.c:1206
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: e2fsck/unix.c:1251
+#: e2fsck/unix.c:1256
 #, c-format
 msgid "%s: %s trying backup blocks...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1253
+#: e2fsck/unix.c:1258
 msgid "Superblock invalid,"
 msgstr ""
 
-#: e2fsck/unix.c:1254
+#: e2fsck/unix.c:1259
 msgid "Group descriptors look bad..."
 msgstr ""
 
-#: e2fsck/unix.c:1264
+#: e2fsck/unix.c:1269
 #, c-format
 msgid "%s: %s while using the backup blocks"
 msgstr ""
 
-#: e2fsck/unix.c:1268
+#: e2fsck/unix.c:1273
 #, c-format
 msgid "%s: going back to original superblock\n"
 msgstr ""
 
-#: e2fsck/unix.c:1296
+#: e2fsck/unix.c:1301
 msgid ""
 "The filesystem revision is apparently too high for this version of e2fsck.\n"
 "(Or the filesystem superblock is corrupt)\n"
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1302
+#: e2fsck/unix.c:1307
 msgid "Could this be a zero-length partition?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1305
+#: e2fsck/unix.c:1310
 #, c-format
 msgid "You must have %s access to the filesystem or be root\n"
 msgstr ""
 
-#: e2fsck/unix.c:1310
+#: e2fsck/unix.c:1315
 msgid "Possibly non-existent or swap device?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1313
+#: e2fsck/unix.c:1318
 msgid "Filesystem mounted or opened exclusively by another program?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1316
+#: e2fsck/unix.c:1321
 msgid "Possibly non-existent device?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1319
+#: e2fsck/unix.c:1324
 msgid ""
 "Disk write-protected; use the -n option to do a read-only\n"
 "check of the device.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1384
+#: e2fsck/unix.c:1389
 msgid "Get a newer version of e2fsck!"
 msgstr ""
 
-#: e2fsck/unix.c:1432
+#: e2fsck/unix.c:1437
 #, c-format
 msgid "while checking ext3 journal for %s"
 msgstr ""
 
-#: e2fsck/unix.c:1443
+#: e2fsck/unix.c:1448
 msgid ""
 "Warning: skipping journal recovery because doing a read-only filesystem "
 "check.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1456
+#: e2fsck/unix.c:1461
 #, c-format
 msgid "unable to set superblock flags on %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1462
+#: e2fsck/unix.c:1467
 #, c-format
 msgid "while recovering ext3 journal of %s"
 msgstr ""
 
-#: e2fsck/unix.c:1487
+#: e2fsck/unix.c:1492
 #, c-format
 msgid "%s has unsupported feature(s):"
 msgstr ""
 
-#: e2fsck/unix.c:1502
+#: e2fsck/unix.c:1507
 #, c-format
 msgid "%s: warning: compression support is experimental.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1508
+#: e2fsck/unix.c:1513
 #, c-format
 msgid ""
 "%s: e2fsck not compiled with HTREE support,\n"
 "\tbut filesystem %s has HTREE directories.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1560
+#: e2fsck/unix.c:1565
 #, c-format
 msgid "%s: %s while reading bad blocks inode\n"
 msgstr ""
 
-#: e2fsck/unix.c:1563
+#: e2fsck/unix.c:1568
 msgid "This doesn't bode well, but we'll try to go on...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1604
+#: e2fsck/unix.c:1609
 #, c-format
 msgid "Creating journal (%d blocks): "
 msgstr ""
 
-#: e2fsck/unix.c:1614
+#: e2fsck/unix.c:1619
 msgid " Done.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1615
+#: e2fsck/unix.c:1620
 msgid ""
 "\n"
 "*** journal has been re-created - filesystem is now ext3 again ***\n"
 msgstr ""
 
-#: e2fsck/unix.c:1638
+#: e2fsck/unix.c:1643
 msgid "Restarting e2fsck from the beginning...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1642
+#: e2fsck/unix.c:1647
 msgid "while resetting context"
 msgstr ""
 
-#: e2fsck/unix.c:1649
+#: e2fsck/unix.c:1654
 #, c-format
 msgid "%s: e2fsck canceled.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1654
+#: e2fsck/unix.c:1659
 msgid "aborted"
 msgstr ""
 
-#: e2fsck/unix.c:1666 e2fsck/util.c:67
+#: e2fsck/unix.c:1671 e2fsck/util.c:67
 #, c-format
 msgid ""
 "\n"
 "%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1670
+#: e2fsck/unix.c:1675
 #, c-format
 msgid "%s: ***** REBOOT LINUX *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1678 e2fsck/util.c:73
+#: e2fsck/unix.c:1683 e2fsck/util.c:73
 #, c-format
 msgid ""
 "\n"
@@ -2981,7 +2981,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1718
+#: e2fsck/unix.c:1723
 msgid "while setting block group checksum info"
 msgstr ""
 
@@ -3485,15 +3485,20 @@ msgid ""
 "Journal start:            %u\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:398 misc/tune2fs.c:218
+#: misc/dumpe2fs.c:386
+#, c-format
+msgid "Journal errno:            %d\n"
+msgstr ""
+
+#: misc/dumpe2fs.c:401 misc/tune2fs.c:218
 msgid "while reading journal superblock"
 msgstr ""
 
-#: misc/dumpe2fs.c:406
+#: misc/dumpe2fs.c:409
 msgid "Couldn't find journal superblock magic numbers"
 msgstr ""
 
-#: misc/dumpe2fs.c:410
+#: misc/dumpe2fs.c:413
 #, c-format
 msgid ""
 "\n"
@@ -3505,27 +3510,27 @@ msgid ""
 "Journal number of users:  %u\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:423
+#: misc/dumpe2fs.c:426
 #, c-format
 msgid "Journal users:            %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:439 misc/mke2fs.c:662 misc/tune2fs.c:1137
+#: misc/dumpe2fs.c:442 misc/mke2fs.c:662 misc/tune2fs.c:1137
 #, c-format
 msgid "Couldn't allocate memory to parse options!\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:465
+#: misc/dumpe2fs.c:468
 #, c-format
 msgid "Invalid superblock parameter: %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:480
+#: misc/dumpe2fs.c:483
 #, c-format
 msgid "Invalid blocksize parameter: %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:491
+#: misc/dumpe2fs.c:494
 #, c-format
 msgid ""
 "\n"
@@ -3539,18 +3544,18 @@ msgid ""
 "\tblocksize=<blocksize>\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:551 misc/mke2fs.c:1525
+#: misc/dumpe2fs.c:554 misc/mke2fs.c:1525
 #, c-format
 msgid "\tUsing %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:587 misc/e2image.c:1309 misc/tune2fs.c:1923
+#: misc/dumpe2fs.c:590 misc/e2image.c:1309 misc/tune2fs.c:1923
 #: resize/main.c:305
 #, c-format
 msgid "Couldn't find valid filesystem superblock.\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:615
+#: misc/dumpe2fs.c:618
 #, c-format
 msgid ""
 "\n"
@@ -5445,7 +5450,7 @@ msgid "Should never happen: resize inode corrupt!\n"
 msgstr ""
 
 #: lib/ext2fs/ext2_err.c:11
-msgid "EXT2FS Library version 1.42.3"
+msgid "EXT2FS Library version 1.42.4"
 msgstr ""
 
 #: lib/ext2fs/ext2_err.c:12
diff --git a/version.h b/version.h
index cde0e05f..7aaddffa 100644
--- a/version.h
+++ b/version.h
@@ -7,5 +7,5 @@
  * file may be redistributed under the GNU Public License v2.
  */
 
-#define E2FSPROGS_VERSION "1.42.3"
-#define E2FSPROGS_DATE "14-May-2012"
+#define E2FSPROGS_VERSION "1.42.4"
+#define E2FSPROGS_DATE "12-June-2012"