Move debian/patches/system_mbedtls_only up and extend it.

* debian/patches/series: Move system_mbedtls_only up in conjunction
  with incorporating part of an upstream patch needed by
  support_mbedtls3.
* debian/patches/system_mbedtls: Extend to cover ncbi_mbedtls.c (as in
  https://github.com/ncbi/ncbi-cxx-toolkit-public/commit/f9c7297dd1)
  and Makefile.xxconnect2.lib.

diff --git a/debian/changelog b/debian/changelog
index 068baf86b5937ebf83af17e90f11b85b795e50d7..e5cb7a797f75e8c9f95aceebac2d16986e4a2bb6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,17 @@ ncbi-blast+ (2.15.0+ds-1) UNRELEASED; urgency=medium
   * debian/control: Build against libnghttp2-dev, libsqlite3-dev, and
     libuv1-dev, newly needed.
   * debian/patches: Update for new release, mostly formally.
+  * debian/patches/series: Move system_mbedtls_only up in conjunction with
+    incorporating part of an upstream patch needed by support_mbedtls3.
+  * debian/patches/system_mbedtls: Extend to cover ncbi_mbedtls.c (as in
+    https://github.com/ncbi/ncbi-cxx-toolkit-public/commit/f9c7297dd1)
+    and Makefile.xxconnect2.lib.
+  * debian/rules:
+    - Extend generated-sources cleanup to objtools/eutils (not entirely
+      straightforward due to input format variation).
+    - Tune flags: Add --without-strip to make --with-symbols effective;
+      switch off warnings from __DATE__/__TIME__ usage, since
+      dpkg-buildpackage's SOURCE_DATE_EPOCH injection should suffice.
 
  -- Aaron M. Ucko <ucko@debian.org>  Wed, 17 Jul 2024 21:39:28 -0400
 

diff --git a/debian/patches/series b/debian/patches/series
index e618e55de8edee49ab6069d84977a89fc5f25f12..8c7d9488ecb29fd155e8551cd81408f4b791d98c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+system_mbedtls_only
 optin_usage_report
 enable_clean_after_failed_compile
 hurd_fixes
@@ -11,7 +12,6 @@ support_x32
 suppress_tls_version_checks
 optionally_keep_sequence
 fix_unit_tests
-system_mbedtls_only
 reprobuild
 spelling
 support_gcc10

diff --git a/debian/patches/system_mbedtls_only b/debian/patches/system_mbedtls_only
index b4617dc21d3b8dbdbf6072bcb0c2b6646b399fa3..2f381dd5e14065d653aa525a4443ca19cf57a40b 100644 (file)
--- a/debian/patches/system_mbedtls_only
+++ b/debian/patches/system_mbedtls_only
@@ -34,3 +34,43 @@ Subject: Omit convenience mbed TLS copy
  
  #include <corelib/ncbimisc.hpp>
  
+--- a/c++/src/connect/ncbi_mbedtls.c
++++ b/c++/src/connect/ncbi_mbedtls.c
+@@ -43,7 +43,6 @@
+ 
+ #if defined(HAVE_LIBMBEDTLS)  ||  defined(NCBI_CXX_TOOLKIT)
+ 
+-#  ifdef HAVE_LIBMBEDTLS  /* external */
+ #    include <mbedtls/ctr_drbg.h>
+ #    include <mbedtls/debug.h>
+ #    include <mbedtls/entropy.h>
+@@ -53,17 +52,6 @@
+ #    include <mbedtls/ssl.h>
+ #    include <mbedtls/threading.h>
+ #    include <mbedtls/version.h>
+-#  else                   /* embedded */
+-#    include "mbedtls/mbedtls/ctr_drbg.h"
+-#    include "mbedtls/mbedtls/debug.h"
+-#    include "mbedtls/mbedtls/entropy.h"
+-#    include "mbedtls/mbedtls/error.h"
+-#    include "mbedtls/mbedtls/pk.h"
+-#    include "mbedtls/mbedtls/net_sockets.h"
+-#    include "mbedtls/mbedtls/ssl.h"
+-#    include "mbedtls/mbedtls/threading.h"
+-#    include "mbedtls/mbedtls/version.h"
+-#  endif /*HAVE_LIBMBEDTLS*/
+ 
+ #  if   defined(ENOTSUP)
+ #    define NCBI_NOTSUPPORTED  ENOTSUP
+--- a/c++/src/connect/Makefile.xxconnect2.lib
++++ b/c++/src/connect/Makefile.xxconnect2.lib
+@@ -9,8 +9,7 @@ REQUIRES = LIBUV NGHTTP2
+ LIB_OR_DLL = both
+ DLL_LIB = xconnect
+ 
+-CPPFLAGS = $(LIBUV_INCLUDE) $(NGHTTP2_INCLUDE) $(TLS_INCLUDE) \
+-           -I$(srcdir)/mbedtls $(ORIG_CPPFLAGS)
++CPPFLAGS = $(LIBUV_INCLUDE) $(NGHTTP2_INCLUDE) $(TLS_INCLUDE) $(ORIG_CPPFLAGS)
+ 
+ LIBS = $(XXCONNECT2_LIBS) $(ORIG_LIBS)
+