Fix errno. Fix dirent calculation on DragonFly.

6 files changed, 70 insertions, 1 deletions

diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index b49ff854f33..2d8c994ccea 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/09/08 22:28:03 abs Exp $
+$NetBSD: distinfo,v 1.9 2006/01/13 18:14:54 joerg Exp $
 
 SHA1 (e2fsprogs-1.32.tar.gz) = 409bbdbc48b5f8ec5006e283962d8432d971d51f
 RMD160 (e2fsprogs-1.32.tar.gz) = eeaaee7dd9eb202a9f2abccdf1f3acb65c0f216d
@@ -9,3 +9,8 @@ SHA1 (patch-ac) = 171e7e887f62831ebf8c48c6aa84cd3804f02067
 SHA1 (patch-ad) = 6aff39f1ca9ff0c43333168a190e16c4d7d98e2b
 SHA1 (patch-ae) = 85d394a64681882006854beee6826d4c6a6cd442
 SHA1 (patch-af) = dcdd61ea70b6eb322733249c9fb38d764243d6c4
+SHA1 (patch-ag) = 4afd200cd9a8a9afa429b15438e480d975312190
+SHA1 (patch-ah) = a45ffe108a40da9908bd0369c5b2d498da695a3d
+SHA1 (patch-ai) = 12880227e26dc53aa7a3d091d8b7687e26d6757f
+SHA1 (patch-aj) = 8d152b19ee4f2160f0cc1480858d0e2682b450db
+SHA1 (patch-ak) = 5b592e902dd3ac0299e91fc9451a0d70f1b1781d
diff --git a/sysutils/e2fsprogs/patches/patch-ag b/sysutils/e2fsprogs/patches/patch-ag
new file mode 100644
index 00000000000..1e9e2f6e2ce
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2006/01/13 18:14:54 joerg Exp $
+
+--- lib/e2p/fgetversion.c.orig	2006-01-13 18:03:42.000000000 +0000
++++ lib/e2p/fgetversion.c
+@@ -51,7 +51,6 @@ int fgetversion (const char * name, unsi
+ 		errno = save_errno;
+ 	return r;
+ #else /* ! HAVE_EXT2_IOCTLS */
+-	extern int errno;
+ 	errno = EOPNOTSUPP;
+ 	return -1;
+ #endif /* ! HAVE_EXT2_IOCTLS */
diff --git a/sysutils/e2fsprogs/patches/patch-ah b/sysutils/e2fsprogs/patches/patch-ah
new file mode 100644
index 00000000000..f683bac94ed
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2006/01/13 18:14:54 joerg Exp $
+
+--- lib/e2p/fsetversion.c.orig	2006-01-13 18:04:22.000000000 +0000
++++ lib/e2p/fsetversion.c
+@@ -51,7 +51,6 @@ int fsetversion (const char * name, unsi
+ 		errno = save_errno;
+ 	return r;
+ #else /* ! HAVE_EXT2_IOCTLS */
+-	extern int errno;
+ 	errno = EOPNOTSUPP;
+ 	return -1;
+ #endif /* ! HAVE_EXT2_IOCTLS */
diff --git a/sysutils/e2fsprogs/patches/patch-ai b/sysutils/e2fsprogs/patches/patch-ai
new file mode 100644
index 00000000000..c1c48ba15ff
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2006/01/13 18:14:54 joerg Exp $
+
+--- lib/e2p/getversion.c.orig	2006-01-13 18:04:55.000000000 +0000
++++ lib/e2p/getversion.c
+@@ -30,7 +30,6 @@ int getversion (int fd, unsigned long * 
+ 	*version = ver;
+ 	return 0;
+ #else /* ! HAVE_EXT2_IOCTLS */
+-	extern int errno;
+ 	errno = EOPNOTSUPP;
+ 	return -1;
+ #endif /* ! HAVE_EXT2_IOCTLS */
diff --git a/sysutils/e2fsprogs/patches/patch-aj b/sysutils/e2fsprogs/patches/patch-aj
new file mode 100644
index 00000000000..e3ca29fa735
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 2006/01/13 18:14:54 joerg Exp $
+
+--- lib/e2p/iod.c.orig	2006-01-13 18:05:23.000000000 +0000
++++ lib/e2p/iod.c
+@@ -54,7 +54,11 @@ int iterate_on_dir (const char * dir_nam
+ 		return -1;
+ 	}
+ 	while ((dep = readdir (dir))) {
++#if defined(__DragonFly__) && defined(_DIRENT_MINSIZ)
++		len = _DIRENT_MINSIZ(dep);
++#else
+ 		len = dep->d_reclen;
++#endif
+ 		if (len < (sizeof(struct dirent)))
+ 			len = sizeof(struct dirent);
+ 		if (len > max_len)
diff --git a/sysutils/e2fsprogs/patches/patch-ak b/sysutils/e2fsprogs/patches/patch-ak
new file mode 100644
index 00000000000..f4c3dd7fb60
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2006/01/13 18:14:54 joerg Exp $
+
+--- lib/e2p/setversion.c.orig	2006-01-13 18:08:12.000000000 +0000
++++ lib/e2p/setversion.c
+@@ -29,7 +29,6 @@ int setversion (int fd, unsigned long ve
+ 	ver = (int) version;
+ 	return ioctl (fd, EXT2_IOC_SETVERSION, &ver);
+ #else /* ! HAVE_EXT2_IOCTLS */
+-	extern int errno;
+ 	errno = EOPNOTSUPP;
+ 	return -1;
+ #endif /* ! HAVE_EXT2_IOCTLS */