diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 015-linux-5-3.patch | 76 | ||||
| -rw-r--r-- | PKGBUILD | 27 |
3 files changed, 20 insertions, 101 deletions
@@ -1,7 +1,7 @@ pkgbase = virtualbox-bin pkgdesc = Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version) - pkgver = 6.0.12 - pkgrel = 2 + pkgver = 6.0.14 + pkgrel = 1 url = https://www.virtualbox.org/ install = virtualbox-bin.install arch = x86_64 @@ -20,7 +20,7 @@ pkgbase = virtualbox-bin optdepends = virtualbox-ext-oracle: for Oracle extensions optdepends = linux-headers: build the module for Arch kernel optdepends = linux-lts-headers: build the module for LTS Arch kernel - provides = virtualbox=6.0.12 + provides = virtualbox=6.0.14 provides = virtualbox-sdk provides = VIRTUALBOX-HOST-MODULES provides = virtualbox-host-dkms @@ -31,13 +31,13 @@ pkgbase = virtualbox-bin conflicts = virtualbox-host-modules-arch replaces = virtualbox_bin replaces = virtualbox-sun - noextract = VirtualBoxSDK-6.0.12-133076.zip + noextract = VirtualBoxSDK-6.0.14-133895.zip options = !strip options = !emptydirs backup = etc/vbox/vbox.cfg backup = etc/conf.d/vboxweb - source = http://download.virtualbox.org/virtualbox/6.0.12/VirtualBox-6.0.12-133076-Linux_amd64.run - source = https://download.virtualbox.org/virtualbox/6.0.12/VirtualBoxSDK-6.0.12-133076.zip + source = http://download.virtualbox.org/virtualbox/6.0.14/VirtualBox-6.0.14-133895-Linux_amd64.run + source = https://download.virtualbox.org/virtualbox/6.0.14/VirtualBoxSDK-6.0.14-133895.zip source = VBoxAuth-r79806.h::https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=79806 source = VBoxAuthPAM-r79806.c::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=79806 source = VBoxAuthSimple-r79806.cpp::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=79806 @@ -48,9 +48,8 @@ pkgbase = virtualbox-bin source = do_dkms source = dkms.conf source = 013-Makefile.patch - source = 015-linux-5-3.patch - sha256sums = 60659c5096252e768cf1eaeb646e7cdf5547ae832b1f8c52e59b4e8799e6b584 - sha256sums = 995310edbc813808c638d96946a6f508099e0b261ee77628c53fd0c924e0f00e + sha256sums = e6a63037caf3bc5ced1bb384b2a7fcf86b9fca5a467101ece4c5f7bf38edc4fe + sha256sums = c7b848034939fa65be095752109009ad0c3733e5d10c09fd26b5addaf58ba159 sha256sums = 584f02a2a1e83b9cabd7b7e3b00a0515b118e040160eb46c014ea6fd3a16586e sha256sums = 600df773fca199dc21acde10c95a4733b03b3efd8ffaef3a9fb9da363a9cd114 sha256sums = 452351c15d97aeda29e45dbcb0da69412dc3a615c9aece43a424af3639368d49 @@ -61,7 +60,6 @@ pkgbase = virtualbox-bin sha256sums = cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a sha256sums = e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801 sha256sums = 268e794de9d66a2751006b2ca3810fc6a05da4af2ffa8b58c56c94b292f1f424 - sha256sums = 37593d09bcde15a056b93d56ad47877a9bbac140474da2c66648871a0537998a pkgname = virtualbox-bin diff --git a/015-linux-5-3.patch b/015-linux-5-3.patch deleted file mode 100644 index 3cc6b383e353..000000000000 --- a/015-linux-5-3.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/vboxhost/vboxnetflt/linux/VBoxNetFlt-linux.c b/src/vboxhost/vboxnetflt/linux/VBoxNetFlt-linux.c -index 15ecd351..a2f2a284 100644 ---- a/src/vboxhost/vboxnetflt/linux/VBoxNetFlt-linux.c -+++ b/src/vboxhost/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/vboxhost/vboxdrv/r0drv/linux/mp-r0drv-linux.c b/src/vboxhost/vboxdrv/r0drv/linux/mp-r0drv-linux.c -index ca480683..72b25bb8 100644 ---- a/src/vboxhost/vboxdrv/r0drv/linux/mp-r0drv-linux.c -+++ b/src/vboxhost/vboxdrv/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); @@ -5,10 +5,10 @@ # Contributor: M0Rf30 pkgname=virtualbox-bin -pkgver=6.0.12 -_build=133076 +pkgver=6.0.14 +_build=133895 _rev=79806 -pkgrel=2 +pkgrel=1 pkgdesc='Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version)' arch=('x86_64') url='https://www.virtualbox.org/' @@ -37,11 +37,10 @@ source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver 'vboxweb.conf' 'do_dkms' 'dkms.conf' - '013-Makefile.patch' - '015-linux-5-3.patch') + '013-Makefile.patch') noextract=("VirtualBoxSDK-${pkgver}-${_build}.zip") -sha256sums=('60659c5096252e768cf1eaeb646e7cdf5547ae832b1f8c52e59b4e8799e6b584' - '995310edbc813808c638d96946a6f508099e0b261ee77628c53fd0c924e0f00e' +sha256sums=('e6a63037caf3bc5ced1bb384b2a7fcf86b9fca5a467101ece4c5f7bf38edc4fe' + 'c7b848034939fa65be095752109009ad0c3733e5d10c09fd26b5addaf58ba159' '584f02a2a1e83b9cabd7b7e3b00a0515b118e040160eb46c014ea6fd3a16586e' '600df773fca199dc21acde10c95a4733b03b3efd8ffaef3a9fb9da363a9cd114' '452351c15d97aeda29e45dbcb0da69412dc3a615c9aece43a424af3639368d49' @@ -51,18 +50,17 @@ sha256sums=('60659c5096252e768cf1eaeb646e7cdf5547ae832b1f8c52e59b4e8799e6b584' '12dbba3b59991f2b68cddeeeda20236aeff63e11b7e2d1b08d9d6a82225f6651' 'cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a' 'e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801' - '268e794de9d66a2751006b2ca3810fc6a05da4af2ffa8b58c56c94b292f1f424' - '37593d09bcde15a056b93d56ad47877a9bbac140474da2c66648871a0537998a') + '268e794de9d66a2751006b2ca3810fc6a05da4af2ffa8b58c56c94b292f1f424') prepare() { mkdir -p "${pkgname}-${pkgver}" # extract the main source file - yes | sh "VirtualBox-${pkgver}-${_build}-Linux_amd64.run" \ - --target "${srcdir}/${pkgname}-${pkgver}" \ - --nox11 \ - --noexec \ - &> /dev/null + yes 2>/dev/null | sh "VirtualBox-${pkgver}-${_build}-Linux_amd64.run" \ + --target "${srcdir}/${pkgname}-${pkgver}" \ + --nox11 \ + --noexec \ + &> /dev/null # extract sdk cd "${pkgname}-${pkgver}" @@ -81,7 +79,6 @@ package() { printf '%s\n' " -> Fixing DKMS build..." cd "${pkgdir}/${_installdir}" patch -Np1 -i "${srcdir}/013-Makefile.patch" - patch -Np1 -i "${srcdir}/015-linux-5-3.patch" # hardened build: mark binaries suid root, and make sure the # directory is only writable by the user |