[VirtualBox] Some fixes
commit ecc947355da3533b4d144138dfb3f5fe7d2d0fd2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Aug 7 19:34:05 2020 +0100
Some fixes
6cbdb672039c33018cf766ec010cb5631b3be1e1.patch | 25 +++++++++++++++++++++++++
VirtualBox.spec | 13 +++++++------
2 files changed, 32 insertions(+), 6 deletions(-)
---
diff --git a/6cbdb672039c33018cf766ec010cb5631b3be1e1.patch
b/6cbdb672039c33018cf766ec010cb5631b3be1e1.patch
new file mode 100644
index 0000000..bde1ef1
--- /dev/null
+++ b/6cbdb672039c33018cf766ec010cb5631b3be1e1.patch
@@ -0,0 +1,25 @@
+From 6cbdb672039c33018cf766ec010cb5631b3be1e1 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Thu, 23 Jul 2020 11:59:16 +0000
+Subject: [PATCH] Add/vboxsf: We're not allowed to include vermagic.h starting
+ with 5.8. We probably haven't needed it for quite a few versions, so no
+ matter. bugref:9801
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@85432
cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c
b/trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+index 71ba646879..04ee187e40 100644
+--- a/trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c
++++ b/trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+@@ -52,7 +52,7 @@
+ #endif
+ #include <linux/seq_file.h>
+ #include <linux/vfs.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62) && LINUX_VERSION_CODE <
KERNEL_VERSION(5, 8, 0)
+ # include <linux/vermagic.h>
+ #endif
+ #include <VBox/err.h>
diff --git a/VirtualBox.spec b/VirtualBox.spec
index cb7cde1..6f63645 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.12
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -102,6 +102,7 @@ Patch90: 6370c9d7c7908f7072b654f9794ed6c5d562768b.patch
Patch91: 088da92603cb4f1175ed6d0c452b049af3372c1e.patch
Patch92: b0f29563e5a7e5d4af8585ee0fffe208d3f528d2.patch
Patch93: 842e5679b0904a80c7f065ad50417d82af265395.patch
+Patch94: 6cbdb672039c33018cf766ec010cb5631b3be1e1.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -214,10 +215,6 @@ Obsoletes: python2-%{name}%{?isa} < %{version}-%{release}
%if ! %{with python3}
Obsoletes: python%{python3_pkgversion}-%{name}%{?isa} < %{version}-%{release}
%endif
-# temporary hack
-# if virtualbox-guest-additions 6.1.2 still in repos, we try remove it to allow
-# install VirtualBox-server 6.1.4
-Obsoletes: virtualbox-guest-additions < 6.1.4-1
%description server
%{name} without Qt GUI part.
@@ -351,7 +348,7 @@ rm -r src/libs/zlib-1.2.*/
%patch61 -p1 -b .automount
%patch70 -p1 -b .python-detection
%patch80 -p1 -b .gcc10
-#patch86 -p1 -b .vboxrem
+%patch86 -p1 -b .vboxrem
%patch87 -p2 -b .kernel-5.8
%patch88 -p2 -b .kernel-5.8
%patch89 -p2 -b .kernel-5.8
@@ -359,6 +356,7 @@ rm -r src/libs/zlib-1.2.*/
%patch91 -p2 -b .kernel-5.8
%patch92 -p2 -b .kernel-5.8
%patch93 -p2 -b .kernel-5.8
+%patch94 -p2 -b .kernel-5.8
%build
@@ -913,6 +911,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Fri Aug 07 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.12-3
+- Some fixes
+
* Wed Aug 05 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.12-2
- Updates for kernel-5.8