Update "e2fsprogs" to version 1.40.7. Changes since version 1.39:

- a lot of bug fixes
- security fix for CVE-2007-5497
- uuid support

6 files changed, 38 insertions, 141 deletions

diff --git a/sysutils/e2fsprogs/patches/patch-aa b/sysutils/e2fsprogs/patches/patch-aa
index 476e4aaa0d1..da57592fde7 100644
--- a/sysutils/e2fsprogs/patches/patch-aa
+++ b/sysutils/e2fsprogs/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2008/03/07 22:40:29 tron Exp $
 
---- e2fsck/unix.c.orig	2006-03-19 20:31:06.000000000 -0500
-+++ e2fsck/unix.c
-@@ -173,7 +173,7 @@ static void check_mount(e2fsck_t ctx)
- 	retval = ext2fs_check_if_mounted(ctx->filesystem_name,
- 					 &ctx->mount_flags);
- 	if (retval) {
--		com_err("ext2fs_check_if_mount", retval,
-+		com_err("ext2fs_check_if_mounted", retval,
- 			_("while determining whether %s is mounted."),
- 			ctx->filesystem_name);
- 		return;
-@@ -568,7 +568,7 @@ static void syntax_err_report(const char
- 	exit(FSCK_ERROR);
- }
- 
--static const char *config_fn[] = { "/etc/e2fsck.conf", 0 };
-+static const char *config_fn[] = { ETC_DIR "/e2fsck.conf", 0 };
- 
- static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
- {
+--- 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 1a134399073..3873e6302a5 100644
--- a/sysutils/e2fsprogs/patches/patch-af
+++ b/sysutils/e2fsprogs/patches/patch-af
@@ -1,39 +1,17 @@
-$NetBSD: patch-af,v 1.5 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: patch-af,v 1.6 2008/03/07 22:40:29 tron Exp $
 
---- lib/ext2fs/ismounted.c.orig	2005-09-06 05:40:14.000000000 -0400
-+++ lib/ext2fs/ismounted.c
-@@ -29,7 +29,11 @@
- #include <sys/mount.h>
- #endif /* HAVE_GETMNTINFO */
- #include <string.h>
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
-+#include <sys/statvfs.h>
-+#else
- #include <sys/stat.h>
-+#endif
- 
- #include "ext2_fs.h"
- #include "ext2fs.h"
-@@ -196,7 +200,11 @@ static errcode_t check_mntent(const char
+--- 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 @@
  static errcode_t check_getmntinfo(const char *file, int *mount_flags,
  				  char *mtpt, int mtlen)
  {
+-	struct statfs *mp;
 +#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
-+	struct statvfs *mp;
++        struct statvfs *mp;
 +#else
- 	struct statfs *mp;
++        struct statfs *mp;
 +#endif
          int    len, n;
          const  char   *s1;
  	char	*s2;
-@@ -325,9 +333,9 @@ errcode_t ext2fs_check_mount_point(const
- 			*mount_flags |= EXT2_MF_BUSY;
- 	} else
- 		close(fd);
-+#endif
- 
- 	return 0;
--#endif
- }
- 
- /*
diff --git a/sysutils/e2fsprogs/patches/patch-al b/sysutils/e2fsprogs/patches/patch-al
index b89d07c2dc5..1807d3e932b 100644
--- a/sysutils/e2fsprogs/patches/patch-al
+++ b/sysutils/e2fsprogs/patches/patch-al
@@ -1,13 +1,14 @@
-$NetBSD: patch-al,v 1.1 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: patch-al,v 1.2 2008/03/07 22:40:29 tron Exp $
 
---- MCONFIG.in.orig	2006-03-22 20:19:19.000000000 -0500
-+++ MCONFIG.in
-@@ -33,7 +33,7 @@ datadir = @datadir@
+--- 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 @@
+  *
+  */
  
- CC = @CC@
- BUILD_CC = @BUILD_CC@
--DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-+DEFS = -DLOCALEDIR=\"$(localedir)\" -DETC_DIR=\"$(root_sysconfdir)\" @DEFS@
- CFLAGS = @CFLAGS@
- CPPFLAGS =  -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
- INTL_FLAGS = @INTL_FLAGS@
+-#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-aq b/sysutils/e2fsprogs/patches/patch-aq
deleted file mode 100644
index 3450720a885..00000000000
--- a/sysutils/e2fsprogs/patches/patch-aq
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2007/06/20 19:51:10 jlam Exp $
-
---- misc/Makefile.in.orig	2006-03-27 00:58:10.000000000 -0500
-+++ misc/Makefile.in
-@@ -228,7 +228,7 @@ installdirs:
- 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
- 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
- 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
--		$(DESTDIR)$(libdir) $(DESTDIR)/etc
-+		$(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)
- 
- install: all $(SMANPAGES) $(UMANPAGES) installdirs
- 	@for i in $(SPROGS); do \
-@@ -288,10 +288,10 @@ install: all $(SMANPAGES) $(UMANPAGES) i
- 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
- 	done
--	@if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
--		echo "	INSTALL_DATA /etc/mke2fs.conf"; \
-+	@if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
-+		echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
- 		$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
--			$(DESTDIR)/etc/mke2fs.conf; \
-+			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
- 	fi
- 
- install-strip: install
-@@ -336,8 +336,8 @@ uninstall:
- 	for i in $(FMANPAGES); do \
- 		$(RM) -f $(DESTDIR)$(man5dir)/$$i; \
- 	done
--	if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)/etc/mke2fs.conf; then \
--		$(RM) $(DESTDIR)/etc/mke2fs.conf; \
-+	if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
-+		$(RM) $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
- 	fi
- 
- clean:
diff --git a/sysutils/e2fsprogs/patches/patch-as b/sysutils/e2fsprogs/patches/patch-as
index 34e8a06714f..bb632899e68 100644
--- a/sysutils/e2fsprogs/patches/patch-as
+++ b/sysutils/e2fsprogs/patches/patch-as
@@ -1,24 +1,13 @@
-$NetBSD: patch-as,v 1.1 2007/06/20 19:51:11 jlam Exp $
+$NetBSD: patch-as,v 1.2 2008/03/07 22:40:29 tron Exp $
 
---- misc/blkid.c.orig	2005-09-06 05:40:14.000000000 -0400
-+++ misc/blkid.c
-@@ -24,6 +24,10 @@ extern int optind;
- 
- #include "blkid/blkid.h"
- 
-+#ifndef ETC_DIR
-+#define ETC_DIR "/etc"		/* Where to find the config file */
-+#endif
-+
- const char *progname = "blkid";
- 
- static void print_version(FILE *out)
-@@ -39,7 +43,7 @@ static void usage(int error)
+--- 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 @@
  	fprintf(out,
- 		"usage:\t%s [-c <file>] [-hl] [-o format] "
+ 		"usage:\t%s [-c <file>] [-ghl] [-o format] "
  		"[-s <tag>] [-t <token>]\n    [-v] [-w <file>] [dev ...]\n"
 -		"\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
-+		"\t-c\tcache file (default: " ETC_DIR "/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"
+ 		"\t-g\tgarbage collect the blkid cache\n"
  		"\t-s\tshow specified tag(s) (default show all tags)\n"
- 		"\t-t\tfind device with a specific token (NAME=value pair)\n"
diff --git a/sysutils/e2fsprogs/patches/patch-au b/sysutils/e2fsprogs/patches/patch-au
deleted file mode 100644
index 0d7edc224f6..00000000000
--- a/sysutils/e2fsprogs/patches/patch-au
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-au,v 1.1 2007/06/20 19:51:11 jlam Exp $
-
---- misc/mke2fs.c.orig	2006-05-13 09:16:57.000000000 -0400
-+++ misc/mke2fs.c
-@@ -61,6 +61,10 @@ extern int optind;
- #define ZAP_BOOTBLOCK
- #endif
- 
-+#ifndef ETC_DIR
-+#define ETC_DIR "/etc"		/* Where to find the config file */
-+#endif
-+
- extern int isatty(int);
- extern FILE *fpopen(const char *cmd, const char *mode);
- 
-@@ -870,7 +874,7 @@ static void syntax_err_report(const char
- 	exit(1);
- }
- 
--static const char *config_fn[] = { "/etc/mke2fs.conf", 0 };
-+static const char *config_fn[] = { ETC_DIR "/mke2fs.conf", 0 };
- 
- static void edit_feature(const char *str, __u32 *compat_array) 
- {