Date: Sat, 10 Jun 2023 11:03:58 GMT From: Eugene Grosbein <eugen@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: caed0bd84c82 - main - net/mpd5: unbreak build with OpenSSL 3.0 Message-ID: <202306101103.35AB3wVS071553@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=caed0bd84c824ef31eea79fc50853a2800b03de5 commit caed0bd84c824ef31eea79fc50853a2800b03de5 Author: Eugene Grosbein <eugen@FreeBSD.org> AuthorDate: 2023-06-10 11:01:46 +0000 Commit: Eugene Grosbein <eugen@FreeBSD.org> CommitDate: 2023-06-10 11:01:46 +0000 net/mpd5: unbreak build with OpenSSL 3.0 This fixes build, so PORTREVISION not bumped. --- net/mpd5/files/patch-openssl30 | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/net/mpd5/files/patch-openssl30 b/net/mpd5/files/patch-openssl30 new file mode 100644 index 000000000000..9aebcd6dd547 --- /dev/null +++ b/net/mpd5/files/patch-openssl30 @@ -0,0 +1,41 @@ +Index: src/contrib/libpdel/io/ssl_fp.c +=================================================================== +--- src/contrib/libpdel/io/ssl_fp.c (revision 2544) ++++ src/contrib/libpdel/io/ssl_fp.c (revision 2546) +@@ -53,6 +53,7 @@ + + #include <openssl/ssl.h> + #include <openssl/err.h> ++#include <openssl/opensslv.h> + + #include "structs/structs.h" + #include "structs/type/array.h" +@@ -364,6 +365,7 @@ ssl_log(ssl_logger_t *logger, void *logarg) + } + #endif + ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x30000000L + /* Add function */ + if ((t = ERR_func_error_string(e)) != NULL) { + strlcat(buf, t, sizeof(buf)); +@@ -372,6 +374,7 @@ ssl_log(ssl_logger_t *logger, void *logarg) + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), + "func=%u: ", ERR_GET_FUNC(e)); + } ++#endif + + /* Add reason */ + if ((t = ERR_reason_error_string(e)) != NULL) { +Index: src/Makefile +=================================================================== +--- src/Makefile (revision 2544) ++++ src/Makefile (revision 2546) +@@ -147,6 +147,8 @@ CFLAGS+= -DMPD_VENDOR='"${MPD_VENDOR}"' + CFLAGS+= -DSYSLOG_FACILITY='"${SYSLOG_FACILITY}"' + .endif + ++CFLAGS+= -DOPENSSL_API_COMPAT=10100 ++ + # Standard sources + + STDSRCS= assert.c auth.c bund.c rep.c ccp.c chap.c \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306101103.35AB3wVS071553>