Refresh patches after prepending allow_pcre2 and support_mbedtls3.

diff --git a/debian/patches/fix_lib_deps b/debian/patches/fix_lib_deps
index b90c0a397f0e9806b21ea0640eaf502f70219816..7780f29bff9b35d508a6dfd7f1831dea6b17c23b 100644 (file)
--- a/debian/patches/fix_lib_deps
+++ b/debian/patches/fix_lib_deps
@@ -478,11 +478,11 @@ Last-Update: 2016-12-05
 +++ b/c++/src/util/xregexp/Makefile.xregexp.lib
 @@ -5,7 +5,7 @@ LIB = xregexp
  
- CPPFLAGS = $(ORIG_CPPFLAGS) $(PCRE_INCLUDE)
+ CPPFLAGS = $(ORIG_CPPFLAGS) $(PCRE_INCLUDE) $(PCRE2_INCLUDE)
  
 -DLL_LIB = $(PCRE_LIB) xutil
 +DLL_LIB = $(PCRE_LIB) xutil xncbi
- LIBS    = $(PCRE_LIBS)
+ LIBS    = $(PCRE_LIBS) $(PCRE2_LIBS)
  
  USES_LIBRARIES =  \
 --- a/c++/src/objtools/readers/Makefile.xobjread.lib

diff --git a/debian/patches/hurd_fixes b/debian/patches/hurd_fixes
index 7c7ac40fb3e501ca50d935a8ffde94c6d3574646..a9fccde724b0a608112d6089ac08585025733174 100644 (file)
--- a/debian/patches/hurd_fixes
+++ b/debian/patches/hurd_fixes
@@ -20,7 +20,7 @@ Last-Update: 2020-09-19
      irix*:* | linux*:KCC | *:Compaq )
 --- a/c++/src/build-system/configure.ac
 +++ b/c++/src/build-system/configure.ac
-@@ -2419,7 +2419,7 @@ if test -z "$CONF_f_runpath" ; then
+@@ -2424,7 +2424,7 @@ if test -z "$CONF_f_runpath" ; then
        CONF_f_runpath="-R"
        ;;
      linux*:[[GI]]CC | linux*Clang | *bsd*:GCC | *bsd*Clang | cygwin*:GCC \

diff --git a/debian/patches/no_multiarch_rpath b/debian/patches/no_multiarch_rpath
index 842d3978790e919d738ab2f158a37a4530c870a8..8423cd88008b8b4ecd37bb4e9affef98adfda646 100644 (file)
--- a/debian/patches/no_multiarch_rpath
+++ b/debian/patches/no_multiarch_rpath
@@ -21,7 +21,7 @@ Last-Update: 2011-08-28
          esac
 --- a/c++/src/build-system/configure.ac
 +++ b/c++/src/build-system/configure.ac
-@@ -2486,7 +2486,7 @@ case "$compiler:$compiler_version:$with_
+@@ -2491,7 +2491,7 @@ case "$compiler:$compiler_version:$with_
                 break
                 ;;
              /* )

diff --git a/debian/patches/suppress_tls_version_checks b/debian/patches/suppress_tls_version_checks
index 39dc4b5a224cfae079195da3b8e6308ba13b8560..6669ec04ac712cdbff00db4aaad114d5f0d712d7 100644 (file)
--- a/debian/patches/suppress_tls_version_checks
+++ b/debian/patches/suppress_tls_version_checks
@@ -26,8 +26,8 @@ Description: suppress gnu TLS and mbed TLS version checks
  
 --- a/c++/src/connect/ncbi_mbedtls.c
 +++ b/c++/src/connect/ncbi_mbedtls.c
-@@ -728,12 +728,14 @@ static EIO_Status s_MbedTlsInit(FSSLPull
-     char buf[32];
+@@ -739,12 +739,14 @@ static EIO_Status s_MbedTlsInit(FSSLPull
+     psa_status_t psa_status;
  
      mbedtls_version_get_string(version);
 +#if 0