Date: Sun, 13 Oct 2019 12:59:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514389 - in head/net/zebra: . files Message-ID: <201910131259.x9DCxnrE057649@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Oct 13 12:59:49 2019 New Revision: 514389 URL: https://svnweb.freebsd.org/changeset/ports/514389 Log: net/zebra: drop FreeBSD < 11.0 fix after r483654 ospfd/ospf_dump.c had a typo, so rebuild is required. PR: 193249 Modified: head/net/zebra/Makefile (contents, props changed) 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 ============================================================================== --- head/net/zebra/Makefile Sun Oct 13 12:43:25 2019 (r514388) +++ head/net/zebra/Makefile Sun Oct 13 12:59:49 2019 (r514389) @@ -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/ \ Modified: head/net/zebra/files/patch-ospfd_ospf_dump.c ============================================================================== --- head/net/zebra/files/patch-ospfd_ospf_dump.c Sun Oct 13 12:43:25 2019 (r514388) +++ head/net/zebra/files/patch-ospfd_ospf_dump.c Sun Oct 13 12:59:49 2019 (r514389) @@ -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; Modified: head/net/zebra/files/patch-ospfd_ospf_packet.c ============================================================================== --- head/net/zebra/files/patch-ospfd_ospf_packet.c Sun Oct 13 12:43:25 2019 (r514388) +++ head/net/zebra/files/patch-ospfd_ospf_packet.c Sun Oct 13 12:59:49 2019 (r514389) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910131259.x9DCxnrE057649>