pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

virtualbox-svn: Push build forwards



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Aug 12 23:58:45 2016 +0200
Changeset:	feb6f7defb83075bfa9cb325a2ec90efa9a0bef5

Modified Files:
	virtualbox-svn/distinfo
Added Files:
	virtualbox-svn/patches/patch-src_VBox_Additions_x11_Makefile.kmk
	virtualbox-svn/patches/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk
	virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
	virtualbox-svn/patches/patch-src_VBox_Devices_Network_lwip-new_src_include_lwip_sockets.h
	virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.cpp
	virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.h
	virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostDVD.cpp
	virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostFloppy.cpp
	virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvVD.cpp
	virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h
	virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPR3HardenedMain.cpp
	virtualbox-svn/patches/patch-src_VBox_Main_include_ConsoleImpl.h
	virtualbox-svn/patches/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp
	virtualbox-svn/patches/patch-src_VBox_NetworkServices_NAT_pxping.c
	virtualbox-svn/patches/patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h
	virtualbox-svn/patches/patch-src_libs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp
	virtualbox-svn/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.h

Log Message:
virtualbox-svn: Push build forwards

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=feb6f7defb83075bfa9cb325a2ec90efa9a0bef5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox-svn/distinfo                            | 16 +++++
 .../patch-src_VBox_Additions_x11_Makefile.kmk      | 18 ++++++
 ...h-src_VBox_Additions_x11_vboxvideo_Makefile.kmk | 12 ++++
 ...atch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp | 25 ++++++++
 ...ces_Network_lwip-new_src_include_lwip_sockets.h | 17 +++++
 .../patch-src_VBox_Devices_Storage_DrvHostBase.cpp | 33 ++++++++++
 .../patch-src_VBox_Devices_Storage_DrvHostBase.h   | 13 ++++
 .../patch-src_VBox_Devices_Storage_DrvHostDVD.cpp  | 73 ++++++++++++++++++++++
 ...atch-src_VBox_Devices_Storage_DrvHostFloppy.cpp | 18 ++++++
 .../patch-src_VBox_Devices_Storage_DrvVD.cpp       | 32 ++++++++++
 .../patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h | 19 ++++++
 ..._VBox_HostDrivers_Support_SUPR3HardenedMain.cpp | 60 ++++++++++++++++++
 .../patch-src_VBox_Main_include_ConsoleImpl.h      | 22 +++++++
 ...patch-src_VBox_Main_src-client_ConsoleImpl2.cpp | 51 +++++++++++++++
 .../patch-src_VBox_NetworkServices_NAT_pxping.c    | 13 ++++
 ...c_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h | 14 +++++
 ...ibs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp | 13 ++++
 ...libs_xpcom18a4_nsprpub_pr_include_md___netbsd.h | 13 ++++
 18 files changed, 462 insertions(+)

diffs:
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index f3704e4..f524648 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -6,10 +6,26 @@ SHA512 (VirtualBox-5.0.16.tar.bz2) = 3da3a227360fb50d299e99770378f65e8cb99525377
 Size (VirtualBox-5.0.16.tar.bz2) = 111062984 bytes
 SHA1 (patch-configure) = 32a205a07cacf12300cd718131153d7a601e48c1
 SHA1 (patch-include_iprt_types.h) = 33af52ca41f7d9555c45cc7dbf5bdc4b33384757
