View | Details | Raw Unified | Return to bug 279173 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/botan3/Makefile (-2 / +5 lines)
Lines 12-19 WWW= https://botan.randombit.net/ Link Here
12
LICENSE=	BSD2CLAUSE
12
LICENSE=	BSD2CLAUSE
13
LICENSE_FILE=	${WRKSRC}/license.txt
13
LICENSE_FILE=	${WRKSRC}/license.txt
14
14
15
BROKEN_FreeBSD_13=	compilation fails: no member named 'find' in namespace 'std::ranges'
16
17
BUILD_DEPENDS=	${LOCALBASE}/include/boost/asio.hpp:devel/boost-libs
15
BUILD_DEPENDS=	${LOCALBASE}/include/boost/asio.hpp:devel/boost-libs
18
16
19
USES=		compiler:c++20-lang cpe gmake shebangfix tar:xz
17
USES=		compiler:c++20-lang cpe gmake shebangfix tar:xz
Lines 88-93 PLIST_SUB+= HAS_PROCESSOR_RNG="@comment " Link Here
88
USES+=	llvm:max=15,min=14
86
USES+=	llvm:max=15,min=14
89
.endif
87
.endif
90
88
89
.if ${OPSYS} == FreeBSD && ( ( ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091 ) || ( ${OSVERSION} < 1302507 ) )
90
# libc++ does not carry std::ranges::find, redirect to boost::range::find:
91
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_tests_unit__x509.cpp
92
.endif
93
91
post-patch:
94
post-patch:
92
	@${REINPLACE_CMD} -e 's|^optimization_flags .*|optimization_flags "${CXXFLAGS}"|' \
95
	@${REINPLACE_CMD} -e 's|^optimization_flags .*|optimization_flags "${CXXFLAGS}"|' \
93
		${WRKSRC}/src/build-data/cc/clang.txt
96
		${WRKSRC}/src/build-data/cc/clang.txt
(-)b/security/botan3/files/extrapatch-src_tests_unit__x509.cpp (-1 / +38 lines)
Added Link Here
0
- 
1
--- src/tests/unit_x509.cpp.orig	2024-02-20 17:28:54 UTC
2
+++ src/tests/unit_x509.cpp
3
@@ -18,6 +18,8 @@
4
    #include <botan/x509path.h>
5
    #include <botan/x509self.h>
6
    #include <botan/internal/calendar.h>
7
+
8
+   #include <boost/range/algorithm.hpp>
9
 #endif
10
 
11
 namespace Botan_Tests {
12
@@ -627,7 +629,7 @@ Test::Result test_x509_encode_authority_info_access_ex
13
 
14
    for(const auto& ca_issuer : cert.ca_issuers()) {
15
       result.confirm("CA issuer URI present in certificate",
16
-                     std::ranges::find(ca_issuers, ca_issuer) != ca_issuers.end());
17
+                     boost::range::find(ca_issuers, ca_issuer) != ca_issuers.end());
18
    }
19
 
20
    result.confirm("no OCSP url available", cert.ocsp_responder().empty());
21
@@ -1400,7 +1402,7 @@ Test::Result test_x509_extensions(const Botan::Private
22
                      !cert_cdps->crl_distribution_urls().empty())) {
23
       for(const auto& cdp : cert_cdps->distribution_points()) {
24
          result.confirm("CDP URI present in self-signed certificate",
25
-                        std::ranges::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end());
26
+                        boost::range::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end());
27
       }
28
    }
29
 
30
@@ -1436,7 +1438,7 @@ Test::Result test_x509_extensions(const Botan::Private
31
                      !cert_cdps->crl_distribution_urls().empty())) {
32
       for(const auto& cdp : cert_cdps->distribution_points()) {
33
          result.confirm("CDP URI present in self-signed certificate",
34
-                        std::ranges::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end());
35
+                        boost::range::find(cdp_urls, cdp.point().get_first_attribute("URI")) != cdp_urls.end());
36
       }
37
    }
38
 

Return to bug 279173