This is an automated email from the git hooks/post-receive script. ucko pushed a commit to branch master in repository ncbi-blast+.
commit 4557e6e3fe50dda03d526efbfb8545181db45b09 Author: Aaron M. Ucko <[email protected]> Date: Wed Dec 7 21:34:44 2016 -0500 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. --- debian/changelog | 5 ++++- debian/patches/series | 1 + debian/patches/suppress_gnutls_version_check | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0ebec59..4fc1253 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 <[email protected]> Wed, 07 Dec 2016 21:30:25 -0500 + -- Aaron M. Ucko <[email protected]> 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 37dc548..df091ea 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 0000000..7dca5fc --- /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; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-blast+.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
