From 13020e508d0c041f38e29c898d56d024e624b1a4e444df294ba22ac4024fdf9d Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@gmail.com>
Date: Thu, 23 Jan 2020 18:19:38 +0000
Subject: [PATCH] Accepting request 766682 from
 home:lwfinger:branches:Virtualization

- 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
---
 fixes_for_5.5.patch | 10 +++++++---
 virtualbox.changes  |  1 +
 virtualbox.spec     |  1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fixes_for_5.5.patch b/fixes_for_5.5.patch
index 15662e4..84facc1 100644
--- a/fixes_for_5.5.patch
+++ b/fixes_for_5.5.patch
@@ -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
diff --git a/virtualbox.changes b/virtualbox.changes
index 89d1d69..37aa107 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -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.
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 9da2368..a430d7d 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -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