[packages/VirtualBox] - rel 2, fix curl incomplete typigns
baggins
baggins at pld-linux.org
Sat Sep 13 17:42:41 CEST 2025
commit 0673b0e71f328526c198f8b9a36d6515aac88023
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Sep 13 19:42:07 2025 +0200
- rel 2, fix curl incomplete typigns
VirtualBox.spec | 4 +++-
curl-types.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 6c3794e..d0952c2 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -49,7 +49,7 @@ exit 1
%define qtver 6.3.0
-%define rel 1
+%define rel 2
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
@@ -89,6 +89,7 @@ Patch16: %{pname}-no-vboxvideo.patch
Patch19: python3.patch
Patch21: xsl-style-dir.patch
Patch22: build-arch.patch
+Patch23: curl-types.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -561,6 +562,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
%patch -P 19 -p1
%patch -P 21 -p1
%patch -P 22 -p1
+%patch -P 23 -p1
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/curl-types.patch b/curl-types.patch
new file mode 100644
index 0000000..c7b8e7d
--- /dev/null
+++ b/curl-types.patch
@@ -0,0 +1,70 @@
+--- VirtualBox-7.1.12/src/VBox/Runtime/generic/http-curl.cpp.orig 2025-09-13 16:01:01.239994670 +0200
++++ VirtualBox-7.1.12/src/VBox/Runtime/generic/http-curl.cpp 2025-09-13 16:05:07.176661258 +0200
+@@ -699,7 +699,7 @@
+ Log(("rtHttpUpdateAutomaticProxyDisable: pThis=%p\n", pThis));
+
+ AssertReturn(curl_easy_setopt(pThis->pCurl, CURLOPT_PROXYTYPE, (long)CURLPROXY_HTTP) == CURLE_OK, VERR_INTERNAL_ERROR_2);
+- pThis->enmProxyType = CURLPROXY_HTTP;
++ pThis->enmProxyType = (curl_proxytype)CURLPROXY_HTTP;
+
+ AssertReturn(curl_easy_setopt(pThis->pCurl, CURLOPT_PROXYPORT, (long)1080) == CURLE_OK, VERR_INTERNAL_ERROR_2);
+ pThis->uProxyPort = 1080;
+@@ -874,7 +874,7 @@
+ curl_proxytype enmProxyType;
+ if (RTUriIsSchemeMatch(pszProxyUrl, "http"))
+ {
+- enmProxyType = CURLPROXY_HTTP;
++ enmProxyType = (curl_proxytype)CURLPROXY_HTTP;
+ if (uProxyPort == UINT32_MAX)
+ uProxyPort = 80;
+ }
+@@ -882,7 +882,7 @@
+ # if CURL_AT_LEAST_VERSION(7,52,0)
+ else if (RTUriIsSchemeMatch(pszProxyUrl, "https"))
+ {
+- enmProxyType = CURLPROXY_HTTPS;
++ enmProxyType = (curl_proxytype)CURLPROXY_HTTPS;
+ if (uProxyPort == UINT32_MAX)
+ uProxyPort = 443;
+ }
+@@ -890,17 +890,17 @@
+ #endif
+ else if ( RTUriIsSchemeMatch(pszProxyUrl, "socks4")
+ || RTUriIsSchemeMatch(pszProxyUrl, "socks"))
+- enmProxyType = CURLPROXY_SOCKS4;
++ enmProxyType = (curl_proxytype)CURLPROXY_SOCKS4;
+ else if (RTUriIsSchemeMatch(pszProxyUrl, "socks4a"))
+- enmProxyType = CURLPROXY_SOCKS4A;
++ enmProxyType = (curl_proxytype)CURLPROXY_SOCKS4A;
+ else if (RTUriIsSchemeMatch(pszProxyUrl, "socks5"))
+- enmProxyType = CURLPROXY_SOCKS5;
++ enmProxyType = (curl_proxytype)CURLPROXY_SOCKS5;
+ else if (RTUriIsSchemeMatch(pszProxyUrl, "socks5h"))
+- enmProxyType = CURLPROXY_SOCKS5_HOSTNAME;
++ enmProxyType = (curl_proxytype)CURLPROXY_SOCKS5_HOSTNAME;
+ else
+ {
+ fUnknownProxyType = true;
+- enmProxyType = CURLPROXY_HTTP;
++ enmProxyType = (curl_proxytype)CURLPROXY_HTTP;
+ if (uProxyPort == UINT32_MAX)
+ uProxyPort = 8080;
+ }
+@@ -2094,7 +2094,7 @@
+ if (!pcszProxy)
+ return rtHttpUpdateAutomaticProxyDisable(pThis);
+
+- return rtHttpUpdateProxyConfig(pThis, CURLPROXY_HTTP, pcszProxy, uPort ? uPort : 1080, pcszProxyUser, pcszProxyPwd);
++ return rtHttpUpdateProxyConfig(pThis, (curl_proxytype)CURLPROXY_HTTP, pcszProxy, uPort ? uPort : 1080, pcszProxyUser, pcszProxyPwd);
+ }
+
+
+@@ -3616,7 +3616,7 @@
+ pProxy->enmProxyType = RTHTTPPROXYTYPE_NOPROXY;
+ else
+ {
+- switch (pThis->enmProxyType)
++ switch ((long)pThis->enmProxyType)
+ {
+ case CURLPROXY_HTTP:
+ #ifdef CURL_AT_LEAST_VERSION
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/0673b0e71f328526c198f8b9a36d6515aac88023
More information about the pld-cvs-commit
mailing list