Update e2fsprogs to 1.41.12 from 1.40.7.

Fix PR pkg/43950.

Major change from 1.40.7:
* ext4 filesystem support
* many translation updates
* many bug-fixes
in detail, see RELEASE-NOTES.

15 files changed, 106 insertions, 97 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 41c213938ff..a106362b1e5 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:12 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2010/12/23 06:34:50 ryoon Exp $
 
-DISTNAME=	e2fsprogs-1.40.7
+DISTNAME=	e2fsprogs-1.41.12
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 
@@ -11,7 +11,7 @@ COMMENT=	Second extended file system (ext2fs) management programs
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	makeinfo
+USE_TOOLS+=	makeinfo gmake
 INFO_FILES=	# PLIST
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/e2fsprogs/PLIST b/sysutils/e2fsprogs/PLIST
index b5687b93e13..212949a1618 100644
--- a/sysutils/e2fsprogs/PLIST
+++ b/sysutils/e2fsprogs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/12/23 06:34:50 ryoon Exp $
 bin/chattr
 bin/lsattr
 bin/uuidgen
@@ -13,18 +13,24 @@ man/man8/badblocks.8
 man/man8/blkid.8
 man/man8/debugfs.8
 man/man8/dumpe2fs.8
+man/man8/e2freefrag.8
 man/man8/e2fsck.8
 man/man8/e2image.8
 man/man8/e2label.8
+man/man8/e2undo.8
 man/man8/filefrag.8
 man/man8/findfs.8
 ${PLIST.fsck}man/man8/fsck.8
 man/man8/fsck.ext2.8
 man/man8/fsck.ext3.8
+man/man8/fsck.ext4.8
+man/man8/fsck.ext4dev.8
 man/man8/logsave.8
 man/man8/mke2fs.8
 man/man8/mkfs.ext2.8
 man/man8/mkfs.ext3.8
+man/man8/mkfs.ext4.8
+man/man8/mkfs.ext4dev.8
 man/man8/mklost+found.8
 man/man8/resize2fs.8
 man/man8/tune2fs.8
@@ -33,18 +39,24 @@ sbin/badblocks
 sbin/blkid
 sbin/debugfs
 sbin/dumpe2fs
+sbin/e2freefrag
 sbin/e2fsck
 sbin/e2image
 sbin/e2label
+sbin/e2undo
 sbin/filefrag
 sbin/findfs
 ${PLIST.fsck}sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3
+sbin/fsck.ext4
+sbin/fsck.ext4dev
 sbin/logsave
 sbin/mke2fs
 sbin/mkfs.ext2
 sbin/mkfs.ext3
+sbin/mkfs.ext4
+sbin/mkfs.ext4dev
 sbin/mklost+found
 sbin/resize2fs
 sbin/tune2fs
@@ -55,9 +67,11 @@ share/locale/cs/LC_MESSAGES/e2fsprogs.mo
 share/locale/de/LC_MESSAGES/e2fsprogs.mo
 share/locale/es/LC_MESSAGES/e2fsprogs.mo
 share/locale/fr/LC_MESSAGES/e2fsprogs.mo
+share/locale/id/LC_MESSAGES/e2fsprogs.mo
 share/locale/it/LC_MESSAGES/e2fsprogs.mo
 share/locale/nl/LC_MESSAGES/e2fsprogs.mo
 share/locale/pl/LC_MESSAGES/e2fsprogs.mo
 share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 share/locale/vi/LC_MESSAGES/e2fsprogs.mo
+share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 0b8e978fea1..7da6b28c1ec 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.15 2008/09/21 16:16:06 joerg Exp $
+$NetBSD: distinfo,v 1.16 2010/12/23 06:34:50 ryoon Exp $
 
-SHA1 (e2fsprogs-1.40.7.tar.gz) = 56ff55add64c34bddf9cf15c3825811d230dd8b1
-RMD160 (e2fsprogs-1.40.7.tar.gz) = bfab47555ff31b8ae8d72d2e4de54c099bfc3b18
-Size (e2fsprogs-1.40.7.tar.gz) = 4087067 bytes
-SHA1 (patch-aa) = 446233b75bd23227c5c7d003cce0a19017f3f71b
+SHA1 (e2fsprogs-1.41.12.tar.gz) = 62b002fe507b2ddafc24b89532e472fe4b55a14f
+RMD160 (e2fsprogs-1.41.12.tar.gz) = aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7
+Size (e2fsprogs-1.41.12.tar.gz) = 4496194 bytes
 SHA1 (patch-ab) = f18d86265be543bab68813200fb49099ad8af909
 SHA1 (patch-ac) = 8f47354ee719d4b933eccc8c8f0a0c7fb7b0feff
