3:18 p.m.
commit dd3aacd59acf4dc0a779e7283176c455a7394e7e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Oct 20 11:24:35 2021 +0100
Update VirtualBox to 6.1.28
...AutoMount-Change-Linux-mount-code-to-use-.patch | 189 ---------------------
96-vbox.preset => 96-vboxguest.preset | 0
96-vbox-server.preset => 96-vboxhost.preset | 0
VirtualBox-6.1.0-VBoxRem.patch | 17 --
...h => VirtualBox-6.1.28-add-Mageia-support.patch | 114 ++++++-------
VirtualBox.spec | 25 ++-
changeset_90377.diff | 11 --
sources | 4 +-
update_vbox.sh | 7 +-
vboxweb.service | 1 +
10 files changed, 76 insertions(+), 292 deletions(-)
---
diff --git a/96-vbox.preset b/96-vboxguest.preset
similarity index 100%
rename from 96-vbox.preset
rename to 96-vboxguest.preset
diff --git a/96-vbox-server.preset b/96-vboxhost.preset
similarity index 100%
rename from 96-vbox-server.preset
rename to 96-vboxhost.preset
diff --git a/VirtualBox-6.1.20-add-Mageia-support.patch
b/VirtualBox-6.1.28-add-Mageia-support.patch
similarity index 63%
rename from VirtualBox-6.1.20-add-Mageia-support.patch
rename to VirtualBox-6.1.28-add-Mageia-support.patch
index 17a157e..ea2eba9 100644
--- a/VirtualBox-6.1.20-add-Mageia-support.patch
+++ b/VirtualBox-6.1.28-add-Mageia-support.patch
@@ -16,10 +16,10 @@
src/VBox/Main/xml/Settings.cpp | 1 +
15 files changed, 59 insertions(+), 2 deletions(-)
-diff -Nurp VirtualBox-6.1.20.orig/include/VBox/ostypes.h
VirtualBox-6.1.20/include/VBox/ostypes.h
---- VirtualBox-6.1.20.orig/include/VBox/ostypes.h 2021-04-20 07:22:16.000000000 +0300
-+++ VirtualBox-6.1.20/include/VBox/ostypes.h 2021-04-20 22:23:34.664631359 +0300
-@@ -112,6 +112,8 @@ typedef enum VBOXOSTYPE
+diff -Nurp VirtualBox-6.1.28.orig/include/VBox/ostypes.h
VirtualBox-6.1.28/include/VBox/ostypes.h
+--- VirtualBox-6.1.28.orig/include/VBox/ostypes.h 2021-10-18 20:47:30.000000000 +0300
++++ VirtualBox-6.1.28/include/VBox/ostypes.h 2021-10-19 23:37:22.566374741 +0300
+@@ -113,6 +113,8 @@ typedef enum VBOXOSTYPE
VBOXOSTYPE_Xandros_x64 = 0x5D100,
VBOXOSTYPE_Oracle = 0x5E000,
VBOXOSTYPE_Oracle_x64 = 0x5E100,
@@ -28,9 +28,9 @@ diff -Nurp VirtualBox-6.1.20.orig/include/VBox/ostypes.h
VirtualBox-6.1.20/inclu
VBOXOSTYPE_FreeBSD = 0x60000,
VBOXOSTYPE_FreeBSD_x64 = 0x60100,
VBOXOSTYPE_OpenBSD = 0x61000,
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh
VirtualBox-6.1.20/src/VBox/Additions/linux/installer/vboxadd-x11.sh
---- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-04-20
07:24:21.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-04-20
22:23:34.686632426 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh
VirtualBox-6.1.28/src/VBox/Additions/linux/installer/vboxadd-x11.sh
+--- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-10-18
20:50:51.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-10-19
23:37:22.566374741 +0300
@@ -94,8 +94,14 @@ install_x11_startup_app() {
x11_autostart="/etc/xdg/autostart"
kde_autostart="/usr/share/autostart"
@@ -46,10 +46,10 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Additions/linux/installer/vboxadd-x11
if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x
"$mandriva_dir" ]
then
install -m 0644 $app_src "$mandriva_dir/$app_dest"
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Devices/VMMDev/VMMDev.cpp
VirtualBox-6.1.20/src/VBox/Devices/VMMDev/VMMDev.cpp
---- VirtualBox-6.1.20.orig/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-04-20
07:30:47.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-04-20 22:23:34.690632620
+0300
-@@ -200,6 +200,7 @@ static void vmmdevLogGuestOsInfo(VBoxGue
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Devices/VMMDev/VMMDev.cpp
VirtualBox-6.1.28/src/VBox/Devices/VMMDev/VMMDev.cpp
+--- VirtualBox-6.1.28.orig/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-10-18
20:56:47.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-10-19 23:37:22.567374788
+0300
+@@ -202,6 +202,7 @@ static void vmmdevLogGuestOsInfo(VBoxGue
case VBOXOSTYPE_OpenSUSE: pszOs = "openSUSE";
break;
case VBOXOSTYPE_FedoraCore: pszOs = "Fedora";
break;
case VBOXOSTYPE_Gentoo: pszOs = "Gentoo";
break;
@@ -57,10 +57,10 @@ diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Devices/VMMDev/VMMDev.cpp
VirtualBox-
case VBOXOSTYPE_Mandriva: pszOs = "Mandriva";
break;
case VBOXOSTYPE_RedHat: pszOs = "RedHat";
break;
case VBOXOSTYPE_Turbolinux: pszOs =
"TurboLinux"; break;
-diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
----
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-04-20
07:31:49.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-04-20
22:23:34.690632620 +0300
-@@ -326,6 +326,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
+diff -Nurp
VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
+---
VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-10-18
20:57:50.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-10-19
23:37:22.567374788 +0300
+@@ -327,6 +327,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
m_guestOSTypeIconNames.insert("Fedora_64",
":/os_fedora_64.png");
m_guestOSTypeIconNames.insert("Gentoo",
":/os_gentoo.png");
m_guestOSTypeIconNames.insert("Gentoo_64",
":/os_gentoo_64.png");
@@ -69,10 +69,10 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIc
m_guestOSTypeIconNames.insert("Mandriva",
":/os_mandriva.png");
m_guestOSTypeIconNames.insert("Mandriva_64",
":/os_mandriva_64.png");
m_guestOSTypeIconNames.insert("RedHat",
":/os_redhat.png");
-diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
----
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-04-20
07:32:00.000000000 +0300
-+++
VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-04-20
22:23:34.694632814 +0300
-@@ -137,8 +137,10 @@ static const osTypePattern gs_OSTypePatt
+diff -Nurp
VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+---
VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-10-18
20:58:01.000000000 +0300
++++
VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-10-19
23:37:22.567374788 +0300
+@@ -138,8 +138,10 @@ static const osTypePattern gs_OSTypePatt
{ QRegExp("Fe.*32", Qt::CaseInsensitive),
"Fedora" },
{ QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive),
"Gentoo_64" },
{ QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive),
"Gentoo" },
@@ -85,9 +85,9 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/wizards/newv
{ QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive),
"RedHat_64" },
{ QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive),
"RedHat" },
{ QRegExp("Tur.*64", Qt::CaseInsensitive),
"Turbolinux_64" },
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
---- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-04-20
07:31:25.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-04-20
22:23:34.695632862 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+--- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-10-18
20:57:28.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-10-19
23:37:22.567374788 +0300
@@ -64,6 +64,8 @@
<file
alias="os_linux_64.png">images/os_linux_64.png</file>
<file alias="os_macosx.png">images/os_macosx.png</file>
@@ -97,9 +97,9 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
<file
alias="os_mandriva.png">images/os_mandriva.png</file>
<file
alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
<file alias="os_netbsd.png">images/os_netbsd.png</file>
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
---- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-04-20
07:31:25.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-04-20
22:23:34.695632862 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
+--- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-10-18
20:57:28.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-10-19
23:37:22.567374788 +0300
@@ -67,6 +67,8 @@
<file
alias="os_linux_x2.png">images/x2/os_linux_x2.png</file>
<file
alias="os_macosx_64_x2.png">images/x2/os_macosx_64_x2.png</file>
@@ -109,9 +109,9 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.q
<file
alias="os_mandriva_64_x2.png">images/x2/os_mandriva_64_x2.png</file>
<file
alias="os_mandriva_x2.png">images/x2/os_mandriva_x2.png</file>
<file
alias="os_netbsd_64_x2.png">images/x2/os_netbsd_64_x2.png</file>
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc
VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc
---- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-04-20
07:31:25.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-04-20
22:23:34.695632862 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc
VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc
+--- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-10-18
20:57:28.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-10-19
23:37:22.567374788 +0300
@@ -67,6 +67,8 @@
<file
alias="os_linux_x3.png">images/x3/os_linux_x3.png</file>
<file
alias="os_macosx_64_x3.png">images/x3/os_macosx_64_x3.png</file>
@@ -121,9 +121,9 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.q
<file
alias="os_mandriva_64_x3.png">images/x3/os_mandriva_64_x3.png</file>
<file
alias="os_mandriva_x3.png">images/x3/os_mandriva_x3.png</file>
<file
alias="os_netbsd_64_x3.png">images/x3/os_netbsd_64_x3.png</file>
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc
VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc
---- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-04-20
07:31:25.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-04-20
22:23:34.695632862 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc
VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc
+--- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-10-18
20:57:28.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-10-19
23:37:22.567374788 +0300
@@ -67,6 +67,8 @@
<file
alias="os_linux_x4.png">images/x4/os_linux_x4.png</file>
<file
alias="os_macosx_64_x4.png">images/x4/os_macosx_64_x4.png</file>
@@ -133,9 +133,9 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.q
<file
alias="os_mandriva_64_x4.png">images/x4/os_mandriva_64_x4.png</file>
<file
alias="os_mandriva_x4.png">images/x4/os_mandriva_x4.png</file>
<file
alias="os_netbsd_64_x4.png">images/x4/os_netbsd_64_x4.png</file>
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Installer/linux/distributions_rpm
VirtualBox-6.1.20/src/VBox/Installer/linux/distributions_rpm
---- VirtualBox-6.1.20.orig/src/VBox/Installer/linux/distributions_rpm 2021-04-20
07:32:09.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Installer/linux/distributions_rpm 2021-04-20
22:23:34.695632862 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Installer/linux/distributions_rpm
VirtualBox-6.1.28/src/VBox/Installer/linux/distributions_rpm
+--- VirtualBox-6.1.28.orig/src/VBox/Installer/linux/distributions_rpm 2021-10-18
20:58:10.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Installer/linux/distributions_rpm 2021-10-19
23:37:22.567374788 +0300
@@ -7,6 +7,21 @@ openSUSE114 = OPENSUSE_11_4
openSUSE113 = OPENSUSE_11_3
sles11.0 = SLES_11_0
@@ -158,9 +158,9 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Installer/linux/distributions_rpm Vir
mdv2011.0 = MANDRIVA_2011_0
fedora33 = FEDORA_33
fedora32 = FEDORA_32
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Installer/linux/VBoxSysInfo.sh
VirtualBox-6.1.20/src/VBox/Installer/linux/VBoxSysInfo.sh
---- VirtualBox-6.1.20.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-04-20
07:32:09.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-04-20
22:23:34.695632862 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Installer/linux/VBoxSysInfo.sh
VirtualBox-6.1.28/src/VBox/Installer/linux/VBoxSysInfo.sh
+--- VirtualBox-6.1.28.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-10-18
20:58:09.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-10-19
23:37:22.567374788 +0300
@@ -44,6 +44,11 @@ get_linux_info () {
# Debian-based system
release=`cat /etc/debian_version`
@@ -173,30 +173,30 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Installer/linux/VBoxSysInfo.sh Virtua
elif [ -r /etc/mandriva-release ]
then
# Mandriva-based system
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/src-all/Global.cpp
VirtualBox-6.1.20/src/VBox/Main/src-all/Global.cpp
---- VirtualBox-6.1.20.orig/src/VBox/Main/src-all/Global.cpp 2021-04-20 07:32:15.000000000
+0300
-+++ VirtualBox-6.1.20/src/VBox/Main/src-all/Global.cpp 2021-04-20 22:23:34.699633056
+0300
-@@ -249,6 +249,17 @@ const Global::OSType Global::sOSTypes[]
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM,
0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-all/Global.cpp
VirtualBox-6.1.28/src/VBox/Main/src-all/Global.cpp
+--- VirtualBox-6.1.28.orig/src/VBox/Main/src-all/Global.cpp 2021-10-18 20:58:15.000000000
+0300
++++ VirtualBox-6.1.28/src/VBox/Main/src-all/Global.cpp 2021-10-19 23:57:42.607061761
+0300
+@@ -257,6 +257,17 @@ const Global::OSType Global::sOSTypes[]
+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
+ { "Linux", "Linux", "Mageia",
"Mageia (32-bit)",
+ VBOXOSTYPE_Mageia, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET |
VBOXOSHINT_X2APIC,
-+ 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ 1, 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
+
+ { "Linux", "Linux", "Mageia_64",
"Mageia (64-bit)",
-+ VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX |
VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
++ VBOXOSTYPE_Mageia_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX |
VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
+ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
-+ 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ 1, 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
+
{ "Linux", "Linux", "Mandriva",
"Mandriva (32-bit)",
VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET |
VBOXOSHINT_X2APIC,
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM,
0, StorageControllerType_PIIX4, StorageBus_IDE,
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/src-server/ApplianceImpl.cpp
VirtualBox-6.1.20/src/VBox/Main/src-server/ApplianceImpl.cpp
---- VirtualBox-6.1.20.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-04-20
07:32:17.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-04-20
22:23:34.700633105 +0300
+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-server/ApplianceImpl.cpp
VirtualBox-6.1.28/src/VBox/Main/src-server/ApplianceImpl.cpp
+--- VirtualBox-6.1.28.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-10-18
20:58:17.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-10-19
23:37:22.568374835 +0300
@@ -218,6 +218,7 @@ static const osTypePattern g_aOsTypesPat
{"SUSE", VBOXOSTYPE_OpenSUSE},
{"Novell", VBOXOSTYPE_OpenSUSE},
@@ -213,10 +213,10 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Vir
{"Mandriva", VBOXOSTYPE_Mandriva_x64},
{"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
{"Debian", VBOXOSTYPE_Debian_x64},
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/src-server/MachineImpl.cpp
VirtualBox-6.1.20/src/VBox/Main/src-server/MachineImpl.cpp
---- VirtualBox-6.1.20.orig/src/VBox/Main/src-server/MachineImpl.cpp 2021-04-20
07:32:18.000000000 +0300
-+++ VirtualBox-6.1.20/src/VBox/Main/src-server/MachineImpl.cpp 2021-04-20
22:23:34.701633153 +0300
-@@ -1360,6 +1360,8 @@ HRESULT Machine::getEffectiveParavirtPro
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-server/MachineImpl.cpp
VirtualBox-6.1.28/src/VBox/Main/src-server/MachineImpl.cpp
+--- VirtualBox-6.1.28.orig/src/VBox/Main/src-server/MachineImpl.cpp 2021-10-18
20:58:18.000000000 +0300
++++ VirtualBox-6.1.28/src/VBox/Main/src-server/MachineImpl.cpp 2021-10-19
23:37:22.569374882 +0300
+@@ -1363,6 +1363,8 @@ HRESULT Machine::getEffectiveParavirtPro
|| mUserData->s.strOsType == "Gentoo_64"
|| mUserData->s.strOsType == "Mandriva"
|| mUserData->s.strOsType == "Mandriva_64"
@@ -225,9 +225,9 @@ diff -Nurp
VirtualBox-6.1.20.orig/src/VBox/Main/src-server/MachineImpl.cpp Virtu
|| mUserData->s.strOsType == "OpenSUSE"
|| mUserData->s.strOsType == "OpenSUSE_64"
|| mUserData->s.strOsType == "Oracle"
-diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/xml/Settings.cpp
VirtualBox-6.1.20/src/VBox/Main/xml/Settings.cpp
---- VirtualBox-6.1.20.orig/src/VBox/Main/xml/Settings.cpp 2021-04-20 07:32:21.000000000
+0300
-+++ VirtualBox-6.1.20/src/VBox/Main/xml/Settings.cpp 2021-04-20 22:23:34.701633153 +0300
+diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/xml/Settings.cpp
VirtualBox-6.1.28/src/VBox/Main/xml/Settings.cpp
+--- VirtualBox-6.1.28.orig/src/VBox/Main/xml/Settings.cpp 2021-10-18 20:58:21.000000000
+0300
++++ VirtualBox-6.1.28/src/VBox/Main/xml/Settings.cpp 2021-10-19 23:37:22.569374882 +0300
@@ -5673,6 +5673,7 @@ const struct {
{ "opensuse", "OpenSUSE" },
{ "fedoracore", "Fedora" },
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 3d8c0d7..46593b0 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,8 +42,8 @@
%endif
Name: VirtualBox
-Version: 6.1.26
-Release: 3%{?dist}
+Version: 6.1.28
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -61,8 +61,8 @@ Source4: vboxdrv.service
Source5: VirtualBox-60-vboxguest.rules
Source6: vboxclient.service
Source7: vboxservice.service
-Source8: 96-vbox.preset
-Source9: 96-vbox-server.preset
+Source8: 96-vboxguest.preset
+Source9: 96-vboxhost.preset
Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
@@ -81,7 +81,7 @@ Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
# from ArchLinux
Patch40: 007-python2-path.patch
# from Mageia
-Patch50: VirtualBox-6.1.20-add-Mageia-support.patch
+Patch50: VirtualBox-6.1.28-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
Patch52: VirtualBox-6.0.10-convert-map-python3.patch
# from Fedora
@@ -96,9 +96,7 @@ Patch72: virtualbox-snpritnf-buffer-overflow.patch
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: gcc-c++
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -344,9 +342,7 @@ rm -r src/libs/zlib-1.2.*/
%patch72 -p1 -b .snpritnf-buffer-overflow
%patch73 -p1 -b .modal-dialog-parent
%patch80 -p1 -b .gcc10
-%patch86 -p1 -b .vboxrem
%patch88 -p1 -b .lzf
-%patch89 -p1 -b .changeset_90377
%build
@@ -612,7 +608,7 @@ desktop-file-validate \
%{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_unitdir}/vboxservice.service
-install -p -m 0644 -D %{SOURCE8} %{buildroot}%{_presetdir}/96-vbox.preset
+install -p -m 0644 -D %{SOURCE8} %{buildroot}%{_presetdir}/96-vboxguest.preset
install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_unitdir}/vboxclient.service
%endif
@@ -640,7 +636,7 @@ install -p -m 0644 -D %{SOURCE3}
%{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
# Install service to load server modules
install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_unitdir}/vboxdrv.service
-install -p -m 0644 -D %{SOURCE9} %{buildroot}%{_presetdir}/96-vbox-server.preset
+install -p -m 0644 -D %{SOURCE9} %{buildroot}%{_presetdir}/96-vboxhost.preset
# Menu entry
@@ -834,7 +830,7 @@ getent passwd vboxadd >/dev/null || \
%config %{_sysconfdir}/vbox/vbox.cfg
%{_udevrulesdir}/60-vboxdrv.rules
%{_unitdir}/vboxdrv.service
-%{_presetdir}/96-vbox-server.preset
+%{_presetdir}/96-vboxhost.preset
%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
%files
@@ -896,13 +892,16 @@ getent passwd vboxadd >/dev/null || \
%{_unitdir}/vboxclient.service
%{_udevrulesdir}/60-vboxguest.rules
%{_unitdir}/vboxservice.service
-%{_presetdir}/96-vbox.preset
+%{_presetdir}/96-vboxguest.preset
%endif
%files kmodsrc
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Oct 20 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.28-1
+- Update VirtualBox to 6.1.28 with with inspirations in the Mageia and Debian packages
+
* Mon Aug 09 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.26-3
- Fix build on rawhide (disabling python) and BR alsa-lib-devel
diff --git a/sources b/sources
index b46ebc2..cdf84b9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-6.1.26.tar.bz2) =
7668abaa6e5e9cfbc3c7ae1c6efc11663bce906aa002f78cf2c7acbf9b47f96faeb64c2762330c7091694c191ff2311f3674bd930cfdc020c23ef1d4fd893c9b
-SHA512 (UserManual.pdf) =
ff698ee9c2e07d3850822c0d1e8707eebc6027a9f8712421876f4868ed59c671f885ff1f36f01dd87cf948b1c314355a04b9b9a97be92d0425d578b383c3e927
+SHA512 (VirtualBox-6.1.28.tar.bz2) =
d0eb49a82ec6ddb7ce7da362faf86254d324e73522001c44ab0f26a09ead3d9a800ce0d4ad3698853d4f9a4e9803ceb21f3bf50388a1855edcb2a42ce51f3a96
+SHA512 (UserManual.pdf) =
7f55346095f91f175eb9ad02aa310744b638524bf0ec5fcdc830167c3da3854e25ddf75b3c2795f39b853a410f39a45bcefef91c90ddc38de6e6050830478ba8
diff --git a/update_vbox.sh b/update_vbox.sh
index 9d6cecd..2a2ce35 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,6 +1,6 @@
-VERSION=6.1.26
+VERSION=6.1.28
REL=1
-RAWHIDE=35
+RAWHIDE=36
REPOS="f34 f33 f32 el8 el7"
if [ -z "$1" ]
then
@@ -24,7 +24,7 @@ rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf
fi
echo Press enter scratch-build or n to skip ; read dummy;
if [[ "$dummy" != "n" ]]; then
- rfpkg scratch-build --srpm
+ rfpkg scratch-build --srpm --nowait
fi
echo Press enter to build on corp -build or n to skip ; read dummy;
if [[ "$dummy" != "n" ]]; then
@@ -35,6 +35,7 @@ fi
if test $stage -le 1
then
echo STAGE 1
+echo Press enter to commit; read dummy;
rfpkg ci -c && git show
echo Press enter to push and build on rawhide; read dummy;
rfpkg push && rfpkg build --nowait
diff --git a/vboxweb.service b/vboxweb.service
index a444f17..ec7566d 100644
--- a/vboxweb.service
+++ b/vboxweb.service
@@ -10,3 +10,4 @@ PIDFile=/run/vboxweb.pid
[Install]
WantedBy=multi-user.target
+Alias=vboxweb-service.service
1133
days inactive
1133
days old
rpmfusion-commits@lists.rpmfusion.org
0 comments
1 participants
participants (1)
-
Sérgio M. Basto