Attachment 171715 Details for Bug 210161 – olsrd-0.9.0.3 patch options fix

[patch] olsrd-0.9.0.3 patch options fix

olsrd-0.9.0.3.patch (text/plain), 3.36 KB, created by Nikola Kolev on 2016-06-23 15:12:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Kolev

Created: 2016-06-23 15:12:49 UTC

Size: 3.36 KB

patch

obsolete

>diff -rupN olsrd.orig/Makefile olsrd/Makefile
>--- olsrd.orig/Makefile	2016-06-23 17:05:20.589290838 +0200
>+++ olsrd/Makefile	2016-06-23 13:59:45.852975309 +0200
>@@ -1,17 +1,15 @@
> # Created by: dave@dogwood.com
>-# $FreeBSD: head/net/olsrd/Makefile 412348 2016-04-01 14:17:44Z mat $
>+# $FreeBSD$
> 
> PORTNAME=	olsrd
>-DISTVERSION=	0.6.6.2
>-PORTREVISION=	2
>+DISTVERSION=	0.9.0.3
> CATEGORIES=	net
>-MASTER_SITES=	http://www.olsr.org/releases/0.6/ \
>-		http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/
>+MASTER_SITES=	http://www.olsr.org/releases/0.9/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	koue@chaosophia.net
> COMMENT=	OLSR routing daemon
> 
>-BUILD_DEPENDS=	makedepend:devel/makedepend
>+LICENSE=	BSD3CLAUSE
> 
> USES=		bison gmake tar:bzip2
> USE_LDCONFIG=	yes
>diff -rupN olsrd.orig/distinfo olsrd/distinfo
>--- olsrd.orig/distinfo	2016-06-23 17:05:20.589290838 +0200
>+++ olsrd/distinfo	2016-06-23 13:59:45.852975309 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (olsrd-0.6.6.2.tar.bz2) = f24b506b19ee8bb2296dbe67a0ce6170c0f4309d4e78a39dab5452376b9953fc
>-SIZE (olsrd-0.6.6.2.tar.bz2) = 5414368
>+SHA256 (olsrd-0.9.0.3.tar.bz2) = 1f038ed3ea72e4f73dfc9701de83de7313f5049161c8df17b9aaeba8e9711e92
>+SIZE (olsrd-0.9.0.3.tar.bz2) = 5439699
>diff -rupN olsrd.orig/files/patch-Makefile olsrd/files/patch-Makefile
>--- olsrd.orig/files/patch-Makefile	2016-06-23 17:05:20.590490050 +0200
>+++ olsrd/files/patch-Makefile	2016-06-23 13:59:45.852975309 +0200
>@@ -1,7 +1,7 @@
>---- Makefile.orig	2014-06-02 12:15:27.000000000 +0200
>-+++ Makefile	2014-06-07 21:42:39.688352979 +0200
>-@@ -128,15 +128,15 @@
>- uninstall: uninstall_olsrd
>+--- Makefile.orig	2015-09-20 12:22:23 UTC
>++++ Makefile
>+@@ -143,15 +143,15 @@ cfgparser_clean:
>+ 		$(MAKECMDPREFIX)$(MAKECMD) -C $(CFGDIR) clean
>  
>  install_bin:
> -		mkdir -p $(SBINDIR)
>@@ -23,7 +23,7 @@
>  		fi
>  endif
>  
>-@@ -147,29 +147,26 @@
>+@@ -162,29 +162,26 @@ 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)
>@@ -65,9 +65,9 @@
> +		mkdir -p ${DESTDIR}$(MANDIR)/man5/
> +		cp files/olsrd.conf.5.gz ${DESTDIR}$(MANDIR)/man5/$(CFGNAME).5.gz
>  endif
>- 
>- uninstall_olsrd:	uninstall_bin
>-@@ -217,7 +214,7 @@
>+ ifneq ($(RCDIR),)
>+ 		cp $(RCFILE) $(RCDIR)/olsrd
>+@@ -239,7 +236,7 @@ libs_clean clean_libs:
>  		-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;rm -f lib/$$dir/*.so lib/$$dir/*.dll;done
>  
>  libs_install install_libs:
>diff -rupN olsrd.orig/files/patch-src_bsd_net.c olsrd/files/patch-src_bsd_net.c
>--- olsrd.orig/files/patch-src_bsd_net.c	1970-01-01 01:00:00.000000000 +0100
>+++ olsrd/files/patch-src_bsd_net.c	2016-06-23 13:59:45.852975309 +0200
>@@ -0,0 +1,11 @@
>+--- src/bsd/net.c.orig	2016-06-22 12:04:33 UTC
>++++ src/bsd/net.c
>+@@ -125,6 +125,8 @@
>+ 
>+ #include <sys/sysctl.h>
>+ 
>++#include "olsr_random.h"
>++
>+ static int ignore_redir;
>+ static int send_redir;
>+ static int gateway;
>diff -rupN olsrd.orig/pkg-plist olsrd/pkg-plist
>--- olsrd.orig/pkg-plist	2016-06-23 17:05:20.590490050 +0200
>+++ olsrd/pkg-plist	2016-06-23 13:59:45.853975328 +0200
>@@ -1,8 +1,7 @@
> sbin/olsrd
>-etc/olsrd.conf.default.full
>-etc/olsrd.conf.default.rfc
>-etc/olsrd.conf.default.lq
>-etc/olsrd.conf.default.lq-fisheye
>+%%ETCDIR%%/olsrd.conf.default.full
>+%%ETCDIR%%/olsrd.conf.default.rfc
>+%%ETCDIR%%/olsrd.conf.default.lq
> lib/olsrd_dot_draw.so.0.3
> lib/olsrd_httpinfo.so.0.1
> lib/olsrd_jsoninfo.so.0.0

Actions: View | Diff

Attachments on bug 210161: 171228 | 171715