From owner-svn-ports-head@freebsd.org  Mon Oct  9 17:25:03 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65406E3728E;
 Mon,  9 Oct 2017 17:25:03 +0000 (UTC) (envelope-from ume@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 mx1.freebsd.org (Postfix) with ESMTPS id 2D80773861;
 Mon,  9 Oct 2017 17:25:03 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v99HP2Hx088616;
 Mon, 9 Oct 2017 17:25:02 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99HP2OE088614;
 Mon, 9 Oct 2017 17:25:02 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201710091725.v99HP2OE088614@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Mon, 9 Oct 2017 17:25:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451626 - in head/net/u6rd: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: ume
X-SVN-Commit-Paths: in head/net/u6rd: . files
X-SVN-Commit-Revision: 451626
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2017 17:25:03 -0000

Author: ume
Date: Mon Oct  9 17:25:02 2017
New Revision: 451626
URL: https://svnweb.freebsd.org/changeset/ports/451626

Log:
  follow raw socket behaviour change on 11 and later.
  
  Submitted by:	guido

Added:
  head/net/u6rd/files/patch-main.c   (contents, props changed)
Modified:
  head/net/u6rd/Makefile

Modified: head/net/u6rd/Makefile
==============================================================================
--- head/net/u6rd/Makefile	Mon Oct  9 17:20:00 2017	(r451625)
+++ head/net/u6rd/Makefile	Mon Oct  9 17:25:02 2017	(r451626)
@@ -2,7 +2,7 @@
 
 PORTNAME=	u6rd
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://ftp.scythe.jp/pub/u6rd/release/
 

Added: head/net/u6rd/files/patch-main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/u6rd/files/patch-main.c	Mon Oct  9 17:25:02 2017	(r451626)
@@ -0,0 +1,12 @@
+--- main.c.orig	2013-06-19 11:23:58 UTC
++++ main.c
+@@ -608,7 +608,8 @@ tun2raw(struct connection *c)
+ 	ip4 = (struct ipv4_header *)(buf - sizeof(*ip4));
+ 	ip4->ver_hlen = 4 << 4 | sizeof(*ip4) >> 2;
+ 	ip4->tos = ntohl(ip6->ver_class_label) >> 20 & 0xff;
+-#if defined(__OpenBSD__) || defined(__linux__)
++#if defined(__OpenBSD__) || defined(__linux__) || \
++    (defined(__FreeBSD__) && __FreeBSD_version >= 1100030)
+ 	ip4->len = htons(len + sizeof(*ip4));
+ #else
+ 	ip4->len = len + sizeof(*ip4);