From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 8 17:42:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF37B13C; Wed, 8 Oct 2014 17:42:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA41E11F; Wed, 8 Oct 2014 17:42:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s98Hgb59017095; Wed, 8 Oct 2014 17:42:37 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s98HgbqX017092; Wed, 8 Oct 2014 17:42:37 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410081742.s98HgbqX017092@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 8 Oct 2014 17:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370474 - in branches/2014Q4/net/zebra: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Oct 2014 17:42:38 -0000 Author: bdrewery Date: Wed Oct 8 17:42:36 2014 New Revision: 370474 URL: https://svnweb.freebsd.org/changeset/ports/370474 QAT: https://qat.redports.org/buildarchive/r370474/ Log: MFH: r370473 - Fix raw sockets for FreeBSD 11 PR: 193249 Submitted by: olivier@cochard.me Added: branches/2014Q4/net/zebra/files/patch-ospfd_ospf_dump.c - copied unchanged from r370473, head/net/zebra/files/patch-ospfd_ospf_dump.c branches/2014Q4/net/zebra/files/patch-ospfd_ospf_packet.c - copied unchanged from r370473, head/net/zebra/files/patch-ospfd_ospf_packet.c Modified: branches/2014Q4/net/zebra/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/zebra/Makefile ============================================================================== --- branches/2014Q4/net/zebra/Makefile Wed Oct 8 17:42:12 2014 (r370473) +++ branches/2014Q4/net/zebra/Makefile Wed Oct 8 17:42:36 2014 (r370474) @@ -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 .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: Copied: branches/2014Q4/net/zebra/files/patch-ospfd_ospf_dump.c (from r370473, head/net/zebra/files/patch-ospfd_ospf_dump.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/net/zebra/files/patch-ospfd_ospf_dump.c Wed Oct 8 17:42:36 2014 (r370474, copy of r370473, head/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; Copied: branches/2014Q4/net/zebra/files/patch-ospfd_ospf_packet.c (from r370473, head/net/zebra/files/patch-ospfd_ospf_packet.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/net/zebra/files/patch-ospfd_ospf_packet.c Wed Oct 8 17:42:36 2014 (r370474, copy of r370473, head/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.