Attachment #207617 for bug #240557




# $FreeBSD$

PORTNAME=	botan
DISTVERSION=	2.11.0
PORTREVISION=	4
CATEGORIES=	security
MASTER_SITES=	http://botan.randombit.net/releases/
PKGNAMESUFFIX=	2

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/license.txt

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:xz
SHEBANG_FILES=	configure.py src/scripts/install.py
HAS_CONFIGURE=	yes
USE_LDCONFIG=	yes

SHEBANG_FILES=	configure.py src/scripts/install.py

HAS_CONFIGURE=		yes
CONFIGURE_SCRIPT=	configure.py
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

DOCSDIR=	${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION}
PLIST_SUB=	SHLIBVER=${SHLIBVER}

_SHLIBVER=	${DISTVERSION:S/./ /g:[2]}
PLIST_SUB=	SHLIBVER=${_SHLIBVER}
PORTDOCS=	*

OPTIONS_DEFINE=		DOCS SQLITE3 SSL

		${WRKSRC}/src/build-data/cc/clang.txt

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${_SHLIBVER}.${_SHLIBVER}.0

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1554050060	1	TIMESTAMP = 1568364010
2	SHA256 (Botan-2.10.0.tgz) = 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31	2	SHA256 (Botan-2.11.0.tar.xz) = f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be
3	SIZE (Botan-2.10.0.tgz) = 7240021	3	SIZE (Botan-2.11.0.tar.xz) = 5765712




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,




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/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/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/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/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

Return to bug 240557

Lines 1-8 Link Here

(-)Makefile (-15 / +18 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= botan	3	PORTNAME= botan
4	DISTVERSION= 2.10.0	4	DISTVERSION= 2.11.0
5	PORTREVISION= 4
6	CATEGORIES= security	5	CATEGORIES= security
7	MASTER_SITES= http://botan.randombit.net/releases/	6	MASTER_SITES= http://botan.randombit.net/releases/
8	PKGNAMESUFFIX= 2	7	PKGNAMESUFFIX= 2
Lines 14-39 Link Here
14	LICENSE= BSD2CLAUSE	13	LICENSE= BSD2CLAUSE
15	LICENSE_FILE= ${WRKSRC}/license.txt	14	LICENSE_FILE= ${WRKSRC}/license.txt
16		15
17	BROKEN_armv6= include/arm_neon.h:28:2: error: "NEON support not enabled"	16	BROKEN_armv6= include/arm_neon.h:28:2: error: "NEON support not enabled"
18		17
19	LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs	18	LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs
20		19
21	USES= compiler:c++11-lang gmake python:build shebangfix tar:tgz	20	USES= compiler:c++11-lang gmake python:build shebangfix tar:xz
22	SHEBANG_FILES= configure.py src/scripts/install.py
23	HAS_CONFIGURE= yes
24	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
25		22
		23	SHEBANG_FILES= configure.py src/scripts/install.py
		24
		25	HAS_CONFIGURE= yes
26	CONFIGURE_SCRIPT= configure.py	26	CONFIGURE_SCRIPT= configure.py
27	CONFIGURE_ARGS= --with-external-includedir=${PREFIX}/include \	27	CONFIGURE_ARGS= --cc=${COMPILER_TYPE} \
28	--with-external-libdir=${PREFIX}/lib \	28	--with-boost \
29	--with-boost --with-bzip2 --with-lzma --with-zlib \	29	--with-bzip2 \
30	--cc=${COMPILER_TYPE}	30	--with-external-includedir=${LOCALBASE}/include \
31	LDFLAGS+= -pthread	31	--with-external-libdir=${LOCALBASE}/lib \
		32	--with-lzma \
		33	--with-zlib
		34	LDFLAGS+= -pthread
32		35
33	SHLIBVER= ${DISTVERSION:S/./ /g:[2]}	36	DOCSDIR= ${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION}
34	PLIST_SUB= SHLIBVER=${SHLIBVER}
35		37
36	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}	38	_SHLIBVER= ${DISTVERSION:S/./ /g:[2]}
		39	PLIST_SUB= SHLIBVER=${_SHLIBVER}
37	PORTDOCS= *	40	PORTDOCS= *
38		41
39	OPTIONS_DEFINE= DOCS SQLITE3 SSL	42	OPTIONS_DEFINE= DOCS SQLITE3 SSL
Lines 63-68 Link Here
63	${WRKSRC}/src/build-data/cc/clang.txt	66	${WRKSRC}/src/build-data/cc/clang.txt
64		67
65	post-install:	68	post-install:
66	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${SHLIBVER}.${SHLIBVER}.0	69	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${_SHLIBVER}.${_SHLIBVER}.0
67		70
68	.include <bsd.port.mk>	71	.include <bsd.port.mk>

