From 8c2ca999284d38390b8a10627a87737c47e8ca0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 26 May 2022 06:38:58 +0200 Subject: [PATCH 01/16] - fix building kernel modules for 5.18 --- VirtualBox.spec | 2 ++ kernel-5.18.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 kernel-5.18.patch diff --git a/VirtualBox.spec b/VirtualBox.spec index c8ea8ba..0708c40 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -89,6 +89,7 @@ Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch Patch18: qt-detect.patch Patch19: kernel-4.9.256.patch +Patch20: kernel-5.18.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -574,6 +575,7 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers tar -zxf host-modules.tar.gz -C HostDrivers cd - %patch19 -p1 +%patch20 -p1 %endif # using system kBuild package diff --git a/kernel-5.18.patch b/kernel-5.18.patch new file mode 100644 index 0000000..1adcf10 --- /dev/null +++ b/kernel-5.18.patch @@ -0,0 +1,16 @@ +--- VirtualBox-6.1.34/kernel/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c~ 2022-05-25 17:21:29.000000000 +0200 ++++ VirtualBox-6.1.34/kernel/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c 2022-05-26 06:36:50.085761576 +0200 +@@ -2310,8 +2310,13 @@ + { + vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1); + Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb)); ++#if RTLNX_VER_MIN(5,18,0) ++ Log6(("vboxNetFltPortOsXmit: netif_rx(%p)\n", pBuf)); ++ err = netif_rx(pBuf); ++#else + Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf)); + err = netif_rx_ni(pBuf); ++#endif + if (err) + rc = RTErrConvertFromErrno(err); + } -- 2.44.0 From ea66265a7d6c72ce4cdc77fe06a1fd2e98db7680 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 26 May 2022 06:43:22 +0200 Subject: [PATCH 02/16] - rel 1 --- VirtualBox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 0708c40..5776d53 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,7 +47,7 @@ exit 1 %define qtver 5.6.0 -%define rel 0.1 +%define rel 1 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 -- 2.44.0 From 6929594b5d2cadc3105ef76cd67322e39bb4a013 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 14 Oct 2022 10:56:15 +0200 Subject: [PATCH 03/16] - up to 6.1.40 --- VirtualBox.spec | 11 ++++------- pld-guest.patch | 4 ++-- x32.patch | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 5776d53..2775fb9 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -52,14 +52,14 @@ exit 1 Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 6.1.34 +Version: 6.1.40 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/Emulators Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 5ee5e141a7bd6251420e7d7a2cc76206 +# Source0-md5: 19439dbfbd13bb8b9f1151052a432d8b Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 16cfa062d19f4578f6bd24648b99eca4 +# Source1-md5: 5299c1371e7ba61150a60954a4453149 Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -88,8 +88,6 @@ Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch Patch18: qt-detect.patch -Patch19: kernel-4.9.256.patch -Patch20: kernel-5.18.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -574,8 +572,6 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers ../src/VBox/HostDrivers/linux/export_modules.sh --file host-modules.tar.gz --without-hardening tar -zxf host-modules.tar.gz -C HostDrivers cd - -%patch19 -p1 -%patch20 -p1 %endif # using system kBuild package @@ -1071,6 +1067,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %lang(id) %{_datadir}/%{pname}/nls/*_id.qm %lang(it) %{_datadir}/%{pname}/nls/*_it.qm %lang(ja) %{_datadir}/%{pname}/nls/*_ja.qm +%lang(ka) %{_datadir}/%{pname}/nls/*_ka.qm %lang(km_KH) %{_datadir}/%{pname}/nls/*_km_KH.qm %lang(ko) %{_datadir}/%{pname}/nls/*_ko.qm %lang(lt) %{_datadir}/%{pname}/nls/*_lt.qm diff --git a/pld-guest.patch b/pld-guest.patch index 42e9152..32ed610 100644 --- a/pld-guest.patch +++ b/pld-guest.patch @@ -98,8 +98,8 @@ +++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-28 09:58:59.493698505 +0200 @@ -133,6 +133,8 @@ { QRegExp("Xa.*32", Qt::CaseInsensitive), "Xandros" }, - { QRegExp("((Or)|(oel)|(ol)).*64", Qt::CaseInsensitive), "Oracle_64" }, - { QRegExp("((Or)|(oel)|(ol)).*32", Qt::CaseInsensitive), "Oracle" }, + { QRegExp("((Or)|(oel)|(^ol)).*64", Qt::CaseInsensitive), "Oracle_64" }, + { QRegExp("((Or)|(oel)|(^ol)).*32", Qt::CaseInsensitive), "Oracle" }, + { QRegExp("PLD.*64", Qt::CaseInsensitive), "PLD_64" }, + { QRegExp("PLD.*32", Qt::CaseInsensitive), "PLD" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, diff --git a/x32.patch b/x32.patch index 7e4e95f..d48082d 100644 --- a/x32.patch +++ b/x32.patch @@ -1,7 +1,7 @@ --- VirtualBox-4.3.26/configure~ 2015-03-28 22:23:14.000000000 +0200 +++ VirtualBox-4.3.26/configure 2015-03-28 22:26:31.627419402 +0200 @@ -1943,7 +1943,7 @@ - SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m" + SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m" for p in $PYTHONDIR; do for d in $SUPPYTHONLIBS; do - for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do -- 2.44.0 From d73f6bc6878ccb83a2664a5628cfb103fc3add6b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Ma=C5=9Bko?= Date: Fri, 5 May 2023 12:19:13 +0200 Subject: [PATCH 04/16] - Up to 6.1.44, the latest from the 6.1 branch (6.1.40 doesn't build on 6.3.x kernels). --- VirtualBox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 2775fb9..813f170 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -52,14 +52,14 @@ exit 1 Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 6.1.40 +Version: 6.1.44 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/Emulators Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 19439dbfbd13bb8b9f1151052a432d8b +# Source0-md5: 309f868297447291db980a1d8fa11ec6 Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 5299c1371e7ba61150a60954a4453149 +# Source1-md5: 282a2d395eac07d7bcde128b529f2bc9 Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig -- 2.44.0 From 254afb199228fc7975e73e1556207663f2ce3d2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Ma=C5=9Bko?= Date: Mon, 24 Jul 2023 14:43:49 +0200 Subject: [PATCH 05/16] - Up to 6.1.46. --- VirtualBox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 813f170..6e04606 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -52,14 +52,14 @@ exit 1 Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 6.1.44 +Version: 6.1.46 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/Emulators Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 309f868297447291db980a1d8fa11ec6 +# Source0-md5: 43a729bd9e0e3a9559188abd16df2a38 Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 282a2d395eac07d7bcde128b529f2bc9 +# Source1-md5: 640a09d26d46ae72268d6bdc7f4669bb Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig -- 2.44.0 From c7e9c3b9f442b0dca3e61e32bb682891c89d1631 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Ma=C5=9Bko?= Date: Mon, 24 Jul 2023 14:53:31 +0200 Subject: [PATCH 06/16] - Removed patch 12. --- VirtualBox.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 6e04606..0ba0b52 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -81,7 +81,6 @@ Patch8: lightdm-greeter-g++-link.patch Patch9: pld-guest.patch Patch10: 16-no-update.patch Patch11: %{pname}-all-translations.patch -Patch12: x32.patch Patch13: %{pname}-no-scrextend.patch Patch14: %{pname}-multipython.patch Patch15: %{pname}-lightdm-1.19.2.patch @@ -546,7 +545,6 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %if %{with all_langs} %patch11 -p0 %endif -%patch12 -p1 %patch13 -p1 %patch14 -p0 %patch15 -p0 -- 2.44.0 From d5cde46bcd87d6acb192cdd28ea41b4e6a8771a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Ma=C5=9Bko?= Date: Fri, 18 Aug 2023 17:25:28 +0200 Subject: [PATCH 07/16] - A patch against kernels 6.4.10 and newer. Probably to be removed in the next version (if will exist). --- VirtualBox.spec | 4 +++- kernel-6.4.10.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 kernel-6.4.10.patch diff --git a/VirtualBox.spec b/VirtualBox.spec index 0ba0b52..ae31aae 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,7 +47,7 @@ exit 1 %define qtver 5.6.0 -%define rel 1 +%define rel 2 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -74,6 +74,7 @@ Source12: udev-guest.rules Patch0: %{pname}-version-error.patch Patch1: %{pname}-VBoxSysInfo.patch Patch2: %{pname}-warning_workaround.patch +Patch3: kernel-6.4.10.patch Patch4: wrapper.patch Patch6: hardening-shared.patch Patch7: lightdm-greeter-makefile.patch @@ -536,6 +537,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch6 -p1 %patch7 -p1 diff --git a/kernel-6.4.10.patch b/kernel-6.4.10.patch new file mode 100644 index 0000000..5ad0b6c --- /dev/null +++ b/kernel-6.4.10.patch @@ -0,0 +1,13 @@ +--- VirtualBox-6.1.46/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c~ 2023-08-18 13:23:19.899777134 +0200 ++++ VirtualBox-6.1.46/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2023-08-18 13:29:51.703087517 +0200 +@@ -37,9 +37,9 @@ + #if RTLNX_VER_MIN(2,6,24) + # include + #endif +-#if RTLNX_VER_MIN(6,5,0) ++#if RTLNX_VER_MIN(6,4,10) + # include + #endif + #include + #if RTLNX_VER_MAX(2,6,29) || RTLNX_VER_MIN(5,11,0) + # include -- 2.44.0 From ef3354183a5237e95f1743463adf9472cbdd749b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 6 Sep 2023 17:25:56 +0200 Subject: [PATCH 08/16] - up to 7.0.10, switch to python 3 --- 16-no-update.patch | 180 ++++++++++++++++++--------------- VirtualBox-multipython.patch | 11 -- VirtualBox-no-vboxvideo.patch | 2 +- VirtualBox.spec | 37 +++---- gcc-13.patch | 12 +++ hardening-shared.patch | 8 +- lightdm-greeter-makefile.patch | 4 +- pld-guest.patch | 58 +++++------ python3.patch | 11 ++ xsl-style-dir.patch | 11 ++ 10 files changed, 184 insertions(+), 150 deletions(-) delete mode 100644 VirtualBox-multipython.patch create mode 100644 gcc-13.patch create mode 100644 python3.patch create mode 100644 xsl-style-dir.patch diff --git a/16-no-update.patch b/16-no-update.patch index e914773..9e0f025 100644 --- a/16-no-update.patch +++ b/16-no-update.patch @@ -1,92 +1,110 @@ + Description: Disable "Check for Updates" action. Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 -Author: Daniel Hahler , Felix Geyer +Author: Daniel Hahler , Felix Geyer , Gianfranco Costamagna -diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp ---- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp -@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown() - - void UIUpdateManager::sltForceCheck() +Index: virtualbox/doc/manual/en_US/user_Introduction.xml +=================================================================== +--- virtualbox.orig/doc/manual/en_US/user_Introduction.xml ++++ virtualbox/doc/manual/en_US/user_Introduction.xml +@@ -6090,14 +6090,14 @@ + . + + +- ++ + + + Language. Enables you to +Index: virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +=================================================================== +--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ++++ virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +@@ -2421,7 +2421,7 @@ + bool UIExtraDataManager::applicationUpdateEnabled() { -+ return; -+ - /* Force call for new version check: */ - sltCheckIfUpdateIsNecessary(true /* force call */); + /* 'True' unless 'restriction' feature allowed: */ +- return !isFeatureAllowed(GUI_PreventApplicationUpdate); ++ return false; } ---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp.orig 2015-07-09 20:11:53.129742315 +0200 -+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp 2015-07-09 20:12:02.136424394 +0200 -@@ -991,7 +991,6 @@ - m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this); + + QString UIExtraDataManager::applicationUpdateData() +Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +=================================================================== +--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +@@ -47,10 +47,10 @@ + #ifdef VBOX_WS_WIN + # include "UIGlobalSettingsInterface.h" + #endif +-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER +-# include "UIGlobalSettingsProxy.h" +-# include "UIGlobalSettingsUpdate.h" +-#endif ++//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER ++//# include "UIGlobalSettingsProxy.h" ++//# include "UIGlobalSettingsUpdate.h" ++//#endif + + /* GUI includes: Machine Settings: */ + #include "UIMachineSettingsAudio.h" +@@ -99,7 +99,7 @@ + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER - m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this); -- m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this); + /* Update page: */ +- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); ++ //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); #endif - m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this); - m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this); -@@ -1033,8 +1033,6 @@ + + /* Language page: */ +@@ -110,7 +110,7 @@ + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER - connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered, - gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection); -- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered, -- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection); + /* Proxy page: */ +- m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); ++ //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); #endif - connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered, - &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection); ---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig 2015-07-09 20:13:36.439757556 +0200 -+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h 2015-07-09 20:13:40.446396985 +0200 -@@ -62,7 +62,6 @@ - UIActionIndex_M_Application_S_Preferences, + + #ifdef VBOX_WS_WIN +@@ -226,14 +226,14 @@ + } #ifdef VBOX_GUI_WITH_NETWORK_MANAGER - UIActionIndex_M_Application_S_NetworkAccessManager, -- UIActionIndex_M_Application_S_CheckForUpdates, + /* Update page: */ +- case GlobalSettingsPageType_Update: ++ /*case GlobalSettingsPageType_Update: + { + pSettingsPage = new UIGlobalSettingsUpdate; + addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png", + iPageIndex, "#update", pSettingsPage); + addPageHelpKeyword(iPageIndex, "preferences"); + break; +- } ++ }*/ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ - UIActionIndex_M_Application_S_ResetWarnings, - UIActionIndex_M_Application_S_Close, ---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp.orig 2015-07-09 20:09:22.239478146 +0200 -+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp 2015-07-09 20:17:20.635207663 +0200 -@@ -1211,9 +1211,6 @@ - /* 'About' action goes to Application menu: */ - pMenu->addAction(action(UIActionIndex_M_Application_S_About)); - # ifdef VBOX_GUI_WITH_NETWORK_MANAGER -- /* 'Check for Updates' action goes to Application menu: */ -- if (gEDataManager->applicationUpdateEnabled()) -- pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates)); - /* 'Network Access Manager' action goes to Application menu: */ - pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager)); - # endif -@@ -1368,9 +1365,6 @@ - # ifdef VBOX_GUI_WITH_NETWORK_MANAGER - /* 'Network Access Manager' action goes to 'File' menu: */ - pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager)); -- /* 'Check for Updates' action goes to 'File' menu: */ -- if (gEDataManager->applicationUpdateEnabled()) -- pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates)); - # endif - /* Separator after tool actions of the 'File' menu: */ - pMenu->addSeparator(); -diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId) - #endif - break; - } -+ case GlobalSettingsPageType_Update: -+ { -+ return false; -+ } - default: - break; - } ---- VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp.orig 2018-12-19 19:53:33.019049148 +0100 -+++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp 2018-12-19 19:53:56.902224273 +0100 -@@ -1366,8 +1366,6 @@ - m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager)); - # ifdef VBOX_GUI_WITH_NETWORK_MANAGER - m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager)); -- if (gEDataManager->applicationUpdateEnabled()) -- m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates)); - # endif - #endif /* !VBOX_WS_MAC */ - } + /* Language page: */ + case GlobalSettingsPageType_Language: +@@ -255,14 +255,14 @@ + } + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER + /* Proxy page: */ +- case GlobalSettingsPageType_Proxy: ++ /*case GlobalSettingsPageType_Proxy: + { + pSettingsPage = new UIGlobalSettingsProxy; + addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png", + iPageIndex, "#proxy", pSettingsPage); + addPageHelpKeyword(iPageIndex, "preferences"); + break; +- } ++ }*/ + #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + #ifdef VBOX_WS_WIN + /* Interface page: */ diff --git a/VirtualBox-multipython.patch b/VirtualBox-multipython.patch deleted file mode 100644 index 61df17d..0000000 --- a/VirtualBox-multipython.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/libs/xpcom18a4/python/Makefile.kmk.orig 2016-09-13 20:04:08.869585445 +0200 -+++ ./src/libs/xpcom18a4/python/Makefile.kmk 2016-09-13 20:04:29.852832898 +0200 -@@ -19,7 +19,7 @@ - include $(KBUILD_PATH)/subheader.kmk - - ifdef VBOX_WITH_MULTIVERSION_PYTHON -- VBOX_MULTIPYTHON = 1 -+ VBOX_MULTIPYTHON = $(VBOX_WITH_MULTIVERSION_PYTHON) - else - VBOX_MULTIPYTHON = 0 - endif diff --git a/VirtualBox-no-vboxvideo.patch b/VirtualBox-no-vboxvideo.patch index 60b721a..b4be740 100644 --- a/VirtualBox-no-vboxvideo.patch +++ b/VirtualBox-no-vboxvideo.patch @@ -8,5 +8,5 @@ Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7 - DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system + DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) - vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod vboxvideo_drv_system_CFLAGS := \ diff --git a/VirtualBox.spec b/VirtualBox.spec index ae31aae..649780d 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,19 +47,19 @@ exit 1 %define qtver 5.6.0 -%define rel 2 +%define rel 0.1 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 6.1.46 +Version: 7.0.10 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/Emulators Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 43a729bd9e0e3a9559188abd16df2a38 +# Source0-md5: dea0dbd1aa2012b4a35c0d416f8155c8 Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 640a09d26d46ae72268d6bdc7f4669bb +# Source1-md5: 536e5176026317c9e3b364ecb558fd02 Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -83,11 +83,13 @@ Patch9: pld-guest.patch Patch10: 16-no-update.patch Patch11: %{pname}-all-translations.patch Patch13: %{pname}-no-scrextend.patch -Patch14: %{pname}-multipython.patch Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch Patch18: qt-detect.patch +Patch19: python3.patch +Patch20: gcc-13.patch +Patch21: xsl-style-dir.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -116,6 +118,7 @@ BuildRequires: OpenGL-devel BuildRequires: Qt5Core-devel >= %{qtver} BuildRequires: Qt5DBus-devel >= %{qtver} BuildRequires: Qt5Gui-devel >= %{qtver} +BuildRequires: Qt5Help-devel >= %{qtver} BuildRequires: Qt5Network-devel >= %{qtver} BuildRequires: Qt5OpenGL-devel >= %{qtver} BuildRequires: Qt5PrintSupport-devel >= %{qtver} @@ -130,13 +133,16 @@ BuildRequires: bcc BuildRequires: bin86 BuildRequires: curl-devel >= 7.19.1 BuildRequires: device-mapper-devel >= 1.02 -%{?with_doc:BuildRequires: docbook-dtd44-xml} +%if %{with doc} +BuildRequires: docbook-dtd45-xml +BuildRequires: docbook-style-xsl +%endif BuildRequires: fakeroot %{?with_lightdm:BuildRequires: fltk-devel} BuildRequires: gcc >= 5:3.2.3 %{?with_webservice:BuildRequires: gsoap-devel} BuildRequires: issue -BuildRequires: kBuild >= 0.1.9998.3093 +BuildRequires: kBuild >= 0.1.9998.3598 BuildRequires: libIDL-devel BuildRequires: libcap-static BuildRequires: libdrm-devel @@ -157,8 +163,9 @@ BuildRequires: pam-devel BuildRequires: pixman-devel BuildRequires: pkgconfig BuildRequires: pulseaudio-devel >= 0.9.0 -BuildRequires: python-devel >= 2.3 -BuildRequires: python-modules +BuildRequires: python3-devel >= 1:3.6 +BuildRequires: python3-modules +BuildRequires: qt5-assistant BuildRequires: qt5-build BuildRequires: qt5-linguist BuildRequires: rpmbuild(macros) >= 1.752 @@ -548,11 +555,13 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch11 -p0 %endif %patch13 -p1 -%patch14 -p0 %patch15 -p0 %patch16 -p0 %patch17 -p1 %patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -734,7 +743,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso # manual installation steps based on src/VBox/Installer/linux/install.sh ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VirtualBox ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxManage -ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxSDL ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl @@ -922,7 +930,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_bindir}/VBoxDTrace %attr(755,root,root) %{_bindir}/VBoxHeadless %attr(755,root,root) %{_bindir}/VBoxManage -%attr(755,root,root) %{_bindir}/VBoxSDL %attr(755,root,root) %{_bindir}/VBoxVRDP %attr(755,root,root) %{_bindir}/vbox-img %dir %{_libdir}/%{pname} @@ -962,9 +969,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl %attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP %attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT -%attr(755,root,root) %{_libdir}/%{pname}/VBoxSDL %attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC -%attr(755,root,root) %{_libdir}/%{pname}/VBoxTunctl %attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload %attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo %attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD @@ -972,16 +977,12 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/bldRTLdrCheckImports %attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin %attr(755,root,root) %{_libdir}/%{pname}/vboximg-mount -%if %{with doc} -%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp -%endif %dir %{_libdir}/%{pname}/tools %attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat %attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod %attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp %attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache %attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiFatExtract -%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFTPServer %attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient %attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster %attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip diff --git a/gcc-13.patch b/gcc-13.patch new file mode 100644 index 0000000..e1234cc --- /dev/null +++ b/gcc-13.patch @@ -0,0 +1,12 @@ +diff --git a/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h b/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +index 3c65c70df..d283792f2 100644 +--- a/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h ++++ b/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +@@ -16,6 +16,7 @@ + #include "util_likely.h" + #include "util_math.h" + ++#include + #include + #include + #include diff --git a/hardening-shared.patch b/hardening-shared.patch index a85fe06..dee77a8 100644 --- a/hardening-shared.patch +++ b/hardening-shared.patch @@ -5,9 +5,9 @@ VBOX_PATH_APP_PRIVATE & VBOX_PATH_APP_PRIVATE_ARCH @@ -1079,7 +1079,7 @@ # ifdef VBOX_WITHOUT_HARDENING - VBOX_WITH_HARDENING= + VBOX_WITH_HARDENING = - ifeq ($(VBOX_WITH_HARDENING),) + ifeq ($(VBOX_WITH_HARDENING),0) - VBOX_PATH_APP_PRIVATE= - VBOX_PATH_APP_PRIVATE_ARCH= - VBOX_PATH_APP_PRIVATE_ARCH_TOP= + VBOX_PATH_APP_PRIVATE = + VBOX_PATH_APP_PRIVATE_ARCH = + VBOX_PATH_APP_PRIVATE_ARCH_TOP = diff --git a/lightdm-greeter-makefile.patch b/lightdm-greeter-makefile.patch index 25c4ab5..1659155 100644 --- a/lightdm-greeter-makefile.patch +++ b/lightdm-greeter-makefile.patch @@ -11,10 +11,10 @@ ## to the INCS, however lightdm.h is missing and will be taken from the system. @@ -59,7 +59,7 @@ /usr/include/glib-2.0 \ - $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \ + $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \ /usr/include/lightdm-gobject-1 \ - $(if $(VBOX_OSE),$(patsubst -I%,%,%(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),) + $(if $(VBOX_OSE),$(patsubst -I%,%,$(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),) ifndef VBOX_WITH_FLTK vbox-greeter_INCS += \ - /usr/include/glib-2.0 \ + /usr/include/glib-2.0 \ diff --git a/pld-guest.patch b/pld-guest.patch index 32ed610..70fd40e 100644 --- a/pld-guest.patch +++ b/pld-guest.patch @@ -12,13 +12,13 @@ +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-05-13 15:51:14.323890458 +0300 @@ -26,6 +26,8 @@ images/os_netware.png - images/os_openbsd.png images/os_openbsd_64.png -+ images/os_pld.png + images/os_openbsd.png + images/os_pld_64.png - images/os_opensuse.png ++ images/os_pld.png images/os_opensuse_64.png - images/os_oracle.png + images/os_opensuse.png + images/os_oracle_64.png --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc~ 2013-04-12 13:37:50.000000000 +0300 +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2013-05-13 15:51:14.323890458 +0300 @@ -26,6 +26,8 @@ @@ -54,24 +54,16 @@ images/x4/os_oracle_64_x4.png --- VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp.orig 2016-07-29 19:25:16.731328887 +0200 +++ VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp 2016-07-29 19:31:59.252427682 +0200 -@@ -321,6 +321,17 @@ - 1, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, +@@ -321,6 +321,9 @@ + VBOX_LINUX_SUBTYPE_A_32(SUSE_LE, "SUSE Linux Enterprise (32-bit)", 2048, 16, 8), + VBOX_LINUX_SUBTYPE_A_64(SUSE_LE, "SUSE Linux Enterprise (64-bit)", 2048, 16, 8), -+ { "Linux", "Linux", "PLD", "PLD Linux (32-bit)", -+ VBOXOSTYPE_PLD, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC, -+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, ++ VBOX_LINUX_SUBTYPE_A_32(PLD, "PLD Linux (32-bit)", 1024, 16, 8), ++ VBOX_LINUX_SUBTYPE_A_64(PLD, "PLD Linux (64-bit)", 1024, 16, 8), + -+ { "Linux", "Linux", "PLD_64", "PLD Linux (64-bit)", -+ VBOXOSTYPE_PLD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC -+ | VBOXOSHINT_X2APIC, -+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, -+ - { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)", - VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, - 1, 1024, 16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + VBOX_LINUX_SUBTYPE_A_32(Turbolinux, "Turbolinux (32-bit)", 384, 16, 8), + VBOX_LINUX_SUBTYPE_A_64(Turbolinux, "Turbolinux (64-bit)", 384, 16, 8), + --- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~ 2014-02-25 19:09:15.000000000 +0200 +++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200 @@ -141,6 +141,8 @@ @@ -86,25 +78,25 @@ --- VirtualBox-4.3.8/include/VBox/ostypes.h~ 2014-02-25 18:59:48.000000000 +0200 +++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-28 09:56:34.440314457 +0200 @@ -103,6 +103,8 @@ - VBOXOSTYPE_Xandros_x64 = 0x5D100, - VBOXOSTYPE_Oracle = 0x5E000, - VBOXOSTYPE_Oracle_x64 = 0x5E100, + VBOXOSTYPE_Oracle8_x64 = 0x5E105, // 64-bit only + VBOXOSTYPE_Oracle9_x64 = 0x5E106, // 64-bit only + VBOXOSTYPE_Oracle_latest_x64 = VBOXOSTYPE_Oracle9_x64, + VBOXOSTYPE_PLD = 0x5F000, + VBOXOSTYPE_PLD_x64 = 0x5F100, VBOXOSTYPE_FreeBSD = 0x60000, VBOXOSTYPE_FreeBSD_x64 = 0x60100, VBOXOSTYPE_OpenBSD = 0x61000, ---- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp~ 2014-02-25 19:09:00.000000000 +0200 -+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-28 09:58:59.493698505 +0200 +--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp~ 2014-02-25 19:09:00.000000000 +0200 ++++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp 2014-02-28 09:58:59.493698505 +0200 @@ -133,6 +133,8 @@ - { QRegExp("Xa.*32", Qt::CaseInsensitive), "Xandros" }, - { QRegExp("((Or)|(oel)|(^ol)).*64", Qt::CaseInsensitive), "Oracle_64" }, - { QRegExp("((Or)|(oel)|(^ol)).*32", Qt::CaseInsensitive), "Oracle" }, -+ { QRegExp("PLD.*64", Qt::CaseInsensitive), "PLD_64" }, -+ { QRegExp("PLD.*32", Qt::CaseInsensitive), "PLD" }, - { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, - { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, - { QRegExp("((Lin)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, + { QRegularExpression("Xa.*32", QRegularExpression::CaseInsensitiveOption), "Xandros" }, + { QRegularExpression("((Or)|(oel)|(^ol)).*64", QRegularExpression::CaseInsensitiveOption), "Oracle_64" }, + { QRegularExpression("((Or)|(oel)|(^ol)).*32", QRegularExpression::CaseInsensitiveOption), "Oracle" }, ++ { QRegularExpression("PLD.*64", QRegularExpression::CaseInsensitiveOption), "PLD_64" }, ++ { QRegularExpression("PLD.*32", QRegularExpression::CaseInsensitiveOption), "PLD" }, + { QRegularExpression("Knoppix", QRegularExpression::CaseInsensitiveOption), "Linux26" }, + { QRegularExpression("Dsl", QRegularExpression::CaseInsensitiveOption), "Linux24" }, + { QRegularExpression("((Lin)|(lnx)).*2.?2", QRegularExpression::CaseInsensitiveOption), "Linux22" }, --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2015-07-09 20:00:01.339965485 +0200 +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200 @@ -332,6 +332,8 @@ diff --git a/python3.patch b/python3.patch new file mode 100644 index 0000000..fd037f7 --- /dev/null +++ b/python3.patch @@ -0,0 +1,11 @@ +--- VirtualBox-7.0.10/configure~ 2023-09-06 15:45:03.000000000 +0200 ++++ VirtualBox-7.0.10/configure 2023-09-06 15:48:44.766964239 +0200 +@@ -2173,7 +2173,7 @@ + } + EOF + found= +- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12" ++ SUPPYTHONLIBS="python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12" + for p in $PYTHONDIR; do + for d in $SUPPYTHONLIBS; do + for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do diff --git a/xsl-style-dir.patch b/xsl-style-dir.patch new file mode 100644 index 0000000..b561f0b --- /dev/null +++ b/xsl-style-dir.patch @@ -0,0 +1,11 @@ +--- VirtualBox-7.0.10/doc/manual/Config.kmk.orig 2023-07-12 18:25:05.000000000 +0200 ++++ VirtualBox-7.0.10/doc/manual/Config.kmk 2023-09-06 16:49:17.062393789 +0200 +@@ -135,7 +135,7 @@ + VBOX_PATH_DOCBOOK_DTD ?= $(KBUILD_DEVTOOLS)/common/docbook-xml/v4.5 + else + # use docbook of the build host +- VBOX_PATH_DOCBOOK ?= /usr/share/xml/docbook/stylesheet/docbook-xsl ++ VBOX_PATH_DOCBOOK ?= /usr/share/sgml/docbook/xsl-stylesheets + VBOX_PATH_DOCBOOK_DTD ?= /usr/share/xml/docbook/schema/dtd/4.5 + endif + VBOX_XML_CATALOG ?= $(VBOX_PATH_MANUAL_OUTBASE)/vbox-doc.cat -- 2.44.0 From 406ba9c3f70193d842265aee345b6018461e6158 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 7 Sep 2023 03:09:05 +0200 Subject: [PATCH 09/16] - fix build on i686 --- VirtualBox.spec | 11 +++++++++-- build-arch.patch | 11 +++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 build-arch.patch diff --git a/VirtualBox.spec b/VirtualBox.spec index 649780d..579e6f0 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -90,6 +90,7 @@ Patch18: qt-detect.patch Patch19: python3.patch Patch20: gcc-13.patch Patch21: xsl-style-dir.patch +Patch22: build-arch.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -562,6 +563,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -611,6 +613,8 @@ TOOL_GCC3_CFLAGS=%{rpmcflags} TOOL_GCC3_CXXFLAGS=%{rpmcxxflags} VBOX_GCC_OPT=%{rpmcxxflags} +TOOL_YASM_AS := /usr/bin/yasm + VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname} VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname} VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) @@ -625,7 +629,10 @@ VBOX_WITH_TESTSUITE := VBOX_WITH_VRDP_RDESKTOP= VBOX_WITH_MULTIVERSION_PYTHON=0 -%{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1} +%if %{without host} +VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1 +VBOX_ONLY_ADDITIONS=1 +%endif EOF %undefine filterout_c @@ -647,7 +654,7 @@ EOF %{nil} . "$PWD/env.sh" -kmk %{?_smp_mflags} +kmk %{?_smp_mflags} %{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1 VBOX_ONLY_ADDITIONS=1} %endif %{?with_kernel:%{expand:%build_kernel_packages}} diff --git a/build-arch.patch b/build-arch.patch new file mode 100644 index 0000000..504bee2 --- /dev/null +++ b/build-arch.patch @@ -0,0 +1,11 @@ +--- VirtualBox-7.0.10/configure.orig 2023-09-07 02:11:31.000000000 +0200 ++++ VirtualBox-7.0.10/configure 2023-09-07 02:20:09.875202421 +0200 +@@ -381,7 +381,7 @@ + check_environment() + { + test_header environment +- BUILD_CPU=`uname -m` ++ BUILD_CPU=`rpm -E '%{_host_cpu}'` + [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '` + case "$BUILD_CPU" in + i[3456789]86|x86|i86pc|BePC) -- 2.44.0 From 0c8089b9a81f1ff14499144e3b1578da764d3df4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 7 Sep 2023 12:56:48 +0200 Subject: [PATCH 10/16] =- updated deps and files --- VirtualBox.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/VirtualBox.spec b/VirtualBox.spec index 579e6f0..569477e 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -147,9 +147,11 @@ BuildRequires: kBuild >= 0.1.9998.3598 BuildRequires: libIDL-devel BuildRequires: libcap-static BuildRequires: libdrm-devel +BuildRequires: liblzf-devel BuildRequires: libpng-devel >= 2:1.2.5 BuildRequires: libstdc++-devel >= 5:3.2.3 BuildRequires: libstdc++-static >= 5:3.2.3 +BuildRequires: libtpms-devel BuildRequires: libuuid-devel BuildRequires: libvncserver-devel >= 0.9.9 BuildRequires: libvpx-devel >= 0.9.5 @@ -688,6 +690,7 @@ cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname} %endif # Guest Only Tools +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxAudioTest %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxDRMClient @@ -947,6 +950,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxDDU.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxDxVk.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxDragAndDropSvc.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestControlSvc.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so @@ -967,6 +971,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : # binaries %attr(755,root,root) %{_libdir}/%{pname}/VBox.sh +%attr(755,root,root) %{_libdir}/%{pname}/VBoxAudioTest %attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart %attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl %attr(755,root,root) %{_libdir}/%{pname}/VBoxDTrace @@ -985,15 +990,19 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin %attr(755,root,root) %{_libdir}/%{pname}/vboximg-mount %dir %{_libdir}/%{pname}/tools +%attr(755,root,root) %{_libdir}/%{pname}/tools/LnxPerfHack %attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat %attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod %attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp %attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache %attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiFatExtract +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiSigDb %attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient %attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFtpServer %attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip %attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttpServer %attr(755,root,root) %{_libdir}/%{pname}/tools/RTIsoMaker %attr(755,root,root) %{_libdir}/%{pname}/tools/RTKrnlModInfo %attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrCheckImports @@ -1117,6 +1126,8 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %if %{with doc} %files doc %defattr(644,root,root,755) +%doc %{_libdir}/%{pname}/UserManual.qch +%doc %{_libdir}/%{pname}/UserManual.qhc # this is a symlink... %doc %{_libdir}/%{pname}/UserManual.pdf %if %{with all_langs} @@ -1137,6 +1148,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vboxservice %{systemdunitdir}/vboxservice.service %{systemdunitdir}/vboxclient-vmsvga.service +%attr(755,root,root) %{_bindir}/VBoxAudioTest %attr(755,root,root) %{_bindir}/VBoxControl %attr(755,root,root) %{_bindir}/VBoxService %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxguest.rules -- 2.44.0 From b9427a48d2a754def357eeb729ba8ba06aab69b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 7 Sep 2023 14:58:24 +0200 Subject: [PATCH 11/16] - rel 1 --- VirtualBox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 569477e..e51d91c 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,7 +47,7 @@ exit 1 %define qtver 5.6.0 -%define rel 0.1 +%define rel 1 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 -- 2.44.0 From 058bd731248f2aba5f91db433b94460b5b275801 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 7 Sep 2023 17:02:47 +0200 Subject: [PATCH 12/16] - try harder to build with python3 --- VirtualBox.spec | 2 ++ python3.patch | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/VirtualBox.spec b/VirtualBox.spec index e51d91c..5eef2a5 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -617,6 +617,8 @@ VBOX_GCC_OPT=%{rpmcxxflags} TOOL_YASM_AS := /usr/bin/yasm +VBOX_BLD_PYTHON := %{__python3} + VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname} VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname} VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) diff --git a/python3.patch b/python3.patch index fd037f7..3e96dd7 100644 --- a/python3.patch +++ b/python3.patch @@ -9,3 +9,20 @@ for p in $PYTHONDIR; do for d in $SUPPYTHONLIBS; do for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do +--- VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py~ 2023-07-12 18:42:54.000000000 +0200 ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py 2023-09-07 16:25:51.601179500 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + """ + Copyright (C) 2009-2023 Oracle and/or its affiliates. +@@ -26,7 +26,7 @@ + import os,sys + from distutils.version import StrictVersion + +-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.9", "3.10", "3.11", "3.12" ] ++versions = ["3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.9", "3.10", "3.11", "3.12" ] + prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] + known = {} + -- 2.44.0 From 7717f26c78794a0b6467da92d15ca8ba687451ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 8 Sep 2023 02:00:49 +0200 Subject: [PATCH 13/16] - build full python 3 api, not the limited one, rel 2 --- VirtualBox.spec | 3 ++- python3.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 5eef2a5..fa3fef2 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,7 +47,7 @@ exit 1 %define qtver 5.6.0 -%define rel 1 +%define rel 2 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -618,6 +618,7 @@ VBOX_GCC_OPT=%{rpmcxxflags} TOOL_YASM_AS := /usr/bin/yasm VBOX_BLD_PYTHON := %{__python3} +VBOX_WITHOUT_PYTHON_LIMITED_API=1 VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname} VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname} diff --git a/python3.patch b/python3.patch index 3e96dd7..cd0efa5 100644 --- a/python3.patch +++ b/python3.patch @@ -26,3 +26,14 @@ prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] known = {} +--- VirtualBox-7.0.10/Config.kmk~ 2023-09-08 01:41:50.000000000 +0200 ++++ VirtualBox-7.0.10/Config.kmk 2023-09-08 01:51:41.947941370 +0200 +@@ -853,7 +853,7 @@ + # unless VBOX_WITH_ONLY_PYTHON_LIMITED_API is overridden). + VBOX_WITH_MULTIVERSION_PYTHON ?= 1 + # Only build the limited Python extension API version for 3.3 and later. +-VBOX_WITH_ONLY_PYTHON_LIMITED_API = 1 ++# VBOX_WITH_ONLY_PYTHON_LIMITED_API = 1 + # Build the Validation Kit. + VBOX_WITH_VALIDATIONKIT = 1 + # Include unit tests (testcases) on the Validation Kit .ISO -- 2.44.0 From ec5bd26e0c5739a8df5dc9423756614807097fd0 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 1 Oct 2023 07:53:59 +0200 Subject: [PATCH 14/16] libvpx 1.13.x rebuild Release 3 (by relup.sh) --- VirtualBox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index fa3fef2..2c653ba 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,7 +47,7 @@ exit 1 %define qtver 5.6.0 -%define rel 2 +%define rel 3 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 -- 2.44.0 From a4c810dd09dc90a6d1bdf0904aa6d2724bb4fd0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 24 Dec 2023 19:28:15 +0100 Subject: [PATCH 15/16] - up to 7.0.12 --- VirtualBox.spec | 12 +-- kernel-4.9.256.patch | 231 ------------------------------------------- kernel-5.18.patch | 16 --- kernel-6.4.10.patch | 13 --- libxml2.12.patch | 43 ++++++++ 5 files changed, 49 insertions(+), 266 deletions(-) delete mode 100644 kernel-4.9.256.patch delete mode 100644 kernel-5.18.patch delete mode 100644 kernel-6.4.10.patch create mode 100644 libxml2.12.patch diff --git a/VirtualBox.spec b/VirtualBox.spec index 2c653ba..98757ef 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,19 +47,19 @@ exit 1 %define qtver 5.6.0 -%define rel 3 +%define rel 1 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 7.0.10 +Version: 7.0.12 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/Emulators Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: dea0dbd1aa2012b4a35c0d416f8155c8 +# Source0-md5: b89fb26c765764ee0e2d14305c0411d5 Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 536e5176026317c9e3b364ecb558fd02 +# Source1-md5: beedd5530d469b38079e4fe066d1ef32 Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -74,7 +74,6 @@ Source12: udev-guest.rules Patch0: %{pname}-version-error.patch Patch1: %{pname}-VBoxSysInfo.patch Patch2: %{pname}-warning_workaround.patch -Patch3: kernel-6.4.10.patch Patch4: wrapper.patch Patch6: hardening-shared.patch Patch7: lightdm-greeter-makefile.patch @@ -91,6 +90,7 @@ Patch19: python3.patch Patch20: gcc-13.patch Patch21: xsl-style-dir.patch Patch22: build-arch.patch +Patch23: libxml2.12.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -547,7 +547,6 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch6 -p1 %patch7 -p1 @@ -566,6 +565,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in diff --git a/kernel-4.9.256.patch b/kernel-4.9.256.patch deleted file mode 100644 index d9c6606..0000000 --- a/kernel-4.9.256.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c ---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:20.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:08:19.038693668 +0100 -@@ -1174,7 +1174,7 @@ - - /* openSUSE Leap 42.3 detection :-/ */ - #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE) --# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */ -+# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */ - #else - # define GET_USER_PAGES_API LINUX_VERSION_CODE - #endif -@@ -1252,7 +1252,7 @@ - # endif - &pMemLnx->apPages[0], /* Page array. */ - papVMAs /* vmas */ --# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0) -+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0) - , NULL /* locked */ - # endif - ); -diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c ---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 22:09:20.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.869047375 +0100 -@@ -37,7 +37,7 @@ - #include - #include "r0drv/mp-r0drv.h" - --#if RTLNX_VER_MIN(4,10,0) -+#if RTLNX_VER_MIN(4,11,0) - - static enum cpuhp_state g_rtR0MpOnline; - -diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/lnkops.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/lnkops.c ---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/lnkops.c 2021-02-06 22:09:20.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/lnkops.c 2021-02-06 21:54:24.869047375 +0100 -@@ -286,7 +286,7 @@ - * Symlink inode operations. - */ - struct inode_operations vbsf_lnk_iops = { --#if RTLNX_VER_MAX(4,10,0) -+#if RTLNX_VER_MAX(4,11,0) - # if RTLNX_VER_MIN(2,6,8) - .readlink = generic_readlink, - # else -diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/regops.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/regops.c ---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/regops.c 2021-02-06 22:09:20.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/regops.c 2021-02-06 21:54:24.869047375 +0100 -@@ -3335,7 +3335,7 @@ - static int vbsf_vmlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - { - int rc; --# if RTLNX_VER_MIN(4,10,0) -+# if RTLNX_VER_MIN(4,11,0) - SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address)); - # else - SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address)); -@@ -3384,7 +3384,7 @@ - static int vbsf_vmlog_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - { - int rc; --# if RTLNX_VER_MIN(4,10,0) -+# if RTLNX_VER_MIN(4,11,0) - SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address)); - # else - SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address)); -@@ -3406,7 +3406,7 @@ - SFLOGFLOW(("vbsf_vmlog_map_pages: returns\n")); - return rc; - } --# elif RTLNX_VER_MIN(4,10,0) -+# elif RTLNX_VER_MIN(4,11,0) - static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end) - { - SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end)); -diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/vfsmod.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/vfsmod.c ---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/vfsmod.c 2021-02-06 22:09:20.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/vfsmod.c 2021-02-06 21:54:24.869047375 +0100 -@@ -443,7 +443,7 @@ - trouches it after this point (we may screw up something). */ - # if RTLNX_VER_RANGE(4,0,0, 4,2,0) - sb->s_bdi = pSuperInfo->bdi_org; /* (noop_backing_dev_info is not exported) */ --# elif RTLNX_VER_RANGE(2,6,34, 4,10,0) -+# elif RTLNX_VER_RANGE(2,6,34, 4,11,0) - sb->s_bdi = &noop_backing_dev_info; - # endif - #endif -diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxvideo/vbox_ttm.c ---- VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c 2021-02-06 22:09:21.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxvideo/vbox_ttm.c 2021-02-06 21:54:24.872380697 +0100 -@@ -314,7 +314,7 @@ - #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) - .init_mem_type = vbox_bo_init_mem_type, - #endif --#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) -+#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) - .eviction_valuable = ttm_bo_eviction_valuable, - #endif - .evict_flags = vbox_bo_evict_flags, -diff -ur VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c ---- VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:22.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:08:40.515390291 +0100 -@@ -1174,7 +1174,7 @@ - - /* openSUSE Leap 42.3 detection :-/ */ - #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE) --# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */ -+# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */ - #else - # define GET_USER_PAGES_API LINUX_VERSION_CODE - #endif -@@ -1252,7 +1252,7 @@ - # endif - &pMemLnx->apPages[0], /* Page array. */ - papVMAs /* vmas */ --# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0) -+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0) - , NULL /* locked */ - # endif - ); -diff -ur VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c ---- VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 22:09:22.000000000 +0100 -+++ VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.872380697 +0100 -@@ -37,7 +37,7 @@ - #include - #include "r0drv/mp-r0drv.h" - --#if RTLNX_VER_MIN(4,10,0) -+#if RTLNX_VER_MIN(4,11,0) - - static enum cpuhp_state g_rtR0MpOnline; - -diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/drm/vbox_ttm.c ---- VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-01-07 16:34:24.000000000 +0100 -+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-02-06 21:54:24.869047375 +0100 -@@ -319,7 +319,7 @@ - #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) - .init_mem_type = vbox_bo_init_mem_type, - #endif --#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) -+#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) - .eviction_valuable = ttm_bo_eviction_valuable, - #endif - .evict_flags = vbox_bo_evict_flags, -diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/lnkops.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/lnkops.c ---- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/lnkops.c 2021-01-07 16:34:26.000000000 +0100 -+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/lnkops.c 2021-02-06 21:54:24.869047375 +0100 -@@ -286,7 +286,7 @@ - * Symlink inode operations. - */ - struct inode_operations vbsf_lnk_iops = { --#if RTLNX_VER_MAX(4,10,0) -+#if RTLNX_VER_MAX(4,11,0) - # if RTLNX_VER_MIN(2,6,8) - .readlink = generic_readlink, - # else -diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/regops.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/regops.c ---- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/regops.c 2021-01-07 16:34:26.000000000 +0100 -+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/regops.c 2021-02-06 21:54:24.869047375 +0100 -@@ -3335,7 +3335,7 @@ - static int vbsf_vmlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - { - int rc; --# if RTLNX_VER_MIN(4,10,0) -+# if RTLNX_VER_MIN(4,11,0) - SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address)); - # else - SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address)); -@@ -3384,7 +3384,7 @@ - static int vbsf_vmlog_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - { - int rc; --# if RTLNX_VER_MIN(4,10,0) -+# if RTLNX_VER_MIN(4,11,0) - SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address)); - # else - SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address)); -@@ -3406,7 +3406,7 @@ - SFLOGFLOW(("vbsf_vmlog_map_pages: returns\n")); - return rc; - } --# elif RTLNX_VER_MIN(4,10,0) -+# elif RTLNX_VER_MIN(4,11,0) - static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end) - { - SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end)); -diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/vfsmod.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/vfsmod.c ---- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2021-01-07 16:34:26.000000000 +0100 -+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2021-02-06 21:54:24.869047375 +0100 -@@ -443,7 +443,7 @@ - trouches it after this point (we may screw up something). */ - # if RTLNX_VER_RANGE(4,0,0, 4,2,0) - sb->s_bdi = pSuperInfo->bdi_org; /* (noop_backing_dev_info is not exported) */ --# elif RTLNX_VER_RANGE(2,6,34, 4,10,0) -+# elif RTLNX_VER_RANGE(2,6,34, 4,11,0) - sb->s_bdi = &noop_backing_dev_info; - # endif - #endif -diff -ur VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ---- VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:20.335448500 +0100 -+++ VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:07:34.318634767 +0100 -@@ -1174,7 +1174,7 @@ - - /* openSUSE Leap 42.3 detection :-/ */ - #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE) --# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */ -+# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */ - #else - # define GET_USER_PAGES_API LINUX_VERSION_CODE - #endif -@@ -1252,7 +1252,7 @@ - # endif - &pMemLnx->apPages[0], /* Page array. */ - papVMAs /* vmas */ --# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0) -+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0) - , NULL /* locked */ - # endif - ); -diff -ur VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c ---- VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c 2021-01-07 16:42:09.000000000 +0100 -+++ VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.869047375 +0100 -@@ -37,7 +37,7 @@ - #include - #include "r0drv/mp-r0drv.h" - --#if RTLNX_VER_MIN(4,10,0) -+#if RTLNX_VER_MIN(4,11,0) - - static enum cpuhp_state g_rtR0MpOnline; - diff --git a/kernel-5.18.patch b/kernel-5.18.patch deleted file mode 100644 index 1adcf10..0000000 --- a/kernel-5.18.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- VirtualBox-6.1.34/kernel/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c~ 2022-05-25 17:21:29.000000000 +0200 -+++ VirtualBox-6.1.34/kernel/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c 2022-05-26 06:36:50.085761576 +0200 -@@ -2310,8 +2310,13 @@ - { - vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1); - Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb)); -+#if RTLNX_VER_MIN(5,18,0) -+ Log6(("vboxNetFltPortOsXmit: netif_rx(%p)\n", pBuf)); -+ err = netif_rx(pBuf); -+#else - Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf)); - err = netif_rx_ni(pBuf); -+#endif - if (err) - rc = RTErrConvertFromErrno(err); - } diff --git a/kernel-6.4.10.patch b/kernel-6.4.10.patch deleted file mode 100644 index 5ad0b6c..0000000 --- a/kernel-6.4.10.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- VirtualBox-6.1.46/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c~ 2023-08-18 13:23:19.899777134 +0200 -+++ VirtualBox-6.1.46/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2023-08-18 13:29:51.703087517 +0200 -@@ -37,9 +37,9 @@ - #if RTLNX_VER_MIN(2,6,24) - # include - #endif --#if RTLNX_VER_MIN(6,5,0) -+#if RTLNX_VER_MIN(6,4,10) - # include - #endif - #include - #if RTLNX_VER_MAX(2,6,29) || RTLNX_VER_MIN(5,11,0) - # include diff --git a/libxml2.12.patch b/libxml2.12.patch new file mode 100644 index 0000000..60df8c8 --- /dev/null +++ b/libxml2.12.patch @@ -0,0 +1,43 @@ +--- VirtualBox-7.0.12/include/iprt/cpp/xml.h.orig 2023-12-24 15:42:18.092685383 +0100 ++++ VirtualBox-7.0.12/include/iprt/cpp/xml.h 2023-12-24 15:46:14.872125732 +0100 +@@ -113,9 +113,9 @@ + class RT_DECL_CLASS XmlError : public RuntimeError + { + public: +- XmlError(xmlErrorPtr aErr); ++ XmlError(const xmlError* aErr); + +- static char* Format(xmlErrorPtr aErr); ++ static char* Format(const xmlError* aErr); + }; + + // Logical errors +--- VirtualBox-7.0.12/src/VBox/Runtime/r3/xml.cpp.orig 2023-12-24 15:31:18.385556729 +0100 ++++ VirtualBox-7.0.12/src/VBox/Runtime/r3/xml.cpp 2023-12-24 15:46:31.679225463 +0100 +@@ -131,7 +131,7 @@ + RTStrFree(msg); + } + +-XmlError::XmlError(xmlErrorPtr aErr) ++XmlError::XmlError(const xmlError* aErr) + { + if (!aErr) + throw EInvalidArg(RT_SRC_POS); +@@ -145,7 +145,7 @@ + * Composes a single message for the given error. The caller must free the + * returned string using RTStrFree() when no more necessary. + */ +-/* static */ char *XmlError::Format(xmlErrorPtr aErr) ++/* static */ char *XmlError::Format(const xmlError *aErr) + { + const char *msg = aErr->message ? aErr->message : ""; + size_t msgLen = strlen(msg); +@@ -1856,7 +1856,7 @@ + va_end(args); + } + +-static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF ++static void xmlParserBaseStructuredError(void *pCtx, const xmlError* error) RT_NOTHROW_DEF + { + NOREF(pCtx); + /* we expect that there is always a trailing NL */ -- 2.44.0 From 479657d33e2ba814880bae21112b5f8237762349 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 16 Apr 2024 18:46:02 +0200 Subject: [PATCH 16/16] - rel 2 (libvpx 1.14) --- VirtualBox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VirtualBox.spec b/VirtualBox.spec index 98757ef..71fbbaf 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,7 +47,7 @@ exit 1 %define qtver 5.6.0 -%define rel 1 +%define rel 2 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 -- 2.44.0