d/p/system_mbedtls_only (new): Omit convenience mbed TLS copy

... which is dead weight and yielded a Lintian error.

diff --git a/debian/changelog b/debian/changelog
index 87ec38eac7cb496091f03dfbae2ee2076b1b4d8c..f415c732d8023e53f11c8e281508d7642a18dc54 100644 (file)
--- 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 <ucko@debian.org>  Sun, 03 Feb 2019 21:40:45 -0500
+ -- Aaron M. Ucko <ucko@debian.org>  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 3791ecc74da105397f07a8651a58682cfea642e6..86ad827d3dbb6bcba96938d9ac8d6cc0df8de8f4 100644 (file)
--- 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 (file)
index 0000000..bf2fa79
--- /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 \