[packages/VirtualBox] up to 6.0.6
atler
atler at pld-linux.org
Wed Apr 17 19:24:11 CEST 2019
commit 55737be5109a968d61269d8b972b5910760df217
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Apr 17 19:23:43 2019 +0200
up to 6.0.6
VirtualBox.spec | 12 ++++--------
kernel-4.4.169.patch | 40 ----------------------------------------
kernel-5.0.patch | 22 ----------------------
3 files changed, 4 insertions(+), 70 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c1f68a8..a0cdd6b 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,19 +42,19 @@ exit 1
%define qtver 5.6.0
-%define rel 3
+%define rel 1
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 6.0.4
+Version: 6.0.6
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 96e53b9e75a37cc6fd2d13d9c9f6881d
+# Source0-md5: 1b3da9c363848c9d516e38eb61b7d1ff
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: b5722fb63e3928e8829ca84132e49c7b
+# Source1-md5: f7c63c2ffebc5d7ff950435d41abbfdf
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -83,8 +83,6 @@ Patch13: %{pname}-no-scrextend.patch
Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
-Patch17: kernel-4.4.169.patch
-Patch18: kernel-5.0.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -563,7 +561,6 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep
%patch14 -p0
%patch15 -p0
%patch16 -p0
-%patch18 -p0
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -583,7 +580,6 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers
../src/VBox/HostDrivers/linux/export_modules.sh --file host-modules.tar.gz --without-hardening
tar -zxf host-modules.tar.gz -C HostDrivers
cd -
-%patch17 -p1
%endif
# using system kBuild package
diff --git a/kernel-4.4.169.patch b/kernel-4.4.169.patch
deleted file mode 100644
index 5b475c5..0000000
--- a/kernel-4.4.169.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- VirtualBox-6.0.0/PLD-MODULE-BUILD/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c~ 2018-12-28 14:24:08.000000000 +0100
-+++ VirtualBox-6.0.0/PLD-MODULE-BUILD/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2018-12-28 14:35:39.146820962 +0100
-@@ -1027,7 +1027,7 @@
-
- /* openSUSE Leap 42.3 detection :-/ */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) \
-- && LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) \
-+ && LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 169) \
- && defined(FAULT_FLAG_REMOTE)
- # define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
- #else
-@@ -1113,7 +1113,7 @@
- pTask->mm, /* Whose pages. */
- R3Ptr, /* Where from. */
- cPages, /* How many pages. */
--# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 9, 0)
-+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 4, 169)
- fWrite ? FOLL_WRITE | /* Write to memory. */
- FOLL_FORCE /* force write access. */
- : 0, /* Write to memory. */
---- VirtualBox-6.0.0/PLD-MODULE-BUILD/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c~ 2018-12-28 23:06:27.000000000 +0900
-+++ VirtualBox-6.0.0/PLD-MODULE-BUILD/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2018-12-28 23:17:25.075959807 +0900
-@@ -1027,7 +1027,7 @@
-
- /* openSUSE Leap 42.3 detection :-/ */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) \
-- && LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) \
-+ && LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 169) \
- && defined(FAULT_FLAG_REMOTE)
- # define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
- #else
-@@ -1113,7 +1113,7 @@
- pTask->mm, /* Whose pages. */
- R3Ptr, /* Where from. */
- cPages, /* How many pages. */
--# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 9, 0)
-+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 4, 169)
- fWrite ? FOLL_WRITE | /* Write to memory. */
- FOLL_FORCE /* force write access. */
- : 0, /* Write to memory. */
diff --git a/kernel-5.0.patch b/kernel-5.0.patch
deleted file mode 100644
index 5ac22fd..0000000
--- a/kernel-5.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-------------------------------------------------------------------------
-r77542 | vboxsync | 2019-03-03 05:40:17 +0100 (nie, 03 mar 2019) | 1 line
-
-linux/vboxsf: MS_REMOUNT and friends moved to uapi/linux/mount.h in 5.0 (rc8), so we need to include it to use it. bugref:9172
-
-Index: src/VBox/Additions/linux/sharedfolders/vfsmod.c
-===================================================================
---- src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 77541)
-+++ src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 77542)
-@@ -45,7 +45,9 @@
- #include "revision-generated.h"
- #include "product-generated.h"
- #include "VBoxGuestR0LibInternal.h"
--#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
-+# include <uapi/linux/mount.h> /* for MS_REMOUNT */
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
- # include <linux/mount.h>
- #endif
- #include <linux/seq_file.h>
-
-------------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/55737be5109a968d61269d8b972b5910760df217
More information about the pld-cvs-commit
mailing list