Page MenuHomeFreeBSD

D20875.diff
No OneTemporary

D20875.diff

Index: security/botan2/Makefile
===================================================================
--- security/botan2/Makefile
+++ security/botan2/Makefile
@@ -1,11 +1,9 @@
# $FreeBSD$
PORTNAME= botan
-DISTVERSION= 2.10.0
-PORTREVISION= 2
+DISTVERSION= 2.11.0
CATEGORIES= security
MASTER_SITES= http://botan.randombit.net/releases/
-PKGNAMESUFFIX= 2
DISTNAME= Botan-${PORTVERSION}
MAINTAINER= tremere@cainites.net
@@ -18,7 +16,7 @@
LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs
-USES= compiler:c++11-lang gmake python:build shebangfix tar:tgz
+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
Index: security/botan2/distinfo
===================================================================
--- security/botan2/distinfo
+++ security/botan2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554050060
-SHA256 (Botan-2.10.0.tgz) = 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31
-SIZE (Botan-2.10.0.tgz) = 7240021
+TIMESTAMP = 1562512213
+SHA256 (Botan-2.11.0.tar.xz) = f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be
+SIZE (Botan-2.11.0.tar.xz) = 5765712
Index: security/botan2/files/patch-boost-1.70
===================================================================
--- security/botan2/files/patch-boost-1.70
+++ /dev/null
@@ -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,
Index: security/botan2/pkg-plist
===================================================================
--- security/botan2/pkg-plist
+++ security/botan2/pkg-plist
@@ -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,7 +48,9 @@
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_sql.h
+include/botan-2/botan/certstor_system.h
%%SQLITE3%%include/botan-2/botan/certstor_sqlite.h
include/botan-2/botan/cfb.h
include/botan-2/botan/chacha.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

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 19, 4:16 PM (41 m, 16 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29955298
Default Alt Text
D20875.diff (4 KB)

Event Timeline