Attachment 146673 Details for Bug 193249 – net/zebra patch for sock_raw

[patch] net/zebra patch for sock_raw

ports.zebra.patch (text/plain), 3.03 KB, created by olivier on 2014-09-02 10:12:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: olivier

Created: 2014-09-02 10:12:41 UTC

Size: 3.03 KB

patch

obsolete

>Index: net/zebra/Makefile
>===================================================================
>--- net/zebra/Makefile	(revision 366908)
>+++ net/zebra/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zebra
> PORTVERSION=	0.95a
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net ipv6
> MASTER_SITES=	ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/ \
> 		ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ \
>Index: net/zebra/files/patch-ospfd_ospf_dump.c
>===================================================================
>--- net/zebra/files/patch-ospfd_ospf_dump.c	(revision 0)
>+++ net/zebra/files/patch-ospfd_ospf_dump.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- ospfd/ospf_dump.c.orig	2003-11-04 20:10:17.000000000 +0100
>++++ ospfd/ospf_dump.c	2014-03-18 14:22:06.123332679 +0100
>+@@ -607,7 +607,7 @@
>+ 
>+   iph = (struct ip *) STREAM_PNT (s);
>+ 
>+-#ifdef GNU_LINUX
>++#ifdef GNU_LINUX || ((defined(__FreeBSD__) && (__FreeBSD_version >= 1100030))
>+   length = ntohs (iph->ip_len);
>+ #else /* GNU_LINUX */
>+   length = iph->ip_len;
>
>Property changes on: net/zebra/files/patch-ospfd_ospf_dump.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: net/zebra/files/patch-ospfd_ospf_packet.c
>===================================================================
>--- net/zebra/files/patch-ospfd_ospf_packet.c	(revision 0)
>+++ net/zebra/files/patch-ospfd_ospf_packet.c	(working copy)
>@@ -0,0 +1,30 @@
>+--- ospfd/ospf_packet.c.orig	2005-06-21 02:58:24.000000000 +0200
>++++ ospfd/ospf_packet.c	2014-03-18 14:22:06.129332906 +0100
>+@@ -528,7 +528,8 @@
>+   iph.ip_hl = sizeof (struct ip) >> 2;
>+   iph.ip_v = IPVERSION;
>+   iph.ip_tos = IPTOS_PREC_INTERNETCONTROL;
>+-#if defined(__NetBSD__) || defined(__FreeBSD__)
>++#if defined(__NetBSD__) \
>++ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030))
>+   iph.ip_len = iph.ip_hl*4 + op->length;
>+ #else
>+   iph.ip_len = htons (iph.ip_hl*4 + op->length);
>+@@ -1893,13 +1894,15 @@
>+       return NULL;
>+     }
>+ 
>+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(OpenBSD_IP_LEN)
>++#if defined(__NetBSD__) \
>++ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \
>++ || defined(OpenBSD_IP_LEN)
>+   ip_len = iph.ip_len;
>+ #else
>+   ip_len = ntohs (iph.ip_len);
>+ #endif
>+ 
>+-#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN)
>++#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN) && (__FreeBSD_version < 1000000)
>+   /*
>+    * Kernel network code touches incoming IP header parameters,
>+    * before protocol specific processing.
>
>Property changes on: net/zebra/files/patch-ospfd_ospf_packet.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 193249: 146673 | 146772