Index: security/botan2/Makefile =================================================================== --- security/botan2/Makefile +++ security/botan2/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= botan -DISTVERSION= 2.10.0 -PORTREVISION= 2 +DISTVERSION= 2.11.0 CATEGORIES= security MASTER_SITES= http://botan.randombit.net/releases/ -PKGNAMESUFFIX= 2 DISTNAME= Botan-${PORTVERSION} MAINTAINER= tremere@cainites.net @@ -18,7 +16,7 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs -USES= compiler:c++11-lang gmake python:build shebangfix tar:tgz +USES= compiler:c++11-lang gmake python:build shebangfix tar:xz SHEBANG_FILES= configure.py src/scripts/install.py HAS_CONFIGURE= yes USE_LDCONFIG= yes Index: security/botan2/distinfo =================================================================== --- security/botan2/distinfo +++ security/botan2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554050060 -SHA256 (Botan-2.10.0.tgz) = 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31 -SIZE (Botan-2.10.0.tgz) = 7240021 +TIMESTAMP = 1562512213 +SHA256 (Botan-2.11.0.tar.xz) = f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be +SIZE (Botan-2.11.0.tar.xz) = 5765712 Index: security/botan2/files/patch-boost-1.70 =================================================================== --- security/botan2/files/patch-boost-1.70 +++ /dev/null @@ -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, Index: security/botan2/pkg-plist =================================================================== --- security/botan2/pkg-plist +++ security/botan2/pkg-plist @@ -14,7 +14,6 @@ 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 @@ -116,7 +115,6 @@ 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