diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-10-08 17:42:36 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-10-08 17:42:36 +0000 |
| commit | 096463aa25ce1c1daf17eced86c244b6a26accbb (patch) | |
| tree | 7b1005dec933d1df000a59eb887ea9ac877885f5 | |
| parent | eb81c6983bbaee4bda2a02736e5b64ae3a77be44 (diff) | |
| download | ports-096463aa25ce1c1daf17eced86c244b6a26accbb.tar.gz ports-096463aa25ce1c1daf17eced86c244b6a26accbb.zip | |
MFH: r370473
- Fix raw sockets for FreeBSD 11
PR: 193249
Submitted by: olivier@cochard.me
Notes
Notes:
svn path=/branches/2014Q4/; revision=370474
| -rw-r--r-- | net/zebra/Makefile | 6 | ||||
| -rw-r--r-- | net/zebra/files/patch-ospfd_ospf_dump.c | 11 | ||||
| -rw-r--r-- | net/zebra/files/patch-ospfd_ospf_packet.c | 30 |
3 files changed, 44 insertions, 3 deletions
diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 3ce6f235db62..247801025a4f 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -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: diff --git a/net/zebra/files/patch-ospfd_ospf_dump.c b/net/zebra/files/patch-ospfd_ospf_dump.c new file mode 100644 index 000000000000..6b7cb26d657f --- /dev/null +++ b/net/zebra/files/patch-ospfd_ospf_dump.c @@ -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; diff --git a/net/zebra/files/patch-ospfd_ospf_packet.c b/net/zebra/files/patch-ospfd_ospf_packet.c new file mode 100644 index 000000000000..8d341da4bbb3 --- /dev/null +++ b/net/zebra/files/patch-ospfd_ospf_packet.c @@ -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. |