Patches for changes in DragonFly's disklabel structure.

From PR 39585.

3 files changed, 69 insertions, 1 deletions

diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index d9ba9fbef8c..0b8e978fea1 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.14 2008/03/07 22:40:29 tron Exp $
+$NetBSD: distinfo,v 1.15 2008/09/21 16:16:06 joerg 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 (patch-ab) = f18d86265be543bab68813200fb49099ad8af909
+SHA1 (patch-ac) = 8f47354ee719d4b933eccc8c8f0a0c7fb7b0feff
 SHA1 (patch-af) = c2c8b373fcba36f031005d364c0de2fbae97106f
 SHA1 (patch-al) = e976de195735cf1f96aaceff1b978b1be405dfc9
 SHA1 (patch-am) = 05a547a48b02d267e200d6161e982e5cf1226d3b
diff --git a/sysutils/e2fsprogs/patches/patch-ab b/sysutils/e2fsprogs/patches/patch-ab
new file mode 100644
index 00000000000..d379df92bcd
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.3 2008/09/21 16:16:06 joerg Exp $
+
+--- lib/ext2fs/getsize.c.orig	2007-06-30 15:58:34 +0300
++++ lib/ext2fs/getsize.c
+@@ -32,6 +32,9 @@
+ #ifdef HAVE_SYS_DISKLABEL_H
+ #include <sys/disklabel.h>
+ #endif
++#ifdef __DragonFly__
++#include <sys/disklabel32.h>
++#endif
+ #ifdef HAVE_SYS_DISK_H
+ #ifdef HAVE_SYS_QUEUE_H
+ #include <sys/queue.h> /* for LIST_HEAD */
+@@ -154,7 +157,11 @@ errcode_t ext2fs_get_device_size(const c
+ #endif
+ #ifdef HAVE_SYS_DISKLABEL_H
+ 	int part;
++#ifdef __DragonFly__
++	struct disklabel32 lab;
++#else
+ 	struct disklabel lab;
++#endif
+ 	struct partition *pp;
+ 	char ch;
+ #endif /* HAVE_SYS_DISKLABEL_H */
diff --git a/sysutils/e2fsprogs/patches/patch-ac b/sysutils/e2fsprogs/patches/patch-ac
new file mode 100644
index 00000000000..ead7746cc25
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.3 2008/09/21 16:16:06 joerg Exp $
+
+--- lib/blkid/getsize.c.orig	2008-06-30 00:05:45 +0300
++++ lib/blkid/getsize.c
+@@ -32,6 +32,9 @@
+ #ifdef HAVE_SYS_DISKLABEL_H
+ #include <sys/disklabel.h>
+ #endif
++#ifdef __DragonFly__
++#include <sys/disklabel32.h>
++#endif
+ #ifdef HAVE_SYS_DISK_H
+ #ifdef HAVE_SYS_QUEUE_H
+ #include <sys/queue.h> /* for LIST_HEAD */
+@@ -86,8 +89,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ #endif
+ #ifdef HAVE_SYS_DISKLABEL_H
+ 	int part = -1;
++#ifdef __DragonFly__
++	struct disklabel32 lab;
++	struct partition32 *pp;
++#else
+ 	struct disklabel lab;
+ 	struct partition *pp;
++#endif
+ 	char ch;
+ 	struct stat st;
+ #endif /* HAVE_SYS_DISKLABEL_H */
+@@ -144,7 +152,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ 	 */
+ 	if ((fstat(fd, &st) >= 0) && (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
+ 		part = st.st_rdev & 7;
++#ifdef __DragonFly__
++	if (part >= 0 && (ioctl(fd, DIOCGDINFO32, (char *)&lab) >= 0)) {
++#else
+ 	if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
++#endif
+ 		pp = &lab.d_partitions[part];
+ 		if (pp->p_size)
+ 			return pp->p_size << 9;