summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--020-linux518.patch50
-rw-r--r--PKGBUILD18
3 files changed, 15 insertions, 71 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53c71d1bd2e9..c444c2ef43aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = virtualbox-bin
pkgdesc = Powerful x86 virtualization for enterprise as well as home use (Oracle branded non-OSE)
- pkgver = 6.1.34
- pkgrel = 2
+ pkgver = 6.1.36
+ pkgrel = 1
url = https://www.virtualbox.org/
arch = x86_64
license = GPL2
makedepends = python
- noextract = VirtualBoxSDK-6.1.34-150636.zip
- source = http://download.virtualbox.org/virtualbox/6.1.34/VirtualBox-6.1.34-150636-Linux_amd64.run
- source = https://download.virtualbox.org/virtualbox/6.1.34/VirtualBoxSDK-6.1.34-150636.zip
+ noextract = VirtualBoxSDK-6.1.36-152435.zip
+ source = http://download.virtualbox.org/virtualbox/6.1.36/VirtualBox-6.1.36-152435-Linux_amd64.run
+ source = https://download.virtualbox.org/virtualbox/6.1.36/VirtualBoxSDK-6.1.36-152435.zip
source = VBoxAuth-r94273.h::https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=94273
source = VBoxAuthPAM-r94273.c::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=94273
source = VBoxAuthSimple-r94273.cpp::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=94273
@@ -19,9 +19,8 @@ pkgbase = virtualbox-bin
source = virtualbox.sysusers
source = LICENSE.sdk
source = 013-Makefile.patch
- source = 020-linux518.patch
- sha256sums = 1e47ac7b0b71bc29aa6fe880f85f300fa7b2c921b01fda1de56144db13703a48
- sha256sums = 79175b299955269635362730c6841141aaaa40d345080d986da2ef6d1e3dc2cb
+ sha256sums = 214586f62034e31f1a25e021752398019817a2dfd005bf1fadaa4e935708cb66
+ sha256sums = eb6ffa0ca0e8d6b89bf7a74fb37151a896c636e7720a55b4311185229da9a676
sha256sums = da610d799e06fc977c695d564b654be53bf3d0f6bd42dabeec687fd9d9af58dc
sha256sums = 69242fc39605786e8ccae38ee76bf771d1047cc237a4d661ebdfcc721e458957
sha256sums = 6b0c34c09c9184a511aff265d115c104db3af3ebe26121032717b053b2b6fd82
@@ -32,7 +31,6 @@ pkgbase = virtualbox-bin
sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
sha256sums = 09335d7d1075df02d29cec13119538134efdf43ea73a93b0f89d0d7d4b6625a1
sha256sums = 3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635
- sha256sums = ee0e2fc32934c1b86f71a693c20d75f2a4d4ee27f17ef07b1eaa71aca7d1b08e
pkgname = virtualbox-bin
depends = device-mapper
@@ -49,7 +47,7 @@ pkgname = virtualbox-bin
optdepends = virtualbox-bin-guest-iso: for guest additions CD image
optdepends = virtualbox-bin-sdk: for the software developer kit
optdepends = virtualbox-ext-oracle: for Oracle extensions pack
- provides = virtualbox=6.1.34
+ provides = virtualbox=6.1.36
provides = virtualbox-host-dkms
provides = VIRTUALBOX-HOST-MODULES
conflicts = virtualbox
diff --git a/020-linux518.patch b/020-linux518.patch
deleted file mode 100644
index 226833cc9858..000000000000
--- a/020-linux518.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/src/vboxhost/vboxdrv/linux/SUPDrv-linux.c
-+++ b/src/vboxhost/vboxdrv/linux/SUPDrv-linux.c
-@@ -1454,6 +1454,31 @@
- }
-
-
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+ RT_NOREF(fCtxHook);
-+#if RTLNX_VER_MIN(5,18,0)
-+ kernel_fpu_begin();
-+ /* if (fCtxHook) */
-+ preempt_enable(); /* HACK ALERT! undo the implicit preempt_disable() in kernel_fpu_begin(). */
-+ return true;
-+#else
-+ return false;
-+#endif
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+ RT_NOREF(fCtxHook);
-+#if RTLNX_VER_MIN(5,18,0)
-+ /* if (fCtxHook) */
-+ preempt_disable(); /* HACK ALERT! undo the implicit preempt_enable() in SUPR0FpuBegin(). */
-+ kernel_fpu_end();
-+#endif
-+}
-+
-+
- int VBOXCALL supdrvOSGetCurrentGdtRw(RTHCUINTPTR *pGdtRw)
- {
- #if RTLNX_VER_MIN(4,12,0)
---- a/src/vboxhost/vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ b/src/vboxhost/vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -2311,7 +2311,13 @@
- vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
- Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
- Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
-+#if RTLNX_VER_MIN(5,18,0)
-+ local_bh_disable();
-+ err = netif_rx(pBuf);
-+ local_bh_enable();
-+#else
- err = netif_rx_ni(pBuf);
-+#endif
- if (err)
- rc = RTErrConvertFromErrno(err);
- }
diff --git a/PKGBUILD b/PKGBUILD
index 7ded81bfd85e..a9ce1ca6195b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
pkgbase=virtualbox-bin
pkgname=('virtualbox-bin' 'virtualbox-bin-guest-iso' 'virtualbox-bin-sdk')
-pkgver=6.1.34
-_build=150636
+pkgver=6.1.36
+_build=152435
_rev=94273
-pkgrel=2
+pkgrel=1
pkgdesc='Powerful x86 virtualization for enterprise as well as home use (Oracle branded non-OSE)'
arch=('x86_64')
url='https://www.virtualbox.org/'
@@ -27,11 +27,10 @@ source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver
'vboxweb.service'
'virtualbox.sysusers'
'LICENSE.sdk'
- '013-Makefile.patch'
- '020-linux518.patch')
+ '013-Makefile.patch')
noextract=("VirtualBoxSDK-${pkgver}-${_build}.zip")
-sha256sums=('1e47ac7b0b71bc29aa6fe880f85f300fa7b2c921b01fda1de56144db13703a48'
- '79175b299955269635362730c6841141aaaa40d345080d986da2ef6d1e3dc2cb'
+sha256sums=('214586f62034e31f1a25e021752398019817a2dfd005bf1fadaa4e935708cb66'
+ 'eb6ffa0ca0e8d6b89bf7a74fb37151a896c636e7720a55b4311185229da9a676'
'da610d799e06fc977c695d564b654be53bf3d0f6bd42dabeec687fd9d9af58dc'
'69242fc39605786e8ccae38ee76bf771d1047cc237a4d661ebdfcc721e458957'
'6b0c34c09c9184a511aff265d115c104db3af3ebe26121032717b053b2b6fd82'
@@ -41,8 +40,7 @@ sha256sums=('1e47ac7b0b71bc29aa6fe880f85f300fa7b2c921b01fda1de56144db13703a48'
'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
'2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
'09335d7d1075df02d29cec13119538134efdf43ea73a93b0f89d0d7d4b6625a1'
- '3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635'
- 'ee0e2fc32934c1b86f71a693c20d75f2a4d4ee27f17ef07b1eaa71aca7d1b08e')
+ '3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635')
prepare() {
local _extractdir="${pkgname}-${pkgver}/VirtualBox-extracted"
@@ -60,8 +58,6 @@ prepare() {
# fix dkms build
patch -d "$_extractdir" -Np1 -i "${srcdir}/013-Makefile.patch"
-
- patch -d "$_extractdir" -Np1 -i "${srcdir}/020-linux518.patch"
}
build() {