Attachment #203467 for bug #237019

View | Details | Raw Unified | Return to bug 237019
Collapse All | Expand All

Lines 1-7 Link Here

(-)Makefile (-2 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= botan	3	PORTNAME= botan
4	DISTVERSION= 2.9.0	4	DISTVERSION= 2.10.0
		5	PORTREVISION= 0
5	CATEGORIES= security	6	CATEGORIES= security
6	MASTER_SITES= http://botan.randombit.net/releases/	7	MASTER_SITES= http://botan.randombit.net/releases/
7	PKGNAMESUFFIX= 2	8	PKGNAMESUFFIX= 2
Lines 30-35 Link Here
30	--cc=${COMPILER_TYPE}	31	--cc=${COMPILER_TYPE}
31	LDFLAGS+= -pthread	32	LDFLAGS+= -pthread
32		33
		34	SHLIBVER= ${DISTVERSION:S/./ /g:[2]}
		35	PLIST_SUB= SHLIBVER=${SHLIBVER}
		36
33	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}	37	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
34	PORTDOCS= *	38	PORTDOCS= *
35		39
Lines 60-65 Link Here
60	${WRKSRC}/src/build-data/cc/clang.txt	64	${WRKSRC}/src/build-data/cc/clang.txt
61		65
62	post-install:	66	post-install:
63	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.9.9.0	67	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${SHLIBVER}.${SHLIBVER}.0
64		68
65	.include <bsd.port.mk>	69	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1547467989	1	TIMESTAMP = 1554050060
2	SHA256 (Botan-2.9.0.tgz) = 305564352334dd63ae63db039077d96ae52dfa57a3248871081719b6a9f2d119	2	SHA256 (Botan-2.10.0.tgz) = 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31
3	SIZE (Botan-2.9.0.tgz) = 7216373	3	SIZE (Botan-2.10.0.tgz) = 7240021




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,

Lines 308-314 Link Here

(-)pkg-plist (-2 / +2 lines)
308	include/botan-2/botan/zlib.h	308	include/botan-2/botan/zlib.h
309	lib/libbotan-2.a	309	lib/libbotan-2.a
310	lib/libbotan-2.so	310	lib/libbotan-2.so
311	lib/libbotan-2.so.9	311	lib/libbotan-2.so.%%SHLIBVER%%
312	lib/libbotan-2.so.9.9.0	312	lib/libbotan-2.so.%%SHLIBVER%%.%%SHLIBVER%%.0
313	%%PYTHON_SITELIBDIR%%/botan2.py	313	%%PYTHON_SITELIBDIR%%/botan2.py
314	libdata/pkgconfig/botan-2.pc	314	libdata/pkgconfig/botan-2.pc

Return to bug 237019

Line 0 Link Here

(-)files/patch-boost170compat (+50 lines)
	1	boost 1.70 compatibility (accepted upstream)
	2	https://github.com/randombit/botan/pull/1881
	3	--- src/cli/tls_http_server.cpp.orig 2019-03-30 08:39:06 UTC
	4	+++ src/cli/tls_http_server.cpp
	5	@@ -41,6 +41,12 @@
	6
	7	#include "credentials.h"
	8
	9	+#if BOOST_VERSION >= 107000
	10	+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
	11	+#else
	12	+#define GET_IO_SERVICE(s) ((s).get_io_service())
	13	+#endif
	14	+
	15	namespace Botan_CLI {
	16
	17	namespace {
	18	@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final
	19	session::pointer make_session()
	20	{
	21	return session::create(
	22	- m_acceptor.get_io_service(),
	23	+ GET_IO_SERVICE(m_acceptor),
	24	m_session_manager,
	25	m_creds,
	26	m_policy);
	27	--- src/cli/tls_proxy.cpp.orig 2019-03-30 08:39:06 UTC
	28	+++ src/cli/tls_proxy.cpp
	29	@@ -33,6 +33,12 @@
	30
	31	#include "credentials.h"
	32
	33	+#if BOOST_VERSION >= 107000
	34	+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
	35	+#else
	36	+#define GET_IO_SERVICE(s) ((s).get_io_service())
	37	+#endif
	38	+
	39	namespace Botan_CLI {
	40
	41	namespace {
	42	@@ -370,7 +376,7 @@ class tls_proxy_server final
	43	session::pointer make_session()
	44	{
	45	return session::create(
	46	- m_acceptor.get_io_service(),
	47	+ GET_IO_SERVICE(m_acceptor),
	48	m_session_manager,
	49	m_creds,
	50	m_policy,