From owner-svn-ports-head@FreeBSD.ORG  Fri Nov 14 18:52:33 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BBEB54F3;
 Fri, 14 Nov 2014 18:52:33 +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 A8254AC;
 Fri, 14 Nov 2014 18:52:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAEIqX3q092289;
 Fri, 14 Nov 2014 18:52:33 GMT (envelope-from nox@FreeBSD.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAEIqXwd092288;
 Fri, 14 Nov 2014 18:52:33 GMT (envelope-from nox@FreeBSD.org)
Message-Id: <201411141852.sAEIqXwd092288@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: nox set sender to nox@FreeBSD.org
 using -f
From: Juergen Lock <nox@FreeBSD.org>
Date: Fri, 14 Nov 2014 18:52:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372573 - head/emulators/qemu-devel/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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2014 18:52:33 -0000

Author: nox
Date: Fri Nov 14 18:52:32 2014
New Revision: 372573
URL: https://svnweb.freebsd.org/changeset/ports/372573
QAT: https://qat.redports.org/buildarchive/r372573/

Log:
  (Attempt to) fix build on head after faith(4) removal. (r274331)
  
  Submitted by:	beefy1 via pkg-fallout

Added:
  head/emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-os-socket.h   (contents, props changed)

Added: head/emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-os-socket.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-os-socket.h	Fri Nov 14 18:52:32 2014	(r372573)
@@ -0,0 +1,22 @@
+--- a/bsd-user/freebsd/os-socket.h
++++ b/bsd-user/freebsd/os-socket.h
+@@ -181,7 +181,9 @@ static inline abi_long do_bsd_setsockopt
+         case IP_PORTRANGE: /* int; range to choose for unspec port */
+         case IP_RECVIF: /* bool; receive reception if w/dgram */
+         case IP_IPSEC_POLICY:   /* int; set/get security policy */
++#ifdef IP_FAITH
+         case IP_FAITH:  /* bool; accept FAITH'ed connections */
++#endif
+         case IP_RECVTTL: /* bool; receive reception TTL w/dgram */
+             val = 0;
+             if (optlen >= sizeof(uint32_t)) {
+@@ -454,7 +456,9 @@ int_case:
+         case IP_MULTICAST_LOOP:
+         case IP_PORTRANGE:
+         case IP_IPSEC_POLICY:
++#ifdef IP_FAITH
+         case IP_FAITH:
++#endif
+         case IP_ONESBCAST:
+         case IP_BINDANY:
+             if (get_user_u32(len, optlen)) {