From bb2184f41f8ffebcc4668874b3eefce6f04143fe922090002e622642432054a8 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 14 Jul 2020 13:58:34 +0000 Subject: [PATCH 1/2] Accepting request 820858 from home:gmbr3:libexecdir - More fixes for %_libexecdir changing to /usr/libexec(bsc#1174075) - Previous fixes accidentally removed from changelog after conflict OBS-URL: https://build.opensuse.org/request/show/820858 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=562 --- virtualbox.changes | 6 ++++++ virtualbox.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/virtualbox.changes b/virtualbox.changes index ca489dd..204e972 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 14 10:37:53 UTC 2020 - Callum Farmer + +- More fixes for %_libexecdir changing to /usr/libexec(bsc#1174075) + - Previous fixes accidentally removed from changelog after conflict + ------------------------------------------------------------------- Fri Jul 10 01:38:55 UTC 2020 - Gary Ching-Pang Lin diff --git a/virtualbox.spec b/virtualbox.spec index 1a124ca..bd39e07 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -285,7 +285,7 @@ Obsoletes: %{name}-ose < %{version} ### Requirements for virtualbox-kmp ### %if %{kmp_package} BuildRequires: libxml2-devel -%(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) +%(sed -e '/^Provides: multiversion(kernel)/d' %{_prefix}/lib/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) %kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7} -n virtualbox -f %{SOURCE5} -x kdump um xen pae xenpae pv Obsoletes: virtualbox-guest-kmp Obsoletes: virtualbox-host-kmp From e16969cc83ff6d945281b7009426060b5d2336e73524035e412fd166f9a9bcf5 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 16 Jul 2020 01:03:58 +0000 Subject: [PATCH 2/2] Accepting request 821171 from home:lwfinger:branches:Virtualization - Version bump to 6.1.12 (released July 14 2020 by Oracle) This is a maintenance release. The following items were fixed and/or added: File "turn_off_cloud_net.patch" added. Fixes for CVE-2020-14628, CVE-2020-14646, CVE-2020-14647, CVE-2020-14649 CVE-2020-14713, CVE-2020-14674, CVE-2020-14675, CVE-2020-14676 CVE-2020-14677, CVE-2020-14699, CVE-2020-14711, CVE-2020-14629 CVE-2020-14703, CVE-2020-14704, CVE-2020-14648, CVE-2020-14650 CVE-2020-14673, CVE-2020-14694, CVE-2020-14695, CVE-2020-14698 CVE-2020-14700, CVE-2020-14712, CVE-2020-14707, CVE-2020-14714 CVE-2020-14715 bsc#1174159. UI: Fixes for Log-Viewer search-backward icon Devices: Fixes and improvements for the BusLogic SCSI controller emulation Serial Port: Regression fixes in FIFO data handling Oracle Cloud Infrastructure integration: Experimental new type of network attachment, allowing local VM to act as if it was run in cloud API: improved resource management in the guest control functionality VBoxManage: fixed command option parsing for the "snapshot edit" sub-command VBoxManage: Fix crash of 'VBoxManage internalcommands repairhd' when processing invalid input (bug #19579) Guest Additions, 3D: New experimental GLX graphics output Guest Additions, 3D: Fixed releasing texture objects, which could cause guest crashes Guest Additions: Fixed writes to a file on a shared folder not being reflected on the host when the file is mmap'ed and the used Linux kernel is between version 4.10.0 and 4.11.x Guest Additions: Fixed the shared folder driver on 32bit Windows 8 and newer returning an error when flushing writes to a file which is mapped into memory under rare circumstances Guest Additions: Improve resize coverage for VMSVGA graphics controller Guest Additions: Fix issues detecting guest additions ISO at runtime Guest Additions: Fixed German translation encoding for Windows GA installer OBS-URL: https://build.opensuse.org/request/show/821171 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=563 --- UserManual.pdf | 4 +- VirtualBox-6.1.10-patched.tar.bz2 | 3 -- VirtualBox-6.1.12-patched.tar.bz2 | 3 ++ fix-missing-includes-with-qt-5.15.patch | 60 ++++--------------------- turn_off_cloud_net.patch | 13 ++++++ virtualbox.changes | 31 +++++++++++++ virtualbox.spec | 5 ++- 7 files changed, 61 insertions(+), 58 deletions(-) delete mode 100644 VirtualBox-6.1.10-patched.tar.bz2 create mode 100644 VirtualBox-6.1.12-patched.tar.bz2 create mode 100644 turn_off_cloud_net.patch diff --git a/UserManual.pdf b/UserManual.pdf index 84004a0..20889e0 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b17eae7e0261744398c9ef98f4ec21c0007093a4d14343cf9fc14a22dadcedd5 -size 4896302 +oid sha256:2d8fd21e1bfbd6f03f534196138370dbf8a3738dd974169af9d5eac9acd1412b +size 4900225 diff --git a/VirtualBox-6.1.10-patched.tar.bz2 b/VirtualBox-6.1.10-patched.tar.bz2 deleted file mode 100644 index 34dc307..0000000 --- a/VirtualBox-6.1.10-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dab5cd74130e91e4a711c6cb39d2ba35c1f85b390abe3666f2e01bdbd057835 -size 119433886 diff --git a/VirtualBox-6.1.12-patched.tar.bz2 b/VirtualBox-6.1.12-patched.tar.bz2 new file mode 100644 index 0000000..e4ce116 --- /dev/null +++ b/VirtualBox-6.1.12-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b6c6e262dbc3be6614f5b041587b4d4dd9d2b52c72639dde8781dbdc21dfe83 +size 119430832 diff --git a/fix-missing-includes-with-qt-5.15.patch b/fix-missing-includes-with-qt-5.15.patch index 138930c..7cdef3a 100644 --- a/fix-missing-includes-with-qt-5.15.patch +++ b/fix-missing-includes-with-qt-5.15.patch @@ -1,40 +1,20 @@ -Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp +Index: VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp =================================================================== ---- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp -+++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp -@@ -17,6 +17,7 @@ - +--- VirtualBox-6.1.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp ++++ VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +@@ -18,6 +18,7 @@ /* Qt includes: */ - #include -+#include - - /* GUI include */ - #include "UIImageTools.h" -Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp -=================================================================== ---- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp -+++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp -@@ -19,6 +19,7 @@ #include #include - #include +#include #include #include #include -Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +Index: VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h =================================================================== ---- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h -+++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h -@@ -24,6 +24,7 @@ - /* Qt includes: */ - #include - #include -+#include - - /* GUI includes: */ - #include "UILibraryDefs.h" -@@ -34,7 +35,6 @@ class QIcon; +--- VirtualBox-6.1.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h ++++ VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +@@ -37,7 +37,6 @@ class QIcon; class QLabel; class QMouseEvent; class QObject; @@ -42,27 +22,3 @@ Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h class QPaintEvent; class QResizeEvent; class QString; -Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp -=================================================================== ---- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp -+++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -Index: VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp -=================================================================== ---- VirtualBox-6.1.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp -+++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/turn_off_cloud_net.patch b/turn_off_cloud_net.patch new file mode 100644 index 0000000..0aad729 --- /dev/null +++ b/turn_off_cloud_net.patch @@ -0,0 +1,13 @@ +Index: VirtualBox-6.1.12/Config.kmk +=================================================================== +--- VirtualBox-6.1.12.orig/Config.kmk ++++ VirtualBox-6.1.12/Config.kmk +@@ -802,7 +802,7 @@ endif + # Use new VBoxNetDhcpd instead of old VBoxNetDHCP + VBOX_WITH_DHCPD = 1 + # Experimental suport for cloud network integration +-VBOX_WITH_CLOUD_NET = 1 ++#VBOX_WITH_CLOUD_NET = 1 + ## @} + + diff --git a/virtualbox.changes b/virtualbox.changes index 204e972..e745b65 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Jul 15 18:52:28 UTC 2020 - Larry Finger + +- Version bump to 6.1.12 (released July 14 2020 by Oracle) + + This is a maintenance release. The following items were fixed and/or added: + + File "turn_off_cloud_net.patch" added. + Fixes for CVE-2020-14628, CVE-2020-14646, CVE-2020-14647, CVE-2020-14649 + CVE-2020-14713, CVE-2020-14674, CVE-2020-14675, CVE-2020-14676 + CVE-2020-14677, CVE-2020-14699, CVE-2020-14711, CVE-2020-14629 + CVE-2020-14703, CVE-2020-14704, CVE-2020-14648, CVE-2020-14650 + CVE-2020-14673, CVE-2020-14694, CVE-2020-14695, CVE-2020-14698 + CVE-2020-14700, CVE-2020-14712, CVE-2020-14707, CVE-2020-14714 + CVE-2020-14715 bsc#1174159. + + UI: Fixes for Log-Viewer search-backward icon + Devices: Fixes and improvements for the BusLogic SCSI controller emulation + Serial Port: Regression fixes in FIFO data handling + Oracle Cloud Infrastructure integration: Experimental new type of network attachment, allowing local VM to act as if it was run in cloud + API: improved resource management in the guest control functionality + VBoxManage: fixed command option parsing for the "snapshot edit" sub-command + VBoxManage: Fix crash of 'VBoxManage internalcommands repairhd' when processing invalid input (bug #19579) + Guest Additions, 3D: New experimental GLX graphics output + Guest Additions, 3D: Fixed releasing texture objects, which could cause guest crashes + Guest Additions: Fixed writes to a file on a shared folder not being reflected on the host when the file is mmap'ed and the used Linux kernel is between version 4.10.0 and 4.11.x + Guest Additions: Fixed the shared folder driver on 32bit Windows 8 and newer returning an error when flushing writes to a file which is mapped into memory under rare circumstances + Guest Additions: Improve resize coverage for VMSVGA graphics controller + Guest Additions: Fix issues detecting guest additions ISO at runtime + Guest Additions: Fixed German translation encoding for Windows GA installer + ------------------------------------------------------------------- Tue Jul 14 10:37:53 UTC 2020 - Callum Farmer diff --git a/virtualbox.spec b/virtualbox.spec index bd39e07..ca92610 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -66,7 +66,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! Name: virtualbox%{?dash}%{?name_suffix} -Version: 6.1.10 +Version: 6.1.12 Release: 0 Summary: %{package_summary} License: GPL-2.0-or-later @@ -147,6 +147,8 @@ Patch111: fix_conflict_between_host_and_guest.patch Patch112: modify_for_4_8_bo_move.patch # Remove all mention of _smp_mflags Patch113: vbox_remove_smp_mflags.patch +# Disable experimental and incomplete CLOUD_NET +Patch114: turn_off_cloud_net.patch # Fix for missing include needed for server 1.19 Patch116: Fix_for_server_1.19.patch # Fix invalid use of internal headers @@ -475,6 +477,7 @@ This package contains the kernel-modules that VirtualBox uses to create or run v %patch111 -p1 %patch112 -p1 %patch113 -p1 +%patch114 -p1 %patch116 -p1 %patch118 -p1 %patch120 -p1