mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00
Code Issues Releases Activity

net/zebra: drop FreeBSD < 11.0 fix after r483654

Browse Source 
ospfd/ospf_dump.c had a typo, so rebuild is required.

PR:		193249
This commit is contained in:
Jan Beich 2019-10-13 12:59:49 +00:00
parent a4c5cda043
commit e4c97294cd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=514389
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/zebra/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= zebra
PORTVERSION= 0.95a
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= net
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/ \

2
net/zebra/files/patch-ospfd_ospf_dump.c
View File

@ -5,7 +5,7 @@
iph = (struct ip *) STREAM_PNT (s);
-#ifdef GNU_LINUX
+#ifdef GNU_LINUX || ((defined(__FreeBSD__) && (__FreeBSD_version >= 1100030))
+#if defined(GNU_LINUX) || defined(__FreeBSD__)
length = ntohs (iph->ip_len);
#else /* GNU_LINUX */
length = iph->ip_len;

13
net/zebra/files/patch-ospfd_ospf_packet.c
View File

@ -1,30 +1,27 @@
--- 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 @@
@@ -528,7 +528,7 @@
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))
+#if defined(__NetBSD__)
iph.ip_len = iph.ip_hl*4 + op->length;
#else
iph.ip_len = htons (iph.ip_hl*4 + op->length);
@@ -1893,13 +1894,15 @@
@@ -1893,13 +1894,13 @@
return NULL;
}
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(OpenBSD_IP_LEN)
+#if defined(__NetBSD__) \
+ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \
+ || defined(OpenBSD_IP_LEN)
+#if defined(__NetBSD__) || 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)
+#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN) && !defined(__FreeBSD__)
/*
* Kernel network code touches incoming IP header parameters,
* before protocol specific processing.