From nobody Tue Jul 25 02:11:44 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 4R90rx24vnz4pQC4; Tue, 25 Jul 2023 02:11:45 +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 4R90rw5m0Wz3J6b; Tue, 25 Jul 2023 02:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690251104; 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=g4fcQFAnht2oWG3Me/9OOVbPpSi8eQZ4Bgc1Ok6ROVw=; b=AQRUdI90tenLFJfcE7T0DwseUow7c93Ph2tCClqN6iGb9MQZaJCmfHVF4SmrhVRbLSR7H5 38MCLUdoDHe0mn5lN7Ki03iGNcsSIBCaVXjLr/8bNTcZDI2bYYk/frsHrZFd3dhlgytIwX vpD0rlyTNDwjWIa15sBvOmc4LO5DMrUaiuqEYjje8qE9cQ4zVIubVveCwapkBfgjQRpnPe pZiBWrmMCviBBXD/n6Cqkw9ZBXWBmoQUzWuzwNSpZDWfBWLM1q/SBDCBrXKApYQ67eUX2I hc3mZj2vnl0TCVkPVDiLlRZx6myP/eN4orNsUJM0zA29cXkWADZeqryueHPiGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690251104; 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=g4fcQFAnht2oWG3Me/9OOVbPpSi8eQZ4Bgc1Ok6ROVw=; b=LRPlV5HPXPnW7FJinpadX4Y/VCDbQGYPA4YHEG0YrKz7kFqanHqLf7BsSGRaiFMfgITkRI prYrWJdMHIjChszs9GC4l6EYtFzxgZvWR4c3JT2URucCoKTylU1zRltU0NnsYFbZwiNLGw Rk5lt0ZJUXeL+9HAm7PZoblhpnKoHjLNi81VRgZM1WzcLV+spvMpAFxQe75op5ZlsXeUVh a5ebT+JvEY0pl4TtC5jrug/d+CTf6RSKSe7ohfnPkuAw1jrkNDzcW7XL9ed5g7/fCgI8pj ThYSLD/+F6/xI4Hmk2JEH4UkRex3PbyyLpS2+J7HNWjbEPqjrdTGuwBqn0YFGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690251104; a=rsa-sha256; cv=none; b=Fb+HF3WJXoW1u1+cqTXehXlAoGAl1MNBgcHRPg3JoXzlBf72JrcP90r3O24nFpFCC+/pZF ZMo3ZHhZrTUiSGzPzI+Le9mU0qmBBZw7/kqL376VzxgSiD34vp1igJ7eubGWPjRl95/EGH njsgO+K88w9bb8gaGYrBv6LmGDcP9/izE/PvYYM3q5qn+uIS+zUR5zDAX165/TxUXYHp7z Q3/+1Se6HmC3Nk/v5uepUGqnx0C3SPAlyCMBH1eEQzlqWRAOMWccKP5mrSDOcMta1Y1T1T eodinlqgXzTenHxk13F0NNXHBipsmmW2gdjH1u6mKK6iaGYCSOieH0PftM6o4Q== 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 4R90rw4qNQzhjX; Tue, 25 Jul 2023 02:11:44 +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 36P2Bigu019206; Tue, 25 Jul 2023 02:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36P2BiGZ019205; Tue, 25 Jul 2023 02:11:44 GMT (envelope-from git) Date: Tue, 25 Jul 2023 02:11:44 GMT Message-Id: <202307250211.36P2BiGZ019205@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 6d297011f9ea - main - sysutils/barrier: unbreak build on non-OpenSSL 3 systems (12 and 13) 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: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d297011f9ea49d22bc36aa2c1fcda549db4ebba Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d297011f9ea49d22bc36aa2c1fcda549db4ebba commit 6d297011f9ea49d22bc36aa2c1fcda549db4ebba Author: Hiroki Tagato AuthorDate: 2023-07-25 02:03:35 +0000 Commit: Hiroki Tagato CommitDate: 2023-07-25 02:11:35 +0000 sysutils/barrier: unbreak build on non-OpenSSL 3 systems (12 and 13) Builds of barrier started failing on non-OpenSSL 3 systems after commit 29ba81195ab384a6b4de7c953cb6ac8ca2fff557 with the following error: /wrkdirs/usr/ports/sysutils/barrier/work/barrier-2.4.0/src/lib/net/SecureUtils.cpp:163:25: error: use of undeclared identifier 'EVP_RSA_gen' auto* private_key = EVP_RSA_gen(2048); ^ 1 warning and 1 error generated. Applying the patch in commit 29ba81195ab384a6b4de7c953cb6ac8ca2fff557 conditionally solves the issue. Approved by: portmgr (build fix blanket) --- sysutils/barrier/Makefile | 6 ++++++ ..._net_SecureUtils.cpp => extra-patch-src_lib_net_SecureUtils.cpp} | 0 2 files changed, 6 insertions(+) diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile index 6e7b9abdf0d8..3d3c2e4feb64 100644 --- a/sysutils/barrier/Makefile +++ b/sysutils/barrier/Makefile @@ -37,6 +37,12 @@ GUI_USES= qt:5 GUI_USE= QT=core,gui,network,widgets,buildtools:build,qmake:build GUI_CMAKE_BOOL= BARRIER_BUILD_GUI +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_lib_net_SecureUtils.cpp +.endif + post-extract: @${CP} -a ${WRKSRC_gulrak}/include ${WRKSRC}/ext/gulrak-filesystem/ diff --git a/sysutils/barrier/files/patch-src_lib_net_SecureUtils.cpp b/sysutils/barrier/files/extra-patch-src_lib_net_SecureUtils.cpp similarity index 100% rename from sysutils/barrier/files/patch-src_lib_net_SecureUtils.cpp rename to sysutils/barrier/files/extra-patch-src_lib_net_SecureUtils.cpp