Index: head/security/botan2/files/patch-boost-1.70
===================================================================
--- head/security/botan2/files/patch-boost-1.70	(revision 512343)
+++ head/security/botan2/files/patch-boost-1.70	(nonexistent)
@@ -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,

Property changes on: head/security/botan2/files/patch-boost-1.70
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/botan2/Makefile
===================================================================
--- head/security/botan2/Makefile	(revision 512343)
+++ head/security/botan2/Makefile	(revision 512344)
@@ -1,68 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	botan
-DISTVERSION=	2.10.0
-PORTREVISION=	4
+DISTVERSION=	2.11.0
 CATEGORIES=	security
 MASTER_SITES=	http://botan.randombit.net/releases/
 PKGNAMESUFFIX=	2
 DISTNAME=	Botan-${PORTVERSION}
 
 MAINTAINER=	tremere@cainites.net
 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
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=		yes
 
 SQLITE3_USES=		sqlite
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	openssl
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
 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
 PLIST_SUB+=	HAS_RDRAND_RNG="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^optimization_flags .*|optimization_flags "${CXXFLAGS}"|' \
 		${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>
Index: head/security/botan2/distinfo
===================================================================
--- head/security/botan2/distinfo	(revision 512343)
+++ head/security/botan2/distinfo	(revision 512344)
@@ -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
Index: head/security/botan2/pkg-plist
===================================================================
--- head/security/botan2/pkg-plist	(revision 512343)
+++ head/security/botan2/pkg-plist	(revision 512344)
@@ -1,314 +1,321 @@
 bin/botan
 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
 include/botan-2/botan/asn1_oid.h
 include/botan-2/botan/asn1_print.h
 include/botan-2/botan/asn1_str.h
 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
 include/botan-2/botan/blinding.h
 include/botan-2/botan/block_cipher.h
 include/botan-2/botan/blowfish.h
 include/botan-2/botan/botan.h
 include/botan-2/botan/bswap.h
 include/botan-2/botan/buf_comp.h
 include/botan-2/botan/buf_filt.h
 include/botan-2/botan/build.h
 include/botan-2/botan/bzip2.h
 include/botan-2/botan/calendar.h
 include/botan-2/botan/camellia.h
 include/botan-2/botan/cascade.h
 include/botan-2/botan/cast128.h
 include/botan-2/botan/cast256.h
 include/botan-2/botan/cbc.h
 include/botan-2/botan/cbc_mac.h
 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
 include/botan-2/botan/chacha.h
 include/botan-2/botan/chacha20poly1305.h
 include/botan-2/botan/chacha_rng.h
 include/botan-2/botan/charset.h
 include/botan-2/botan/cipher_filter.h
 include/botan-2/botan/cipher_mode.h
 include/botan-2/botan/cmac.h
 include/botan-2/botan/comb4p.h
 include/botan-2/botan/comp_filter.h
 include/botan-2/botan/compiler.h
 include/botan-2/botan/compression.h
 include/botan-2/botan/cpuid.h
 include/botan-2/botan/crc24.h
 include/botan-2/botan/crc32.h
 include/botan-2/botan/credentials_manager.h
 include/botan-2/botan/crl_ent.h
 include/botan-2/botan/cryptobox.h
 include/botan-2/botan/ctr.h
 include/botan-2/botan/curve25519.h
 include/botan-2/botan/curve_gfp.h
 include/botan-2/botan/curve_nistp.h
 include/botan-2/botan/data_snk.h
 include/botan-2/botan/data_src.h
 include/botan-2/botan/database.h
 include/botan-2/botan/datastor.h
 include/botan-2/botan/der_enc.h
 include/botan-2/botan/des.h
 include/botan-2/botan/desx.h
 include/botan-2/botan/dh.h
 include/botan-2/botan/divide.h
 include/botan-2/botan/dl_algo.h
 include/botan-2/botan/dl_group.h
 include/botan-2/botan/dlies.h
 include/botan-2/botan/dsa.h
 include/botan-2/botan/dyn_load.h
 include/botan-2/botan/eax.h
 include/botan-2/botan/ec_group.h
 include/botan-2/botan/ecc_key.h
 include/botan-2/botan/ecdh.h
 include/botan-2/botan/ecdsa.h
 include/botan-2/botan/ecgdsa.h
 include/botan-2/botan/ecies.h
 include/botan-2/botan/eckcdsa.h
 include/botan-2/botan/ed25519.h
 include/botan-2/botan/elgamal.h
 include/botan-2/botan/eme.h
 include/botan-2/botan/eme_pkcs.h
 include/botan-2/botan/eme_raw.h
 include/botan-2/botan/emsa.h
 include/botan-2/botan/emsa1.h
 include/botan-2/botan/emsa_pkcs1.h
 include/botan-2/botan/emsa_raw.h
 include/botan-2/botan/emsa_x931.h
 include/botan-2/botan/entropy_src.h
 include/botan-2/botan/exceptn.h
 include/botan-2/botan/fd_unix.h
 include/botan-2/botan/ffi.h
 include/botan-2/botan/filter.h
 include/botan-2/botan/filters.h
 include/botan-2/botan/fpe_fe1.h
 include/botan-2/botan/gcm.h
 include/botan-2/botan/gf2m_small_m.h
 include/botan-2/botan/ghash.h
 include/botan-2/botan/gmac.h
 include/botan-2/botan/gost_28147.h
 include/botan-2/botan/gost_3410.h
 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
 include/botan-2/botan/hotp.h
 include/botan-2/botan/http_util.h
 include/botan-2/botan/idea.h
 include/botan-2/botan/init.h
 include/botan-2/botan/iso9796.h
 include/botan-2/botan/kasumi.h
 include/botan-2/botan/kdf.h
 include/botan-2/botan/kdf1.h
 include/botan-2/botan/kdf1_iso18033.h
 include/botan-2/botan/kdf2.h
 include/botan-2/botan/keccak.h
 include/botan-2/botan/key_constraint.h
 include/botan-2/botan/key_filt.h
 include/botan-2/botan/key_spec.h
 include/botan-2/botan/keypair.h
 include/botan-2/botan/lion.h
 include/botan-2/botan/loadstor.h
 include/botan-2/botan/locking_allocator.h
 include/botan-2/botan/lookup.h
 include/botan-2/botan/lzma.h
 include/botan-2/botan/mac.h
 include/botan-2/botan/mceies.h
 include/botan-2/botan/mceliece.h
 include/botan-2/botan/md4.h
 include/botan-2/botan/md5.h
 include/botan-2/botan/mdx_hash.h
 include/botan-2/botan/mem_ops.h
 include/botan-2/botan/mgf1.h
 include/botan-2/botan/misty1.h
 include/botan-2/botan/mode_pad.h
 include/botan-2/botan/monty.h
 include/botan-2/botan/mul128.h
 include/botan-2/botan/mutex.h
 include/botan-2/botan/name_constraint.h
 include/botan-2/botan/newhope.h
 include/botan-2/botan/nist_keywrap.h
 include/botan-2/botan/noekeon.h
 include/botan-2/botan/numthry.h
 include/botan-2/botan/oaep.h
 include/botan-2/botan/ocb.h
 include/botan-2/botan/ocsp.h
 include/botan-2/botan/ocsp_types.h
 include/botan-2/botan/ofb.h
 include/botan-2/botan/oids.h
 include/botan-2/botan/p11.h
 include/botan-2/botan/p11_ecc_key.h
 include/botan-2/botan/p11_ecdh.h
 include/botan-2/botan/p11_ecdsa.h
 include/botan-2/botan/p11_module.h
 include/botan-2/botan/p11_object.h
 include/botan-2/botan/p11_randomgenerator.h
 include/botan-2/botan/p11_rsa.h
 include/botan-2/botan/p11_session.h
 include/botan-2/botan/p11_slot.h
 include/botan-2/botan/p11_x509.h
 include/botan-2/botan/package.h
 include/botan-2/botan/par_hash.h
 include/botan-2/botan/parsing.h
 include/botan-2/botan/passhash9.h
 include/botan-2/botan/pbes2.h
 include/botan-2/botan/pbkdf.h
 include/botan-2/botan/pbkdf1.h
 include/botan-2/botan/pbkdf2.h
 include/botan-2/botan/pem.h
 include/botan-2/botan/pgp_s2k.h
 include/botan-2/botan/pipe.h
 include/botan-2/botan/pk_algs.h
 include/botan-2/botan/pk_keys.h
 include/botan-2/botan/pk_ops.h
 include/botan-2/botan/pk_ops_fwd.h
 include/botan-2/botan/pkcs10.h
 include/botan-2/botan/pkcs11.h
 include/botan-2/botan/pkcs11f.h
 include/botan-2/botan/pkcs11t.h
 include/botan-2/botan/pkcs8.h
 include/botan-2/botan/point_gfp.h
 include/botan-2/botan/poly1305.h
 include/botan-2/botan/polyn_gf2m.h
 include/botan-2/botan/pow_mod.h
 include/botan-2/botan/prf_tls.h
 include/botan-2/botan/prf_x942.h
 include/botan-2/botan/psk_db.h
 include/botan-2/botan/psk_db_sql.h
 include/botan-2/botan/pssr.h
 include/botan-2/botan/pubkey.h
 include/botan-2/botan/pwdhash.h
 include/botan-2/botan/rc4.h
 %%HAS_RDRAND_RNG%%include/botan-2/botan/rdrand_rng.h
 include/botan-2/botan/reducer.h
 include/botan-2/botan/rfc3394.h
 include/botan-2/botan/rfc6979.h
 include/botan-2/botan/rmd160.h
 include/botan-2/botan/rng.h
 include/botan-2/botan/rotate.h
 include/botan-2/botan/rsa.h
 include/botan-2/botan/salsa20.h
 include/botan-2/botan/scan_name.h
 include/botan-2/botan/scrypt.h
 include/botan-2/botan/secmem.h
 include/botan-2/botan/secqueue.h
 include/botan-2/botan/seed.h
 include/botan-2/botan/serpent.h
 include/botan-2/botan/sha160.h
 include/botan-2/botan/sha2_32.h
 include/botan-2/botan/sha2_64.h
 include/botan-2/botan/sha3.h
 include/botan-2/botan/shacal2.h
 include/botan-2/botan/shake.h
 include/botan-2/botan/shake_cipher.h
 include/botan-2/botan/siphash.h
 include/botan-2/botan/siv.h
 include/botan-2/botan/skein_512.h
 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
 %%SQLITE3%%include/botan-2/botan/sqlite3.h
 include/botan-2/botan/srp6.h
 include/botan-2/botan/stateful_rng.h
 include/botan-2/botan/stl_compatibility.h
 include/botan-2/botan/stream_cipher.h
 include/botan-2/botan/stream_mode.h
 include/botan-2/botan/streebog.h
 include/botan-2/botan/sym_algo.h
 include/botan-2/botan/symkey.h
 include/botan-2/botan/system_rng.h
 include/botan-2/botan/threefish.h
 include/botan-2/botan/threefish_512.h
 include/botan-2/botan/tiger.h
 include/botan-2/botan/tls_alert.h
 include/botan-2/botan/tls_algos.h
 include/botan-2/botan/tls_blocking.h
 include/botan-2/botan/tls_callbacks.h
 include/botan-2/botan/tls_channel.h
 include/botan-2/botan/tls_ciphersuite.h
 include/botan-2/botan/tls_client.h
 include/botan-2/botan/tls_exceptn.h
 include/botan-2/botan/tls_extensions.h
 include/botan-2/botan/tls_handshake_msg.h
 include/botan-2/botan/tls_magic.h
 include/botan-2/botan/tls_messages.h
 include/botan-2/botan/tls_policy.h
 include/botan-2/botan/tls_server.h
 include/botan-2/botan/tls_server_info.h
 include/botan-2/botan/tls_session.h
 include/botan-2/botan/tls_session_manager.h
 include/botan-2/botan/tls_session_manager_sql.h
 %%SQLITE3%%include/botan-2/botan/tls_session_manager_sqlite.h
 include/botan-2/botan/tls_version.h
 include/botan-2/botan/totp.h
 include/botan-2/botan/tss.h
 include/botan-2/botan/twofish.h
 include/botan-2/botan/types.h
 include/botan-2/botan/uuid.h
 include/botan-2/botan/version.h
 include/botan-2/botan/whrlpool.h
 include/botan-2/botan/workfactor.h
 include/botan-2/botan/x509_ca.h
 include/botan-2/botan/x509_crl.h
 include/botan-2/botan/x509_dn.h
 include/botan-2/botan/x509_ext.h
 include/botan-2/botan/x509_key.h
 include/botan-2/botan/x509_obj.h
 include/botan-2/botan/x509cert.h
 include/botan-2/botan/x509path.h
 include/botan-2/botan/x509self.h
 include/botan-2/botan/x919_mac.h
 include/botan-2/botan/xmss.h
 include/botan-2/botan/xmss_address.h
 include/botan-2/botan/xmss_common_ops.h
 include/botan-2/botan/xmss_hash.h
 include/botan-2/botan/xmss_index_registry.h
 include/botan-2/botan/xmss_key_pair.h
 include/botan-2/botan/xmss_parameters.h
 include/botan-2/botan/xmss_privatekey.h
 include/botan-2/botan/xmss_publickey.h
 include/botan-2/botan/xmss_tools.h
 include/botan-2/botan/xmss_wots_parameters.h
 include/botan-2/botan/xmss_wots_privatekey.h
 include/botan-2/botan/xmss_wots_publickey.h
 include/botan-2/botan/xtea.h
 include/botan-2/botan/xts.h
 include/botan-2/botan/zlib.h
 lib/libbotan-2.a
 lib/libbotan-2.so
 lib/libbotan-2.so.%%SHLIBVER%%
 lib/libbotan-2.so.%%SHLIBVER%%.%%SHLIBVER%%.0
 %%PYTHON_SITELIBDIR%%/botan2.py
 libdata/pkgconfig/botan-2.pc