Date: Mon, 7 Aug 2023 23:40:34 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e1cfb4d87150 - main - mail/datovka: Fix build with openssl3 Message-ID: <202308072340.377NeYVS052100@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1cfb4d871508757e27f4b7568cf02a82e78e6a8 commit e1cfb4d871508757e27f4b7568cf02a82e78e6a8 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-08-07 16:28:40 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-08-07 22:00:18 +0000 mail/datovka: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- mail/datovka/Makefile | 8 +------- mail/datovka/files/patch-src_crypto_crypto.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/mail/datovka/Makefile b/mail/datovka/Makefile index 7e956c32bbf8..b9b2c561db02 100644 --- a/mail/datovka/Makefile +++ b/mail/datovka/Makefile @@ -19,10 +19,4 @@ USE_GL= gl USE_QT= buildtools core gui network printsupport sql svg websockets \ widgets -.include <bsd.port.pre.mk> - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/datovka/files/patch-src_crypto_crypto.c b/mail/datovka/files/patch-src_crypto_crypto.c new file mode 100644 index 000000000000..098dd144f94c --- /dev/null +++ b/mail/datovka/files/patch-src_crypto_crypto.c @@ -0,0 +1,12 @@ +--- src/crypto/crypto.c.orig 2023-08-07 16:26:04 UTC ++++ src/crypto/crypto.c +@@ -312,7 +312,9 @@ int crypto_init(void) + OpenSSL_add_all_algorithms(); + + ERR_load_crypto_strings(); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_CMS_strings(); ++#endif + //ERR_free_strings(); + + if (NULL != ca_certs) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308072340.377NeYVS052100>