From: Aaron M. Ucko <ucko@debian.org>
Date: Thu, 8 Dec 2016 02:34:44 +0000 (-0500)
Subject: New suppress_gnutls_version_check patch.
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~191
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4557e6e3fe50dda03d526efbfb8545181db45b09;p=ncbi-blast%2B.git

New suppress_gnutls_version_check patch.

Prevent bailing when the exact compile-time and runtime GNU TLS versions
differ; trust dpkg to disallow combinations that are actually incompatible.
---

diff --git a/debian/changelog b/debian/changelog
index 0ebec595..4fc1253e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 ncbi-blast+ (2.5.0-3) UNRELEASED; urgency=medium
 
   * NOT YET RELEASED.
+  * New suppress_gnutls_version_check patch to prevent bailing when the
+    exact compile-time and runtime GNU TLS versions differ; trust dpkg to
+    disallow combinations that are actually incompatible.
 
- -- Aaron M. Ucko <ucko@debian.org>  Wed, 07 Dec 2016 21:30:25 -0500
+ -- Aaron M. Ucko <ucko@debian.org>  Wed, 07 Dec 2016 21:34:43 -0500
 
 ncbi-blast+ (2.5.0-2) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 37dc5489..df091ea2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ fix_configure
 #fix_version_extraction
 #support_recent_boost
 support_x32
+suppress_gnutls_version_check
diff --git a/debian/patches/suppress_gnutls_version_check b/debian/patches/suppress_gnutls_version_check
new file mode 100644
index 00000000..7dca5fc0
--- /dev/null
+++ b/debian/patches/suppress_gnutls_version_check
@@ -0,0 +1,18 @@
+--- a/c++/src/connect/ncbi_gnutls.c
++++ b/c++/src/connect/ncbi_gnutls.c
+@@ -585,6 +585,7 @@ static EIO_Status s_GnuTlsInit(FSSLPull
+ 
+     assert(!s_GnuTlsCredAnon);
+ 
++#if 0
+     version = gnutls_check_version(0);
+     if (strcasecmp(GNUTLS_VERSION, version) != 0) {
+         CORE_LOGF(eLOG_Critical,
+@@ -592,6 +593,7 @@ static EIO_Status s_GnuTlsInit(FSSLPull
+                    GNUTLS_VERSION, version));
+         assert(0);
+     }
++#endif
+ 
+     val = ConnNetInfo_GetValue(0, "GNUTLS_LOGLEVEL", buf, sizeof(buf), 0);
+     CORE_LOCK_READ;