From 6e35cf03c88a3d05486283c6ca645442965dfb81 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Wed, 1 Dec 2021 23:35:52 -0500 Subject: [PATCH] d/p/system_mbedtls_only: Patch out use of local mbed TLS headers ... which formally rename all symbols. --- debian/changelog | 4 +++- debian/patches/system_mbedtls_only | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69d2f9aa..b53add54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ ncbi-blast+ (2.12.0+ds-2) UNRELEASED; urgency=medium * NOT RELEASED YET. * Clean up spurious release-status comment from 2.12.0+ds-1. + * debian/patches/system_mbedtls_only: Patch out use of local mbed TLS + headers, which formally rename all symbols. - -- Aaron M. Ucko Wed, 01 Dec 2021 23:30:19 -0500 + -- Aaron M. Ucko Wed, 01 Dec 2021 23:35:51 -0500 ncbi-blast+ (2.12.0+ds-1) unstable; urgency=medium diff --git a/debian/patches/system_mbedtls_only b/debian/patches/system_mbedtls_only index 68cccaeb..394f3eaf 100644 --- a/debian/patches/system_mbedtls_only +++ b/debian/patches/system_mbedtls_only @@ -1,5 +1,5 @@ Author: Aaron M. Ucko -Date: Sun Feb 3 21:43:23 2019 -0500 +Date: Wed, 01 Dec 2021 23:33:11 -0500 Subject: Omit convenience mbed TLS copy --- a/c++/src/connect/Makefile.connssl.lib +++ b/c++/src/connect/Makefile.connssl.lib @@ -14,3 +14,21 @@ Subject: Omit convenience mbed TLS copy mbedtls/aes mbedtls/aesni mbedtls/arc4 mbedtls/asn1parse \ mbedtls/asn1write mbedtls/base64 mbedtls/bignum mbedtls/blowfish \ mbedtls/camellia mbedtls/ccm mbedtls/cipher mbedtls/cipher_wrap \ +--- a/c++/src/connect/connect_misc_impl.hpp ++++ b/c++/src/connect/connect_misc_impl.hpp +@@ -30,11 +30,10 @@ + * + */ + +-#include "mbedtls/mbedtls/ncbicxx_rename_mbedtls.h" +-#include "mbedtls/mbedtls/error.h" +-#include "mbedtls/mbedtls/ctr_drbg.h" +-#include "mbedtls/mbedtls/entropy.h" +-#include "mbedtls/mbedtls/ssl.h" ++#include ++#include ++#include ++#include + + #include + -- 2.30.2