Attachment #207462 for bug #240563

View | Details | Raw Unified | Return to bug 240563
Collapse All | Expand All

Lines 2-10 Link Here

(-)/home/decke/dev/myports/net/olsrd/Makefile (-5 / +7 lines)
2	# $FreeBSD: head/net/olsrd/Makefile 453479 2017-11-04 19:30:37Z joneum $	2	# $FreeBSD: head/net/olsrd/Makefile 453479 2017-11-04 19:30:37Z joneum $
3		3
4	PORTNAME= olsrd	4	PORTNAME= olsrd
5	DISTVERSION= 0.9.6.1	5	DISTVERSIONPREFIX= v
		6	DISTVERSION= 0.9.8
6	CATEGORIES= net	7	CATEGORIES= net
7	MASTER_SITES= http://www.olsr.org/releases/0.9/
8		8
9	MAINTAINER= koue@chaosophia.net	9	MAINTAINER= koue@chaosophia.net
10	COMMENT= OLSR routing daemon	10	COMMENT= OLSR routing daemon
Lines 12-22 Link Here
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/license.txt	13	LICENSE_FILE= ${WRKSRC}/license.txt
14		14
15	MAKE_ARGS= VERBOSE=1	15	USES= bison gmake
16	USES= bison gmake tar:bzip2	16	USE_GITHUB= yes
17	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
18	USE_RC_SUBR= olsrd	18	USE_RC_SUBR= olsrd
19		19
		20	GH_ACCOUNT= OLSR
		21	MAKE_ARGS= VERBOSE=1
		22
20	ALL_TARGET= build_all	23	ALL_TARGET= build_all
21	INSTALL_TARGET= install_all	24	INSTALL_TARGET= install_all
22		25
Lines 27-33 Link Here
27	MULTI_IF_MAKE_ARGS= LIBNET=1	30	MULTI_IF_MAKE_ARGS= LIBNET=1
28		31
29	post-patch:	32	post-patch:
30	@${REINPLACE_CMD} -e 's\|/sbin/ldconfig\|:\|g' ${WRKSRC}/make/Makefile.fbsd
31	@${CP} ${WRKSRC}/src/cfgparser/cfgfile_gen.c \	33	@${CP} ${WRKSRC}/src/cfgparser/cfgfile_gen.c \
32	${WRKSRC}/src/cfgparser/olsrd_conf.h \	34	${WRKSRC}/src/cfgparser/olsrd_conf.h \
33	${WRKSRC}/lib/httpinfo/src/	35	${WRKSRC}/lib/httpinfo/src/

Lines 1-3 Link Here

(-)/home/decke/dev/myports/net/olsrd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1509820621	1	TIMESTAMP = 1566815063
2	SHA256 (olsrd-0.9.6.1.tar.bz2) = 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612	2	SHA256 (OLSR-olsrd-v0.9.8_GH0.tar.gz) = ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3
3	SIZE (olsrd-0.9.6.1.tar.bz2) = 908871	3	SIZE (OLSR-olsrd-v0.9.8_GH0.tar.gz) = 14416300




--- Makefile.orig	2019-08-11 08:09:47 UTC
+++ Makefile
@@ -167,20 +167,17 @@ uninstall_bin:
 install_olsrd:	install_bin

 		@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

Lines 1-8 Link Here

(-)/home/decke/dev/myports/net/olsrd/files/patch-lib-httpinfo-Makefile (-4 / +4 lines)
1	--- lib/httpinfo/Makefile.orig 2016-11-22 19:39:42 UTC	1	--- lib/httpinfo/Makefile.orig 2019-08-11 08:09:47 UTC
2	+++ lib/httpinfo/Makefile	2	+++ lib/httpinfo/Makefile
3	@@ -52,7 +52,6 @@ ifdef ADMIN_INTERFACE	3	@@ -54,7 +54,6 @@ endif
4	CPPFLAGS += -DADMIN_INTERFACE	4
5	endif	5	LDFLAGS += -lm
6		6
7	-OBJS += $(TOPDIR)/src/cfgparser/cfgfile_gen.o	7	-OBJS += $(TOPDIR)/src/cfgparser/cfgfile_gen.o
8		8

