Index: head/net/olsrd/Makefile =================================================================== --- head/net/olsrd/Makefile (revision 513488) +++ head/net/olsrd/Makefile (revision 513489) @@ -1,39 +1,41 @@ # Created by: dave@dogwood.com # $FreeBSD$ PORTNAME= olsrd -DISTVERSION= 0.9.6.1 +DISTVERSIONPREFIX= v +DISTVERSION= 0.9.8 CATEGORIES= net -MASTER_SITES= http://www.olsr.org/releases/0.9/ MAINTAINER= koue@chaosophia.net COMMENT= OLSR routing daemon LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -MAKE_ARGS= VERBOSE=1 -USES= bison gmake tar:bzip2 +USES= bison gmake +USE_GITHUB= yes USE_LDCONFIG= yes USE_RC_SUBR= olsrd +GH_ACCOUNT= OLSR +MAKE_ARGS= VERBOSE=1 + ALL_TARGET= build_all INSTALL_TARGET= install_all OPTIONS_DEFINE= MULTI_IF MULTI_IF_DESC= IPv4 multiple interface support MULTI_IF_LIB_DEPENDS= libnet.so:net/libnet MULTI_IF_MAKE_ARGS= LIBNET=1 post-patch: - @${REINPLACE_CMD} -e 's|/sbin/ldconfig|:|g' ${WRKSRC}/make/Makefile.fbsd @${CP} ${WRKSRC}/src/cfgparser/cfgfile_gen.c \ ${WRKSRC}/src/cfgparser/olsrd_conf.h \ ${WRKSRC}/lib/httpinfo/src/ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* .include Index: head/net/olsrd/distinfo =================================================================== --- head/net/olsrd/distinfo (revision 513488) +++ head/net/olsrd/distinfo (revision 513489) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509820621 -SHA256 (olsrd-0.9.6.1.tar.bz2) = 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 -SIZE (olsrd-0.9.6.1.tar.bz2) = 908871 +TIMESTAMP = 1566815063 +SHA256 (OLSR-olsrd-v0.9.8_GH0.tar.gz) = ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3 +SIZE (OLSR-olsrd-v0.9.8_GH0.tar.gz) = 14416300 Index: head/net/olsrd/files/patch-Makefile =================================================================== --- head/net/olsrd/files/patch-Makefile (revision 513488) +++ head/net/olsrd/files/patch-Makefile (revision 513489) @@ -1,32 +1,45 @@ ---- Makefile.orig 2016-11-22 19:39:42 UTC +--- Makefile.orig 2019-08-11 08:09:47 UTC +++ Makefile @@ -167,20 +167,17 @@ uninstall_bin: install_olsrd: install_bin @echo ========= C O N F I G U R A T I O N - F I L E ============ @echo $(EXENAME) uses the configfile $(CFGFILE) - @echo a default configfile. A sample RFC-compliance aimed - @echo configfile can be found in olsrd.conf.default.rfc. - @echo However none of the larger OLSRD using networks use that - @echo so install a configfile with activated link quality exstensions - @echo per default. - @echo can be found at files/olsrd.conf.default.lq + @echo a default configfile. Sample config files are installed + @echo as $(CFGFILE).default.full, $(CFGFILE).default.rfc, + @echo $(CFGFILE).default.lq and $(CFGFILE).default.lq-fisheye + @echo copy and edit one of these to $(CFGFILE) + @echo If in doubt start with $(CFGFILE).default.lq @echo ========================================================== mkdir -p $(ETCDIR) - $(MAKECMDPREFIX)if [ -e $(CFGFILE) ]; then \ - cp -f files/olsrd.conf.default.lq $(CFGFILE).new; \ - echo "Configuration file was saved as $(CFGFILE).new"; \ - else \ - cp -f files/olsrd.conf.default.lq $(CFGFILE); \ - fi + -cp files/olsrd.conf.default.full $(CFGFILE).default.full + -cp files/olsrd.conf.default.rfc $(CFGFILE).default.rfc + -cp files/olsrd.conf.default.lq $(CFGFILE).default.lq + -cp files/olsrd.conf.default.lq-fisheye $(CFGFILE).default.lq-fisheye @echo ------------------------------------------- @echo Edit $(CFGFILE) before running olsrd!! @echo ------------------------------------------- +@@ -196,9 +193,10 @@ ifneq ($(RCDIR),) + endif + ifneq ($(DOCDIR_OLSRD),) + mkdir -p "$(DOCDIR_OLSRD)" +- cp -t "$(DOCDIR_OLSRD)" "CHANGELOG" "README-Olsr-Extensions" \ ++ cp "CHANGELOG" "README-Olsr-Extensions" \ + "README-LINUX_NL80211.txt" "files/olsrd.conf.default" \ +- "files/olsrd.conf.default.txt" "license.txt" ++ "files/olsrd.conf.default.txt" "license.txt" \ ++ "$(DOCDIR_OLSRD)" + endif + + uninstall_olsrd: uninstall_bin Index: head/net/olsrd/files/patch-lib-httpinfo-Makefile =================================================================== --- head/net/olsrd/files/patch-lib-httpinfo-Makefile (revision 513488) +++ head/net/olsrd/files/patch-lib-httpinfo-Makefile (revision 513489) @@ -1,10 +1,10 @@ ---- lib/httpinfo/Makefile.orig 2016-11-22 19:39:42 UTC +--- lib/httpinfo/Makefile.orig 2019-08-11 08:09:47 UTC +++ lib/httpinfo/Makefile -@@ -52,7 +52,6 @@ ifdef ADMIN_INTERFACE - CPPFLAGS += -DADMIN_INTERFACE - endif +@@ -54,7 +54,6 @@ endif + + LDFLAGS += -lm -OBJS += $(TOPDIR)/src/cfgparser/cfgfile_gen.o default_target: $(PLUGIN_FULLNAME) ifdef ADMIN_INTERFACE Index: head/net/olsrd/files/patch-lib_dot__draw_Makefile =================================================================== --- head/net/olsrd/files/patch-lib_dot__draw_Makefile (nonexistent) +++ head/net/olsrd/files/patch-lib_dot__draw_Makefile (revision 513489) @@ -0,0 +1,11 @@ +--- lib/dot_draw/Makefile.orig 2019-08-11 08:09:47 UTC ++++ lib/dot_draw/Makefile +@@ -63,7 +63,7 @@ install: $(PLUGIN_FULLNAME) + $(INSTALL_LIB) + ifneq ($(DOCDIR_OLSRD),) + mkdir -p "$(DOCDIR_OLSRD)" +- cp -t "$(DOCDIR_OLSRD)" "README_DOT_DRAW" "olsr-topology-view.pl" ++ cp "README_DOT_DRAW" "olsr-topology-view.pl" "$(DOCDIR_OLSRD)" + endif + + uninstall: Property changes on: head/net/olsrd/files/patch-lib_dot__draw_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/olsrd/files/patch-make-Makefile.fbsd =================================================================== --- head/net/olsrd/files/patch-make-Makefile.fbsd (revision 513488) +++ head/net/olsrd/files/patch-make-Makefile.fbsd (revision 513489) @@ -1,73 +1,71 @@ ---- make/Makefile.fbsd.orig 2016-11-22 19:39:42 UTC +--- make/Makefile.fbsd.orig 2019-08-11 08:09:47 UTC +++ make/Makefile.fbsd -@@ -45,44 +45,49 @@ - # FREEBSD SPECIFIC CONFIGURATION - # +@@ -47,44 +47,47 @@ + LDCONFIG ?= /sbin/ldconfig + -PREFIX ?= /usr/local -SBINDIR = $(PREFIX)/sbin -ETCDIR = $(PREFIX)/etc/olsrd -LIBDIR = $(PREFIX)/lib -DOCDIR = $(PREFIX)/share/doc -MANDIR = $(PREFIX)/man +DESTDIR ?= +prefix ?= /usr/local +etcdir ?= $(prefix)/etc/olsrd +libdir ?= $(prefix)/lib +datarootdir ?= $(prefix)/share +mandir ?= $(prefix)/man +sbindir ?= $(prefix)/sbin --SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c) --HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h) +-SRCS += $(sort $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)) +-HDRS += $(sort $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)) +# the rest are defined in Makefile.inc, but we don't need to override defaults +ETCDIR = $(DESTDIR)$(etcdir) +LIBDIR = $(DESTDIR)$(libdir) +MANDIR = $(DESTDIR)$(mandir) +SBINDIR = $(DESTDIR)$(sbindir) +SHAREDIR = $(DESTDIR)$(datarootdir) -LIBS = +SRCS += $(wildcard src/bsd/*.c src/unix/*.c) +HDRS += $(wildcard src/bsd/*.h src/unix/*.h) CPPFLAGS += -DOLSRD_GLOBAL_CONF_FILE=\"$(CFGFILE)\" +LIBS += ifdef NO_80211 CPPFLAGS += -DFBSD_NO_80211=1 endif ifdef LIBNET - -CPPFLAGS += -DSPOOF -I$(PREFIX)/include -LIBS += -L$(PREFIX)/lib -lnet - +CPPFLAGS += -I$(prefix)/include -DSPOOF +LIBS += -L$(prefix)/lib -lnet endif +PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so +PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) -+INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -+ /sbin/ldconfig -m $(LIBDIR) -+UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \ -+ /sbin/ldconfig -m $(LIBDIR) ++INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME) ++UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME) + ifdef OLSRD_PLUGIN CFLAGS += -fPIC LDFLAGS += -fPIC endif -PLUGIN_SONAME ?= $(PLUGIN_NAME) -PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) -INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig +- $(LDCONFIG) -UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig +- $(LDCONFIG) - -OS_LIB_PTHREAD = -pthread +OS_LIB_PTHREAD = -lpthread OS_CFLAG_PTHREAD = -pthread OS_LIB_DYNLOAD = Index: head/net/olsrd/files/patch-src_bsd_kernel__routes.c =================================================================== --- head/net/olsrd/files/patch-src_bsd_kernel__routes.c (nonexistent) +++ head/net/olsrd/files/patch-src_bsd_kernel__routes.c (revision 513489) @@ -0,0 +1,12 @@ +--- src/bsd/kernel_routes.c.orig 2019-08-11 08:09:47 UTC ++++ src/bsd/kernel_routes.c +@@ -351,7 +351,9 @@ add_del_route6(const struct rt_entry *rt, int add) + memcpy(walker, &sdl, sizeof(sdl)); + walker += sdl_size; + rtm->rtm_addrs |= RTA_GATEWAY; ++#ifdef RTF_CLONING + rtm->rtm_flags |= RTF_CLONING; ++#endif /* RTF_CLONING */ + rtm->rtm_flags &= ~RTF_GATEWAY; + } + Property changes on: head/net/olsrd/files/patch-src_bsd_kernel__routes.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/olsrd/files/patch-src_bsd_net.c =================================================================== --- head/net/olsrd/files/patch-src_bsd_net.c (revision 513488) +++ head/net/olsrd/files/patch-src_bsd_net.c (revision 513489) @@ -1,11 +1,11 @@ ---- src/bsd/net.c.orig 2016-06-22 12:04:33 UTC +--- src/bsd/net.c.orig 2019-08-11 08:09:47 UTC +++ src/bsd/net.c -@@ -125,6 +125,8 @@ +@@ -124,6 +124,8 @@ #include +#include "olsr_random.h" + static int ignore_redir; static int send_redir; static int gateway;