mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
security/botan2: Update to 2.11.0
Changes: https://botan.randombit.net/news.html#version-2-11-0-2019-07-01 PR: 240557 Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer) Approved by: araujo (mentor) Differential Revision: https://reviews.freebsd.org/D21716
This commit is contained in:
parent
08398c97bb
commit
e73360392c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=512344
@ -1,8 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= botan
|
||||
DISTVERSION= 2.10.0
|
||||
PORTREVISION= 4
|
||||
DISTVERSION= 2.11.0
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= http://botan.randombit.net/releases/
|
||||
PKGNAMESUFFIX= 2
|
||||
@ -14,26 +13,30 @@ COMMENT= Portable, easy to use and efficient C++ crypto library
|
||||
LICENSE= BSD2CLAUSE
|
||||
LICENSE_FILE= ${WRKSRC}/license.txt
|
||||
|
||||
BROKEN_armv6= include/arm_neon.h:28:2: error: "NEON support not enabled"
|
||||
BROKEN_armv6= include/arm_neon.h:28:2: error: "NEON support not enabled"
|
||||
|
||||
LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs
|
||||
|
||||
USES= compiler:c++11-lang gmake python:build shebangfix tar:tgz
|
||||
SHEBANG_FILES= configure.py src/scripts/install.py
|
||||
HAS_CONFIGURE= yes
|
||||
USES= compiler:c++11-lang gmake python:build shebangfix tar:xz
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
SHEBANG_FILES= configure.py src/scripts/install.py
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_SCRIPT= configure.py
|
||||
CONFIGURE_ARGS= --with-external-includedir=${PREFIX}/include \
|
||||
--with-external-libdir=${PREFIX}/lib \
|
||||
--with-boost --with-bzip2 --with-lzma --with-zlib \
|
||||
--cc=${COMPILER_TYPE}
|
||||
LDFLAGS+= -pthread
|
||||
CONFIGURE_ARGS= --cc=${COMPILER_TYPE} \
|
||||
--with-boost \
|
||||
--with-bzip2 \
|
||||
--with-external-includedir=${LOCALBASE}/include \
|
||||
--with-external-libdir=${LOCALBASE}/lib \
|
||||
--with-lzma \
|
||||
--with-zlib
|
||||
LDFLAGS+= -pthread
|
||||
|
||||
SHLIBVER= ${DISTVERSION:S/./ /g:[2]}
|
||||
PLIST_SUB= SHLIBVER=${SHLIBVER}
|
||||
DOCSDIR= ${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION}
|
||||
|
||||
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
|
||||
_SHLIBVER= ${DISTVERSION:S/./ /g:[2]}
|
||||
PLIST_SUB= SHLIBVER=${_SHLIBVER}
|
||||
PORTDOCS= *
|
||||
|
||||
OPTIONS_DEFINE= DOCS SQLITE3 SSL
|
||||
@ -52,6 +55,10 @@ SSL_CONFIGURE_WITH= openssl
|
||||
CONFIGURE_ARGS+= --cc-abi="-march=armv8-a+crypto"
|
||||
.endif
|
||||
|
||||
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000
|
||||
CONFIGURE_ARGS+= --without-os-features=getentropy,elf_aux_info
|
||||
.endif
|
||||
|
||||
.if ${ARCH} == i386 || ${ARCH} == amd64
|
||||
PLIST_SUB+= HAS_RDRAND_RNG=""
|
||||
.else
|
||||
@ -63,6 +70,6 @@ post-patch:
|
||||
${WRKSRC}/src/build-data/cc/clang.txt
|
||||
|
||||
post-install:
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${SHLIBVER}.${SHLIBVER}.0
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${_SHLIBVER}.${_SHLIBVER}.0
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1554050060
|
||||
SHA256 (Botan-2.10.0.tgz) = 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31
|
||||
SIZE (Botan-2.10.0.tgz) = 7240021
|
||||
TIMESTAMP = 1568364010
|
||||
SHA256 (Botan-2.11.0.tar.xz) = f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be
|
||||
SIZE (Botan-2.11.0.tar.xz) = 5765712
|
||||
|
@ -1,51 +0,0 @@
|
||||
boost 1.70 compatibility (accepted upstream)
|
||||
https://github.com/randombit/botan/pull/1881
|
||||
|
||||
--- src/cli/tls_http_server.cpp.orig 2019-01-04 11:14:58 UTC
|
||||
+++ src/cli/tls_http_server.cpp
|
||||
@@ -41,6 +41,12 @@
|
||||
|
||||
#include "credentials.h"
|
||||
|
||||
+#if BOOST_VERSION >= 107000
|
||||
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
|
||||
+#else
|
||||
+#define GET_IO_SERVICE(s) ((s).get_io_service())
|
||||
+#endif
|
||||
+
|
||||
namespace Botan_CLI {
|
||||
|
||||
namespace {
|
||||
@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final
|
||||
session::pointer make_session()
|
||||
{
|
||||
return session::create(
|
||||
- m_acceptor.get_io_service(),
|
||||
+ GET_IO_SERVICE(m_acceptor),
|
||||
m_session_manager,
|
||||
m_creds,
|
||||
m_policy);
|
||||
--- src/cli/tls_proxy.cpp.orig 2019-01-04 11:14:58 UTC
|
||||
+++ src/cli/tls_proxy.cpp
|
||||
@@ -33,6 +33,12 @@
|
||||
|
||||
#include "credentials.h"
|
||||
|
||||
+#if BOOST_VERSION >= 107000
|
||||
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
|
||||
+#else
|
||||
+#define GET_IO_SERVICE(s) ((s).get_io_service())
|
||||
+#endif
|
||||
+
|
||||
namespace Botan_CLI {
|
||||
|
||||
namespace {
|
||||
@@ -370,7 +376,7 @@ class tls_proxy_server final
|
||||
session::pointer make_session()
|
||||
{
|
||||
return session::create(
|
||||
- m_acceptor.get_io_service(),
|
||||
+ GET_IO_SERVICE(m_acceptor),
|
||||
m_session_manager,
|
||||
m_creds,
|
||||
m_policy,
|
@ -3,7 +3,12 @@ include/botan-2/botan/adler32.h
|
||||
include/botan-2/botan/aead.h
|
||||
include/botan-2/botan/aes.h
|
||||
include/botan-2/botan/alg_id.h
|
||||
include/botan-2/botan/argon2.h
|
||||
include/botan-2/botan/aria.h
|
||||
include/botan-2/botan/asio_async_ops.h
|
||||
include/botan-2/botan/asio_context.h
|
||||
include/botan-2/botan/asio_error.h
|
||||
include/botan-2/botan/asio_stream.h
|
||||
include/botan-2/botan/asn1_alt_name.h
|
||||
include/botan-2/botan/asn1_attribute.h
|
||||
include/botan-2/botan/asn1_obj.h
|
||||
@ -14,12 +19,12 @@ include/botan-2/botan/asn1_time.h
|
||||
include/botan-2/botan/assert.h
|
||||
include/botan-2/botan/atomic.h
|
||||
include/botan-2/botan/auto_rng.h
|
||||
include/botan-2/botan/b64_filt.h
|
||||
include/botan-2/botan/base32.h
|
||||
include/botan-2/botan/base58.h
|
||||
include/botan-2/botan/base64.h
|
||||
include/botan-2/botan/basefilt.h
|
||||
include/botan-2/botan/bcrypt.h
|
||||
include/botan-2/botan/bcrypt_pbkdf.h
|
||||
include/botan-2/botan/ber_dec.h
|
||||
include/botan-2/botan/bigint.h
|
||||
include/botan-2/botan/blake2b.h
|
||||
@ -43,6 +48,8 @@ include/botan-2/botan/ccm.h
|
||||
include/botan-2/botan/cecpq1.h
|
||||
include/botan-2/botan/cert_status.h
|
||||
include/botan-2/botan/certstor.h
|
||||
include/botan-2/botan/certstor_flatfile.h
|
||||
include/botan-2/botan/certstor_system.h
|
||||
include/botan-2/botan/certstor_sql.h
|
||||
%%SQLITE3%%include/botan-2/botan/certstor_sqlite.h
|
||||
include/botan-2/botan/cfb.h
|
||||
@ -116,7 +123,6 @@ include/botan-2/botan/gost_3411.h
|
||||
include/botan-2/botan/hash.h
|
||||
include/botan-2/botan/hash_id.h
|
||||
include/botan-2/botan/hex.h
|
||||
include/botan-2/botan/hex_filt.h
|
||||
include/botan-2/botan/hkdf.h
|
||||
include/botan-2/botan/hmac.h
|
||||
include/botan-2/botan/hmac_drbg.h
|
||||
@ -236,6 +242,7 @@ include/botan-2/botan/sm2.h
|
||||
include/botan-2/botan/sm2_enc.h
|
||||
include/botan-2/botan/sm3.h
|
||||
include/botan-2/botan/sm4.h
|
||||
include/botan-2/botan/sodium.h
|
||||
include/botan-2/botan/sp800_108.h
|
||||
include/botan-2/botan/sp800_56a.h
|
||||
include/botan-2/botan/sp800_56c.h
|
||||
|
Loading…
Reference in New Issue
Block a user