Lines 1-51 Link Here

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

Lines 3-9 Link Here

(-)pkg-plist (-2 / +9 lines)
3	include/botan-2/botan/aead.h	3	include/botan-2/botan/aead.h
4	include/botan-2/botan/aes.h	4	include/botan-2/botan/aes.h
5	include/botan-2/botan/alg_id.h	5	include/botan-2/botan/alg_id.h
		6	include/botan-2/botan/argon2.h
6	include/botan-2/botan/aria.h	7	include/botan-2/botan/aria.h
		8	include/botan-2/botan/asio_async_ops.h
		9	include/botan-2/botan/asio_context.h
		10	include/botan-2/botan/asio_error.h
		11	include/botan-2/botan/asio_stream.h
7	include/botan-2/botan/asn1_alt_name.h	12	include/botan-2/botan/asn1_alt_name.h
8	include/botan-2/botan/asn1_attribute.h	13	include/botan-2/botan/asn1_attribute.h
9	include/botan-2/botan/asn1_obj.h	14	include/botan-2/botan/asn1_obj.h
Lines 14-25 Link Here
14	include/botan-2/botan/assert.h	19	include/botan-2/botan/assert.h
15	include/botan-2/botan/atomic.h	20	include/botan-2/botan/atomic.h
16	include/botan-2/botan/auto_rng.h	21	include/botan-2/botan/auto_rng.h
17	include/botan-2/botan/b64_filt.h
18	include/botan-2/botan/base32.h	22	include/botan-2/botan/base32.h
19	include/botan-2/botan/base58.h	23	include/botan-2/botan/base58.h
20	include/botan-2/botan/base64.h	24	include/botan-2/botan/base64.h
21	include/botan-2/botan/basefilt.h	25	include/botan-2/botan/basefilt.h
22	include/botan-2/botan/bcrypt.h	26	include/botan-2/botan/bcrypt.h
		27	include/botan-2/botan/bcrypt_pbkdf.h
23	include/botan-2/botan/ber_dec.h	28	include/botan-2/botan/ber_dec.h
24	include/botan-2/botan/bigint.h	29	include/botan-2/botan/bigint.h
25	include/botan-2/botan/blake2b.h	30	include/botan-2/botan/blake2b.h
Lines 43-48 Link Here
43	include/botan-2/botan/cecpq1.h	48	include/botan-2/botan/cecpq1.h
44	include/botan-2/botan/cert_status.h	49	include/botan-2/botan/cert_status.h
45	include/botan-2/botan/certstor.h	50	include/botan-2/botan/certstor.h
		51	include/botan-2/botan/certstor_flatfile.h
		52	include/botan-2/botan/certstor_system.h
46	include/botan-2/botan/certstor_sql.h	53	include/botan-2/botan/certstor_sql.h
47	%%SQLITE3%%include/botan-2/botan/certstor_sqlite.h	54	%%SQLITE3%%include/botan-2/botan/certstor_sqlite.h
48	include/botan-2/botan/cfb.h	55	include/botan-2/botan/cfb.h
Lines 116-122 Link Here
116	include/botan-2/botan/hash.h	123	include/botan-2/botan/hash.h
117	include/botan-2/botan/hash_id.h	124	include/botan-2/botan/hash_id.h
118	include/botan-2/botan/hex.h	125	include/botan-2/botan/hex.h
119	include/botan-2/botan/hex_filt.h
120	include/botan-2/botan/hkdf.h	126	include/botan-2/botan/hkdf.h
121	include/botan-2/botan/hmac.h	127	include/botan-2/botan/hmac.h
122	include/botan-2/botan/hmac_drbg.h	128	include/botan-2/botan/hmac_drbg.h
Lines 236-241 Link Here
236	include/botan-2/botan/sm2_enc.h	242	include/botan-2/botan/sm2_enc.h
237	include/botan-2/botan/sm3.h	243	include/botan-2/botan/sm3.h
238	include/botan-2/botan/sm4.h	244	include/botan-2/botan/sm4.h
		245	include/botan-2/botan/sodium.h
239	include/botan-2/botan/sp800_108.h	246	include/botan-2/botan/sp800_108.h
240	include/botan-2/botan/sp800_56a.h	247	include/botan-2/botan/sp800_56a.h
241	include/botan-2/botan/sp800_56c.h	248	include/botan-2/botan/sp800_56c.h