svn commit: r474461 - branches/2018Q3/emulators/virtualbox-ose/files
Jung-uk Kim
jkim at FreeBSD.org
Wed Jul 11 16:24:27 UTC 2018
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 <sys/libkern.h>
++ /*
++ * 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 <VBox/VBoxGuestLibSharedFolders.h>
+
+#define VBOXVFS_DEBUG(lvl, ...) do { \
More information about the svn-ports-all
mailing list