From 12496204b4f688627d279e4e9d39bb052fe03859 Mon Sep 17 00:00:00 2001 From: "Alexander V. Chernikov" Date: Sat, 27 Sep 2014 08:45:13 +0000 Subject: [PATCH] Fix raw sockets operation for bird on -current. PR: 193245 Submitted by: olivier Approved by: az (implicit) --- net/bird/Makefile | 1 + net/bird/files/patch-bsd-sysdep.h | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 net/bird/files/patch-bsd-sysdep.h diff --git a/net/bird/Makefile b/net/bird/Makefile index c02ac345f4b0..886e9308c308 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -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/ diff --git a/net/bird/files/patch-bsd-sysdep.h b/net/bird/files/patch-bsd-sysdep.h new file mode 100644 index 000000000000..d09aac02867b --- /dev/null +++ b/net/bird/files/patch-bsd-sysdep.h @@ -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 + #include // Workaround for some BSDs + #include ++#ifdef __FreeBSD__ ++#include // 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 + }