update: net/olsrd

Update olsrd to the latest stable release (not listed on the project's
website but visible at http://www.olsr.org/releases/0.9/ -- pointed out by
upstream in https://lists.olsr.org/pipermail/olsr-dev/2017-May/008407.html)

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/olsrd/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 13 May 2017 22:27:20 -0000 1.28
+++ Makefile 4 Jun 2017 09:48:51 -0000
@@ -3,7 +3,7 @@
COMMENT-main= OLSR routing daemon
COMMENT-gui= OLSR routing daemon GUI

-VERSION= 0.9.0.3
+VERSION= 0.9.6.1
DISTNAME= olsrd-${VERSION}
PKGNAME-main= olsrd-${VERSION}
PKGNAME-gui= olsrd-gui-${VERSION}
@@ -41,7 +41,10 @@ NO_TEST= Yes
MODULES= devel/gettext

ALL_TARGET= build_all
-MAKE_FLAGS= DEBUG=0 CC="${CC}" OS=obsd LIBNET=1
+MAKE_FLAGS= CC="${CC}" OS=obsd LIBNET=1
+.ifdef DEBUG
+MAKE_FLAGS+= DEBUG=1
+.endif
CPPFLAGS+= "-I${PREFIX}/libnet-1.1"
FAKE_FLAGS= SBINDIR=${DESTDIR}/${PREFIX}/sbin \
ETCDIR=${DESTDIR}/${PREFIX}/share/examples/olsrd \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/olsrd/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 13 May 2017 22:27:20 -0000 1.9
+++ distinfo 4 Jun 2017 09:49:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (olsrd-0.9.0.3.tar.gz) = WdN1cMWOwlY2px1afPRGBEi+aT8B12iuNpp/ZuWAd/s=
-SIZE (olsrd-0.9.0.3.tar.gz) = 5791920
+SHA256 (olsrd-0.9.6.1.tar.gz) = y5UaXThKtIApcx+hs9109/ErU1L0LuraVLuB3ULHdFc=
+SIZE (olsrd-0.9.6.1.tar.gz) = 1104287
Index: patches/patch-Makefile_inc
===================================================================
RCS file: /cvs/ports/net/olsrd/patches/patch-Makefile_inc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_inc
--- patches/patch-Makefile_inc 17 May 2017 12:46:42 -0000 1.3
+++ patches/patch-Makefile_inc 4 Jun 2017 10:02:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_inc,v 1.3 2017/
Index: Makefile.inc
--- Makefile.inc.orig
+++ Makefile.inc
-@@ -42,12 +42,6 @@ endif
+@@ -90,13 +90,6 @@ endif
#

# programs
@@ -13,6 +13,7 @@ Index: Makefile.inc
-else
-CC ?= $(CCACHE) gcc
-endif
+-CC := $(strip $(CC))
ifeq ($(DEBUG),0)
- STRIP ?= strip
- else
+ ifeq ($(NOSTRIP),0)
+ STRIP ?= strip
Index: patches/patch-make_Makefile_obsd
===================================================================
RCS file: /cvs/ports/net/olsrd/patches/patch-make_Makefile_obsd,v
retrieving revision 1.3
diff -u -p -r1.3 patch-make_Makefile_obsd
--- patches/patch-make_Makefile_obsd 13 May 2017 22:27:20 -0000 1.3
+++ patches/patch-make_Makefile_obsd 4 Jun 2017 09:59:54 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-make_Makefile_obsd,v 1.3
Index: make/Makefile.obsd
--- make/Makefile.obsd.orig
+++ make/Makefile.obsd
-@@ -8,22 +8,24 @@ ETCDIR = /etc/olsrd
+@@ -51,22 +51,24 @@ ETCDIR = /etc/olsrd
LIBDIR = $(PREFIX)/lib
DOCDIR = $(PREFIX)/share/doc
MANDIR = $(PREFIX)/man
Index: patches/patch-src_bsd_kernel_routes_c
===================================================================
RCS file: /cvs/ports/net/olsrd/patches/patch-src_bsd_kernel_routes_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_bsd_kernel_routes_c
--- patches/patch-src_bsd_kernel_routes_c 13 May 2017 22:27:20 -0000 1.1
+++ patches/patch-src_bsd_kernel_routes_c 4 Jun 2017 09:59:54 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_bsd_kernel_routes_c,
Index: src/bsd/kernel_routes.c
--- src/bsd/kernel_routes.c.orig
+++ src/bsd/kernel_routes.c
-@@ -111,6 +111,9 @@ add_del_route(const struct rt_entry *rt, int add)
+@@ -115,6 +115,9 @@ add_del_route(const struct rt_entry *rt, int add)
rtm->rtm_flags = olsr_rt_flags(rt, add);
rtm->rtm_pid = OLSR_PID;
rtm->rtm_seq = ++seq;
@@ -13,7 +13,7 @@ Index: src/bsd/kernel_routes.c

/* walk to the end of the header */
walker = buff + sizeof(struct rt_msghdr);
-@@ -222,14 +225,31 @@ add_del_route(const struct rt_entry *rt, int add)
+@@ -226,14 +229,24 @@ add_del_route(const struct rt_entry *rt, int add)
drtm->rtm_version = RTM_VERSION;
drtm->rtm_type = RTM_DELETE;
drtm->rtm_index = 0;
@@ -29,13 +29,6 @@ Index: src/bsd/kernel_routes.c
memcpy(walker, &sin4, sizeof(sin4));
walker += sin_size;
drtm->rtm_addrs = RTA_DST;
-+ if (0 != (drtm->rtm_flags & RTF_GATEWAY)) {
-+ nexthop = &rt->rt_nexthop;
-+ sin4.sin_addr = nexthop->gateway.v4;
-+ memcpy(walker, &sin4, sizeof(sin4));
-+ walker += sin_size;
-+ drtm->rtm_addrs |= RTA_GATEWAY;
-+ }
+ if (0 == (drtm->rtm_flags & RTF_HOST)) {
+ olsr_prefix_to_netmask(&mask, rt->rt_dst.prefix_len);
+ sin4.sin_addr = mask.v4;
@@ -46,7 +39,7 @@ Index: src/bsd/kernel_routes.c
drtm->rtm_msglen = (unsigned short)(walker - dbuff);
len = write(olsr_cnf->rts, dbuff, drtm->rtm_msglen);
if (len < 0) {
-@@ -298,6 +318,9 @@ add_del_route6(const struct rt_entry *rt, int add)
+@@ -302,6 +315,9 @@ add_del_route6(const struct rt_entry *rt, int add)
rtm->rtm_flags = olsr_rt_flags(rt, add);
rtm->rtm_pid = OLSR_PID;
rtm->rtm_seq = ++seq;
@@ -56,7 +49,7 @@ Index: src/bsd/kernel_routes.c

/* walk to the end of the header */
walker = buff + sizeof(struct rt_msghdr);
-@@ -385,6 +408,9 @@ add_del_route6(const struct rt_entry *rt, int add)
+@@ -389,6 +405,9 @@ add_del_route6(const struct rt_entry *rt, int add)
drtm->rtm_index = 0;
drtm->rtm_flags = olsr_rt_flags(rt, add);
drtm->rtm_seq = ++seq;
Index: patches/patch-src_bsd_net_c
===================================================================
RCS file: /cvs/ports/net/olsrd/patches/patch-src_bsd_net_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_bsd_net_c
--- patches/patch-src_bsd_net_c 13 May 2017 22:27:20 -0000 1.3
+++ patches/patch-src_bsd_net_c 4 Jun 2017 10:45:16 -0000
@@ -3,11 +3,92 @@ $OpenBSD: patch-src_bsd_net_c,v 1.3 2017
Index: src/bsd/net.c
--- src/bsd/net.c.orig
+++ src/bsd/net.c
-@@ -51,6 +51,7 @@
- #include "../ipcalc.h"
- #include "../parser.h" /* dnc: needed for call to packet_parser() */
- #include "../olsr_protocol.h"
-+#include "../olsr_random.h"
- #include "../olsr_cfg.h"
- #include "../olsr.h"
+@@ -55,6 +55,7 @@
+ #include "ipcalc.h"
+ #include "parser.h" /* dnc: needed for call to packet_parser() */
+ #include "olsr_protocol.h"
++#include "olsr_random.h"
+ #include "olsr_cfg.h"
+ #include "olsr.h"

+@@ -64,6 +65,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <net/if.h>
++#include <net/if_media.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <syslog.h>
+@@ -86,7 +88,6 @@
+ #ifdef __NetBSD__
+ #include <net/if_ether.h>
+ #include <netinet6/in6_var.h> /* For struct in6_ifreq */
+-#include <net80211/ieee80211_ioctl.h>
+ #include <ifaddrs.h>
+