From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F204E1581FD for ; Fri, 12 Sep 2025 15:54:45 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DAA86341070 for ; Fri, 12 Sep 2025 15:54:45 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C71CA11056F; Fri, 12 Sep 2025 15:54:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AE25011056F for ; Fri, 12 Sep 2025 15:54:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B6CA34107F for ; Fri, 12 Sep 2025 15:54:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE40838E7 for ; Fri, 12 Sep 2025 15:54:40 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1757692443.ff42a016463d45c91ab20d7292cba881e5270b85.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/files/virtualbox-7.2.2-curl-8.16.patch app-emulation/virtualbox/virtualbox-7.2.2.ebuild X-VCS-Directories: app-emulation/virtualbox/files/ app-emulation/virtualbox/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: ff42a016463d45c91ab20d7292cba881e5270b85 X-VCS-Branch: master Date: Fri, 12 Sep 2025 15:54:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11aaf0a7-1f8f-44c3-96e7-aba974f56d47 X-Archives-Hash: fe62ce4cb2d55f0962b95c00fe39a5a6 commit: ff42a016463d45c91ab20d7292cba881e5270b85 Author: Viorel Munteanu gentoo org> AuthorDate: Fri Sep 12 15:03:18 2025 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Fri Sep 12 15:54:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff42a016 app-emulation/virtualbox: fix build with net-misc/curl-8.16 Closes: https://bugs.gentoo.org/962744 Signed-off-by: Viorel Munteanu gentoo.org> .../files/virtualbox-7.2.2-curl-8.16.patch | 54 ++++++++++++++++++++++ app-emulation/virtualbox/virtualbox-7.2.2.ebuild | 2 + 2 files changed, 56 insertions(+) diff --git a/app-emulation/virtualbox/files/virtualbox-7.2.2-curl-8.16.patch b/app-emulation/virtualbox/files/virtualbox-7.2.2-curl-8.16.patch new file mode 100644 index 000000000000..6a1d401cca98 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-7.2.2-curl-8.16.patch @@ -0,0 +1,54 @@ +Breaking change in curl 8.16: +https://github.com/curl/curl/commit/1a12663d06d9c42fd40a8655d5247f7afeeb8e1e + +Change curl_proxytype to long. + +See also: https://bugs.gentoo.org/962744 + +--- a/src/VBox/Runtime/generic/http-curl.cpp ++++ b/src/VBox/Runtime/generic/http-curl.cpp +@@ -188,7 +188,7 @@ + /** 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 @@ + * @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; +@@ -610,7 +610,7 @@ + if ( pThis->fReapplyProxyInfo + || enmProxyType != pThis->enmProxyType) + { +- rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROXYTYPE, (long)enmProxyType); ++ rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROXYTYPE, enmProxyType); + AssertMsgReturn(CURL_SUCCESS(rcCurl), ("CURLOPT_PROXYTYPE=%d: %d (%#x)\n", enmProxyType, rcCurl, rcCurl), + VERR_HTTP_CURL_PROXY_CONFIG); + pThis->enmProxyType = enmProxyType; +@@ -871,7 +871,7 @@ + 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 @@ + * Determine the proxy type (not entirely sure about type == proxy type and + * not scheme/protocol)... + */ +- curl_proxytype enmProxyType = CURLPROXY_HTTP; ++ long enmProxyType = CURLPROXY_HTTP; + uint32_t uDefaultProxyPort = 8080; + if ( CFEqual(hStrProxyType, kCFProxyTypeHTTP) + || CFEqual(hStrProxyType, kCFProxyTypeHTTPS)) diff --git a/app-emulation/virtualbox/virtualbox-7.2.2.ebuild b/app-emulation/virtualbox/virtualbox-7.2.2.ebuild index 7ce2201827a7..33c7f7fe1e8f 100644 --- a/app-emulation/virtualbox/virtualbox-7.2.2.ebuild +++ b/app-emulation/virtualbox/virtualbox-7.2.2.ebuild @@ -200,6 +200,8 @@ REQUIRED_USE=" PATCHES=( # Downloaded patchset "${WORKDIR}"/virtualbox-patches-${PATCHES_PV}/patches + + "${FILESDIR}"/${P}-curl-8.16.patch ) pkg_pretend() {