-SHA1 (patch-af) = c2c8b373fcba36f031005d364c0de2fbae97106f
-SHA1 (patch-al) = e976de195735cf1f96aaceff1b978b1be405dfc9
-SHA1 (patch-am) = 05a547a48b02d267e200d6161e982e5cf1226d3b
-SHA1 (patch-an) = 0324fe2a0b7a9464f8af401d554e07a0bcfa22e2
-SHA1 (patch-ao) = 57c8757cd378a72d728475f26cdf9a452afbf64b
-SHA1 (patch-ap) = 175e97acf1a7cfcbd3a18c80ed513f26ac111e13
-SHA1 (patch-ar) = 8a4a7ba5bd51ba8d68e6954c82ac6fd4cdf6153d
-SHA1 (patch-as) = e8c444fe4e1e443d1d841dc44ce54d50d31b5994
-SHA1 (patch-at) = 80785a73eaa57a4a73bd0a683697ea2f890f8dbc
-SHA1 (patch-av) = 07f3fbf646e2e9716ea10d55580fa15dd99db01d
-SHA1 (patch-aw) = 4f25dc800f6fc3a428f43eba2b9674c7b3256ea6
+SHA1 (patch-af) = 8e1c2f5b90b78fdd4c5a4fcb573f23fc1db6e90f
+SHA1 (patch-am) = 9c3be47010f6101e4f41343e108b967c88847c12
+SHA1 (patch-an) = 62acb3f18f61ae6a729a8eebd308a1a1efe83e50
+SHA1 (patch-ao) = 241b33700249d09f60f11f3167ef8cf771d1e588
+SHA1 (patch-ap) = 4f9f8e47ecbea53acb1318e5ef0abe58cfbbb9ce
+SHA1 (patch-ar) = 9103ed55e0f13451fbb2f34c4bee28f5e24c216a
+SHA1 (patch-as) = 6066be5bf84753419407d2ee70cd8934b918c298
+SHA1 (patch-at) = 53cbd25d89a9df733ba931490c1dcb77b20ddbe3
+SHA1 (patch-av) = 92c9d34c82cba121744cfff5b23e4b92c9442545
+SHA1 (patch-aw) = cb5e382077c07f0ced114fcbf195537cc7b0058c
diff --git a/sysutils/e2fsprogs/patches/patch-aa b/sysutils/e2fsprogs/patches/patch-aa
index da57592fde7..e69de29bb2d 100644
--- a/sysutils/e2fsprogs/patches/patch-aa
+++ b/sysutils/e2fsprogs/patches/patch-aa
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2008/03/07 22:40:29 tron Exp $
-
---- configure.orig	2008-02-28 23:03:53.000000000 +0000
-+++ configure	2008-03-07 20:24:01.000000000 +0000
-@@ -15107,7 +15107,7 @@
- fi
- { echo "$as_me:$LINENO: checking for unified diff option" >&5
- echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
--if diff -u $0 $0 >& /dev/null ; then
-+if diff -u $0 $0 /dev/null 2>&1; then
-    UNI_DIFF_OPTS=-u
- else
-    UNI_DIFF_OPTS=-c
diff --git a/sysutils/e2fsprogs/patches/patch-af b/sysutils/e2fsprogs/patches/patch-af
index 3873e6302a5..27fc0702020 100644
--- a/sysutils/e2fsprogs/patches/patch-af
+++ b/sysutils/e2fsprogs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2008/03/07 22:40:29 tron Exp $
+$NetBSD: patch-af,v 1.7 2010/12/23 06:34:50 ryoon Exp $
 
---- lib/ext2fs/ismounted.c.orig	2008-02-28 23:03:53.000000000 +0000
-+++ lib/ext2fs/ismounted.c	2008-03-07 21:08:08.000000000 +0000
-@@ -196,7 +196,11 @@
+--- lib/ext2fs/ismounted.c.orig	2010-05-18 03:04:39.000000000 +0000
++++ lib/ext2fs/ismounted.c
+@@ -198,7 +198,11 @@ static errcode_t check_mntent(const char
  static errcode_t check_getmntinfo(const char *file, int *mount_flags,
  				  char *mtpt, int mtlen)
  {
diff --git a/sysutils/e2fsprogs/patches/patch-al b/sysutils/e2fsprogs/patches/patch-al
index 1807d3e932b..e69de29bb2d 100644
--- a/sysutils/e2fsprogs/patches/patch-al
+++ b/sysutils/e2fsprogs/patches/patch-al
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.2 2008/03/07 22:40:29 tron Exp $
-
---- debugfs/util.c.orig	2008-02-28 23:03:53.000000000 +0000
-+++ debugfs/util.c	2008-03-07 21:11:18.000000000 +0000
-@@ -6,7 +6,8 @@
-  *
-  */
- 
--#define _XOPEN_SOURCE /* needed for strptime */
-+
-+#define _XOPEN_SOURCE 500 /* needed for strptime */
- 
- #include <stdio.h>
- #include <unistd.h>
diff --git a/sysutils/e2fsprogs/patches/patch-am b/sysutils/e2fsprogs/patches/patch-am
index aa5f42c0efc..62596c4d187 100644
--- a/sysutils/e2fsprogs/patches/patch-am
+++ b/sysutils/e2fsprogs/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: patch-am,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- e2fsck/e2fsck.conf.5.in.orig	2006-03-27 00:55:38.000000000 -0500
+--- e2fsck/e2fsck.conf.5.in.orig	2010-05-13 22:59:49.000000000 +0000
 +++ e2fsck/e2fsck.conf.5.in
-@@ -157,7 +157,7 @@ things out may be dangerous.)
+@@ -238,7 +238,7 @@ things out may be dangerous.)
  		}
  .SH FILES
  .TP
diff --git a/sysutils/e2fsprogs/patches/patch-an b/sysutils/e2fsprogs/patches/patch-an
index 5659acbe99a..4fcc58eaff7 100644
--- a/sysutils/e2fsprogs/patches/patch-an
+++ b/sysutils/e2fsprogs/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2007/06/20 19:51:10 jlam Exp $
+$NetBSD: patch-an,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- e2fsck/e2fsck.h.orig	2006-03-18 21:33:55.000000000 -0500
+--- e2fsck/e2fsck.h.orig	2010-05-13 22:59:49.000000000 +0000
 +++ e2fsck/e2fsck.h
-@@ -58,6 +58,10 @@
+@@ -61,6 +61,10 @@
  #define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural))
  #endif
  
diff --git a/sysutils/e2fsprogs/patches/patch-ao b/sysutils/e2fsprogs/patches/patch-ao
index bd02fa4f549..d4069ebf8ac 100644
--- a/sysutils/e2fsprogs/patches/patch-ao
+++ b/sysutils/e2fsprogs/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2007/06/20 19:51:10 jlam Exp $
+$NetBSD: patch-ao,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- lib/blkid/blkidP.h.orig	2006-02-20 14:16:42.000000000 -0500
+--- lib/blkid/blkidP.h.orig	2009-08-13 01:39:57.000000000 +0000
 +++ lib/blkid/blkidP.h
 @@ -104,7 +104,11 @@ struct blkid_struct_cache
  extern char *blkid_strdup(const char *s);
@@ -12,6 +12,6 @@ $NetBSD: patch-ao,v 1.1 2007/06/20 19:51:10 jlam Exp $
 +#endif
 +
 +#define BLKID_CACHE_FILE ETC_DIR "/blkid.tab"
- extern const char *blkid_devdirs[];
  
  #define BLKID_ERR_IO	 5
+ #define BLKID_ERR_PROC	 9
diff --git a/sysutils/e2fsprogs/patches/patch-ap b/sysutils/e2fsprogs/patches/patch-ap
index 842ac2caf88..7fe11de5ccb 100644
--- a/sysutils/e2fsprogs/patches/patch-ap
+++ b/sysutils/e2fsprogs/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.1 2007/06/20 19:51:10 jlam Exp $
+$NetBSD: patch-ap,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- lib/blkid/libblkid.3.in.orig	2005-09-06 05:40:14.000000000 -0400
+--- lib/blkid/libblkid.3.in.orig	2009-08-13 01:39:57.000000000 +0000
 +++ lib/blkid/libblkid.3.in
 @@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
  specific block device names into configuration files.
