aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBernhard Froehlich <decke@FreeBSD.org>2019-10-02 11:08:26 +0000
committerBernhard Froehlich <decke@FreeBSD.org>2019-10-02 11:08:26 +0000
commit102ab1c8588c8ecbf58137b24696ad79182ebc92 (patch)
treebff1bf2319855a757c4eb9421e61fbb43ae567ae /net
parent1c05d8ca8ad1a619f006edb01cf9f34726b78e42 (diff)
downloadports-102ab1c8588c8ecbf58137b24696ad79182ebc92.tar.gz
ports-102ab1c8588c8ecbf58137b24696ad79182ebc92.zip
MFH: r513489
net/olsrd: - Update to 0.9.8 - Switch to fetch from GitHub because they don't provide tarballs anymore - Fix portlint warnings - Fix some GNUisms (cp -t) - Fix compile error when RTF_CLONING is not defined PR: 240563 Submitted by: myself Approved by: ports-secteam (joneum)
Notes
Notes: svn path=/branches/2019Q4/; revision=513569
Diffstat (limited to 'net')
-rw-r--r--net/olsrd/Makefile12
-rw-r--r--net/olsrd/distinfo6
-rw-r--r--net/olsrd/files/patch-Makefile15
-rw-r--r--net/olsrd/files/patch-lib-httpinfo-Makefile8
-rw-r--r--net/olsrd/files/patch-lib_dot__draw_Makefile11
-rw-r--r--net/olsrd/files/patch-make-Makefile.fbsd22
-rw-r--r--net/olsrd/files/patch-src_bsd_kernel__routes.c12
-rw-r--r--net/olsrd/files/patch-src_bsd_net.c4
8 files changed, 63 insertions, 27 deletions
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 6c7f8d47ee91..1009d76bdcc5 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -2,9 +2,9 @@
# $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
@@ -12,11 +12,14 @@ 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
@@ -27,7 +30,6 @@ 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/
diff --git a/net/olsrd/distinfo b/net/olsrd/distinfo
index 94ab0da548ef..dc3233d0dc11 100644
--- a/net/olsrd/distinfo
+++ b/net/olsrd/distinfo
@@ -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
diff --git a/net/olsrd/files/patch-Makefile b/net/olsrd/files/patch-Makefile
index 1a7c1404f2bd..8a0f2ff345ca 100644
--- a/net/olsrd/files/patch-Makefile
+++ b/net/olsrd/files/patch-Makefile
@@ -1,4 +1,4 @@
---- 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
@@ -30,3 +30,16 @@
@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
diff --git a/net/olsrd/files/patch-lib-httpinfo-Makefile b/net/olsrd/files/patch-lib-httpinfo-Makefile
index 8497179e448b..975d65c50e3c 100644
--- a/net/olsrd/files/patch-lib-httpinfo-Makefile
+++ b/net/olsrd/files/patch-lib-httpinfo-Makefile
@@ -1,8 +1,8 @@
---- 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
diff --git a/net/olsrd/files/patch-lib_dot__draw_Makefile b/net/olsrd/files/patch-lib_dot__draw_Makefile
new file mode 100644
index 000000000000..3cb80399d329
--- /dev/null
+++ b/net/olsrd/files/patch-lib_dot__draw_Makefile
@@ -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:
diff --git a/net/olsrd/files/patch-make-Makefile.fbsd b/net/olsrd/files/patch-make-Makefile.fbsd
index 0c89bc537cf9..bcb893408105 100644
--- a/net/olsrd/files/patch-make-Makefile.fbsd
+++ b/net/olsrd/files/patch-make-Makefile.fbsd
@@ -1,8 +1,8 @@
---- 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
@@ -18,8 +18,8 @@
+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)
@@ -49,10 +49,8 @@
+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
@@ -62,9 +60,9 @@
-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
diff --git a/net/olsrd/files/patch-src_bsd_kernel__routes.c b/net/olsrd/files/patch-src_bsd_kernel__routes.c
new file mode 100644
index 000000000000..9f822984d64a
--- /dev/null
+++ b/net/olsrd/files/patch-src_bsd_kernel__routes.c
@@ -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;
+ }
+
diff --git a/net/olsrd/files/patch-src_bsd_net.c b/net/olsrd/files/patch-src_bsd_net.c
index 6911e1d43ada..d2998619838a 100644
--- a/net/olsrd/files/patch-src_bsd_net.c
+++ b/net/olsrd/files/patch-src_bsd_net.c
@@ -1,6 +1,6 @@
---- 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 <sys/sysctl.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 08:57:41 +0000