svn commit: r370473 - in head/net/zebra: . files

[Bryan Drewery]

Author: bdrewery
Date: Wed Oct  8 17:42:12 2014
New Revision: 370473
URL: https://svnweb.freebsd.org/changeset/ports/370473
QAT: https://qat.redports.org/buildarchive/r370473/

Log:
  - Fix raw sockets for FreeBSD 11
  
  PR:		193249
  Submitted by:	olivier at cochard.me

Added:
  head/net/zebra/files/patch-ospfd_ospf_dump.c   (contents, props changed)
  head/net/zebra/files/patch-ospfd_ospf_packet.c   (contents, props changed)
Modified:
  head/net/zebra/Makefile

Modified: head/net/zebra/Makefile
==============================================================================
--- head/net/zebra/Makefile	Wed Oct  8 17:33:25 2014	(r370472)
+++ head/net/zebra/Makefile	Wed Oct  8 17:42:12 2014	(r370473)
@@ -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/ \
@@ -74,10 +74,10 @@ ZEBRAARGS?=	-d
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MOSPF6D}
-IGNORE=		OSPF6D requires IPV6 option.
+IGNORE=		OSPF6D requires IPV6 option
 .endif
 .if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MRIPNGD}
-IGNORE=		RIPNGD requires IPV6 option.
+IGNORE=		RIPNGD requires IPV6 option
 .endif
 
 post-install:

Added: head/net/zebra/files/patch-ospfd_ospf_dump.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/zebra/files/patch-ospfd_ospf_dump.c	Wed Oct  8 17:42:12 2014	(r370473)
@@ -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;

Added: head/net/zebra/files/patch-ospfd_ospf_packet.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/zebra/files/patch-ospfd_ospf_packet.c	Wed Oct  8 17:42:12 2014	(r370473)
@@ -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.