diff --git a/VirtualBox-7.2.4-patched.tpxz b/VirtualBox-7.2.4-patched.tpxz deleted file mode 100644 index 57eeaef..0000000 --- a/VirtualBox-7.2.4-patched.tpxz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b40a46dcc54a190b23854533b2ddce825d556b5a66e676415e4675f619aaabc3 -size 153065164 diff --git a/VirtualBox-7.2.6-patched.tpxz b/VirtualBox-7.2.6-patched.tpxz new file mode 100644 index 0000000..0b4c974 --- /dev/null +++ b/VirtualBox-7.2.6-patched.tpxz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c7c532decfeee726a9148d2344f13fb7196ec64092d7de051fd21c19d63aa53 +size 153689012 diff --git a/curl-8.16.patch b/curl-8.16.patch deleted file mode 100644 index 9210b6f..0000000 --- a/curl-8.16.patch +++ /dev/null @@ -1,59 +0,0 @@ -References: https://bugzilla.suse.com/1249448 -From: Gianfranco Costamagna -From: Jan Engelhardt -Date: 2025-09-09 12:22:00 +0200 -Subject: [PATCH] Fix build with new curl version -References: https://github.com/curl/curl/pull/18054 -References: https://bugs.debian.org/1114436 -References: https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/commit/dbf9a6ef75380ebd2705df0198c6ac8073d0b4cb#f28811e0ca565091f1d341d90b8ba208319492f5 -References: https://bugzilla.suse.com/1249448 - -curl 8.16 changed CURLPROXY_* definitions from enum{int} to long. -C++ has more rules than C, preventing some implicit conversions -involving enums. Debian patch changed to instead use an explicit -conversion. [-jengelh] - -http-curl.cpp: In function ‘int rtHttpUpdateAutomaticProxyDisable(PRTHTTPINTERNAL)’: -http-curl.cpp:702:27: error: invalid conversion from ‘long int’ to ‘curl_proxytype’ [-fpermissive] - 702 | pThis->enmProxyType = CURLPROXY_HTTP; - -diff --git a/src/VBox/Runtime/generic/http-curl.cpp b/src/VBox/Runtime/generic/http-curl.cpp -index 4cf51049d..a76bf14f8 100644 ---- a/src/VBox/Runtime/generic/http-curl.cpp -+++ b/src/VBox/Runtime/generic/http-curl.cpp -@@ -188,7 +188,7 @@ typedef struct RTHTTPINTERNAL - /** Proxy port number (UINT32_MAX if not specified). */ - uint32_t uProxyPort; - /** The proxy type (CURLPROXY_HTTP, CURLPROXY_SOCKS5, ++). */ -- curl_proxytype enmProxyType; -+ long enmProxyType; - /** Proxy username (RTStrFree). */ - char *pszProxyUsername; - /** Proxy password (RTStrFree). */ -@@ -591,7 +591,7 @@ RTR3DECL(int) RTHttpUseSystemProxySettings(RTHTTP hHttp) - * @param pszUsername The proxy username, or NULL if none. - * @param pszPassword The proxy password, or NULL if none. - */ --static int rtHttpUpdateProxyConfig(PRTHTTPINTERNAL pThis, curl_proxytype enmProxyType, const char *pszHost, -+static int rtHttpUpdateProxyConfig(PRTHTTPINTERNAL pThis, long enmProxyType, const char *pszHost, - uint32_t uPort, const char *pszUsername, const char *pszPassword) - { - CURLcode rcCurl; -@@ -871,7 +871,7 @@ static int rtHttpConfigureProxyFromUrl(PRTHTTPINTERNAL pThis, const char *pszPro - char *pszPassword = RTUriParsedAuthorityPassword(pszProxyUrl, &Parsed); - uint32_t uProxyPort = RTUriParsedAuthorityPort(pszProxyUrl, &Parsed); - bool fUnknownProxyType = false; -- curl_proxytype enmProxyType; -+ long enmProxyType; - if (RTUriIsSchemeMatch(pszProxyUrl, "http")) - { - enmProxyType = CURLPROXY_HTTP; -@@ -1352,7 +1352,7 @@ static int rtHttpDarwinTryConfigProxy(PRTHTTPINTERNAL pThis, CFDictionaryRef hDi - * Determine the proxy type (not entirely sure about type == proxy type and - * not scheme/protocol)... - */ -- curl_proxytype enmProxyType = CURLPROXY_HTTP; -+ long enmProxyType = (long)CURLPROXY_HTTP; - uint32_t uDefaultProxyPort = 8080; - if ( CFEqual(hStrProxyType, kCFProxyTypeHTTP) - || CFEqual(hStrProxyType, kCFProxyTypeHTTPS)) diff --git a/virtualbox-patch-source.sh b/virtualbox-patch-source.sh index b6cda64..03f4f57 100755 --- a/virtualbox-patch-source.sh +++ b/virtualbox-patch-source.sh @@ -6,7 +6,6 @@ if [ -z "$1" ]; then fi REMOVE_DIRS=( -src/VBox/Additions/WINNT src/VBox/Additions/os2 src/VBox/Runtime/r3/darwin src/VBox/Runtime/r0drv/darwin diff --git a/virtualbox.changes b/virtualbox.changes index 5a90bb5..78095c4 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Feb 10 23:13:26 UTC 2026 - Lubos Kocman + +- Update license tag to GPL-3.0-only + * Requested by SUSE legal via legaldb + +------------------------------------------------------------------- +Mon Feb 2 09:59:43 UTC 2026 - Jan Engelhardt + +- Update to release 7.2.6 + * VMM: Fixed issue when VM process was crashing during RHEL5 + guest boot + * VMM: Fixed issue when VMX nested-guest VM-entry was checking + the wrong VM-execution control bit in the virtual VMCS + * VMM: Fixed issue when guest process was crashing inside Windows + guest on AMD system + * The VRDP server, the USB smartcard emulation, the disk/VM + encryption features are now in the open source base package +- Drop curl-8.16.patch (merged) + ------------------------------------------------------------------- Wed Oct 22 10:52:35 UTC 2025 - Jan Engelhardt diff --git a/virtualbox.spec b/virtualbox.spec index 3e9f8ee..06bf9fa 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -68,11 +68,11 @@ %endif Name: virtualbox%{?dash}%{?name_suffix} -Version: 7.2.4 -%define rversion 7.2.4 +Version: 7.2.6 +%define rversion 7.2.6 Release: 0 Summary: %{package_summary} -License: GPL-3.0-or-later +License: GPL-3.0-only %if %{kmp_package} Group: System/Kernel %else @@ -133,7 +133,6 @@ Patch10: fix_for_leap15.5.patch Patch11: cxx17.patch Patch12: host-source.patch Patch20: gentoo-C23.patch -Patch21: curl-8.16.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp BuildRequires: %{kernel_module_package_buildreqs} @@ -812,8 +811,9 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_vbox_instdir}/VBoxSharedFolders.so %{_vbox_instdir}/VBoxVMM.so %{_vbox_instdir}/VBoxVMMArm.so -%{_vbox_instdir}/VBoxXPCOMC.so +%{_vbox_instdir}/VBoxVRDP.so %{_vbox_instdir}/VBoxXPCOM.so +%{_vbox_instdir}/VBoxXPCOMC.so %{_vbox_instdir}/VBox*.r0 %{_vbox_instdir}/VMMR0.r0 %{_vbox_instdir}/VBoxEFI*.fd