From owner-svn-ports-all@freebsd.org Wed Jul 11 16:24:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 047EB1025480; Wed, 11 Jul 2018 16:24:27 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB0DE7A1FF; Wed, 11 Jul 2018 16:24:26 +0000 (UTC) (envelope-from jkim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72F4E151EC; Wed, 11 Jul 2018 16:24:26 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6BGOQtZ003384; Wed, 11 Jul 2018 16:24:26 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6BGOQ1T003382; Wed, 11 Jul 2018 16:24:26 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201807111624.w6BGOQ1T003382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 11 Jul 2018 16:24:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r474461 - branches/2018Q3/emulators/virtualbox-ose/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: branches/2018Q3/emulators/virtualbox-ose/files X-SVN-Commit-Revision: 474461 X-SVN-Commit-Repository: ports 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.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2018 16:24:27 -0000 Author: jkim Date: Wed Jul 11 16:24:25 2018 New Revision: 474461 URL: https://svnweb.freebsd.org/changeset/ports/474461 Log: MFH: r474458 Unbreak emulators/virtualbox-ose-additions and emulators/virtualbox-ose-kmod on head after r335879. Approved by: ports-secteam (blanket) Added: branches/2018Q3/emulators/virtualbox-ose/files/patch-include_iprt_string.h - copied unchanged from r474458, head/emulators/virtualbox-ose/files/patch-include_iprt_string.h Modified: branches/2018Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h Directory Properties: branches/2018Q3/ (props changed) Copied: branches/2018Q3/emulators/virtualbox-ose/files/patch-include_iprt_string.h (from r474458, head/emulators/virtualbox-ose/files/patch-include_iprt_string.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/emulators/virtualbox-ose/files/patch-include_iprt_string.h Wed Jul 11 16:24:25 2018 (r474461, copy of r474458, head/emulators/virtualbox-ose/files/patch-include_iprt_string.h) @@ -0,0 +1,14 @@ +--- include/iprt/string.h.orig 2018-06-29 13:08:03 UTC ++++ include/iprt/string.h +@@ -43,6 +43,11 @@ + #elif defined(RT_OS_FREEBSD) && defined(_KERNEL) + RT_C_DECLS_BEGIN + # include ++ /* ++ * Kludge for the FreeBSD kernel: ++ * sys/libkern.h includes sys/param.h via sys/systm.h since r335879. ++ */ ++# undef PVM + RT_C_DECLS_END + + #elif defined(RT_OS_NETBSD) && defined(_KERNEL) Modified: branches/2018Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h ============================================================================== --- branches/2018Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h Wed Jul 11 16:22:54 2018 (r474460) +++ branches/2018Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h Wed Jul 11 16:24:25 2018 (r474461) @@ -1,4 +1,4 @@ ---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2017-10-18 07:06:47 UTC +--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2018-06-29 13:08:17 UTC +++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h @@ -1,8 +1,3 @@ -/* $Id: vboxvfs.h $ */ @@ -7,9 +7,9 @@ - */ - /* - * Copyright (C) 2010-2016 Oracle Corporation + * Copyright (C) 2010-2017 Oracle Corporation * -@@ -21,72 +16,416 @@ +@@ -21,72 +16,413 @@ #define VBOXVFS_VFSNAME "vboxvfs" #define VBOXVFS_VERSION 1 @@ -174,9 +174,6 @@ - long nextino; - int caseopt; - int didrele; -+#if defined(RT_OS_FREEBSD) && defined(_KERNEL) -+# undef PVM /** XXX: For not conflict with PVM in sys/priority.h */ -+#endif +#include + +#define VBOXVFS_DEBUG(lvl, ...) do { \