From owner-svn-ports-head@freebsd.org Sun Oct 13 12:59:50 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B2A1F87FC; Sun, 13 Oct 2019 12:59:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46rhc62F7Gz3PLc; Sun, 13 Oct 2019 12:59:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 12A3F1D2CE; Sun, 13 Oct 2019 12:59:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9DCxnQu057651; Sun, 13 Oct 2019 12:59:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9DCxnrE057649; Sun, 13 Oct 2019 12:59:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201910131259.x9DCxnrE057649@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 13 Oct 2019 12:59:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514389 - in head/net/zebra: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/net/zebra: . files X-SVN-Commit-Revision: 514389 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2019 12:59:50 -0000 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.