Update e2fsprogs to 1.32. No list of changes available.

6 files changed, 55 insertions, 22 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 34089a8da19..25a95ceea71 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/02/16 19:19:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/14 23:15:54 hubertf Exp $
 #
 
-DISTNAME=	e2fsprogs-1.19
+DISTNAME=	e2fsprogs-1.32
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} \
 		ftp://ftp.dei.uc.pt/.d4/linuxberg/files/console/system/ \
diff --git a/sysutils/e2fsprogs/PLIST.common b/sysutils/e2fsprogs/PLIST.common
index 5afc4cc6257..c174a4b285d 100644
--- a/sysutils/e2fsprogs/PLIST.common
+++ b/sysutils/e2fsprogs/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2003/02/16 19:19:56 jschauma Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2003/04/14 23:15:54 hubertf Exp $
 bin/chattr
 bin/lsattr
 bin/uuidgen
@@ -10,8 +10,14 @@ man/man8/badblocks.8
 man/man8/debugfs.8
 man/man8/dumpe2fs.8
 man/man8/e2fsck.8
+man/man8/e2image.8
 man/man8/e2label.8
+man/man8/findfs.8
+man/man8/fsck.ext2.8
+man/man8/fsck.ext3.8
 man/man8/mke2fs.8
+man/man8/mkfs.ext2.8
+man/man8/mkfs.ext3.8
 man/man8/mklost+found.8
 man/man8/resize2fs.8
 man/man8/tune2fs.8
@@ -19,11 +25,14 @@ sbin/badblocks
 sbin/debugfs
 sbin/dumpe2fs
 sbin/e2fsck
+sbin/e2image
 sbin/e2label
+sbin/findfs
 sbin/fsck.ext2
 sbin/fsck.ext3
 sbin/mke2fs
 sbin/mkfs.ext2
+sbin/mkfs.ext3
 sbin/mklost+found
 sbin/resize2fs
 sbin/tune2fs
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index d3139f86325..f9b4c852113 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/04/14 23:15:54 hubertf Exp $
 
-SHA1 (e2fsprogs-1.19.tar.gz) = a5f0c8fb7b2a232b1e20e07748a286ebb9076be0
-Size (e2fsprogs-1.19.tar.gz) = 957756 bytes
-SHA1 (patch-aa) = 6cf31cd25801b975474fccd0400fee74f1ba064d
+SHA1 (e2fsprogs-1.32.tar.gz) = 409bbdbc48b5f8ec5006e283962d8432d971d51f
+Size (e2fsprogs-1.32.tar.gz) = 2894603 bytes
+SHA1 (patch-aa) = 61561b5c12345aceee3d8b46249b805a3f97822b
+SHA1 (patch-ab) = 932d19e15eed6589e124de60c35712b32e86eb83
+SHA1 (patch-ac) = 171e7e887f62831ebf8c48c6aa84cd3804f02067
diff --git a/sysutils/e2fsprogs/patches/patch-aa b/sysutils/e2fsprogs/patches/patch-aa
index 41cecafec00..2dc5b4dc3a1 100644
--- a/sysutils/e2fsprogs/patches/patch-aa
+++ b/sysutils/e2fsprogs/patches/patch-aa
@@ -1,16 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/05 03:10:59 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2003/04/14 23:15:54 hubertf Exp $
 
---- e2fsck/journal.c.orig	Sat Aug  5 04:28:05 2000
-+++ e2fsck/journal.c	Sat Aug  5 04:29:09 2000
-@@ -59,7 +59,11 @@
- 	 * Now that it mounted cleanly, the filesystem will have been
- 	 * recovered, so we can now unmount it.
- 	 */
-+#ifdef __NetBSD__
-+	ret = unmount(device, 0);
-+#else
- 	ret = umount(device);
-+#endif
- 	if (ret)
- 		return errno;
- 	/*
+--- lib/ext2fs/flushb.c.orig    Thu Oct 31 12:17:24 2002
++++ lib/ext2fs/flushb.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/param.h>
+ #if HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
diff --git a/sysutils/e2fsprogs/patches/patch-ab b/sysutils/e2fsprogs/patches/patch-ab
new file mode 100644
index 00000000000..63985361780
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/04/14 23:15:54 hubertf Exp $
+
+--- e2fsck/journal.c.orig       Thu Apr 10 13:59:22 2003
++++ e2fsck/journal.c
+@@ -13,6 +13,8 @@
+  */
+ 
+ #ifdef HAVE_SYS_MOUNT_H
++#include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/mount.h>
+ #define MNT_FL (MS_MGC_VAL | MS_RDONLY)
+ #endif
diff --git a/sysutils/e2fsprogs/patches/patch-ac b/sysutils/e2fsprogs/patches/patch-ac
new file mode 100644
index 00000000000..326ca7233a2
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/04/14 23:15:55 hubertf Exp $
+
+--- e2fsck/pass1.c.orig	Fri Nov  8 17:37:28 2002
++++ e2fsck/pass1.c
+@@ -162,7 +162,7 @@
+  * Incredibly, libc5 doesn't appear to have strnlen.  So we have to
+  * provide our own.
+  */
+-static int strnlen(const char * s, int count)
++int strnlen(const char * s, int count)
+ {
+ 	const char *cp = s;
+