Attachment 173056 Details for Bug 211413 – Patch to update net/bird to 1.6.0

[patch] Patch to update net/bird to 1.6.0

ports.net.bird.1.6.0.diff (text/plain), 5.52 KB, created by Niclas Zeising on 2016-07-27 18:04:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2016-07-27 18:04:45 UTC

Size: 5.52 KB

patch

obsolete

>Index: net/bird/Makefile
>===================================================================
>--- net/bird/Makefile	(revision 419179)
>+++ net/bird/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME?=	bird
>-PORTVERSION=	1.5.0
>-PORTREVISION=	1
>+PORTVERSION=	1.6.0
> CATEGORIES=	net
> MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
> 		http://bird.mpls.in/distfiles/bird/
>Index: net/bird/distinfo
>===================================================================
>--- net/bird/distinfo	(revision 419179)
>+++ net/bird/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (bird-1.5.0.tar.gz) = 79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d
>-SIZE (bird-1.5.0.tar.gz) = 1300141
>+TIMESTAMP = 1469633743
>+SHA256 (bird-1.6.0.tar.gz) = db3dfe37deac73b38b7d6966e577985f7b8e23f246760cb095ad13b0d8010e13
>+SIZE (bird-1.6.0.tar.gz) = 1273899
>Index: net/bird/files/firewall_support.patch
>===================================================================
>--- net/bird/files/firewall_support.patch	(revision 419179)
>+++ net/bird/files/firewall_support.patch	(working copy)
>@@ -101,12 +101,12 @@
> --- nest/route.h
> +++ nest/route.h
> @@ -361,7 +361,8 @@ typedef struct eattr {
>- #define EAP_RIP 2			/* RIP */
>  #define EAP_OSPF 3			/* OSPF */
>  #define EAP_KRT 4			/* Kernel route attributes */
>--#define EAP_MAX 5
>-+#define EAP_FIREWALL 5			/* Abstact firewall interface */
>-+#define EAP_MAX 6
>+ #define EAP_BABEL 5			/* Babel attributes */
>+-#define EAP_MAX 6
>++#define EAP_FIREWALL 6			/* Abstact firewall interface */
>++#define EAP_MAX 7
>  
>  #define EA_CODE(proto,id) (((proto) << 8) | (id))
>  #define EA_PROTO(ea) ((ea) >> 8)
>Index: net/bird/files/patch-bsd-sysdep.h
>===================================================================
>--- net/bird/files/patch-bsd-sysdep.h	(revision 419179)
>+++ net/bird/files/patch-bsd-sysdep.h	(nonexistent)
>@@ -1,23 +0,0 @@
>---- sysdep/bsd/sysio.h	2014-07-10 01:40:13.000000000 +0400
>-+++ sysdep/bsd/sysio.h	2014-09-27 12:12:09.000000000 +0400
>-@@ -9,6 +9,9 @@
>- #include <net/if_dl.h>
>- #include <netinet/in_systm.h> // Workaround for some BSDs
>- #include <netinet/ip.h>
>-+#ifdef __FreeBSD__
>-+#include <sys/param.h> // FreeBSD_version definition
>-+#endif
>- 
>- 
>- #ifdef __NetBSD__
>-@@ -175,8 +178,8 @@
>-   ip->ip_src = ipa_to_in4(s->saddr);
>-   ip->ip_dst = ipa_to_in4(s->daddr);
>- 
>--#ifdef __OpenBSD__
>--  /* OpenBSD expects ip_len in network order, other BSDs expect host order */
>-+#if defined __OpenBSD__ || (defined __FreeBSD__ && (__FreeBSD_version >= 1100030))
>-+  /* OpenBSD and FreeBSD (since 11) expects ip_len in network order, other BSDs expect host order */
>-   ip->ip_len = htons(ip->ip_len);
>- #endif
>- }
>
>Property changes on: net/bird/files/patch-bsd-sysdep.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/bird/files/patch-sysdep_bsd_sysio.h
>===================================================================
>--- net/bird/files/patch-sysdep_bsd_sysio.h	(revision 419179)
>+++ net/bird/files/patch-sysdep_bsd_sysio.h	(working copy)
>@@ -1,5 +1,5 @@
>---- sysdep/bsd/sysio.h	2014-07-10 01:40:13.000000000 +0400
>-+++ sysdep/bsd/sysio.h	2014-09-27 12:12:09.000000000 +0400
>+--- sysdep/bsd/sysio.h.orig	2016-04-29 09:13:23 UTC
>++++ sysdep/bsd/sysio.h
> @@ -9,6 +9,9 @@
>  #include <net/if_dl.h>
>  #include <netinet/in_systm.h> // Workaround for some BSDs
>@@ -10,7 +10,7 @@
>  
>  
>  #ifdef __NetBSD__
>-@@ -175,8 +178,8 @@
>+@@ -175,8 +178,8 @@ sk_prepare_ip_header(sock *s, void *hdr,
>    ip->ip_src = ipa_to_in4(s->saddr);
>    ip->ip_dst = ipa_to_in4(s->daddr);
>  
>Index: net/bird/files/patch-tools-Makefile.in
>===================================================================
>--- net/bird/files/patch-tools-Makefile.in	(revision 419179)
>+++ net/bird/files/patch-tools-Makefile.in	(working copy)
>@@ -1,8 +1,8 @@
>---- tools/Makefile.in.orig	2012-08-07 13:15:45.000000000 +0400
>-+++ tools/Makefile.in	2012-08-15 15:51:51.000000000 +0400
>-@@ -61,11 +61,7 @@
>+--- tools/Makefile.in.orig	2016-04-29 09:13:23 UTC
>++++ tools/Makefile.in
>+@@ -77,11 +77,7 @@ install: all
>  	if test -n "@CLIENT@" ; then								\
>- 		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
>+ 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
>  	fi
> -	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
> -		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
>Index: net/bird/files/patch-tools-Rules.in
>===================================================================
>--- net/bird/files/patch-tools-Rules.in	(revision 419179)
>+++ net/bird/files/patch-tools-Rules.in	(working copy)
>@@ -1,12 +1,13 @@
>---- tools/Rules.in.orig	2010-10-10 21:48:20.000000000 +0200
>-+++ tools/Rules.in	2010-12-18 15:00:27.000000000 +0100
>-@@ -66,9 +66,7 @@
>+--- tools/Rules.in.orig	2016-04-29 09:13:23 UTC
>++++ tools/Rules.in
>+@@ -66,10 +66,8 @@ else
>  subdir: all.o
>  
>  all.o: $(objs)
> -#       $(LD) -r -o $@ $^
> -#	Changed to $(CC) because $(LD) has problems with crosscompiling
>--	$(CC) -nostdlib -r -o $@ $^
>+ 	@echo LD -r -o $@ $^
>+-	@$(CC) -nostdlib -r -o $@ $^
> +	$(LD) -r -o $@ $^
>  
>  endif
>Index: net/bird6/Makefile
>===================================================================
>--- net/bird6/Makefile	(revision 419179)
>+++ net/bird6/Makefile	(working copy)
>@@ -7,8 +7,6 @@
> 
> MASTERDIR=	${.CURDIR}/../bird
> 
>-OPTIONS_DEFINE=	EXP
>-
> USE_RC_SUBR=	${PORTNAME}
> 
> PLIST_SUB=	VER="6"

Actions: View | Diff

Attachments on bug 211413: 173056