cope with net/if.h struct changes.

This commit is contained in:
sthen 2012-11-16 17:05:13 +00:00
parent ac9bad0461
commit c4b4fc9490
4 changed files with 42 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.31 2011/11/15 23:11:55 sthen Exp $
# $OpenBSD: Makefile,v 1.32 2012/11/16 17:05:13 sthen Exp $
COMMENT-main= portable low-level networking library
COMMENT-python= python interface to libdnet
@ -7,8 +7,8 @@ MODPY_EGG_VERSION=1.12
DISTNAME= libdnet-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-python= py-${DISTNAME}
REVISION-main= 4
REVISION-python= 4
REVISION-main= 5
REVISION-python= 5
SHARED_LIBS= dnet 1.0

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_intf_c,v 1.1 2012/11/16 17:05:13 sthen Exp $
--- src/intf.c.orig Wed Nov 14 04:15:30 2012
+++ src/intf.c Wed Nov 14 04:16:33 2012
@@ -66,7 +66,13 @@
/* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
struct dnet_ifaliasreq {
char ifra_name[IFNAMSIZ];
- struct sockaddr ifra_addr;
+ union {
+ struct sockaddr ifrau_addr;
+ int ifrau_align;
+ } ifra_ifrau;
+#ifndef ifra_addr
+#define ifra_addr ifra_ifrau.ifrau_addr
+#endif
struct sockaddr ifra_brdaddr;
struct sockaddr ifra_mask;
int ifra_cookie; /* XXX - IRIX!@#$ */

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.103 2012/09/19 08:15:09 jasper Exp $
# $OpenBSD: Makefile,v 1.104 2012/11/16 17:05:13 sthen Exp $
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
@ -8,8 +8,8 @@ DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
REVISION-main= 0
REVISION-zenmap=0
REVISION-main= 1
REVISION-zenmap=1
CATEGORIES= net security
MASTER_SITES= http://nmap.org/dist/

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libdnet-stripped_src_intf_c,v 1.1 2012/11/16 17:05:13 sthen Exp $
--- libdnet-stripped/src/intf.c.orig Wed Nov 14 04:18:29 2012
+++ libdnet-stripped/src/intf.c Wed Nov 14 04:19:10 2012
@@ -76,7 +76,13 @@
/* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
struct dnet_ifaliasreq {
char ifra_name[IFNAMSIZ];
- struct sockaddr ifra_addr;
+ union {
+ struct sockaddr ifrau_addr;
+ int ifrau_align;
+ } ifra_ifrau;
+#ifndef ifra_addr
+#define ifra_addr ifra_ifrau.ifrau_addr
+#endif
struct sockaddr ifra_brdaddr;
struct sockaddr ifra_mask;
int ifra_cookie; /* XXX - IRIX!@#$ */