forked from pool/virtualbox
Compare commits
3 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| b5ad9bc3c6 | |||
| e94f7a20d6 | |||
| abbfbbe45c |
BIN
VirtualBox-7.1.12a-patched.tpxz
LFS
BIN
VirtualBox-7.1.12a-patched.tpxz
LFS
Binary file not shown.
BIN
VirtualBox-7.2.0-patched.tpxz
LFS
Normal file
BIN
VirtualBox-7.2.0-patched.tpxz
LFS
Normal file
Binary file not shown.
59
curl-8.16.patch
Normal file
59
curl-8.16.patch
Normal file
@@ -0,0 +1,59 @@
|
||||
References: https://bugzilla.suse.com/1249448
|
||||
From: Gianfranco Costamagna <locutusofborg@debian.org>
|
||||
From: Jan Engelhardt <ej@inai.de>
|
||||
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))
|
||||
@@ -1,8 +1,13 @@
|
||||
Index: VirtualBox-7.0.20/configure
|
||||
---
|
||||
configure | 17 ++++++-----------
|
||||
src/VBox/Frontends/VBoxSDL/Makefile.kmk | 8 ++++----
|
||||
2 files changed, 10 insertions(+), 15 deletions(-)
|
||||
|
||||
Index: VirtualBox-7.2.0/configure
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.20.orig/configure
|
||||
+++ VirtualBox-7.0.20/configure
|
||||
@@ -1186,21 +1186,19 @@ check_sdl()
|
||||
--- VirtualBox-7.2.0.orig/configure
|
||||
+++ VirtualBox-7.2.0/configure
|
||||
@@ -1150,21 +1150,19 @@ check_sdl()
|
||||
fail
|
||||
fi
|
||||
else
|
||||
@@ -27,7 +32,7 @@ Index: VirtualBox-7.0.20/configure
|
||||
#undef main
|
||||
extern "C" int main(int argc, char** argv)
|
||||
{
|
||||
@@ -1216,7 +1214,7 @@ extern "C" int main(int argc, char** arg
|
||||
@@ -1180,7 +1178,7 @@ extern "C" int main(int argc, char** arg
|
||||
}
|
||||
EOF
|
||||
[ -n "$INCSDL" ] && I_INCSDL=`prefix_I "$INCSDL"`
|
||||
@@ -36,7 +41,7 @@ Index: VirtualBox-7.0.20/configure
|
||||
if test_execute; then
|
||||
cnf_append "LIB_SDK_LIBSDL_SDL" "`strip_l "$LIBSDL"`"
|
||||
cnf_append "SDK_LIBSDL_LIBPATH" "`strip_L "$LIBSDL"`"
|
||||
@@ -3010,11 +3008,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
|
||||
@@ -2960,11 +2958,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
|
||||
[ $WITH_LIBLZMA -eq 1 ] && check_liblzma
|
||||
[ "$OS" != "darwin" ] && check_png
|
||||
[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
|
||||
@@ -50,20 +55,20 @@ Index: VirtualBox-7.0.20/configure
|
||||
[ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
|
||||
[ $WITH_X11 -eq 1 ] && check_x
|
||||
# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
|
||||
Index: VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
Index: VirtualBox-7.2.0/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.20.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
+++ VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
--- VirtualBox-7.2.0.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
+++ VirtualBox-7.2.0/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
@@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
PROGRAMS += VBoxSDL
|
||||
endif
|
||||
VBoxSDL_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientExe)
|
||||
VBoxSDL_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientSignedExe)
|
||||
- VBoxSDL_SDKS = LIBSDL2
|
||||
+ VBoxSDL_SDKS = LIBSDL
|
||||
VBoxSDL_SOURCES = \
|
||||
VBoxSDL.cpp \
|
||||
Framebuffer.cpp \
|
||||
@@ -81,7 +81,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
@@ -78,7 +78,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
endif
|
||||
ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
|
||||
VBoxSDL_LIBS = \
|
||||
@@ -72,7 +77,7 @@ Index: VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
endif
|
||||
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
|
||||
VBoxSDL_LIBS += \
|
||||
@@ -121,7 +121,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
@@ -116,7 +116,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
if 0
|
||||
PROGRAMS += tstSDL
|
||||
tstSDL_TEMPLATE = VBoxR3TstExe
|
||||
@@ -81,7 +86,7 @@ Index: VirtualBox-7.0.20/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
tstSDL_INST = $(INST_TESTCASE)
|
||||
tstSDL_SOURCES = \
|
||||
VBoxSDLTest.cpp
|
||||
@@ -138,7 +138,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
@@ -131,7 +131,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
$(LIB_RUNTIME)
|
||||
ifn1of ($(KBUILD_TARGET), solaris)
|
||||
tstSDL_LIBS += \
|
||||
|
||||
@@ -1,19 +1,25 @@
|
||||
Index: VirtualBox-7.0.20/src/apps/Makefile.kmk
|
||||
---
|
||||
src/apps/Makefile.kmk | 2
|
||||
src/apps/VBoxPermissionMessage/Makefile.kmk | 32 +++++++++++++++
|
||||
src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp | 12 +++++
|
||||
3 files changed, 46 insertions(+)
|
||||
|
||||
Index: VirtualBox-7.2.0/src/apps/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.20.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.0.20/src/apps/Makefile.kmk
|
||||
@@ -28,5 +28,7 @@
|
||||
SUB_DEPTH = ../..
|
||||
include $(KBUILD_PATH)/subheader.kmk
|
||||
--- VirtualBox-7.2.0.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.2.0/src/apps/Makefile.kmk
|
||||
@@ -33,5 +33,7 @@ ifneq ($(KBUILD_TARGET),win)
|
||||
include $(PATH_SUB_CURRENT)/svn2git-vbox/Makefile.kmk
|
||||
endif
|
||||
|
||||
+include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
|
||||
+
|
||||
include $(FILE_KBUILD_SUB_FOOTER)
|
||||
|
||||
Index: VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
Index: VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
+++ VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
@@ -0,0 +1,32 @@
|
||||
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
||||
+## @file
|
||||
@@ -47,10 +53,10 @@ Index: VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
+
|
||||
+include $(KBUILD_PATH)/subfooter.kmk
|
||||
+
|
||||
Index: VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
Index: VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.20/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
+++ VirtualBox-7.2.0/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
@@ -0,0 +1,12 @@
|
||||
+#include <QtWidgets/QApplication>
|
||||
+#include <QtWidgets/QMessageBox>
|
||||
|
||||
@@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 11 15:03:37 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add curl-8.16.patch [boo#1249448]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 26 10:21:54 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
|
||||
|
||||
- Disable python bindings for Leap 16.0 (bsc#1248418)
|
||||
python3.13 is not supported by the current virtualbox version so
|
||||
we can't build the bindings.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 15 14:46:51 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 7.2.0
|
||||
* GUI: Moved global and VM tools from hamburger menus to global
|
||||
tools taskbar (vertically on the left) and the VM tools tabs
|
||||
(horizontally above the right hand panel) to make them easier
|
||||
to reach.
|
||||
* ARM host: Virtualization of Windows 11/ARM VMs.
|
||||
* Linux host: Video decoding acceleration when 3D is enabled.
|
||||
* Storage: The NVMe storage controller emulation is now part of
|
||||
the open source base package.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 24 13:07:21 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@@ -55,15 +55,22 @@
|
||||
%endif
|
||||
|
||||
# If you want to disable building Python parts, just set this to %%nil
|
||||
%if 0%{?suse_version} == 1600
|
||||
# Leap 16.0 has python3.13, currently not supported
|
||||
%global mypython %nil
|
||||
%else
|
||||
# Using python3.11 for Factory, current version doesn't support python3.13
|
||||
%global mypython python311
|
||||
%endif
|
||||
|
||||
%if "%mypython" != ""
|
||||
%global __mypython %{expand:%%__%{mypython}}
|
||||
%global mypython_sitelib %{expand:%%%{mypython}_sitelib}
|
||||
%endif
|
||||
|
||||
Name: virtualbox%{?dash}%{?name_suffix}
|
||||
Version: 7.1.12a
|
||||
%define rversion 7.1.12
|
||||
Version: 7.2.0
|
||||
%define rversion 7.2.0
|
||||
Release: 0
|
||||
Summary: %{package_summary}
|
||||
License: GPL-3.0-or-later
|
||||
@@ -127,6 +134,7 @@ 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}
|
||||
@@ -143,7 +151,7 @@ BuildRequires: gcc-c++
|
||||
BuildRequires: gcc12
|
||||
BuildRequires: gcc12-c++
|
||||
%endif
|
||||
BuildRequires: kbuild >= 0.1.9998+svn3613
|
||||
BuildRequires: kbuild >= 0.1.9998+svn3686
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
@@ -823,6 +831,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
|
||||
%{_vbox_instdir}/VBoxRT.so
|
||||
%{_vbox_instdir}/VBoxSharedFolders.so
|
||||
%{_vbox_instdir}/VBoxVMM.so
|
||||
%{_vbox_instdir}/VBoxVMMArm.so
|
||||
%{_vbox_instdir}/VBoxXPCOMC.so
|
||||
%{_vbox_instdir}/VBoxXPCOM.so
|
||||
%{_vbox_instdir}/VBox*.r0
|
||||
|
||||
Reference in New Issue
Block a user