Hi,
There's going to be a minor fallout in ports regarding the change
I just did to split kernel parts of if.h to if_var.h. While most
of the software will pick up if_var.h, there will be some that'll
fail to compile. I'm attaching patches for net/ifmcstat and
security/antisniff. Please contact me if in doubt how to fix your
port!
Cheers,
Mike
Index: patches/patch-ifmcstat_c
===================================================================
RCS file: /home/ncvs/ports/net/ifmcstat/patches/patch-ifmcstat_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ifmcstat_c
--- patches/patch-ifmcstat_c 28 Oct 2013 15:07:30 -0000 1.2
+++ patches/patch-ifmcstat_c 21 Nov 2013 16:02:16 -0000
@@ -1,7 +1,30 @@
$OpenBSD: patch-ifmcstat_c,v 1.2 2013/10/28 15:07:30 naddy Exp $
--- ifmcstat.c.orig Tue Jul 21 09:47:07 2009
-+++ ifmcstat.c Mon Oct 28 14:08:14 2013
-@@ -58,6 +58,11 @@
++++ ifmcstat.c Thu Nov 21 16:38:11 2013
+@@ -40,7 +40,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <net/if.h>
+-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
++#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__OpenBSD__)
+ # include <net/if_var.h>
+ #endif
+ #include <net/if_types.h>
+@@ -50,14 +50,25 @@
+ # ifdef __FreeBSD__
+ # define KERNEL
+ # endif
++# ifdef __OpenBSD__
++# define _KERNEL
++# endif
+ # include <netinet/if_ether.h>
+ # ifdef __FreeBSD__
+ # undef KERNEL
+ # endif
++# ifdef __OpenBSD__
++# undef _KERNEL
++# endif
+ #else
# include <net/if_ether.h>
#endif
#include <netinet/in_var.h>
@@ -13,3 +36,21 @@ $OpenBSD: patch-ifmcstat_c,v 1.2 2013/10
#include <arpa/inet.h>
#include <netdb.h>
+@@ -85,7 +96,7 @@ void if6_addrlist __P((struct ifaddr *));
+ void in6_multilist __P((struct in6_multi *));
+ struct in6_multi * in6_multientry __P((struct in6_multi *));
+
+-#if !defined(__NetBSD__) && !(defined(__FreeBSD__) && __FreeBSD__ >= 3) &&
!defined(__OpenBSD__)
++#if !defined(__NetBSD__) && !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
+ #ifdef __bsdi__
+ struct ether_addr {
+ u_int8_t ether_addr_octet[6];
+@@ -369,7 +380,7 @@ in6_multilist(mc)
+ mc = in6_multientry(mc);
+ }
+
+-#if !defined(__NetBSD__) && !(defined(__FreeBSD__) && __FreeBSD__ >= 3) &&
!defined(__OpenBSD__)
++#if !defined(__NetBSD__) && !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
+ static char *
+ ether_ntoa(e)
+ struct ether_addr *e;
Index: patches/patch-includes_h
===================================================================
RCS file: /home/ncvs/ports/security/antisniff/patches/patch-includes_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-includes_h
--- patches/patch-includes_h 24 Mar 2002 08:36:33 -0000 1.1
+++ patches/patch-includes_h 21 Nov 2013 16:38:27 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-includes_h,v 1.1 2002/03/24 08:36:33 jsyn Exp $
---- includes.h.orig Mon Apr 10 23:21:13 2000
-+++ includes.h Wed May 17 14:13:46 2000
-@@ -30,7 +30,7 @@
+--- includes.h.orig Tue Apr 11 05:21:13 2000
++++ includes.h Thu Nov 21 17:05:58 2013
+@@ -30,7 +30,8 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
-
+#include <net/if.h>
++#include <net/if_var.h>
#include <netinet/if_ether.h>
#ifdef _linux_
#include "linux_flood_net.h"
-@@ -45,7 +45,6 @@
+@@ -45,7 +46,6 @@
#include <sys/sockio.h>
#endif
#include <sys/ioctl.h>
@@ -18,7 +19,14 @@ $OpenBSD: patch-includes_h,v 1.1 2002/03
#ifdef SOLARIS
#include <net/if_arp.h>
#include <sys/stropts.h>
-@@ -72,6 +71,7 @@
+@@ -67,11 +67,14 @@
+ #include <sys/dirent.h>
+ #include <net/bpf.h>
+ #include <kvm.h>
++#define _KERNEL
+ #include <netinet/in_var.h>
++#undef _KERNEL
+ #include <net/if_dl.h>
#endif
#include <arpa/nameser.h>
