diff --git a/files/linux-5.3.patch b/files/linux-5.3.patch deleted file mode 100644 --- a/files/linux-5.3.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -index 15ecd351..a2f2a284 100644 ---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign - #endif - if (in_dev != NULL) - { -- for_ifa(in_dev) { -+ struct in_ifaddr *ifa; -+ -+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { - if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address)) - return NOTIFY_OK; - -@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign - - pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, - /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address); -- } endfor_ifa(in_dev); -+ } - } - - /* -diff --git a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c -index ca480683..72b25bb8 100644 ---- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c -@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - if (RTCpuSetCount(&OnlineSet) > 1) - { - /* Fire the function on all other CPUs without waiting for completion. */ --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) -+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); -+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) - int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); -+ Assert(!rc); NOREF(rc); - # else - int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); --# endif - Assert(!rc); NOREF(rc); -+# endif - } - #endif - -@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - { - #ifdef CONFIG_SMP - IPRT_LINUX_SAVE_EFL_AC(); -- int rc; - RTMPARGS Args; - - RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; -@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - Args.cHits = 0; - - RTThreadPreemptDisable(&PreemptState); --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) -+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+ Assert(rc == 0); NOREF(rc); - # else /* older kernels */ -- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); -+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); -+ Assert(rc == 0); NOREF(rc); - # endif /* older kernels */ - RTThreadPreemptRestore(&PreemptState); - -- Assert(rc == 0); NOREF(rc); - IPRT_LINUX_RESTORE_EFL_AC(); - #else - RT_NOREF(pfnWorker, pvUser1, pvUser2); diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,4 +1,3 @@ Disable-automatic-check-for-updates.patch 0001-Fix-rdesktop-vrdp-keymaps-path.patch 0001-Patch-out-notify-send-call.patch -linux-5.3.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : virtualbox -version : 6.0.12 -release : 122 +version : 6.0.14 +release : 123 source : - - https://download.virtualbox.org/virtualbox/6.0.12/VirtualBox-6.0.12.tar.bz2 : c8878d1ad867461e6adfb82c22f15bf5d284e214e75f7b2c6bcd81854edeabc3 + - https://download.virtualbox.org/virtualbox/6.0.14/VirtualBox-6.0.14.tar.bz2 : 5e12b14f0c38bf195d9592d76a9e0a128df2d38cd77c26ce5b5488397715dd0c - git|https://github.com/jwrdegoede/vboxsf.git : 83b9657878a229c83e4ce652af809bdc18a3a327 license : GPL-2.0-only component : diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ virtualbox - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net GPL-2.0-only virt @@ -23,7 +23,7 @@ virt - virtualbox-common + virtualbox-common /lib/modules/4.9.196-141.lts/extra/vboxdrv.ko @@ -345,7 +345,7 @@ virt - virtualbox-common + virtualbox-common /lib/modules/5.2.20-130.current/extra/vboxdrv.ko @@ -363,8 +363,8 @@ programming.devel - virtualbox - virtualbox-common + virtualbox + virtualbox-common /usr/lib/python3.6/site-packages/vboxapi-1.0-py3.6.egg-info @@ -816,7 +816,7 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/4.9.196-141.lts/misc/vboxguest.ko @@ -857,19 +857,19 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/5.2.20-130.current/misc/vboxsf.ko - - 2019-10-09 - 6.0.12 + + 2019-10-16 + 6.0.14 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file