Index: Makefile =================================================================== --- Makefile (revision 498334) +++ Makefile (working copy) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= botan -DISTVERSION= 2.9.0 +DISTVERSION= 2.10.0 +PORTREVISION= 0 CATEGORIES= security MASTER_SITES= http://botan.randombit.net/releases/ PKGNAMESUFFIX= 2 @@ -30,6 +31,9 @@ --cc=${COMPILER_TYPE} LDFLAGS+= -pthread +SHLIBVER= ${DISTVERSION:S/./ /g:[2]} +PLIST_SUB= SHLIBVER=${SHLIBVER} + DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= * @@ -60,6 +64,6 @@ ${WRKSRC}/src/build-data/cc/clang.txt post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.9.9.0 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${SHLIBVER}.${SHLIBVER}.0 .include Index: distinfo =================================================================== --- distinfo (revision 498334) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547467989 -SHA256 (Botan-2.9.0.tgz) = 305564352334dd63ae63db039077d96ae52dfa57a3248871081719b6a9f2d119 -SIZE (Botan-2.9.0.tgz) = 7216373 +TIMESTAMP = 1554050060 +SHA256 (Botan-2.10.0.tgz) = 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31 +SIZE (Botan-2.10.0.tgz) = 7240021 Index: files/patch-boost170compat =================================================================== --- files/patch-boost170compat (nonexistent) +++ files/patch-boost170compat (working copy) @@ -0,0 +1,50 @@ +boost 1.70 compatibility (accepted upstream) +https://github.com/randombit/botan/pull/1881 +--- src/cli/tls_http_server.cpp.orig 2019-03-30 08:39:06 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-03-30 08:39:06 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: files/patch-boost170compat ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 498334) +++ pkg-plist (working copy) @@ -308,7 +308,7 @@ include/botan-2/botan/zlib.h lib/libbotan-2.a lib/libbotan-2.so -lib/libbotan-2.so.9 -lib/libbotan-2.so.9.9.0 +lib/libbotan-2.so.%%SHLIBVER%% +lib/libbotan-2.so.%%SHLIBVER%%.%%SHLIBVER%%.0 %%PYTHON_SITELIBDIR%%/botan2.py libdata/pkgconfig/botan-2.pc