From nobody Sat Jun 10 11:03:58 2023 X-Original-To: dev-commits-ports-main@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 4QdZnp5Hrjz4c3Lk; Sat, 10 Jun 2023 11:03:58 +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 4QdZnp4pR8z4LGb; Sat, 10 Jun 2023 11:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686395038; 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=JL+DW1ClQ7CMNFsVyvYSRp7Ps6IGtGrD/ADcXtwd8xs=; b=gOfrfFK30TT48ZInJsc5X3ewwGW8EEZbvPO+NE4h/ejKNOGkxqlHDeccD7c7+sLlP+tvOc IfiTjIzUt6Yo7imoyLW99hWVBgAXmpkhkrH2Ql9y9daWGC/J8TNclePgQJV2ZG+3WLkiXJ GjwS3czE0h71iH9xKvKiNYKZt3jXdXiO5AHFydynYGuJjAdEvdazdKTfT/VJbok98fccUw Ay4QvMc/BwIhRmVhCJ7aaB7TlHLJTPSl6hNfaooLTqrkDRDyCR4/1H3PNk8zkS4oTu5Ixs Q3xPS1FYco6aKAhzqWqxPF1nM3SiIcIQQ9kV53dI5dbMIf+u/PlOj00ol9qVsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686395038; 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=JL+DW1ClQ7CMNFsVyvYSRp7Ps6IGtGrD/ADcXtwd8xs=; b=g8WpZnWpK9DqZoUKBAaTNOMxKjiI/vrB95f6EKJiUaJs6/Cl6YMXItSAaT56cKPGoCRe4S q+71HUkKbAjTJHyNuAT3o5xNUdtdNmFKOJtG5bI23NrJWJRRE5R74XqizhGuRUIkzKKQK6 e+qDOVrUHRuX3BUsNFgxoOYIpdsWujokuJ4yqleBB0bj+GF9Kx6lyFc3XbGFl/gf7e9gBN vGW5/Djpd4f5xWTTz1BQXUllNfsHu538En80xtdaThTPIdXl4Zl4KmkkILAF1isLIrBWja rdpRlB4gBAO3a41l1syKumkhzCg3xTk8bSwRXm4/5o2dxs1RojoVOeh029XxtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686395038; a=rsa-sha256; cv=none; b=NiVEQo+uuAp9Ss/dw3sjzz87YMaTxrpBLTObPnYWtn9yLOgSjh5k1VaHXWZfN5wnXO7vd0 cInzJiCee1xdHRCfIadvKvAaqNuRjFL+nLMcatSEvCB20w+Vllz/h6epnEGsBHReMzv25G jb/CnVo0Y87rij0/wB9rdQtuP7biR2keamzaEMmhMBduJFF1XOuZyn6mSJK0ZLmi9WxhFp uO21FzbFe8ZFH+z57qMshxyZ7EUzXlEVHllEdmRfxMjvFdMqAGda8NMV04FMxnU+RM3SQN HmlsGzrga0SqSr5h7t4FMWydgId6tPF/aV+Yeo/fOGqYsrB9GJQzDxZSxyHj/g== 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 4QdZnp3sbgzFPJ; Sat, 10 Jun 2023 11:03:58 +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 35AB3wJq071554; Sat, 10 Jun 2023 11:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35AB3wVS071553; Sat, 10 Jun 2023 11:03:58 GMT (envelope-from git) Date: Sat, 10 Jun 2023 11:03:58 GMT Message-Id: <202306101103.35AB3wVS071553@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: caed0bd84c82 - main - net/mpd5: unbreak build with OpenSSL 3.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: caed0bd84c824ef31eea79fc50853a2800b03de5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=caed0bd84c824ef31eea79fc50853a2800b03de5 commit caed0bd84c824ef31eea79fc50853a2800b03de5 Author: Eugene Grosbein AuthorDate: 2023-06-10 11:01:46 +0000 Commit: Eugene Grosbein 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 + #include ++#include + + #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 \