diff options
| author | obache <obache@pkgsrc.org> | 2011-01-01 12:42:28 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2011-01-01 12:42:28 +0000 |
| commit | 381fd959cbc449b40f51ebef6c981eb0a52c1814 (patch) | |
| tree | eb5a5c888887f149dd04b5a09733577995809a8d /net/aoe-vblade | |
| parent | c5f89e104b7bab04fe62d1b75e72d924452468e2 (diff) | |
| download | pkgsrc-381fd959cbc449b40f51ebef6c981eb0a52c1814.tar.gz | |
Fixes for DragonFly-2.8.2.
Diffstat (limited to 'net/aoe-vblade')
| -rw-r--r-- | net/aoe-vblade/distinfo | 4 | ||||
| -rw-r--r-- | net/aoe-vblade/patches/patch-aa | 27 |
2 files changed, 27 insertions, 4 deletions
diff --git a/net/aoe-vblade/distinfo b/net/aoe-vblade/distinfo index 9b95fea2efe..21ec700a0f1 100644 --- a/net/aoe-vblade/distinfo +++ b/net/aoe-vblade/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2007/03/31 13:36:27 obache Exp $ +$NetBSD: distinfo,v 1.4 2011/01/01 12:42:28 obache Exp $ SHA1 (vblade-14.tgz) = 57bea505f3acb88f03f761954eea0759a0241e3f RMD160 (vblade-14.tgz) = ad0fe6f0c4ab40fa31daa68c7b14143ad87f443c Size (vblade-14.tgz) = 20317 bytes -SHA1 (patch-aa) = 0de85d0d4af15f874e17420ca70136a01955c87a +SHA1 (patch-aa) = fe40105ed835cb54a23edb4861024f1d16ef1116 SHA1 (patch-ab) = b7ab4ac144f885d9198d1efacd2089c7f4dcfb33 diff --git a/net/aoe-vblade/patches/patch-aa b/net/aoe-vblade/patches/patch-aa index 60c44162eb0..d14a1d69b5c 100644 --- a/net/aoe-vblade/patches/patch-aa +++ b/net/aoe-vblade/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2007/03/31 13:36:27 obache Exp $ +$NetBSD: patch-aa,v 1.3 2011/01/01 12:42:28 obache Exp $ --- freebsd.c.orig 2006-11-13 18:57:34.000000000 +0000 +++ freebsd.c @@ -15,9 +15,13 @@ $NetBSD: patch-aa,v 1.2 2007/03/31 13:36:27 obache Exp $ #include <net/bpf.h> #include <net/if.h> #include <net/if_arp.h> -@@ -27,6 +32,9 @@ +@@ -26,7 +31,13 @@ + #include <net/if.h> #include <sys/stat.h> #include <sys/disklabel.h> ++#ifdef __DragonFly__ ++#include <sys/disklabel32.h> ++#endif #include <sys/select.h> +#ifdef __NetBSD__ +#include <sys/param.h> @@ -25,3 +29,22 @@ $NetBSD: patch-aa,v 1.2 2007/03/31 13:36:27 obache Exp $ #include <sys/sysctl.h> #include <fcntl.h> +@@ -302,10 +313,18 @@ getsize(int fd) + vlong size; + struct stat s; + int n; ++#ifdef __DragonFly__ ++ struct disklabel32 lab; ++#else + struct disklabel lab; ++#endif + + // Try getting disklabel from block dev ++#ifdef __DragonFly__ ++ if ((n = ioctl(fd, DIOCGDINFO32, lab)) != -1) { ++#else + if ((n = ioctl(fd, DIOCGDINFO, lab)) != -1) { ++#endif + size = lab.d_secsize * lab.d_secperunit; + } else { + // must not be a block special dev |