+cc chris@ to make sure he sees the nsh bits. On 2013/11/26 01:35, Jérémie Courrèges-Anglas wrote:
Ok for the diffs, but a few comments inline: > Index: devel/libgtop2/patches/patch-sysdeps_openbsd_netload_c This brings up an issue worth mentioning. The standard autoconf test for headers, AC_CHECK_HEADERS, test-compiles the header on its own, which fails with if_var.h, so HAVE_NET_IF_VAR_H doesn't get set. As this particular file is OpenBSD-only I think fixing in this way is reasonable, though it might not be good for upstream. > +++ net/wide-dhcp/patches/patch-server_getmac_c 25 Nov 2013 23:41:32 > -0000 > + #endif > ++#if defined(__OpenBSD__) > ++#include <net/if_var.h> > ++#endif > + > + #include <netinet/in.h> > ++#define _KERNEL > + #include <netinet/in_var.h> > + #include <netinet/if_ether.h> > ++#undef _KERNEL This is one of the cases that Mike mentioned needing careful checks - but we're ok because it doesn't use the ether_* functions whose prototypes are in a !_KERNEL if block. > Index: shells/nsh/patches/patch-conf_c > =================================================================== > RCS file: shells/nsh/patches/patch-conf_c > diff -N shells/nsh/patches/patch-conf_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ shells/nsh/patches/patch-conf_c 26 Nov 2013 00:05:12 -0000 > @@ -0,0 +1,11 @@ > +$OpenBSD$ > +--- conf.c.orig Tue Nov 26 01:01:40 2013 > ++++ conf.c Tue Nov 26 01:02:08 2013 > +@@ -29,6 +29,7 @@ > + #include <sys/stat.h> > + #include <sys/limits.h> > + #include <net/if.h> > ++#include <net/if_var.h> > + #include <net/if_types.h> > + #include <netinet/in.h> > + #include <netinet/if_ether.h> > Index: shells/nsh/patches/patch-if_c > =================================================================== > RCS file: shells/nsh/patches/patch-if_c > diff -N shells/nsh/patches/patch-if_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ shells/nsh/patches/patch-if_c 25 Nov 2013 23:59:13 -0000 > @@ -0,0 +1,11 @@ > +$OpenBSD$ > +--- if.c.orig Tue Nov 26 00:58:52 2013 > ++++ if.c Tue Nov 26 00:59:06 2013 > +@@ -26,6 +26,7 @@ > + #include <sys/sockio.h> > + #include <sys/ioctl.h> > + #include <net/if.h> > ++#include <net/if_var.h> > + #include <net/if_types.h> > + #include <net/if_dl.h> > + #include <net/route.h> > Index: shells/nsh/patches/patch-sysctl_c > =================================================================== > RCS file: shells/nsh/patches/patch-sysctl_c > diff -N shells/nsh/patches/patch-sysctl_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ shells/nsh/patches/patch-sysctl_c 26 Nov 2013 00:05:12 -0000 > @@ -0,0 +1,13 @@ > +$OpenBSD$ > +--- sysctl.c.orig Tue Nov 26 01:05:08 2013 > ++++ sysctl.c Tue Nov 26 01:03:56 2013 > +@@ -23,6 +23,9 @@ > + #include <sys/sysctl.h> > + #include <sys/socket.h> > + #include <net/if.h> > ++#define _KERNEL > ++#include <net/if_var.h> > ++#undef _KERNEL > + #include <net/pipex.h> > + #include <netinet/in.h> > + #include <netinet/ip_ether.h> >
