Attachment 171228 Details for Bug 210161 – olsrd-0.9.0.3 patch

[patch] olsrd-0.9.0.3 patch

olsrd-0.9.0.3.patch (text/plain), 7.40 KB, created by Nikola Kolev on 2016-06-09 10:28:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Kolev

Created: 2016-06-09 10:28:18 UTC

Size: 7.40 KB

patch

obsolete

>diff -rupN olsrd.orig/Makefile olsrd/Makefile
>--- olsrd.orig/Makefile	2016-06-09 09:11:33.129032549 +0000
>+++ olsrd/Makefile	2016-06-09 09:23:35.901246128 +0000
>@@ -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-09 09:11:33.129032549 +0000
>+++ olsrd/distinfo	2016-06-09 09:14:26.181494208 +0000
>@@ -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-09 09:11:33.129032549 +0000
>+++ olsrd/files/patch-Makefile	2016-06-09 09:19:03.399001897 +0000
>@@ -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.orig/olsrd.in olsrd/files.orig/olsrd.in
>--- olsrd.orig/files.orig/olsrd.in	1970-01-01 00:00:00.000000000 +0000
>+++ olsrd/files.orig/olsrd.in	2016-06-09 09:18:54.338002854 +0000
>@@ -0,0 +1,20 @@
>+#!/bin/sh
>+#
>+# $FreeBSD: head/net/olsrd/files/olsrd.in 340872 2014-01-24 00:14:07Z mat $
>+#
>+# PROVIDE: olsrd
>+# REQUIRE: NETWORKING SERVERS
>+
>+. /etc/rc.subr
>+
>+name="olsrd"
>+rcvar=olsrd_enable
>+
>+command=%%PREFIX%%/sbin/olsrd
>+command_args="-d 0"
>+
>+olsrd_enable=${olsrd_enable:-"NO"}
>+
>+load_rc_config $name
>+run_rc_command "$1"
>+
>diff -rupN olsrd.orig/files.orig/patch-Makefile olsrd/files.orig/patch-Makefile
>--- olsrd.orig/files.orig/patch-Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ olsrd/files.orig/patch-Makefile	2016-06-09 09:18:54.338002854 +0000
>@@ -0,0 +1,78 @@
>+--- 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
>+ 
>+ install_bin:
>+-		mkdir -p $(SBINDIR)
>+-		install -m 755 $(EXENAME) $(SBINDIR)
>+-		$(STRIP) $(SBINDIR)/$(EXENAME)
>++		mkdir -p ${DESTDIR}$(SBINDIR)
>++		install -m 755 $(EXENAME) ${DESTDIR}$(SBINDIR)
>++		$(STRIP) ${DESTDIR}$(SBINDIR)/$(EXENAME)
>+ ifeq ($(SGW_SUPPORT),1)
>+-		$(MAKECMDPREFIX)if [ -e $(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \
>+-			cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \
>+-			echo "Policy routing script was saved as $(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \
>++		$(MAKECMDPREFIX)if [ -e ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \
>++			cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \
>++			echo "Policy routing script was saved as ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \
>+ 		else \
>+-			cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT); \
>++			cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT); \
>+ 		fi
>+ endif
>+ 
>+@@ -147,29 +147,26 @@
>+ 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
>++		mkdir -p ${DESTDIR}$(ETCDIR)
>++		-cp files/olsrd.conf.default.full ${DESTDIR}$(CFGFILE).default.full
>++		-cp files/olsrd.conf.default.rfc ${DESTDIR}$(CFGFILE).default.rfc
>++		-cp files/olsrd.conf.default.lq ${DESTDIR}$(CFGFILE).default.lq
>++		-cp files/olsrd.conf.default.lq-fisheye ${DESTDIR}$(CFGFILE).default.lq-fisheye
>+ 		@echo -------------------------------------------
>+ 		@echo Edit $(CFGFILE) before running olsrd!!
>+ 		@echo -------------------------------------------
>+ 		@echo Installing manpages $(EXENAME)$8$ and $(CFGNAME)$5$
>+ ifneq ($(MANDIR),)
>+-		mkdir -p $(MANDIR)/man8/
>+-		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
>+-		mkdir -p $(MANDIR)/man5/
>+-		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
>++		mkdir -p ${DESTDIR}$(MANDIR)/man8/
>++		cp files/olsrd.8.gz ${DESTDIR}$(MANDIR)/man8/$(EXENAME).8.gz
>++		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 @@
>+ 		-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:
>+-		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
>++		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=${DESTDIR}$(LIBDIR) install;done
>+ 
>+ libs_uninstall uninstall_libs:
>+ 		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done
>diff -rupN olsrd.orig/pkg-plist olsrd/pkg-plist
>--- olsrd.orig/pkg-plist	2016-06-09 09:11:33.129032549 +0000
>+++ olsrd/pkg-plist	2016-06-09 09:17:05.955241531 +0000
>@@ -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