Date: Thu, 8 Jun 2023 18:03:24 GMT From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 21bc9af15c83 - main - net/x11vnc: fix build with openssl30 Message-ID: <202306081803.358I3OMe015559@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=21bc9af15c833fd11a75db9127f22fa27ba685fe commit 21bc9af15c833fd11a75db9127f22fa27ba685fe Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2023-06-08 18:02:56 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> 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 <openssl/rand.h> + + 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306081803.358I3OMe015559>