jengelh/virtualbox
SHA256
1
0
Fork 1
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 766682 from home:lwfinger:branches:Virtualization

Browse Source 
- Version update to 6.1.2 (released January 14 2020i by Oracle)

  18 Vulnerabilities fixed: CVE-2020-2674 CVE-2020-2682 CVE-2020-2698 CVE-2020-2701 CVE-2020-2702 CVE-2020-2726
			    CVE-2020-2681 CVE-2020-2689 CVE-2020-2690 CVE-2020-2691 CVE-2020-2692 CVE-2020-2703
			    CVE-2020-2704 CVE-2020-2705 CVE-2020-2725 CVE-2020-2678 CVE-2020-2727 CVE-2020-2693
			    See bsc#1161050
  File "fixes_for_leap15.2.patch" added to fix build for Leap 15.2.
  File "vbox_fix_for_gcc7.patch" is deleted - fixed upstream.
  File "fixes_for_5.4.patch" is deleted - fixed upstream.
  Exclude 32-bit builds
  Update so the openSUSE Leap 42.3 builds OK.

OBS-URL: https://build.opensuse.org/request/show/766682
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=529
This commit is contained in:
Larry Finger 2020-01-23 18:19:38 +00:00 committed by Git OBS Bridge
parent 1f61a8fc1d
commit 13020e508d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fixes_for_5.5.patch
View File

@ -218,18 +218,22 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -45,6 +45,10 @@
@@ -45,6 +45,14 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81)
#include <drm/drm_probe_helper.h>
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+#include <drm/drm_fourcc.h>
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+#include <drm/drm_vblank.h>
+#else
+#include <drm/drmP.h>
+#endif
#include "VBoxVideo.h"
@@ -398,6 +402,13 @@ static struct drm_encoder *drm_encoder_f
@@ -398,6 +406,13 @@ static struct drm_encoder *drm_encoder_f
static struct drm_encoder *vbox_best_single_encoder(struct drm_connector
*connector)
{
@ -243,7 +247,7 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c
int enc_id = connector->encoder_ids[0];
/* pick the encoder ids */
@@ -410,6 +421,7 @@ static struct drm_encoder *vbox_best_sin
@@ -410,6 +425,7 @@ static struct drm_encoder *vbox_best_sin
#else
return drm_encoder_find(connector->dev, enc_id);
#endif

1
virtualbox.changes
View File

@ -11,6 +11,7 @@ Fri Jan 17 22:56:58 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
File "vbox_fix_for_gcc7.patch" is deleted - fixed upstream.
File "fixes_for_5.4.patch" is deleted - fixed upstream.
Exclude 32-bit builds
Update so the openSUSE Leap 42.3 builds OK.
As announced earlier by Oracle, 32-bit builds are no longer supported.

1
virtualbox.spec
View File

@ -236,7 +236,6 @@ Obsoletes: %{name}-ose < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template)
ExclusiveArch: x86_64
ExcludeArch: %ix86
%ifarch amd64 x86_64 ia32e em64t
BuildRequires: gcc-32bit
BuildRequires: gcc-c++-32bit