@@ -11,12 +11,12 @@ $NetBSD: patch-ap,v 1.1 2007/06/20 19:51:10 jlam Exp $
  and is verified to still be valid before being returned to the user
  (if the user has read permission on the raw block device, otherwise not).
  The cache file also allows unprivileged users (normally anyone other
-@@ -49,7 +49,7 @@ was written by Andreas Dilger for the ex
+@@ -51,7 +51,7 @@ was written by Andreas Dilger for the ex
  from Ted Ts'o.  The library was subsequently heavily modified by Ted Ts'o.
  .SH FILES
  .TP
--.I /etc/blkid.tab 
-+.I @root_sysconfdir@/blkid.tab 
+-.I /etc/blkid.tab
++.I @root_sysconfdir@/blkid.tab
  Caches data extracted from each recognized block device.
  .SH AVAILABILITY
  .B libblkid
diff --git a/sysutils/e2fsprogs/patches/patch-ar b/sysutils/e2fsprogs/patches/patch-ar
index 704028f4502..eecd4fd24ec 100644
--- a/sysutils/e2fsprogs/patches/patch-ar
+++ b/sysutils/e2fsprogs/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.1 2007/06/20 19:51:11 jlam Exp $
+$NetBSD: patch-ar,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- misc/blkid.8.in.orig	2005-09-06 05:40:14.000000000 -0400
+--- misc/blkid.8.in.orig	2009-08-13 01:39:57.000000000 +0000
 +++ misc/blkid.8.in
 @@ -55,7 +55,7 @@ more devices.
  Read from
@@ -10,8 +10,8 @@ $NetBSD: patch-ar,v 1.1 2007/06/20 19:51:11 jlam Exp $
 +.IR @root_sysconfdir@/blkid.tab .
  If you want to start with a clean cache (i.e. don't report devices previously
  scanned but not necessarily available at this time), specify
- .IR /dev/null.
-@@ -139,7 +139,7 @@ Display version number and exit.
+ .IR /dev/null .
+@@ -133,7 +133,7 @@ Display version number and exit.
  Write the device cache to
  .I writecachefile
  instead of writing it to the default cache file
diff --git a/sysutils/e2fsprogs/patches/patch-as b/sysutils/e2fsprogs/patches/patch-as
index bb632899e68..c0ae661f922 100644
--- a/sysutils/e2fsprogs/patches/patch-as
+++ b/sysutils/e2fsprogs/patches/patch-as
@@ -1,11 +1,11 @@
-$NetBSD: patch-as,v 1.2 2008/03/07 22:40:29 tron Exp $
+$NetBSD: patch-as,v 1.3 2010/12/23 06:34:50 ryoon Exp $
 
---- misc/blkid.c.orig	2008-02-19 04:33:10.000000000 +0000
-+++ misc/blkid.c	2008-03-07 20:19:07.000000000 +0000
-@@ -40,7 +40,7 @@
+--- misc/blkid.c.orig	2009-08-13 01:39:57.000000000 +0000
++++ misc/blkid.c
+@@ -52,7 +52,7 @@ static void usage(int error)
  	fprintf(out,
- 		"usage:\t%s [-c <file>] [-ghl] [-o format] "
- 		"[-s <tag>] [-t <token>]\n    [-v] [-w <file>] [dev ...]\n"
+ 		"usage:\t%s [-c <file>] [-ghlLv] [-o format] "
+ 		"[-s <tag>] [-t <token>]\n    [-w <file>] [dev ...]\n"
 -		"\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
 +		"\t-c\tcache file (default: "  ROOT_SYSCONFDIR "/blkid.tab, /dev/null = none)\n"
  		"\t-h\tprint this usage message and exit\n"
diff --git a/sysutils/e2fsprogs/patches/patch-at b/sysutils/e2fsprogs/patches/patch-at
index c772bd02548..03403f6fed0 100644
--- a/sysutils/e2fsprogs/patches/patch-at
+++ b/sysutils/e2fsprogs/patches/patch-at
@@ -1,22 +1,46 @@
-$NetBSD: patch-at,v 1.1 2007/06/20 19:51:11 jlam Exp $
+$NetBSD: patch-at,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- misc/mke2fs.8.in.orig	2006-05-28 21:39:03.000000000 -0400
+--- misc/mke2fs.8.in.orig	2010-02-06 03:51:19.000000000 +0000
 +++ misc/mke2fs.8.in
-@@ -347,7 +347,7 @@ enabled by default are specified by the
+@@ -159,7 +159,7 @@ option was specified.
+ .PP
+ The defaults of the parameters for the newly created filesystem, if not
+ overridden by the options listed below, are controlled by the
+-.B /etc/mke2fs.conf
++.B @root_sysconfdir@/mke2fs.conf
+ configuration file.  See the
+ .BR mke2fs.conf (5)
+ manual page for more details.
+@@ -445,7 +445,7 @@ enabled by default are specified by the
  relation, either in the
- .I [libdefaults]
+ .I [defaults]
  section in the
 -.B /etc/mke2fs.conf
 +.B @root_sysconfdir@/mke2fs.conf
- configuration file, or in the subsection of the 
+ configuration file,
+ or in the
  .I [fs_types]
- section for the filesystem type as specified by the
-@@ -441,7 +441,7 @@ Specify how the filesystem is going to b
- .B mke2fs 
- can choose optimal filesystem parameters for that use.  The filesystem
- types that are can be supported are defined in the configuration file 
+@@ -578,12 +578,12 @@ If this option is not specified,
+ will pick a default either via how
+ the command was run (for example, using a name of the form mkfs.ext2,
+ mkfs.ext3, etc.) or via a default as defined by the
+-.BR /etc/mke2fs.conf (5)
++.BR @root_sysconfdir@/mke2fs.conf (5)
+ file.   This option controls which filesystem options are used by
+ default, based on the
+ .B fstypes
+ configuration stanza in
+-.BR /etc/mke2fs.conf (5).
++.BR @root_sysconfdir@/mke2fs.conf (5).
+ .sp
+ If the
+ .B \-O
+@@ -602,7 +602,7 @@ Specify how the filesystem is going to b
+ .B mke2fs
+ can choose optimal filesystem parameters for that use.  The usage
+ types that are supported are defined in the configuration file
 -.BR /etc/mke2fs.conf (5).
 +.BR @root_sysconfdir@/mke2fs.conf (5).
- The default configuration file contains definitions for the filesystem
- types: small, floppy, news, largefile, and largefile4.  
- .TP
+ The user may specify one or more usage types
+ using a comma separated list.
+ .sp
diff --git a/sysutils/e2fsprogs/patches/patch-av b/sysutils/e2fsprogs/patches/patch-av
index b444887eac8..0b28000b894 100644
--- a/sysutils/e2fsprogs/patches/patch-av
+++ b/sysutils/e2fsprogs/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.1 2007/06/20 19:51:12 jlam Exp $
+$NetBSD: patch-av,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- misc/mke2fs.conf.5.in.orig	2006-05-22 17:50:10.000000000 -0400
+--- misc/mke2fs.conf.5.in.orig	2009-08-13 01:39:57.000000000 +0000
 +++ misc/mke2fs.conf.5.in
-@@ -183,7 +183,7 @@ This relation specifies the default inod
- specify one on the command line.
+@@ -354,7 +354,7 @@ by
+ on a per-filesystem type basis.
  .SH FILES
  .TP
 -.I /etc/mke2fs.conf
diff --git a/sysutils/e2fsprogs/patches/patch-aw b/sysutils/e2fsprogs/patches/patch-aw
index 1d9c91e4673..34d58454c7d 100644
--- a/sysutils/e2fsprogs/patches/patch-aw
+++ b/sysutils/e2fsprogs/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1 2007/06/20 19:51:12 jlam Exp $
+$NetBSD: patch-aw,v 1.2 2010/12/23 06:34:50 ryoon Exp $
 
---- doc/Makefile.in.orig	2005-09-06 05:40:13.000000000 -0400
+--- doc/Makefile.in.orig	2010-02-10 23:16:03.000000000 +0000
 +++ doc/Makefile.in
-@@ -26,8 +26,6 @@ install-doc-libs:
+@@ -26,8 +26,6 @@ install-doc-libs: libext2fs.info libext2
  		echo "	INSTALL_DATA $(infodir)/$$i" ; \
  		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
  	done
--	@echo "	GZIP $(infodir)/libext2fs.info*"
--	@gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+-	$(E) "	GZIP $(infodir)/libext2fs.info*"
+-	-$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
  
  uninstall-doc-libs:
  	$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*