Attachment 207462 Details for Bug 240563 – olsrd-0.9.8

[patch] olsrd-0.9.8

olsrd-0.9.8.diff (text/plain), 7.74 KB, created by Bernhard Froehlich on 2019-09-13 13:42:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernhard Froehlich

Created: 2019-09-13 13:42:34 UTC

Size: 7.74 KB

patch

obsolete

>diff -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/Makefile /home/decke/dev/myports/net/olsrd/Makefile
>--- /home/decke/dev/ports/net/olsrd/Makefile	2018-11-06 14:32:44.519815000 +0000
>+++ /home/decke/dev/myports/net/olsrd/Makefile	2019-08-26 10:42:05.084388000 +0000
>@@ -2,9 +2,9 @@
> # $FreeBSD: head/net/olsrd/Makefile 453479 2017-11-04 19:30:37Z joneum $
> 
> 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 @@
> 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_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 -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/distinfo /home/decke/dev/myports/net/olsrd/distinfo
>--- /home/decke/dev/ports/net/olsrd/distinfo	2018-11-06 14:32:44.521428000 +0000
>+++ /home/decke/dev/myports/net/olsrd/distinfo	2019-08-26 10:24:23.863557000 +0000
>@@ -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 -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/files/patch-Makefile /home/decke/dev/myports/net/olsrd/files/patch-Makefile
>--- /home/decke/dev/ports/net/olsrd/files/patch-Makefile	2018-11-06 14:32:44.524553000 +0000
>+++ /home/decke/dev/myports/net/olsrd/files/patch-Makefile	2019-08-26 10:51:52.000000000 +0000
>@@ -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 -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/files/patch-lib-httpinfo-Makefile /home/decke/dev/myports/net/olsrd/files/patch-lib-httpinfo-Makefile
>--- /home/decke/dev/ports/net/olsrd/files/patch-lib-httpinfo-Makefile	2018-11-06 14:32:44.526136000 +0000
>+++ /home/decke/dev/myports/net/olsrd/files/patch-lib-httpinfo-Makefile	2019-08-26 10:44:42.000000000 +0000
>@@ -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 -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/files/patch-lib_dot__draw_Makefile /home/decke/dev/myports/net/olsrd/files/patch-lib_dot__draw_Makefile
>--- /home/decke/dev/ports/net/olsrd/files/patch-lib_dot__draw_Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ /home/decke/dev/myports/net/olsrd/files/patch-lib_dot__draw_Makefile	2019-08-26 10:53:33.000000000 +0000
>@@ -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 -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/files/patch-make-Makefile.fbsd /home/decke/dev/myports/net/olsrd/files/patch-make-Makefile.fbsd
>--- /home/decke/dev/ports/net/olsrd/files/patch-make-Makefile.fbsd	2018-11-06 14:32:44.527621000 +0000
>+++ /home/decke/dev/myports/net/olsrd/files/patch-make-Makefile.fbsd	2019-08-26 11:01:40.000000000 +0000
>@@ -1,9 +1,9 @@
>---- 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
>@@ -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 -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/files/patch-src_bsd_kernel__routes.c /home/decke/dev/myports/net/olsrd/files/patch-src_bsd_kernel__routes.c
>--- /home/decke/dev/ports/net/olsrd/files/patch-src_bsd_kernel__routes.c	1970-01-01 00:00:00.000000000 +0000
>+++ /home/decke/dev/myports/net/olsrd/files/patch-src_bsd_kernel__routes.c	2019-08-26 10:47:21.000000000 +0000
>@@ -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 -x CVS -x .svn -x .git -uNr -I \$FreeBSD /home/decke/dev/ports/net/olsrd/files/patch-src_bsd_net.c /home/decke/dev/myports/net/olsrd/files/patch-src_bsd_net.c
>--- /home/decke/dev/ports/net/olsrd/files/patch-src_bsd_net.c	2018-11-06 14:32:44.529150000 +0000
>+++ /home/decke/dev/myports/net/olsrd/files/patch-src_bsd_net.c	2019-08-26 10:44:42.000000000 +0000
>@@ -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>
>

Actions: View | Diff

Attachments on bug 240563: 207462