From nobody Thu Aug 17 04:33:31 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 4RRBvw1r1Bz4qBF1; Thu, 17 Aug 2023 04:33:32 +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 4RRBvw1LFlz3Nwf; Thu, 17 Aug 2023 04:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692246812; 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=pGKAwE+EoNpN7n/I5ntAp0lWlNFeDrxOTPj+6ewhgKE=; b=L09K+d7nOMzaU219/Fd4dMx3h7Kr055IyIlGhaqTpNoh5ImiE87BfTOZwE0LWnkpT14QlX 0M9M7SL+2khFhxN1PA1op464eIXEyEn/dcPFbu5i/YBmwjveTLqjoKxgelDqqGzHF92f+g FTmIbRgFSAfDBnBsOI4QiAZwMatZK122by/YdIr7ongT8yb+ezKala66yBD2LrHR89tdTX GX4HlvjSCjc9HvkA5oxHFhl5qFIRyILPVM6xQMmEusDqQJGB2rXAlcTqIq32Blwn+4kUuJ 66Y+BHIbPD1ALCtiixOC+IEt+L7WaTtLM2pR7WH0UUFsCEIqHDq5c2rf78uAvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692246812; 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=pGKAwE+EoNpN7n/I5ntAp0lWlNFeDrxOTPj+6ewhgKE=; b=Vjx/jQoqE46Kx78jOLJh/8vNB9JAmpcZmYa3gLdHFG7otNageyx55aVdywV9v6dWDnlYVk 3PcE81dYHcW/dX9hDulDdd0OByvApziLTgL/OOUb7sUkvSxrqr9uvylvJv6yPPe6zZgfwl kvvy7ggdkvPZBNa7fbvEUvZQOWMVpPV51Bl8xdlhqljKlWcXVLymwFAv9K/iZvVj4dzs5b p/wC7BoSxaT31a1xDeQ2JPlzWHG8ZBCaYurx5h6RZ+C68qU2BOmWsDOVks3JxzXyjzYDM8 mVWNSA8VOyGw4MZ1lzumdBnamNXnfcOZyLxooDHpgYE1Y4/VjRNueFpkRdpF2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692246812; a=rsa-sha256; cv=none; b=wl7H8IAtteY2fVWzdegFUBsHyvdE+A6NnA13JsFXQHgpgbWJTXrJZOWoCvSMfRZNicBI6G Jl7FlKTdffGsAeX4bJvnGTkbGwjzzjiGwa2gamrfpBq+bx4Na6gKEGpmxo1dddLAIe/PXP YsxDGnICA9UoQGmFshFFp5LbPhPnaIomsWwjOa6XFTYy41wFq11PCA0l5/ZChW4/LGoLLY L6TB2gXrPjmMmvKv1/70DRBS9mUAeBK0BF4yVCZ3iE+baoG7/lNhcZKM5WDmhpWe5H7qL9 oj/J3JvV+hfTR3UjtVvf/Kzjtsx3dBgZkpGjTp9AHeHapST5er6kYN1e1otsHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRBvw0PSLz5B5; Thu, 17 Aug 2023 04:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H4XVgk045557; Thu, 17 Aug 2023 04:33:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H4XVfc045554; Thu, 17 Aug 2023 04:33:31 GMT (envelope-from git) Date: Thu, 17 Aug 2023 04:33:31 GMT Message-Id: <202308170433.37H4XVfc045554@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 02e76c94a8a1 - main - devel/ucommon: Fix build with openssl3 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02e76c94a8a1d30b993ddc2ad84abc9fa7dfbb2f Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=02e76c94a8a1d30b993ddc2ad84abc9fa7dfbb2f commit 02e76c94a8a1d30b993ddc2ad84abc9fa7dfbb2f Author: Muhammad Moinur Rahman AuthorDate: 2023-08-16 16:15:40 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-17 04:33:21 +0000 devel/ucommon: Fix build with openssl3 Sponsored by: The FreeBSD Foundation --- devel/ucommon/Makefile | 4 ---- devel/ucommon/files/patch-openssl_secure.cpp | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile index 5d3f9048b0f5..b86b69db4292 100644 --- a/devel/ucommon/Makefile +++ b/devel/ucommon/Makefile @@ -23,10 +23,6 @@ TEST_TARGET= test USE_CXXSTD= c++11 .endif -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L -.endif - post-install: ${INSTALL_DATA} ${BUILD_WRKSRC}/ucommon-config.h ${STAGEDIR}${PREFIX}/include/ucommon diff --git a/devel/ucommon/files/patch-openssl_secure.cpp b/devel/ucommon/files/patch-openssl_secure.cpp new file mode 100644 index 000000000000..6821ad6a11b3 --- /dev/null +++ b/devel/ucommon/files/patch-openssl_secure.cpp @@ -0,0 +1,12 @@ +--- openssl/secure.cpp.orig 2023-08-16 16:05:03 UTC ++++ openssl/secure.cpp +@@ -72,7 +72,9 @@ bool secure::init(void) + + SSL_library_init(); + SSL_load_error_strings(); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_BIO_strings(); ++#endif + OpenSSL_add_all_algorithms(); + OpenSSL_add_all_digests(); +