+SHA1 (patch-src_VBox_Additions_x11_Makefile.kmk) = 2afd3794e3df3d97db9743ee3b72159d747197fb
+SHA1 (patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk) = eae2633316f418e172215db90fad2d78cb41dce9
+SHA1 (patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp) = 8ec61f85d856d292c7907eafd8f20f13b1bda6d5
+SHA1 (patch-src_VBox_Devices_Network_lwip-new_src_include_lwip_sockets.h) = 772cf503bd67b4eec97e90f032d0a87f7fb99299
+SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.cpp) = d0bf9e0f6c5279ae048629d1ecfe8cda3ad6e691
+SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.h) = 9cdcfb390d3b3ada3e5fa6b3893ca25c475be5d6
+SHA1 (patch-src_VBox_Devices_Storage_DrvHostDVD.cpp) = 5ed9adc7ea7d89846332272a85fd97b19b7add7a
+SHA1 (patch-src_VBox_Devices_Storage_DrvHostFloppy.cpp) = 4c93cbebd814c870785f81a4483f3652058b25ca
+SHA1 (patch-src_VBox_Devices_Storage_DrvVD.cpp) = 18564e44251cbd8af6aca05159467b4e421239f4
+SHA1 (patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h) = df93779d885d4d661f7fbd3d2cfe02517f8ddac6
+SHA1 (patch-src_VBox_HostDrivers_Support_SUPR3HardenedMain.cpp) = 0e086dc3914c2993206cd0f6aa932f4ca5f93f00
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_postflight) = d073de54d5de4f61e154003e8e2acc039b6e059b
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_preflight) = f24f7d6dd449e6ad664b8e5a8f5861dd7e0f13e8
 SHA1 (patch-src_VBox_Main_cbinding_VBoxCAPIGlue.c) = 03d23375afaf4448751141bedb7771abc7635f3c
 SHA1 (patch-src_VBox_Main_glue_NativeEventQueue.cpp) = 58ff96858e861b03a495323fd5d6141044ac36f5
