diff options
author | Daniel Bermond | 2020-10-21 16:18:04 +0000 |
---|---|---|
committer | Daniel Bermond | 2020-10-21 16:18:04 +0000 |
commit | 9bd324b63e547d66b1de084f61b145192d50e17a (patch) | |
tree | 3a6c685c1a141e20b2ce1f2c73173d32fae5cf37 | |
parent | 2d358da9a46484d5c0a4f42015b2ec4be697e0e4 (diff) | |
download | aur-9bd324b63e547d66b1de084f61b145192d50e17a.tar.gz |
Update to version 6.1.16
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 021-kernel-5.9.patch | 69 | ||||
-rw-r--r-- | PKGBUILD | 17 |
3 files changed, 15 insertions, 89 deletions
@@ -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.14 - pkgrel = 3 + pkgver = 6.1.16 + pkgrel = 1 url = https://www.virtualbox.org/ arch = x86_64 license = GPL2 makedepends = python - noextract = VirtualBoxSDK-6.1.14-140239.zip - source = http://download.virtualbox.org/virtualbox/6.1.14/VirtualBox-6.1.14-140239-Linux_amd64.run - source = https://download.virtualbox.org/virtualbox/6.1.14/VirtualBoxSDK-6.1.14-140239.zip + noextract = VirtualBoxSDK-6.1.16-140961.zip + source = http://download.virtualbox.org/virtualbox/6.1.16/VirtualBox-6.1.16-140961-Linux_amd64.run + source = https://download.virtualbox.org/virtualbox/6.1.16/VirtualBoxSDK-6.1.16-140961.zip source = VBoxAuth-r83509.h::https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=83509 source = VBoxAuthPAM-r83509.c::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=83509 source = VBoxAuthSimple-r83509.cpp::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=83509 @@ -19,9 +19,8 @@ pkgbase = virtualbox-bin source = virtualbox.sysusers source = LICENSE.sdk source = 013-Makefile.patch - source = 021-kernel-5.9.patch - sha256sums = 29a6506445909f6286bb0a113a353b9aa92dd831609a9343ff9763f4aee92845 - sha256sums = 935c210fda2b0fbed42c4bc6acdf7d1fd2b197e348ad4c42b4be4c4d2ffd2c75 + sha256sums = 35406e85a96ecf180b13145614230bae6c171e31a1f66263bf4c2b74bf6709e6 + sha256sums = 0dc5a55fbf40e5120008a4148df1e9312bf0aa974cfb96f49e2947e20d408d47 sha256sums = 61eab70173ec0c4959ec3b8bf9fa19cfac49bb223a0bb041fe12aa14742db15a sha256sums = f54c38e2d112e0221daa1ddd563a260d18d7d510c485a7d27c317d379e06ff79 sha256sums = 2ef58e7f24ed9114dbf29dfa77372b5e15962a2244315ffbfb592cdc10920ad8 @@ -32,7 +31,6 @@ pkgbase = virtualbox-bin sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c sha256sums = 09335d7d1075df02d29cec13119538134efdf43ea73a93b0f89d0d7d4b6625a1 sha256sums = 3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635 - sha256sums = 36bb00a53842b46267cac7acf7584e5394816a10f0ea72473ced6dc0494d9ed0 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.14 + provides = virtualbox=6.1.16 provides = virtualbox-host-dkms provides = VIRTUALBOX-HOST-MODULES conflicts = virtualbox diff --git a/021-kernel-5.9.patch b/021-kernel-5.9.patch deleted file mode 100644 index 409fd62a0e24..000000000000 --- a/021-kernel-5.9.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/src/vboxhost/vboxdrv/r0drv/linux/the-linux-kernel.h -+++ b/src/vboxhost/vboxdrv/r0drv/linux/the-linux-kernel.h -@@ -137,7 +137,10 @@ - #include <linux/interrupt.h> - #include <linux/completion.h> - #include <linux/compiler.h> --#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */ -+#if RTLNX_VER_MIN(5, 9, 0) -+#define HAVE_UNLOCKED_IOCTL 1 /* defined in linux/fs.h for kernels before 5.9 */ -+#endif -+#ifndef HAVE_UNLOCKED_IOCTL - # include <linux/smp_lock.h> - #endif - /* For the shared folders module */ ---- a/src/vboxhost/vboxnetadp/r0drv/linux/the-linux-kernel.h -+++ b/src/vboxhost/vboxnetadp/r0drv/linux/the-linux-kernel.h -@@ -137,7 +137,10 @@ - #include <linux/interrupt.h> - #include <linux/completion.h> - #include <linux/compiler.h> --#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */ -+#if RTLNX_VER_MIN(5, 9, 0) -+#define HAVE_UNLOCKED_IOCTL 1 /* defined in linux/fs.h for kernels before 5.9 */ -+#endif -+#ifndef HAVE_UNLOCKED_IOCTL - # include <linux/smp_lock.h> - #endif - /* For the shared folders module */ ---- a/src/vboxhost/vboxnetflt/r0drv/linux/the-linux-kernel.h -+++ b/src/vboxhost/vboxnetflt/r0drv/linux/the-linux-kernel.h -@@ -137,7 +137,10 @@ - #include <linux/interrupt.h> - #include <linux/completion.h> - #include <linux/compiler.h> --#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */ -+#if RTLNX_VER_MIN(5, 9, 0) -+#define HAVE_UNLOCKED_IOCTL 1 /* defined in linux/fs.h for kernels before 5.9 */ -+#endif -+#ifndef HAVE_UNLOCKED_IOCTL - # include <linux/smp_lock.h> - #endif - /* For the shared folders module */ ---- a/src/vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -+++ b/src/vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -@@ -1181,7 +1181,9 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser - */ - else - rc = get_user_pages_remote( -+#if RTLNX_VER_MAX(5, 9, 0) - pTask, /* Task for fault accounting. */ -+#endif - pTask->mm, /* Whose pages. */ - R3Ptr, /* Where from. */ - cPages, /* How many pages. */ ---- a/src/vboxhost/vboxdrv/r0drv/linux/thread2-r0drv-linux.c -+++ b/src/vboxhost/vboxdrv/r0drv/linux/thread2-r0drv-linux.c -@@ -92,8 +92,12 @@ DECLHIDDEN(int) rtThreadNativeSetPriorit - return VERR_INVALID_PARAMETER; - } - -+#if RTLNX_VER_MAX(5, 9, 0) - sched_setscheduler(current, iSchedClass, &Param); - #else -+ sched_set_fifo_low(current); -+#endif -+#else - RT_NOREF_PV(enmType); - #endif - RT_NOREF_PV(pThread); @@ -6,10 +6,10 @@ pkgbase=virtualbox-bin pkgname=('virtualbox-bin' 'virtualbox-bin-guest-iso' 'virtualbox-bin-sdk') -pkgver=6.1.14 -_build=140239 +pkgver=6.1.16 +_build=140961 _rev=83509 -pkgrel=3 +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' - '021-kernel-5.9.patch') + '013-Makefile.patch') noextract=("VirtualBoxSDK-${pkgver}-${_build}.zip") -sha256sums=('29a6506445909f6286bb0a113a353b9aa92dd831609a9343ff9763f4aee92845' - '935c210fda2b0fbed42c4bc6acdf7d1fd2b197e348ad4c42b4be4c4d2ffd2c75' +sha256sums=('35406e85a96ecf180b13145614230bae6c171e31a1f66263bf4c2b74bf6709e6' + '0dc5a55fbf40e5120008a4148df1e9312bf0aa974cfb96f49e2947e20d408d47' '61eab70173ec0c4959ec3b8bf9fa19cfac49bb223a0bb041fe12aa14742db15a' 'f54c38e2d112e0221daa1ddd563a260d18d7d510c485a7d27c317d379e06ff79' '2ef58e7f24ed9114dbf29dfa77372b5e15962a2244315ffbfb592cdc10920ad8' @@ -41,8 +40,7 @@ sha256sums=('29a6506445909f6286bb0a113a353b9aa92dd831609a9343ff9763f4aee92845' 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' '09335d7d1075df02d29cec13119538134efdf43ea73a93b0f89d0d7d4b6625a1' - '3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635' - '36bb00a53842b46267cac7acf7584e5394816a10f0ea72473ced6dc0494d9ed0') + '3c2089575e8c03b7517fe176e65168e15fb7aefe7e71224bf264d21812dbc635') prepare() { local _extractdir="${pkgname}-${pkgver}/VirtualBox-extracted" @@ -60,7 +58,6 @@ prepare() { # fix dkms build patch -d "$_extractdir" -Np1 -i "${srcdir}/013-Makefile.patch" - patch -d "$_extractdir" -Np1 -i "${srcdir}/021-kernel-5.9.patch" } build() { |