Line 0 Link Here

(-)/home/decke/dev/myports/net/olsrd/files/patch-lib_dot__draw_Makefile (+11 lines)
	1	--- lib/dot_draw/Makefile.orig 2019-08-11 08:09:47 UTC
	2	+++ lib/dot_draw/Makefile
	3	@@ -63,7 +63,7 @@ install: $(PLUGIN_FULLNAME)
	4	$(INSTALL_LIB)
	5	ifneq ($(DOCDIR_OLSRD),)
	6	mkdir -p "$(DOCDIR_OLSRD)"
	7	- cp -t "$(DOCDIR_OLSRD)" "README_DOT_DRAW" "olsr-topology-view.pl"
	8	+ cp "README_DOT_DRAW" "olsr-topology-view.pl" "$(DOCDIR_OLSRD)"
	9	endif
	10
	11	uninstall:




--- make/Makefile.fbsd.orig	2019-08-11 08:09:47 UTC
+++ make/Makefile.fbsd
@@ -47,44 +47,47 @@
 # FREEBSD SPECIFIC CONFIGURATION
 #
 
 LDCONFIG ?= /sbin/ldconfig
 
-PREFIX ?= /usr/local
-SBINDIR = $(PREFIX)/sbin
-ETCDIR = $(PREFIX)/etc/olsrd

+mandir ?= $(prefix)/man
+sbindir ?= $(prefix)/sbin
 
-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)

 
+PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so
+PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
+INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME)
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME)
+UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+		/sbin/ldconfig -m $(LIBDIR)
+
 ifdef OLSRD_PLUGIN
 CFLAGS +=	-fPIC

-PLUGIN_SONAME ?= $(PLUGIN_NAME)
-PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
-INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
-		$(LDCONFIG)
-UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
-		$(LDCONFIG)
-
-OS_LIB_PTHREAD = -pthread
+OS_LIB_PTHREAD = -lpthread




--- 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;
   }
 

Lines 1-6 Link Here

(-)/home/decke/dev/myports/net/olsrd/files/patch-src_bsd_net.c (-2 / +2 lines)
1	--- src/bsd/net.c.orig 2016-06-22 12:04:33 UTC	1	--- src/bsd/net.c.orig 2019-08-11 08:09:47 UTC
2	+++ src/bsd/net.c	2	+++ src/bsd/net.c
3	@@ -125,6 +125,8 @@	3	@@ -124,6 +124,8 @@
4		4
5	#include <sys/sysctl.h>	5	#include <sys/sysctl.h>
6		6

Return to bug 240563

Lines 1-4 Link Here

(-)/home/decke/dev/myports/net/olsrd/files/patch-Makefile (-1 / +14 lines)
1	--- Makefile.orig 2016-11-22 19:39:42 UTC	1	--- Makefile.orig 2019-08-11 08:09:47 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -167,20 +167,17 @@ uninstall_bin:	3	@@ -167,20 +167,17 @@ uninstall_bin:
4	install_olsrd: install_bin	4	install_olsrd: install_bin
Lines 30-32 Link Here
30	@echo -------------------------------------------	30	@echo -------------------------------------------
31	@echo Edit $(CFGFILE) before running olsrd!!	31	@echo Edit $(CFGFILE) before running olsrd!!
32	@echo -------------------------------------------	32	@echo -------------------------------------------
		33	@@ -196,9 +193,10 @@ ifneq ($(RCDIR),)
		34	endif
		35	ifneq ($(DOCDIR_OLSRD),)
		36	mkdir -p "$(DOCDIR_OLSRD)"
		37	- cp -t "$(DOCDIR_OLSRD)" "CHANGELOG" "README-Olsr-Extensions" \
		38	+ cp "CHANGELOG" "README-Olsr-Extensions" \
		39	"README-LINUX_NL80211.txt" "files/olsrd.conf.default" \
		40	- "files/olsrd.conf.default.txt" "license.txt"
		41	+ "files/olsrd.conf.default.txt" "license.txt" \
		42	+ "$(DOCDIR_OLSRD)"
		43	endif
		44
		45	uninstall_olsrd: uninstall_bin

