add build directories for openbsd. many of them does not work well du…

…e to

the lack of hoplimit control (need advapi fix).
openbsd portability fix for gifconfig and rtadvd.

kame/kame/gifconfig/gifconfig.c

@@ -361,7 +361,7 @@ ifconfig(argc, argv, af, rafp)
 	else
 		metric = ifr.ifr_metric;
 
-#ifdef SIOCGIFMTU
+#if defined(SIOCGIFMTU) && !defined(__OpenBSD__)
 	if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) < 0)
 		perror("ioctl (SIOCGIFMTU)");
 	else

kame/kame/rtadvd/if.c

@@ -49,6 +49,9 @@
 #ifdef __bsdi__
 # include <netinet/if_ether.h>
 #endif
+#ifdef __OpenBSD__
+#include <netinet/if_ether.h>
+#endif
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>

openbsd/usr.sbin/Makefile

@@ -3,5 +3,7 @@
 SUBDIR+=inetd sysctl
 
 SUBDIR+=rtsold ifmcstat ndp tcpdump
+# does not work due to lack of hoplimit control
+#SUBDIR+=traceroute6 rtadvd mld6query rrenumd prefix icmp6dump gifconfig rip6query route6d
 
 .include <bsd.subdir.mk>

openbsd/usr.sbin/gifconfig/Makefile

@@ -0,0 +1,14 @@
+PROG=	gifconfig
+MAN=	gifconfig.8
+
+CPPFLAGS+= -DINET6
+
+LDADD+=	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+
+.PATH:	${.CURDIR}/../../kame/gifconfig
+
+.include <bsd.prog.mk>

openbsd/usr.sbin/icmp6dump/Makefile

@@ -0,0 +1,21 @@
+SRCDIR=	${.CURDIR}/../../kame/icmp6dump
+
+PROG=	icmp6dump
+
+BINOWN=	root
+BINGRP=	bin
+BINMODE=4555
+CFLAGS+=-g
+CPPFLAGS+=-DINET6
+
+LDADD+=	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+
+MAN=	icmp6dump.8
+
+.PATH:	${SRCDIR}
+
+.include <bsd.prog.mk>

openbsd/usr.sbin/mld6query/Makefile

@@ -0,0 +1,20 @@
+BINDIR=	$(PREFIX)/sbin
+PROG=	mld6query
+SRCS=	mld6.c
+
+MAN=	mld6query.8
+
+BINOWN=	root
+BINGRP=	bin
+
+CPPFLAGS+= -DINET6
+
+LDADD+=	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+
+.PATH:	${.CURDIR}/../../kame/mld6query
+
+.include <bsd.prog.mk>

openbsd/usr.sbin/prefix/Makefile

@@ -0,0 +1,18 @@
+SRCDIR=	${.CURDIR}/../../kame/prefix
+
+PROG=	prefix
+SRCS=	prefix.c
+
+MAN=	prefix.8
+
+CFLAGS+=-g
+CPPFLAGS+=-DINET6
+LDADD+=	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+
+.PATH:	${SRCDIR}
+
+.include <bsd.prog.mk>

openbsd/usr.sbin/rip6query/Makefile

@@ -0,0 +1,15 @@
+SRCDIR=	${.CURDIR}/../../kame/rip6query
+
+PROG=	rip6query
+NOMAN=	yes
+
+CPPFLAGS+=	-DINET6 -I${SRCDIR}/../route6d
+LDADD+=	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+
+.PATH:	${SRCDIR}
+
+.include <bsd.prog.mk>

openbsd/usr.sbin/route6d/Makefile

@@ -0,0 +1,13 @@
+PROG=	route6d
+MAN=	route6d.8
+
+CPPFLAGS+=	-Dss_len=__ss_len -Dss_family=__ss_family -DADVAPI -DINET6
+LDADD+=	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+= ${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+
+.PATH:	${.CURDIR}/../../kame/route6d
+
+.include <bsd.prog.mk>

openbsd/usr.sbin/rrenumd/.cvsignore

@@ -0,0 +1,3 @@
+y.tab.h
+parser.c
+lexer.c

openbsd/usr.sbin/rrenumd/Makefile

@@ -0,0 +1,30 @@
+SRCDIR=	${.CURDIR}/../../kame/rrenumd
+
+PROG=	rrenumd
+SRCS=	rrenumd.c  parser.y lexer.l
+YFLAGS+=	-d
+
+CPPFLAGS+= -DINET6 -I${SRCDIR} -I${.CURDIR}
+LDADD+=	-L${.CURDIR}/../../lib/libipsec -L${.CURDIR}/../../lib/libipsec/obj \
+	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+=	${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+LDADD+=	-lcompat
+DPADD+=	${LIBCOMPAT}
+LDADD+= -ll -ly
+DPADD+=	${LIBL} ${LIBY}
+
+MAN=	rrenumd.8 rrenumd.conf.5
+
+.if defined(YACCDEBUG)
+CFLAGS+= -DYYDEBUG
+YFLAGS+= -t -v
+.endif
+
+.PATH:	${SRCDIR}
+
+.include <bsd.prog.mk>
+
+CLEANFILES+=	y.tab.h

openbsd/usr.sbin/rtadvd/Makefile

@@ -0,0 +1,17 @@
+SRCDIR=	${.CURDIR}/../../kame/rtadvd
+
+PROG=	rtadvd
+SRCS=	rtadvd.c rrenum.c advcap.c if.c config.c timer.c
+
+CPPFLAGS+=-DINET6
+LDADD+=	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6 -lcompat
+DPADD+=	${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a \
+	${LIBCOMPAT}
+MAN=	rtadvd.8 rtadvd.conf.5
+
+.PATH:	${SRCDIR}
+
+.include <bsd.prog.mk>

openbsd/usr.sbin/traceroute6/Makefile

@@ -0,0 +1,24 @@
+SRCDIR=	${.CURDIR}/../../kame/traceroute6
+
+PROG=	traceroute6
+
+BINOWN=	root
+BINGRP=	bin
+BINMODE=4555
+
+CPPFLAGS+=-DINET6
+LDADD+=	-L${.CURDIR}/../../lib/libipsec -L${.CURDIR}/../../lib/libipsec/obj \
+	-L${.CURDIR}/../../lib/libinet6 -L${.CURDIR}/../../lib/libinet6/obj \
+	-L/usr/local/v6/lib -linet6
+DPADD+=	${.CURDIR}/../../lib/libinet6/libinet6.a \
+	${.CURDIR}/../../lib/libinet6/obj/libinet6.a \
+	/usr/local/v6/lib/libinet6.a
+
+BINOWN=	root
+BINMODE=4555
+
+MAN=	traceroute6.8
+
+.PATH:	${SRCDIR}
+
+.include <bsd.prog.mk>