+SHA1 (patch-src_VBox_Main_include_ConsoleImpl.h) = 2af64e329ca18787d1f9db8746200f6557b951fa
+SHA1 (patch-src_VBox_Main_src-client_ConsoleImpl2.cpp) = 8b7bdd045d0c905c122c497d6b50197a02068c5f
+SHA1 (patch-src_VBox_NetworkServices_NAT_pxping.c) = 47ac337c6e46b0ae4dec3da2e987b94a16e478fc
 SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = deaa4e4f3d2fcbf0de22b430b547f63d075ca670
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h) = 45e4d9f4a67449099651e96b54b7d108bebe606c
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk.sh) = d949a78be396466636aa2c8d92e6ecf76725f336
+SHA1 (patch-src_libs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp) = 6ea4110abb786937a69bf0feddcf641d604f7fad
+SHA1 (patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.h) = 4acbece0d8456f1e645380dd01dcf7a2f7810a1d
diff --git a/virtualbox-svn/patches/patch-src_VBox_Additions_x11_Makefile.kmk b/virtualbox-svn/patches/patch-src_VBox_Additions_x11_Makefile.kmk
new file mode 100644
index 0000000..8d15d40
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Additions_x11_Makefile.kmk
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/VBox/Additions/x11/Makefile.kmk.orig	2016-08-05 17:44:25.000000000 +0000
++++ src/VBox/Additions/x11/Makefile.kmk
+@@ -20,7 +20,7 @@ include $(KBUILD_PATH)/subheader.kmk
+ # Include sub-makefiles.
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+- include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
++# include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
+  ifneq ($(KBUILD_TARGET), solaris)
+   include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+  endif
+@@ -30,4 +30,3 @@ if1of ($(KBUILD_TARGET), freebsd linux n
+ endif
+ 
+ include $(FILE_KBUILD_SUB_FOOTER)
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk b/virtualbox-svn/patches/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk
new file mode 100644
index 0000000..1298fc6
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2016-08-05 17:26:18.000000000 +0000
++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -95,6 +95,7 @@ vboxvideo_drv_INCS = \
+ 	$(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
+ 	$(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
+ vboxvideo_drv_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++#vboxvideo_drv_INCS += /usr/X11R7/include
+ vboxvideo_drv_SOURCES = \
+ 	getmode.c \
+ 	helpers.c \
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp b/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
new file mode 100644
index 0000000..22c3f21
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2016-08-12 18:06:09.000000000 +0000
++++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
+@@ -137,6 +137,7 @@ static OSSAUDIOCFG s_OSSConf =
+ };
+ 
+ 
++#ifndef __NetBSD__
+ /* http://www.df.lth.se/~john_e/gems/gem002d.html */
+ static uint32_t popcount(uint32_t u)
+ {
+@@ -147,6 +148,7 @@ static uint32_t popcount(uint32_t u)
+     u = ( u&0x0000ffff) + (u>>16);
+     return u;
+ }
++#endif
+ 
+ static uint32_t lsbindex(uint32_t u)
+ {
+@@ -1149,4 +1151,3 @@ const PDMDRVREG g_DrvHostOSSAudio =
+     /* u32EndVersion */
+     PDM_DRVREG_VERSION
+ };
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Network_lwip-new_src_include_lwip_sockets.h b/virtualbox-svn/patches/patch-src_VBox_Devices_Network_lwip-new_src_include_lwip_sockets.h
new file mode 100644
index 0000000..58a3f77
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Network_lwip-new_src_include_lwip_sockets.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/VBox/Devices/Network/lwip-new/src/include/lwip/sockets.h.orig	2016-08-05 16:20:22.000000000 +0000
++++ src/VBox/Devices/Network/lwip-new/src/include/lwip/sockets.h
+@@ -361,9 +361,11 @@ typedef struct ip_mreq {
+ /** LWIP_TIMEVAL_PRIVATE: if you want to use the struct timeval provided
+  * by your system, set this to 0 and include <sys/time.h> in cc.h */ 
+ #ifndef LWIP_TIMEVAL_PRIVATE
+-#define LWIP_TIMEVAL_PRIVATE 1
++#define LWIP_TIMEVAL_PRIVATE 0
+ #endif
+ 
++#include <sys/time.h>
++
+ #if LWIP_TIMEVAL_PRIVATE
+ struct timeval {
+   long    tv_sec;         /* seconds */
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.cpp b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.cpp
new file mode 100644
index 0000000..3e10933
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.cpp
@@ -0,0 +1,33 @@
+$NetBSD$
+
+--- src/VBox/Devices/Storage/DrvHostBase.cpp.orig	2016-08-05 16:42:58.000000000 +0000
++++ src/VBox/Devices/Storage/DrvHostBase.cpp
+@@ -96,15 +96,18 @@ NTSTATUS __stdcall NtQueryVolumeInformat
+         /*IN*/ ULONG                Length,
+         /*IN*/ FS_INFORMATION_CLASS FileSystemInformationClass );
+ 
+-#elif defined(RT_OS_FREEBSD)
++#elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ # include <sys/cdefs.h>
+ # include <sys/param.h>
++# undef PVM
+ # include <errno.h>
+ # include <stdio.h>
+-# include <cam/cam.h>
+-# include <cam/cam_ccb.h>
+-# include <cam/scsi/scsi_message.h>
+-# include <cam/scsi/scsi_pass.h>
++# if defined(RT_OS_FREEBSD)
++#  include <cam/cam.h>
++#  include <cam/cam_ccb.h>
++#  include <cam/scsi/scsi_message.h>
++#  include <cam/scsi/scsi_pass.h>
++# endif
+ # include <VBox/scsi.h>
+ # include <iprt/log.h>
+ #else
+@@ -2237,4 +2240,3 @@ int DRVHostBaseInitFinish(PDRVHOSTBASE p
+         return src;
+     return rc;
+ }
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.h b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.h
new file mode 100644
index 0000000..6f531b5
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostBase.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/VBox/Devices/Storage/DrvHostBase.h.orig	2016-08-05 16:42:58.000000000 +0000
++++ src/VBox/Devices/Storage/DrvHostBase.h
+@@ -183,7 +183,7 @@ int DRVHostBaseInitFinish(PDRVHOSTBASE p
+ int DRVHostBaseMediaPresent(PDRVHOSTBASE pThis);
+ void DRVHostBaseMediaNotPresent(PDRVHOSTBASE pThis);
+ DECLCALLBACK(void) DRVHostBaseDestruct(PPDMDRVINS pDrvIns);
+-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
++#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMMEDIATXDIR enmTxDir,
+                                      void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);
+ #endif
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostDVD.cpp b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostDVD.cpp
new file mode 100644
index 0000000..a0498e6
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostDVD.cpp
@@ -0,0 +1,73 @@
+$NetBSD$
+
+--- src/VBox/Devices/Storage/DrvHostDVD.cpp.orig	2016-08-05 16:42:58.000000000 +0000
++++ src/VBox/Devices/Storage/DrvHostDVD.cpp
+@@ -86,12 +86,15 @@
+ # undef _interlockedbittestandreset64
+ # undef USE_MEDIA_POLLING
+ 
+-#elif defined(RT_OS_FREEBSD)
++#elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ # include <sys/cdefs.h>
+ # include <sys/param.h>
++# undef PVM
+ # include <stdio.h>
+-# include <cam/cam.h>
+-# include <cam/cam_ccb.h>
++# if defined(RT_OS_FREEBSD)
++#  include <cam/cam.h>
++#  include <cam/cam_ccb.h>
++# endif
+ # define USE_MEDIA_POLLING
+ 
+ #else
+@@ -145,7 +148,7 @@ static DECLCALLBACK(int) drvHostDvdUnmou
+             /*
+              * Eject the disc.
+              */
+-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
++#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+             uint8_t abCmd[16] =
+             {
+                 SCSI_START_STOP_UNIT, 0, 0, 0, 2 /*eject+stop*/, 0,
+@@ -235,7 +238,7 @@ static DECLCALLBACK(int) drvHostDvdUnmou
+  */
+ static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock)
+ {
+-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
++#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+     uint8_t abCmd[16] =
+     {
+         SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL, 0, 0, 0, fLock, 0,
+@@ -323,7 +326,7 @@ static DECLCALLBACK(int) drvHostDvdPoll(
+     /*
+      * Poll for media change.
+      */
+-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
++#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ #ifdef RT_OS_DARWIN
+     AssertReturn(pThis->ppScsiTaskDI, VERR_INTERNAL_ERROR);
+ #endif
+@@ -393,7 +396,7 @@ static DECLCALLBACK(int) drvHostDvdPoll(
+         /*
+          * Poll for media change.
+          */
+-#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
++#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+         /* taken care of above. */
+ #elif defined(RT_OS_LINUX)
+         bool fMediaChanged = ioctl(RTFileToNative(pThis->hFileDevice), CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1;
+@@ -423,7 +426,7 @@ static DECLCALLBACK(int) drvHostDvdSendC
+     int rc;
+     LogFlow(("%s: cmd[0]=%#04x txdir=%d pcbBuf=%d timeout=%d\n", __FUNCTION__, pbCmd[0], enmTxDir, *pcbBuf, cTimeoutMillies));
+ 
+-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
++#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+     /*
+      * Pass the request on to the internal scsi command interface.
+      * The command seems to be 12 bytes long, the docs a bit copy&pasty on the command length point...
+@@ -880,4 +883,3 @@ const PDMDRVREG g_DrvHostDVD =
+     /* u32EndVersion */
+     PDM_DRVREG_VERSION
+ };
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostFloppy.cpp b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostFloppy.cpp
new file mode 100644
index 0000000..7c05f44
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvHostFloppy.cpp
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/VBox/Devices/Storage/DrvHostFloppy.cpp.orig	2016-08-05 16:42:58.000000000 +0000
++++ src/VBox/Devices/Storage/DrvHostFloppy.cpp
+@@ -35,7 +35,7 @@
+ #elif defined(RT_OS_L4)
+ 
+ #else /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
+-# error "Unsupported Platform."
++//# error "Unsupported Platform."
+ #endif /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
+ 
+ #include <VBox/vmm/pdmdrv.h>
+@@ -287,4 +287,3 @@ const PDMDRVREG g_DrvHostFloppy =
+     /* u32EndVersion */
+     PDM_DRVREG_VERSION
+ };
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvVD.cpp b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvVD.cpp
new file mode 100644
index 0000000..6578456
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Storage_DrvVD.cpp
@@ -0,0 +1,32 @@
+$NetBSD$
+
+--- src/VBox/Devices/Storage/DrvVD.cpp.orig	2016-08-05 16:42:58.000000000 +0000
++++ src/VBox/Devices/Storage/DrvVD.cpp
+@@ -65,6 +65,7 @@ RT_C_DECLS_END
+ extern bool DevINIPConfigured(void);
+ #endif /* VBOX_WITH_INIP */
+ 
++#include <sys/time.h>
+ 
+ /** @def VBOX_PERIODIC_FLUSH
+  * Enable support for periodically flushing the VDI to disk. This may prove
+@@ -1099,10 +1100,10 @@ static DECLCALLBACK(int) drvvdINIPSelect
+         rc = lwip_select(pSocketInt->hSock + 1, &fdsetR, NULL, &fdsetE, NULL);
+     else
+     {
+-        struct timeval timeout;
+-        timeout.tv_sec = cMillies / 1000;
+-        timeout.tv_usec = (cMillies % 1000) * 1000;
+-        rc = lwip_select(pSocketInt->hSock + 1, &fdsetR, NULL, &fdsetE, &timeout);
++        struct timeval vb_timeout;
++        vb_timeout.tv_sec = cMillies / 1000;
++        vb_timeout.tv_usec = (cMillies % 1000) * 1000;
++        rc = lwip_select(pSocketInt->hSock + 1, &fdsetR, NULL, &fdsetE, &vb_timeout);
+     }
+     if (rc > 0)
+         return VINF_SUCCESS;
+@@ -5214,4 +5215,3 @@ const PDMDRVREG g_DrvVD =
+     /* u32EndVersion */
+     PDM_DRVREG_VERSION
+ };
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h b/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h
new file mode 100644
index 0000000..bad9aa9
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- src/VBox/HostDrivers/Support/SUPDrvIDC.h.orig	2016-08-05 17:22:49.000000000 +0000
++++ src/VBox/HostDrivers/Support/SUPDrvIDC.h
+@@ -233,6 +233,9 @@ extern DECLIMPORT(int) VBOXCALL SUPDrvDa
+ #elif defined(RT_OS_FREEBSD)
+ extern int VBOXCALL SUPDrvFreeBSDIDC(uint32_t iReq, PSUPDRVIDCREQHDR pReq);
+ 
++#elif defined(RT_OS_NETBSD)
++extern int VBOXCALL SUPDrvNetBSDIDC(uint32_t iReq, PSUPDRVIDCREQHDR pReq);
++
+ #elif defined(RT_OS_LINUX)
+ extern int VBOXCALL SUPDrvLinuxIDC(uint32_t iReq, PSUPDRVIDCREQHDR pReq);
+ 
+@@ -272,4 +275,3 @@ typedef DECLCALLBACK(int) FNSUPDRVIDCENT
+ #pragma pack()                          /* paranoia */
+ 
+ #endif
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPR3HardenedMain.cpp b/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPR3HardenedMain.cpp
new file mode 100644
index 0000000..5d2f068
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_SUPR3HardenedMain.cpp
@@ -0,0 +1,60 @@
+$NetBSD$
+
+--- src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp.orig	2016-08-05 17:22:56.000000000 +0000
++++ src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
+@@ -425,9 +425,10 @@
+ #  ifndef CAP_TO_MASK
+ #   define CAP_TO_MASK(cap) RT_BIT(cap)
+ #  endif
+-# elif defined(RT_OS_FREEBSD)
++# elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ #  include <sys/param.h>
+ #  include <sys/sysctl.h>
++#  undef PVM
+ # elif defined(RT_OS_SOLARIS)
+ #  include <priv.h>
+ # endif
+@@ -1221,7 +1222,7 @@ static void supR3HardenedGetFullExePath(
+      *
+      * Darwin, OS/2 and Windows all have proper APIs for getting the program file name.
+      */
+-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS)
++#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD) || defined(RT_OS_SOLARIS)
+ # ifdef RT_OS_LINUX
+     int cchLink = readlink("/proc/self/exe", &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
+ 
+@@ -1230,12 +1231,19 @@ static void supR3HardenedGetFullExePath(
+     sprintf(szFileBuf, "/proc/%ld/path/a.out", (long)getpid());
+     int cchLink = readlink(szFileBuf, &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
+ 
+-# else /* RT_OS_FREEBSD */
++# else /* RT_OS_FREEBSD || RT_OS_NETBSD */
+     int aiName[4];
++#  if defined(RT_OS_FREEBSD)
+     aiName[0] = CTL_KERN;
+     aiName[1] = KERN_PROC;
+     aiName[2] = KERN_PROC_PATHNAME;
+     aiName[3] = getpid();
++#  else /* RT_OS_NETBSD */
++    aiName[0] = CTL_KERN;
++    aiName[1] = KERN_PROC_ARGS;
++    aiName[2] = getpid();
++    aiName[3] = KERN_PROC_PATHNAME;
++#  endif
+ 
+     size_t cbPath = sizeof(g_szSupLibHardenedExePath);
+     if (sysctl(aiName, RT_ELEMENTS(aiName), g_szSupLibHardenedExePath, &cbPath, NULL, 0) < 0)
+@@ -1922,7 +1930,7 @@ static void supR3HardenedMainDropPrivile
+     egid = getegid();
+     rgid = sgid = getgid();
+ 
+-# elif defined(RT_OS_SOLARIS)
++# elif defined(RT_OS_SOLARIS) || defined(RT_OS_NETBSD)
+     /* Solaris doesn't have setresuid, but the setreuid interface is BSD
+        compatible and will set the saved uid to euid when we pass it a ruid
+        that isn't -1 (which we do). */
+@@ -2391,4 +2399,3 @@ DECLHIDDEN(int) SUPR3HardenedMain(const 
+     g_enmSupR3HardenedMainState = SUPR3HARDENEDMAINSTATE_CALLED_TRUSTED_MAIN;
+     return pfnTrustedMain(argc, argv, envp);
+ }
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_Main_include_ConsoleImpl.h b/virtualbox-svn/patches/patch-src_VBox_Main_include_ConsoleImpl.h
new file mode 100644
index 0000000..33ba5b2
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Main_include_ConsoleImpl.h
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/VBox/Main/include/ConsoleImpl.h.orig	2016-08-12 18:06:16.000000000 +0000
++++ src/VBox/Main/include/ConsoleImpl.h
+@@ -581,7 +581,7 @@ private:
+     HRESULT i_powerDown(IProgress *aProgress = NULL);
+ 
+ /* Note: FreeBSD needs this whether netflt is used or not. */
+-#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
++#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)) && !defined(VBOX_WITH_NETFLT)
+     HRESULT i_attachToTapInterface(INetworkAdapter *networkAdapter);
+     HRESULT i_detachFromTapInterface(INetworkAdapter *networkAdapter);
+ #endif
+@@ -948,7 +948,7 @@ private:
+     } *mpIfSecKeyHlp;
+ 
+ /* Note: FreeBSD needs this whether netflt is used or not. */
+-#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
++#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD))
+     Utf8Str      maTAPDeviceName[8];
+     RTFILE       maTapFD[8];
+ #endif
diff --git a/virtualbox-svn/patches/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp b/virtualbox-svn/patches/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp
new file mode 100644
index 0000000..ae77ca2
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp
@@ -0,0 +1,51 @@
+$NetBSD$
+
+--- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig	2016-08-12 18:06:18.000000000 +0000
++++ src/VBox/Main/src-client/ConsoleImpl2.cpp
+@@ -103,7 +103,7 @@
+ #  include <linux/types.h>
+ #  include <linux/if.h>
+ #  include <linux/wireless.h>
+-# elif defined(RT_OS_FREEBSD)
++# elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ #  include <unistd.h>
+ #  include <sys/types.h>
+ #  include <sys/ioctl.h>
+@@ -4880,7 +4880,7 @@ int Console::i_configNetwork(const char 
+ 
+             case NetworkAttachmentType_Bridged:
+             {
+-#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
++#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)) && !defined(VBOX_WITH_NETFLT)
+                 hrc = i_attachToTapInterface(aNetworkAdapter);
+                 if (FAILED(hrc))
+                 {
+@@ -5075,8 +5075,8 @@ int Console::i_configNetwork(const char 
+                 const char *pszTrunk = szTrunkName;
+                 /* we're not releasing the INetCfg stuff here since we use it later to figure out whether it is wireless */
+ 
+-# elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
+-#  if defined(RT_OS_FREEBSD)
++# elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
++#  if defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+                 /*
+                  * If we bridge to a tap interface open it the `old' direct way.
+                  * This works and performs better than bridging a physical
+@@ -5186,7 +5186,7 @@ int Console::i_configNetwork(const char 
+                 }
+                 else
+                     Log(("Failed to open wireless socket\n"));
+-# elif defined(RT_OS_FREEBSD)
++# elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+                 int iSock = socket(AF_INET, SOCK_DGRAM, 0);
+                 if (iSock >= 0)
+                 {
+@@ -5304,7 +5304,7 @@ int Console::i_configNetwork(const char 
+             /* NOTHING TO DO HERE */
+ #elif defined(RT_OS_LINUX)
+ /// @todo aleksey: is there anything to be done here?
+-#elif defined(RT_OS_FREEBSD)
++#elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ /** @todo FreeBSD: Check out this later (HIF networking). */
+ #else
+ # error "Port me"
diff --git a/virtualbox-svn/patches/patch-src_VBox_NetworkServices_NAT_pxping.c b/virtualbox-svn/patches/patch-src_VBox_NetworkServices_NAT_pxping.c
new file mode 100644
index 0000000..c477e68
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_NetworkServices_NAT_pxping.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/VBox/NetworkServices/NAT/pxping.c.orig	2016-08-05 17:05:42.000000000 +0000
++++ src/VBox/NetworkServices/NAT/pxping.c
+@@ -562,6 +562,8 @@ pxping_recv4(void *arg, struct pbuf *p)
+         df = df ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
+ #elif defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+         USE_DF_OPTION(IP_DONTFRAG);
++#elif defined(RT_OS_NETBSD)
++        USE_DF_OPTION(IP_DF);
+ #elif defined(RT_OS_WINDOWS)
+         USE_DF_OPTION(IP_DONTFRAGMENT);
+ #endif
diff --git a/virtualbox-svn/patches/patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h b/virtualbox-svn/patches/patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h
new file mode 100644
index 0000000..eab9973
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/VBox/Runtime/r0drv/netbsd/the-netbsd-kernel.h.orig	2016-08-12 18:06:15.000000000 +0000
++++ src/VBox/Runtime/r0drv/netbsd/the-netbsd-kernel.h
+@@ -36,8 +36,8 @@
+ /* Deal with conflicts first. */
+ #include <sys/param.h>
+ #undef PVM
+-#include <sys/bus.h>
+ #include <sys/types.h>
++#include <sys/bus.h>
+ #include <sys/errno.h>
+ #include <sys/kernel.h>
+ #include <sys/uio.h>
diff --git a/virtualbox-svn/patches/patch-src_libs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp b/virtualbox-svn/patches/patch-src_libs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp
new file mode 100644
index 0000000..7832845
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_libs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp.orig	2016-08-05 16:18:14.000000000 +0000
++++ src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp
+@@ -39,7 +39,7 @@
+ #elif defined(XP_OS2) && defined(XP_OS2_NATIVEIPC)
+ #else
+ #include <string.h>
+-#ifdef XP_UNIX
++#if defined(XP_UNIX) || defined(__NetBSD__) // XXX
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <pwd.h>
diff --git a/virtualbox-svn/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.h b/virtualbox-svn/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.h
new file mode 100644
index 0000000..15bf38a
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/libs/xpcom18a4/nsprpub/pr/include/md/_netbsd.h.orig	2016-08-05 16:17:21.000000000 +0000
++++ src/libs/xpcom18a4/nsprpub/pr/include/md/_netbsd.h
+@@ -57,6 +57,8 @@
+ #elif defined(__arm32__) || defined(__arm__) || defined(__armel__) \
+     || defined(__armeb__)
+ #define _PR_SI_ARCHITECTURE "arm"
++#elif defined(__x86_64__)
++#define _PR_SI_ARCHITECTURE "x86_64"
+ #endif
+ 
+ #if defined(__ELF__)


Home | Main Index | Thread Index | Old Index