Holger Mauermann schrieb: > Here is the update for net/olsrd to 0.5.4. Tested on i386. > More info at www.olsr.org.
This update includes a patch to identify wireless interfaces on OpenBSD. Thanks to Sebastian Reitenbach who sent it to me and submitted it upstream. ccache dependency is removed, thanks to Stefan Sperling. Holger
Index: Makefile =================================================================== RCS file: /cvs/ports/net/olsrd/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 15 Sep 2007 22:36:56 -0000 1.3 +++ Makefile 6 Nov 2007 21:53:03 -0000 @@ -2,11 +2,11 @@ COMMENT= OLSR routing daemon -DISTNAME= olsrd-0.4.10 +DISTNAME= olsrd-0.5.4 CATEGORIES= net HOMEPAGE= http://www.olsr.org/ -MASTER_SITES= http://www.olsr.org/releases/0.4/ +MASTER_SITES= http://www.olsr.org/releases/0.5/ MAINTAINER= Holger Mauermann <[EMAIL PROTECTED]> @@ -15,6 +15,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + +BUILD_DEPENDS+= ::devel/bison WANTLIB= c USE_GMAKE= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/net/olsrd/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 5 Apr 2007 16:20:12 -0000 1.3 +++ distinfo 6 Nov 2007 21:53:03 -0000 @@ -1,5 +1,5 @@ -MD5 (olsrd-0.4.10.tar.gz) = y2MTZJ0ZsF5djV6vhmu5jQ== -RMD160 (olsrd-0.4.10.tar.gz) = AkFVqiSWCEs2ljodwygqm86gA+M= -SHA1 (olsrd-0.4.10.tar.gz) = 8nI/0oO8pPJLoDUQ/5uN8Ns79J8= -SHA256 (olsrd-0.4.10.tar.gz) = U/pSv4ii/BLjRZuCbx+uVu0rOJ62o+RldT8rtUeSbkQ= -SIZE (olsrd-0.4.10.tar.gz) = 596097 +MD5 (olsrd-0.5.4.tar.gz) = SbJgEMsnyNaCR3E/9sEU6g== +RMD160 (olsrd-0.5.4.tar.gz) = Tz3nC7354MH7bj/3Y/OreY77/LI= +SHA1 (olsrd-0.5.4.tar.gz) = iYJ7xdigSFhZdZFWr6fYB9MKwQQ= +SHA256 (olsrd-0.5.4.tar.gz) = Fm5c8iXI2cyp8jld+FzW1aRGedpOW4e+u398JFGy6Nc= +SIZE (olsrd-0.5.4.tar.gz) = 602647 Index: patches/patch-Makefile_inc =================================================================== RCS file: patches/patch-Makefile_inc diff -N patches/patch-Makefile_inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_inc 6 Nov 2007 21:53:03 -0000 @@ -0,0 +1,20 @@ +$OpenBSD$ +--- Makefile.inc.orig Sat Nov 3 00:48:05 2007 ++++ Makefile.inc Sat Nov 3 00:51:22 2007 +@@ -1,10 +1,10 @@ + # programs +-CCACHE ?= $(shell which ccache 2> /dev/null) +-ifeq ($(origin CC),default) +-CC = $(CCACHE) gcc +-else +-CC ?= $(CCACHE) gcc +-endif ++#CCACHE ?= $(shell which ccache 2> /dev/null) ++#ifeq ($(origin CC),default) ++#CC = $(CCACHE) gcc ++#else ++#CC ?= $(CCACHE) gcc ++#endif + STRIP ?= strip + BISON ?= bison + FLEX ?= flex Index: patches/patch-src_bsd_net.c =================================================================== RCS file: patches/patch-src_bsd_net.c diff -N patches/patch-src_bsd_net.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_bsd_net.c 6 Nov 2007 21:53:03 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ +--- src/bsd/net.c Fri Oct 5 00:27:31 2007 ++++ src/bsd/net.c.new Sun Nov 4 15:54:09 2007 +@@ -61,6 +61,8 @@ + #include <netinet6/in6_var.h> /* For struct in6_ifreq */ + #include <ifaddrs.h> + #include <sys/uio.h> ++#include <net80211/ieee80211.h> ++#include <net80211/ieee80211_ioctl.h> + #endif + + #ifdef __FreeBSD__ +@@ -837,6 +839,11 @@ + ireq.i_type = IEEE80211_IOC_SSID; + ireq.i_val = -1; + return (ioctl(olsr_cnf->ioctl_s, SIOCG80211, &ireq) >= 0) ? 1 : 0; ++#elif defined __OpenBSD__ ++ struct ieee80211_nodereq nr; ++ bzero(&nr, sizeof(nr)); ++ strlcpy(nr.nr_ifname, ifname, sizeof(nr.nr_ifname)); ++ return (ioctl(olsr_cnf->ioctl_s, SIOCG80211FLAGS, &nr) >=0) ? 1: 0; + #else + return 0; + #endif Index: patches/patch-src_cfgparser_Makefile =================================================================== RCS file: /cvs/ports/net/olsrd/patches/patch-src_cfgparser_Makefile,v retrieving revision 1.3 diff -u -r1.3 patch-src_cfgparser_Makefile --- patches/patch-src_cfgparser_Makefile 14 Feb 2006 23:48:10 -0000 1.3 +++ patches/patch-src_cfgparser_Makefile 6 Nov 2007 21:53:03 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_cfgparser_Makefile,v 1.3 2006/02/14 23:48:10 pvalchev Exp $ ---- src/cfgparser/Makefile.orig Tue Feb 14 16:21:49 2006 -+++ src/cfgparser/Makefile Tue Feb 14 16:23:10 2006 -@@ -71,10 +71,10 @@ else - ifeq (${OS}, osx) - LDFLAGS += -dynamiclib -single_module - else --LDFLAGS += -shared -Wl,-soname,$(LIBNAME) -+LDFLAGS += -shared -fPIC -Wl,-soname,$(LIBNAME) - endif - --CFLAGS += -DMAKELIB -+CFLAGS += -DMAKELIB -fPIC - NAME = $(LIBNAME) - - endif Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/olsrd/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 21 Jan 2006 11:34:04 -0000 1.2 +++ pkg/PLIST 6 Nov 2007 21:53:03 -0000 @@ -8,7 +8,7 @@ share/doc/olsrd/README-Link-Quality-Fish-Eye.txt share/doc/olsrd/README-Link-Quality.html share/examples/olsrd/ +share/examples/olsrd/olsrd.conf.default.rfc share/examples/olsrd/olsrd.conf.default.lq share/examples/olsrd/olsrd.conf.default.lq-fisheye -share/examples/olsrd/olsrd.conf.default.rfc @sample ${SYSCONFDIR}/olsrd.conf
