From nobody Wed Oct 01 14:23:22 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ccHGL3frLz69jCh; Wed, 01 Oct 2025 14:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccHGL38g2z47vF; Wed, 01 Oct 2025 14:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759328602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyiVBbBhL+uaVjoJXY/izr+nioHsxoLStWq6leoD0jY=; b=CKZ7J4LpNIUQ/2hGIKQftBnDMMcLP7fU90W0FOBbeMKCVvjuvsDj2XL4mPz5FxYmx0I596 EJtNuDTUjDGY6klwP7DnwNfm7crGoL7PxCwvkFtd/Nq/pY3tgA0ANmmSyjwTKLbfyv4Fhq 26UKVfSP7uNhdoTmJLgk+qe2SQcZQLFaKp9EzFxK+doz01ZIWeD/TR2YlAvcDU0vHe9YZl Y6KUoR96gHqBh2eLksqLlAUbVzEflbL8V4tZXqRtmmxiODYxojxiPC0dwC2DCXBfdImhvr Lzrf+4HaMifzq8PZzYwKRc/aWsbBecI9I9PzGBjbAsfjgJpaNRqLzO70LPCXCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759328602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyiVBbBhL+uaVjoJXY/izr+nioHsxoLStWq6leoD0jY=; b=wOcvOouv2sYzfg8BlkV1qDqFBHM+55Q5pcC7BCCEXu1JseoEr3MIs+nogqHFmgXPuqkHDx jb3Q62kmcyHopPJCnlPTw+8ZLZBi6/HGscuoNhh7p22Pc00p8cvAC5ILahbwrqkIFG95CI uO9XwSuAaI4p6jRVSBlOjUvdl4TlwISJV9nW2qE2ohvDeL3F/esfo8rYI5Es2ZbiVRCyaQ iIp/BOjyVt75wHxRrqAi5uDJSIVYtS8W1G0R9U6FjVfpKCfvJeoXfck5U6NMwX3ajek//Z Xpd6bLyTX+XjGn0nw9jrU6N0yqIryQV2ngSkWGNERF8Z/CWRDJVZwl4sSE1zPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759328602; a=rsa-sha256; cv=none; b=Dzg5yg6cJpA5KArpj/snLQhgxitobjbhVXA7UACZnYJ99ZILawCDVhIps7TLcyHBkC8rH7 Zd5lVRJRYVIc6kLUkhlee9/P0cj2rOeboLMaM3AchmiCtZvzjAe+sbvqBWEcoYYXDpAgTa wEzqsfrIR0bd43HTmKbNgMMfpwBnV3eK81I1SBob5VcbzYDjL81lWTOXz0h15Rd73J4C7Z yXU6sbkW7f2aHUDdvCL9WzGLkws1CNxTLmGqEw3plFS77TyYCkkCSMAZlsLGIIneZ5Gp6E 0Q+LHeMlwXtQveb7Pqr0Sa6TCd1hGbFPrmbS4P0pQt8dZJ8QVJvPc+5Hs8934g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ccHGL2kmnz9jv; Wed, 01 Oct 2025 14:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 591ENMMj065150; Wed, 1 Oct 2025 14:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591ENMdT065146; Wed, 1 Oct 2025 14:23:22 GMT (envelope-from git) Date: Wed, 1 Oct 2025 14:23:22 GMT Message-Id: <202510011423.591ENMdT065146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 40fa37204330 - main - emulators/virtualbox-ose{,-nox11}{,-70,-71,-72,-legacy}: Fix build with ftp/curl 8.16.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40fa37204330ec70f24e229271fb71e255b6b6b5 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=40fa37204330ec70f24e229271fb71e255b6b6b5 commit 40fa37204330ec70f24e229271fb71e255b6b6b5 Author: Vladimir Druzenko AuthorDate: 2025-10-01 12:35:54 +0000 Commit: Vladimir Druzenko CommitDate: 2025-10-01 14:08:08 +0000 emulators/virtualbox-ose{,-nox11}{,-70,-71,-72,-legacy}: Fix build with ftp/curl 8.16.0 kBuild: Compiling VBoxRT - /wrkdirs/usr/ports/emulators/virtualbox-ose-72/work/VirtualBox-7.2.0/src/VBox/Runtime/generic/http-curl.cpp /wrkdirs/usr/ports/emulators/virtualbox-ose-72/work/VirtualBox-7.2.0/src/VBox/Runtime/generic/http-curl.cpp:702:27: error: assigning to 'curl_proxytype' from incompatible type 'long' 702 | pThis->enmProxyType = CURLPROXY_HTTP; | ^~~~~~~~~~~~~~ /usr/local/include/curl/curl.h:791:35: note: expanded from macro 'CURLPROXY_HTTP' 791 | #define CURLPROXY_HTTP 0L /* added in 7.10, new in 7.19.4 default is | ^~ Upstream bug report: https://github.com/curl/curl/issues/18054#issuecomment-3354156324 PR: 289924 --- emulators/virtualbox-ose-70/Makefile | 2 ++ emulators/virtualbox-ose-71/Makefile | 2 ++ emulators/virtualbox-ose-72/Makefile | 2 ++ emulators/virtualbox-ose-legacy/Makefile | 2 ++ emulators/virtualbox-ose/Makefile | 2 ++ 5 files changed, 10 insertions(+) diff --git a/emulators/virtualbox-ose-70/Makefile b/emulators/virtualbox-ose-70/Makefile index 4d7dea9d02ca..70ae1ff3695f 100644 --- a/emulators/virtualbox-ose-70/Makefile +++ b/emulators/virtualbox-ose-70/Makefile @@ -317,6 +317,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ diff --git a/emulators/virtualbox-ose-71/Makefile b/emulators/virtualbox-ose-71/Makefile index 7b5d79a0d306..288552b6f76d 100644 --- a/emulators/virtualbox-ose-71/Makefile +++ b/emulators/virtualbox-ose-71/Makefile @@ -317,6 +317,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ diff --git a/emulators/virtualbox-ose-72/Makefile b/emulators/virtualbox-ose-72/Makefile index 3110b3efe1aa..e6caf18b27d1 100644 --- a/emulators/virtualbox-ose-72/Makefile +++ b/emulators/virtualbox-ose-72/Makefile @@ -317,6 +317,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 77ed9000a262..2040fa8bf3e0 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -314,6 +314,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp do-build: cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \ diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 3bb9bd477162..0090c98652d1 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -328,6 +328,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \