[VirtualBox] Update VirtualBox to 6.1.26 Patch 61 was included upstream

commit 36361dbec496b57fc00925a864f1c671a2fc4f8f Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Mon Aug 2 04:42:22 2021 +0100 Update VirtualBox to 6.1.26 Patch 61 was included upstream VirtualBox.spec | 26 ++++++++++++-------------- sources | 4 ++-- update_vbox.sh | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index c616f3f..cd4d135 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -32,21 +32,16 @@ %bcond_without guest_additions %endif -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 - %bcond_with python2 -%else - %bcond_without python2 -%endif - -%if 0%{?fedora} > 15 || 0%{?rhel} > 7 - %bcond_without python3 +# Since version 6.1.28, VBox should not have the python2 dependency +%if 0%{?fedora} > 34 +%bcond_with python3 %else - %bcond_with python3 +%bcond_without python3 %endif Name: VirtualBox -Version: 6.1.22 -Release: 3%{?dist} +Version: 6.1.26 +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -55,7 +50,6 @@ URL: http://www.virtualbox.org/wiki/VirtualBox ExclusiveArch: x86_64 Requires: %{name}-server%{?isa} = %{version} -Obsoletes: %{name}-qt < 5.1.8 Source0: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/Virtua... Source1: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/UserMa... @@ -93,7 +87,6 @@ Patch52: VirtualBox-6.0.10-convert-map-python3.patch # Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as # a systemd service, this works with both Wayland and Xorg based sessions Patch60: VirtualBox-5.2.10-xclient.patch -#Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch # from OpenSuse Patch70: vbox-python-detection.diff Patch71: fixes_for_Qt5.11to15.patch @@ -103,6 +96,7 @@ Patch73: vb-6.1.16-modal-dialog-parent.patch Patch80: VirtualBox-6.1.4-gcc10.patch Patch86: VirtualBox-6.1.0-VBoxRem.patch Patch88: VirtualBox-lzf.patch +Patch89: changeset_90377.diff BuildRequires: kBuild >= 0.1.9998.r3093 BuildRequires: SDL-devel @@ -343,7 +337,6 @@ rm -r src/libs/zlib-1.2.*/ %patch50 -p1 -b .mageia-support %patch51 -p1 -b .revert-VBox.sh %patch60 -p1 -b .xclient -#patch61 -p1 -b .automount %patch70 -p1 -b .python-detection %patch71 -p1 -b .qt %patch72 -p1 -b .snpritnf-buffer-overflow @@ -351,6 +344,7 @@ rm -r src/libs/zlib-1.2.*/ %patch80 -p1 -b .gcc10 %patch86 -p1 -b .vboxrem %patch88 -p1 -b .lzf +%patch89 -p1 -b .changeset_90377 %build @@ -904,6 +898,10 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Mon Aug 02 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.26-1 +- Update VirtualBox to 6.1.26 +- Patch 61 was included upstream + * Tue Jun 15 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 6.1.22-3 - Rebuild for python-3.10 diff --git a/sources b/sources index 8b4539e..b46ebc2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-6.1.22.tar.bz2) = ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d -SHA512 (UserManual.pdf) = 6f0911d6ef3e1d1b9e2df3de7da660f12400364ff07f2f1642e942670dd3f0219d1ed8f51d79fa1e219596cd066d053f207a53036302bba0f223c3478f5518f9 +SHA512 (VirtualBox-6.1.26.tar.bz2) = 7668abaa6e5e9cfbc3c7ae1c6efc11663bce906aa002f78cf2c7acbf9b47f96faeb64c2762330c7091694c191ff2311f3674bd930cfdc020c23ef1d4fd893c9b +SHA512 (UserManual.pdf) = ff698ee9c2e07d3850822c0d1e8707eebc6027a9f8712421876f4868ed59c671f885ff1f36f01dd87cf948b1c314355a04b9b9a97be92d0425d578b383c3e927 diff --git a/update_vbox.sh b/update_vbox.sh index 2622168..5eb93de 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,4 +1,4 @@ -VERSION=6.1.22 +VERSION=6.1.26 REL=1 RAWHIDE=35 REPOS="f34 f33 f32 el8 el7"