From owner-svn-ports-all@FreeBSD.ORG  Sat Sep 27 08:45:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A8D9ACE2;
 Sat, 27 Sep 2014 08:45:14 +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 79F7AE7;
 Sat, 27 Sep 2014 08:45:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8R8jEWR022792;
 Sat, 27 Sep 2014 08:45:14 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8R8jEM1022790;
 Sat, 27 Sep 2014 08:45:14 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201409270845.s8R8jEM1022790@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sat, 27 Sep 2014 08:45:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r369382 - in head/net/bird: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Sep 2014 08:45:14 -0000

Author: melifaro (src committer)
Date: Sat Sep 27 08:45:13 2014
New Revision: 369382
URL: http://svnweb.freebsd.org/changeset/ports/369382
QAT: https://qat.redports.org/buildarchive/r369382/

Log:
  Fix raw sockets operation for bird on -current.
  
  PR:		193245
  Submitted by:	olivier
  Approved by:	az (implicit)

Added:
  head/net/bird/files/patch-bsd-sysdep.h   (contents, props changed)
Modified:
  head/net/bird/Makefile

Modified: head/net/bird/Makefile
==============================================================================
--- head/net/bird/Makefile	Sat Sep 27 08:42:03 2014	(r369381)
+++ head/net/bird/Makefile	Sat Sep 27 08:45:13 2014	(r369382)
@@ -3,6 +3,7 @@
 
 PORTNAME?=	bird
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
 		http://bird.mpls.in/distfiles/bird/

Added: head/net/bird/files/patch-bsd-sysdep.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/bird/files/patch-bsd-sysdep.h	Sat Sep 27 08:45:13 2014	(r369382)
@@ -0,0 +1,23 @@
+--- sysdep/bsd/sysio.h	2014-07-10 01:40:13.000000000 +0400
++++ sysdep/bsd/sysio.h	2014-09-27 12:12:09.000000000 +0400
+@@ -9,6 +9,9 @@
+ #include <net/if_dl.h>
+ #include <netinet/in_systm.h> // Workaround for some BSDs
+ #include <netinet/ip.h>
++#ifdef __FreeBSD__
++#include <sys/param.h> // FreeBSD_version definition
++#endif
+ 
+ 
+ #ifdef __NetBSD__
+@@ -175,8 +178,8 @@
+   ip->ip_src = ipa_to_in4(s->saddr);
+   ip->ip_dst = ipa_to_in4(s->daddr);
+ 
+-#ifdef __OpenBSD__
+-  /* OpenBSD expects ip_len in network order, other BSDs expect host order */
++#if defined __OpenBSD__ || (defined __FreeBSD__ && (__FreeBSD_version >= 1100030))
++  /* OpenBSD and FreeBSD (since 11) expects ip_len in network order, other BSDs expect host order */
+   ip->ip_len = htons(ip->ip_len);
+ #endif
+ }