Lines 1-9 Link Here

(-)/home/decke/dev/myports/net/olsrd/files/patch-make-Makefile.fbsd (-12 / +10 lines)
1	--- make/Makefile.fbsd.orig 2016-11-22 19:39:42 UTC	1	--- make/Makefile.fbsd.orig 2019-08-11 08:09:47 UTC
2	+++ make/Makefile.fbsd	2	+++ make/Makefile.fbsd
3	@@ -45,44 +45,49 @@	3	@@ -47,44 +47,47 @@
4	# FREEBSD SPECIFIC CONFIGURATION
5	#
6		4
		5	LDCONFIG ?= /sbin/ldconfig
		6
7	-PREFIX ?= /usr/local	7	-PREFIX ?= /usr/local
8	-SBINDIR = $(PREFIX)/sbin	8	-SBINDIR = $(PREFIX)/sbin
9	-ETCDIR = $(PREFIX)/etc/olsrd	9	-ETCDIR = $(PREFIX)/etc/olsrd
Lines 18-25 Link Here
18	+mandir ?= $(prefix)/man	18	+mandir ?= $(prefix)/man
19	+sbindir ?= $(prefix)/sbin	19	+sbindir ?= $(prefix)/sbin
20		20
21	-SRCS += $(wildcard src/bsd/.c) $(wildcard src/unix/.c)	21	-SRCS += $(sort $(wildcard src/bsd/.c) $(wildcard src/unix/.c))
22	-HDRS += $(wildcard src/bsd/.h) $(wildcard src/unix/.h)	22	-HDRS += $(sort $(wildcard src/bsd/.h) $(wildcard src/unix/.h))
23	+# the rest are defined in Makefile.inc, but we don't need to override defaults	23	+# the rest are defined in Makefile.inc, but we don't need to override defaults
24	+ETCDIR = $(DESTDIR)$(etcdir)	24	+ETCDIR = $(DESTDIR)$(etcdir)
25	+LIBDIR = $(DESTDIR)$(libdir)	25	+LIBDIR = $(DESTDIR)$(libdir)
Lines 49-58 Link Here
49		49
50	+PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so	50	+PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so
51	+PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)	51	+PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
52	+INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \	52	+INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME)
53	+ /sbin/ldconfig -m $(LIBDIR)	53	+UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME)
54	+UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
55	+ /sbin/ldconfig -m $(LIBDIR)
56	+	54	+
57	ifdef OLSRD_PLUGIN	55	ifdef OLSRD_PLUGIN
58	CFLAGS += -fPIC	56	CFLAGS += -fPIC
Lines 62-70 Link Here
62	-PLUGIN_SONAME ?= $(PLUGIN_NAME)	60	-PLUGIN_SONAME ?= $(PLUGIN_NAME)
63	-PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)	61	-PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
64	-INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \	62	-INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
65	- /sbin/ldconfig	63	- $(LDCONFIG)
66	-UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \	64	-UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
67	- /sbin/ldconfig	65	- $(LDCONFIG)
68	-	66	-
69	-OS_LIB_PTHREAD = -pthread	67	-OS_LIB_PTHREAD = -pthread
70	+OS_LIB_PTHREAD = -lpthread	68	+OS_LIB_PTHREAD = -lpthread

Line 0 Link Here

(-)/home/decke/dev/myports/net/olsrd/files/patch-src_bsd_kernel__routes.c (+12 lines)
	1	--- src/bsd/kernel_routes.c.orig 2019-08-11 08:09:47 UTC
	2	+++ src/bsd/kernel_routes.c
	3	@@ -351,7 +351,9 @@ add_del_route6(const struct rt_entry *rt, int add)
	4	memcpy(walker, &sdl, sizeof(sdl));
	5	walker += sdl_size;
	6	rtm->rtm_addrs \|= RTA_GATEWAY;
	7	+#ifdef RTF_CLONING
	8	rtm->rtm_flags \|= RTF_CLONING;
	9	+#endif /* RTF_CLONING */
	10	rtm->rtm_flags &= ~RTF_GATEWAY;
	11	}
	12