From nobody Thu Jun 8 18:03:24 2023 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 4QcXBh6s8fz4cDY3; Thu, 8 Jun 2023 18:03:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QcXBh6QFQz3wPs; Thu, 8 Jun 2023 18:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686247404; 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=tzGdyhSNBCWOVNOgbkCsbp0R3EQi/oPy11sGRQpL1cs=; b=h+yB1UiTyAzYJGEU+2MJ84+WdoNdMkoi2rBgLa0aJk+d8O3fNHnk9vkPNXhV5UYFRfPFOm zQd4yvZXZ1/5jow7fbwSsEW99YLE3I7kUa/pxQuxDW2lVcr/6NRCVuIirjGBpuEnr9sjh1 xEA72+Df4XSjiLsXiCu658Xzq0JConKn+N077ZB0MqrEvYUDKlavVuC/jiQwAdL8CkgBHG meF5oog6Nlm1a9ecZMXijHMktwllH/IMppzruQZATZDX0JgGwbjl/L5fpQPCYkVqy/zxwu h4NvCc772d8cBX4s5kYpe4joPuqWxyhIeTYv+X1644gB2khU4uHR3HZFVwd/gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686247404; 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=tzGdyhSNBCWOVNOgbkCsbp0R3EQi/oPy11sGRQpL1cs=; b=PmjekN083VqpT7/Nw6aL6KD4Y8SsEzYJUXvKXPHMLbCKk711Li6Ii3lLzFKttB+QumjrSZ wfi9bAigqxf93FiVQldZD/7D4Ajpfj/S6K63PjILxIzD+zty2gSfOsWCmxegZ/1ZNHs7jD kS2nAjQWKZBxe1YcNklpiDDeth7/lMcTQC9SRy5OUYJ3jpMdPTTDebksZCXaBjLG72+qMk Rb3mEFNlzVMf3UrdoJhW/YgPqohJ9pv5OIdssGQeULbre+atJKhrenNBBxPCLhAgMn3bfI mNmVgs6+9cYWq7RoyWPVX40RUfdyCH5KodxAVcSpSyXQBQSgAVdEqaFzzqFwIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686247404; a=rsa-sha256; cv=none; b=hvqAN1JOU3hSKIdqtKbsXNXID3Ctrnu/oYhSOyeRfIEwCVTGKaig1EXnpELy8jq89lrc2M t938dVHxFJ6Pr0gEe9tnIi3BMvDo7RlnxgfjlMvGk8PGIfDnYSCBAhCy3SX+C+oDWf5oVh Z48ukr6M5nj034C0vHnP/qhmHSMEYrjxDSa1omql+k2cnp6JXvB5Ma55XIBLm5slVquCPn EWn+Z5VVkYSHeVU85cTWMdfgNPwYPfyXpfysCr01mUNXFE1301alY5YeSM+xaLdXuenA4V q1KzTHN76/7AnFaTjfKABixMxmwKT0uBLx4hsves402Dlb6DiVE5XIohUKH9sg== 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 4QcXBh5Vvsz13Y0; Thu, 8 Jun 2023 18:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 358I3OC2015560; Thu, 8 Jun 2023 18:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 358I3OMe015559; Thu, 8 Jun 2023 18:03:24 GMT (envelope-from git) Date: Thu, 8 Jun 2023 18:03:24 GMT Message-Id: <202306081803.358I3OMe015559@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 21bc9af15c83 - main - net/x11vnc: fix build with openssl30 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21bc9af15c833fd11a75db9127f22fa27ba685fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=21bc9af15c833fd11a75db9127f22fa27ba685fe commit 21bc9af15c833fd11a75db9127f22fa27ba685fe Author: Dirk Meyer AuthorDate: 2023-06-08 18:02:56 +0000 Commit: Dirk Meyer CommitDate: 2023-06-08 18:02:56 +0000 net/x11vnc: fix build with openssl30 --- net/x11vnc/Makefile | 2 +- net/x11vnc/files/patch-sslhelper.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 2c95f289fcc7..12f0bc497ab3 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -1,6 +1,6 @@ PORTNAME= x11vnc PORTVERSION= 0.9.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MAINTAINER= dinoex@FreeBSD.org diff --git a/net/x11vnc/files/patch-sslhelper.c b/net/x11vnc/files/patch-sslhelper.c new file mode 100644 index 000000000000..223495a207cb --- /dev/null +++ b/net/x11vnc/files/patch-sslhelper.c @@ -0,0 +1,32 @@ +--- src/sslhelper.c.orig 2019-01-05 13:22:11 UTC ++++ src/sslhelper.c +@@ -732,8 +732,10 @@ static void ssl_xfer(int csock, int s_in, int s_out, i + #include + + static SSL_CTX *ctx = NULL; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + static RSA *rsa_512 = NULL; + static RSA *rsa_1024 = NULL; ++#endif + static SSL *ssl = NULL; + static X509_STORE *revocation_store = NULL; + +@@ -1063,8 +1065,9 @@ void openssl_init(int isclient) { + sslerrexit(); + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ds = dnow(); +- rsa_512 = RSA_generate_key(512, RSA_F4, NULL, NULL); ++ rsa_512 = RSA_generate_key_ex(512, RSA_F4, NULL, NULL); + if (rsa_512 == NULL) { + rfbLog("openssl_init: RSA_generate_key(512) failed.\n"); + sslerrexit(); +@@ -1087,6 +1090,7 @@ void openssl_init(int isclient) { + rfbLog("openssl_init: SSL_CTX_set_tmp_rsa(1024) failed.\n"); + sslerrexit(); + } ++#endif + + mode = 0; + mode |= SSL_MODE_ENABLE_PARTIAL_WRITE;