9 files changed, 36 insertions, 150 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 0bd5e78b6ebe..839aeb605998 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.27
+PORTVERSION=	1.32
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="-Derrcode_t=long"
 
 MAN1=	chattr.1 lsattr.1 uuidgen.1
 MAN8=	badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 fsck.8 \
-	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
+	findfs.8 mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
 	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8
 
 post-patch:
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 733829b77aba..6dc2e5a53c11 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1 +1 @@
-MD5 (e2fsprogs-1.27.tar.gz) = 485b43875becc98dd11ac4c2a30dd734
+MD5 (e2fsprogs-1.32.tar.gz) = a7ced9d6edaba3a000ccc5200e09b90d
diff --git a/sysutils/e2fsprogs/files/patch-MCONFIG.in b/sysutils/e2fsprogs/files/patch-MCONFIG.in
index 293447620344..334c5011510d 100644
--- a/sysutils/e2fsprogs/files/patch-MCONFIG.in
+++ b/sysutils/e2fsprogs/files/patch-MCONFIG.in
@@ -1,20 +1,12 @@
---- MCONFIG.in.orig	Mon Feb 25 05:03:57 2002
-+++ MCONFIG.in	Sun Aug  4 15:15:37 2002
-@@ -57,14 +57,14 @@
- #
- LIB = $(top_builddir)/lib
- LIBSS = $(LIB)/libss@LIB_EXT@
+$FreeBSD$
+
+--- MCONFIG.in.orig	Thu Oct 31 00:49:21 2002
++++ MCONFIG.in	Wed Aug 27 20:00:17 2003
+@@ -64 +64 @@
 -LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
 +LIBCOM_ERR = /usr/lib/libcom_err.so
- LIBE2P = $(LIB)/libe2p@LIB_EXT@
- LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
- LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ 
- DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
- 
+@@ -70,2 +70,2 @@
 -STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
 -STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
 +STATIC_LIBSS = STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
 +STATIC_LIBCOM_ERR = /usr/lib/libcom_err.a
- STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
- STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
- STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
diff --git a/sysutils/e2fsprogs/files/patch-Makefile.in b/sysutils/e2fsprogs/files/patch-Makefile.in
index 51c7fdbe0037..25aac1b5adcf 100644
--- a/sysutils/e2fsprogs/files/patch-Makefile.in
+++ b/sysutils/e2fsprogs/files/patch-Makefile.in
@@ -1,18 +1,7 @@
-
 $FreeBSD$
 
---- Makefile.in.orig	Sat Jun 23 07:25:59 2001
-+++ Makefile.in	Tue Jul  3 18:51:42 2001
-@@ -10,9 +10,9 @@
- @RESIZER_CMT@RESIZE_DIR= resize
- @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
- 
--LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid # lib/finddev
--PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs 
--SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
-+LIB_SUBDIRS=lib/e2p lib/ext2fs lib/uuid # lib/finddev
-+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR)
-+SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS)
- 
- SUBS= lib/ext2fs/ext2_types.h
- 
+--- Makefile.in.orig	Wed Jul 23 06:08:04 2003
++++ Makefile.in	Wed Aug 27 10:52:04 2003
+@@ -14 +14 @@
+-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl
++LIB_SUBDIRS=              lib/e2p lib/ext2fs lib/uuid lib/blkid intl
diff --git a/sysutils/e2fsprogs/files/patch-intl%Makefile.in b/sysutils/e2fsprogs/files/patch-intl%Makefile.in
new file mode 100644
index 000000000000..bbefa2df6c71
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-intl%Makefile.in
@@ -0,0 +1,10 @@
+$FreeBSD$
+
+--- intl/Makefile.in.orig	Sun Feb 24 13:03:59 2002
++++ intl/Makefile.in	Sun Aug 31 02:58:10 2003
+@@ -142,4 +142,5 @@
+ # Define this as empty until I found a useful application.
+ installcheck:
++install-shlibs:
+ 
+ uninstall:
diff --git a/sysutils/e2fsprogs/files/patch-lib::ext2fs::Makefile.in b/sysutils/e2fsprogs/files/patch-lib::ext2fs::Makefile.in
index ac516f420cea..b9301f5124d4 100644
--- a/sysutils/e2fsprogs/files/patch-lib::ext2fs::Makefile.in
+++ b/sysutils/e2fsprogs/files/patch-lib::ext2fs::Makefile.in
@@ -1,14 +1,5 @@
-
-$FreeBSD$
-
---- lib/ext2fs/Makefile.in	2001/07/03 15:30:54	1.1
-+++ lib/ext2fs/Makefile.in	2001/07/03 15:31:07
-@@ -156,7 +156,7 @@
- @ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
- @BSDLIB_CMT@	$(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
- 
--COMPILE_ET=../et/compile_et
+--- lib/ext2fs/Makefile.in.orig	Wed Jul 23 06:53:05 2003
++++ lib/ext2fs/Makefile.in	Thu Aug 28 09:58:57 2003
+@@ -173 +173 @@
+-COMPILE_ET=../et/compile_et --build-tree
 +COMPILE_ET=compile_et
- 
- DISTFILES= Makefile *.c *.h image
- 
diff --git a/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c b/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c
deleted file mode 100644
index 198b3ae4179a..000000000000
--- a/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c
+++ /dev/null
@@ -1,104 +0,0 @@
---- lib/ext2fs/ismounted.c.orig	Mon Feb 25 05:03:59 2002
-+++ lib/ext2fs/ismounted.c	Sun Aug  4 02:51:39 2002
-@@ -146,50 +146,6 @@
- 	return retval;
- }
- 
--/*
-- * Check to see if we're dealing with the swap device.
-- */
--static int is_swap_device(const char *file)
--{
--	FILE		*f;
--	char		buf[1024], *cp;
--	dev_t		file_dev;
--	struct stat	st_buf;
--	int		ret = 0;
--
--	file_dev = 0;
--#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
--	if (stat(file, &st_buf) == 0)
--		file_dev = st_buf.st_rdev;
--#endif	
--
--	if (!(f = fopen("/proc/swaps", "r")))
--		return 0;
--	/* Skip the first line */
--	fgets(buf, sizeof(buf), f);
--	while (!feof(f)) {
--		if (!fgets(buf, sizeof(buf), f))
--			break;
--		if ((cp = strchr(buf, ' ')) != NULL)
--			*cp = 0;
--		if ((cp = strchr(buf, '\t')) != NULL)
--			*cp = 0;
--		if (strcmp(buf, file) == 0) {
--			ret++;
--			break;
--		}
--#ifndef __GNU__
--		if (file_dev && (stat(buf, &st_buf) == 0) &&
--		    file_dev == st_buf.st_rdev) {
--			ret++;
--			break;
--		}
--#endif
--	}
--	fclose(f);
--	return ret;
--}
--
- static errcode_t check_mntent(const char *file, int *mount_flags,
- 			      char *mtpt, int mtlen)
- {
-@@ -248,6 +204,50 @@
- 	return 0;
- }
- #endif /* HAVE_GETMNTINFO */
-+
-+/*
-+ * Check to see if we're dealing with the swap device.
-+ */
-+static int is_swap_device(const char *file)
-+{
-+	FILE		*f;
-+	char		buf[1024], *cp;
-+	dev_t		file_dev;
-+	struct stat	st_buf;
-+	int		ret = 0;
-+
-+	file_dev = 0;
-+#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
-+	if (stat(file, &st_buf) == 0)
-+		file_dev = st_buf.st_rdev;
-+#endif	
-+
-+	if (!(f = fopen("/proc/swaps", "r")))
-+		return 0;
-+	/* Skip the first line */
-+	fgets(buf, sizeof(buf), f);
-+	while (!feof(f)) {
-+		if (!fgets(buf, sizeof(buf), f))
-+			break;
-+		if ((cp = strchr(buf, ' ')) != NULL)
-+			*cp = 0;
-+		if ((cp = strchr(buf, '\t')) != NULL)
-+			*cp = 0;
-+		if (strcmp(buf, file) == 0) {
-+			ret++;
-+			break;
-+		}
-+#ifndef __GNU__
-+		if (file_dev && (stat(buf, &st_buf) == 0) &&
-+		    file_dev == st_buf.st_rdev) {
-+			ret++;
-+			break;
-+		}
-+#endif
-+	}
-+	fclose(f);
-+	return ret;
-+}
- 
- /*
-  * ext2fs_check_mount_point() returns 1 if the device is mounted, 0
diff --git a/sysutils/e2fsprogs/files/patch-pass1.c b/sysutils/e2fsprogs/files/patch-pass1.c
new file mode 100644
index 000000000000..f691105ad724
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-pass1.c
@@ -0,0 +1,7 @@
+$FreeBSD$
+
+--- e2fsck/pass1.c.orig	Wed Aug 27 19:59:14 2003
++++ e2fsck/pass1.c	Wed Aug 27 19:59:19 2003
+@@ -165 +165 @@
+-static int strnlen(const char * s, int count)
++int strnlen(const char * s, int count)
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index 15dd4d1090ac..addc3f947ce5 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -36,6 +36,7 @@ sbin/dumpe2fs
 sbin/e2fsck
 sbin/e2image
 sbin/e2label
+sbin/findfs
 sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3