From nobody Wed May 29 00:32:34 2024 X-Original-To: dev-commits-ports-all@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 4Vpr1t6M7Mz5LXRX; Wed, 29 May 2024 00:32:34 +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 4Vpr1t4zxNz488f; Wed, 29 May 2024 00:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716942754; 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=gKfUf1/l7mpLlqWDs628MNieVY6TenAtMw2TBf8rSSU=; b=gXfEXA3dqfzLGfmULuSMVKMeg+3n1HgzqtBVg7sH3/EtRbDRgRTuav3xp/9dDMkF/m3Qd5 BQLHAeG1CJxlSpt7OfXDkhHS67EyhLharHjt23FSZ7tUWkv/zRtPnqv1Z0rAmLH6b4z1mR hFVmS3EYZhPi/upYD6GBHpHigRUvBWBF6hjJPXRBt1HXXvCgZNZH32CuwBuFK1qkdTj7b+ Qsnf4741H5bXmWmX0qjHNt2dljxTyd4y2JSsDYPjcAerPwGoC42b20zw4o2qzEmZ6FHO3+ shaJ6H0fw7x+21IeuTAHTB5KM7KJQeNVJCeyZD+WFu7c3i6IYMUJNlOHmRC0ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716942754; a=rsa-sha256; cv=none; b=QqFgArOkQMArz+dwYP2dH7OcLnOkBJ3IKVTN8tVj3WkLpDPVO6FYYy33nxbNZL0uhPw/hC zWaPhYI5RFVtVVxD8rlIwvhcF7uoZ33FMfThC+M8nkxHckjGpDrtqnp3jpXFdjVNnwrhxk a9gG3xQXGA5QkmyHwJHTqKdmE5O5HjvJLeBkqmjfrZP8nLUMCd4E9VlpDuAto8jZ4bWt2E R1GXz9rOgoJzAIPxz5ClvO6Xa3lE+Uwer0fVEkvywIBrAyKq1EoTZcAh2R3xFyIDyQl8Ou 1WGyPLCchSb+nG+VMgnKvrgiJN8tL0DFCWxTi2EKiIsSzzbUGmgmto5GeyndMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716942754; 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=gKfUf1/l7mpLlqWDs628MNieVY6TenAtMw2TBf8rSSU=; b=rxWqSWMBTtFOQgiswMQy/pMvh4Jh5ncYP1vwbyletJu1KULk7qtRU1s6Q4hpvtbzStYU7e yiadd0mWk+b9sZNjlPB1btxbucohUdmdmVTCCv9N1tfme5PSvRR3HELT6n9C0blGA8YvTh MpxFMdlosQFIJO3U8AapveZxbEQZGARbeivob0ZYoGrukfH7UpHYoiT5t9RV+5PuaOeJa/ yyXOVLiIvwBS8Mr4p/mrXuFIW7LhAwd4bZwaZ9oNu89lAPVOAkRHO3Nkvi/4qqEggaORuY n8E6x6xmFn/dDb9/eQAZ6OAfcHfUau8cPymzXktmTctTtfvvcDqAID/6UHzc6w== 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 4Vpr1t4cG7zb88; Wed, 29 May 2024 00:32:34 +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 44T0WYwX078639; Wed, 29 May 2024 00:32:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T0WYiG078636; Wed, 29 May 2024 00:32:34 GMT (envelope-from git) Date: Wed, 29 May 2024 00:32:34 GMT Message-Id: <202405290032.44T0WYiG078636@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 63fe92d7ab52 - main - security/botan3: libc++<16 lacks std::ranges::find, work around List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63fe92d7ab52f8657300837de6f774b26ed1f7d9 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=63fe92d7ab52f8657300837de6f774b26ed1f7d9 commit 63fe92d7ab52f8657300837de6f774b26ed1f7d9 Author: Matthias Andree AuthorDate: 2024-05-19 22:46:54 +0000 Commit: Matthias Andree CommitDate: 2024-05-29 00:32:21 +0000 security/botan3: libc++<16 lacks std::ranges::find, work around ...by using boost::range::find, we already depend on boost already. PR: 279173 Approved by: portmgr@ (just-fix-it blanket approval) --- security/botan3/Makefile | 9 +++-- .../files/extrapatch-src_tests_unit__x509.cpp | 38 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/security/botan3/Makefile b/security/botan3/Makefile index e79a686ca23f..1fcd76593800 100644 --- a/security/botan3/Makefile +++ b/security/botan3/Makefile @@ -12,9 +12,7 @@ WWW= https://botan.randombit.net/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -BROKEN_FreeBSD_13= compilation fails: no member named 'find' in namespace 'std::ranges' - -LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs +BUILD_DEPENDS= ${LOCALBASE}/include/boost/asio.hpp:devel/boost-libs USES= compiler:c++20-lang cpe gmake llvm:17 shebangfix tar:xz # llvm:17 fixes build failure, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279136 CPE_VENDOR= ${PORTNAME}_project @@ -86,6 +84,11 @@ PLIST_SUB+= HAS_PROCESSOR_RNG="@comment " #USES+= llvm:max=15,min=14 #.endif +.if ${OPSYS} == FreeBSD && ( ( ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091 ) || ( ${OSVERSION} < 1302507 ) ) +# libc++ does not carry std::ranges::find, redirect to boost::range::find: +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_tests_unit__x509.cpp +.endif + post-patch: @${REINPLACE_CMD} -e 's|^optimization_flags .*|optimization_flags "${CXXFLAGS}"|' \ ${WRKSRC}/src/build-data/cc/clang.txt diff --git a/security/botan3/files/extrapatch-src_tests_unit__x509.cpp b/security/botan3/files/extrapatch-src_tests_unit__x509.cpp new file mode 100644 index 000000000000..dfd4e13e9037 --- /dev/null +++ b/security/botan3/files/extrapatch-src_tests_unit__x509.cpp @@ -0,0 +1,38 @@ +--- src/tests/unit_x509.cpp.orig 2024-02-20 17:28:54 UTC ++++ src/tests/unit_x509.cpp +@@ -18,6 +18,8 @@ + #include + #include + #include ++ ++ #include + #endif + + namespace Botan_Tests { +@@ -627,7 +629,7 @@ Test::Result test_x509_encode_authority_info_access_ex + + for(const auto& ca_issuer : cert.ca_issuers()) { + result.confirm("CA issuer URI present in certificate", +- std::ranges::find(ca_issuers, ca_issuer) != ca_issuers.end()); ++ boost::range::find(ca_issuers, ca_issuer) != ca_issuers.end()); + } + + result.confirm("no OCSP url available", cert.ocsp_responder().empty()); +@@ -1400,7 +1402,7 @@ Test::Result test_x509_extensions(const Botan::Private + !cert_cdps->crl_distribution_urls().empty())) { + for(const auto& cdp : cert_cdps->distribution_points()) { + result.confirm("CDP URI present in self-signed certificate", +- std::ranges::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); ++ boost::range::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); + } + } + +@@ -1436,7 +1438,7 @@ Test::Result test_x509_extensions(const Botan::Private + !cert_cdps->crl_distribution_urls().empty())) { + for(const auto& cdp : cert_cdps->distribution_points()) { + result.confirm("CDP URI present in self-signed certificate", +- std::ranges::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); ++ boost::range::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end()); + } + } +