Attachment 207617 Details for Bug 240557 – Update to Botan 2.11.0 (fixed version)

[patch] Update to Botan 2.11.0 (fixed version)

botan2-2.11.0.diff (text/plain), 6.27 KB, created by Ralf van der Enden on 2019-09-19 07:51:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2019-09-19 07:51:53 UTC

Size: 6.27 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 512316)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	botan
>-DISTVERSION=	2.10.0
>-PORTREVISION=	4
>+DISTVERSION=	2.11.0
> CATEGORIES=	security
> MASTER_SITES=	http://botan.randombit.net/releases/
> PKGNAMESUFFIX=	2
>@@ -14,26 +13,30 @@
> 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
>@@ -63,6 +66,6 @@
> 		${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: distinfo
>===================================================================
>--- distinfo	(revision 512316)
>+++ distinfo	(working copy)
>@@ -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: files/patch-boost-1.70
>===================================================================
>--- files/patch-boost-1.70	(revision 512316)
>+++ 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: 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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 512316)
>+++ pkg-plist	(working copy)
>@@ -3,7 +3,12 @@
> 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
>@@ -14,12 +19,12 @@
> 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
>@@ -43,6 +48,8 @@
> 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
>@@ -116,7 +123,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
>@@ -236,6 +242,7 @@
> 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

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 240557: 207456 | 207457 | 207617