From 2b183ea1c0932bbeb7abc6fd1fec52c51e4253fe Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Sun, 3 Feb 2019 21:43:23 -0500 Subject: [PATCH] d/p/system_mbedtls_only (new): Omit convenience mbed TLS copy ... which is dead weight and yielded a Lintian error. --- debian/changelog | 4 +++- debian/patches/series | 1 + debian/patches/system_mbedtls_only | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 debian/patches/system_mbedtls_only diff --git a/debian/changelog b/debian/changelog index 87ec38ea..f415c732 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ ncbi-blast+ (2.8.1-1) UNRELEASED; urgency=medium - Update patches that apply with offsets or outright fuzz, or need full-fledged porting. * debian/patches/fix_lib_deps: Link xcleanup against $(OBJEDIT_LIBS). + * debian/patches/system_mbedtls_only (new): Omit convenience mbed TLS + copy, which is dead weight and yielded a Lintian error. - -- Aaron M. Ucko Sun, 03 Feb 2019 21:40:45 -0500 + -- Aaron M. Ucko Sun, 03 Feb 2019 21:43:22 -0500 ncbi-blast+ (2.7.1-2) unstable; urgency=medium diff --git a/debian/patches/series b/debian/patches/series index 3791ecc7..86ad827d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ suppress_gnutls_version_check optionally_keep_sequence fix_unit_tests #support_boost_1_67 +system_mbedtls_only diff --git a/debian/patches/system_mbedtls_only b/debian/patches/system_mbedtls_only new file mode 100644 index 00000000..bf2fa79a --- /dev/null +++ b/debian/patches/system_mbedtls_only @@ -0,0 +1,13 @@ +--- a/c++/src/connect/Makefile.connssl.lib ++++ b/c++/src/connect/Makefile.connssl.lib +@@ -2,7 +2,9 @@ + + CPPFLAGS = $(TLS_INCLUDE) $(ORIG_CPPFLAGS) + +-SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls \ ++SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls ++ ++SRC_MBEDTLS_UNUSED = \ + 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 \ -- 2.30.2