From 0b5931c46ebdf8944d50bdd2374e3a5bfb66295b Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 2 Jan 2019 07:05:25 -0500 Subject: Commit Debian 3.0 (quilt) metadata [dgit (3.11~deb9u1) quilt-fixup] --- debian/patches/debian-changes | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 742a293..8f2e632 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -5,16 +5,10 @@ Description: information below has been extracted from the changelog. Adjust it or drop it. . - libradsec (0.0.5-4) unstable; urgency=medium + libradsec (0.0.5-5) unstable; urgency=high . - * Fix problems detected by better warnings in gcc 7, Closes: #853506 - * We were building against some horrible combination of openssl 1.0 - directly and openssl 1.1 via libevent. That works surprisingly - better than you might think sort of, but can't be any good at all, so - finish moving all the way to openssl 1.1, Closes: #848681 + * Fix assert, necessary for library to work with OpenSSL 1.1.1. Author: Sam Hartman -Bug-Debian: https://bugs.debian.org/848681 -Bug-Debian: https://bugs.debian.org/853506 --- The information above should follow the Patch Tagging Guidelines, please @@ -27,7 +21,7 @@ Bug-Debian: https://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: -Last-Update: 2017-08-12 +Last-Update: 2019-01-02 --- /dev/null +++ libradsec-0.0.5/.gitignore @@ -5231,3 +5225,19 @@ Last-Update: 2017-08-12 { if (s_openssl_mutexes == NULL || i >= s_openssl_mutexes_count) return; +@@ -231,9 +232,13 @@ tls_init () + { + SSL_load_error_strings (); + #if defined HAVE_PTHREADS +- if (CRYPTO_get_locking_callback () == NULL) ++ /* OpenSSL 1.1 removed the locking functions and finally implemented ++ * its own thread safety. In this case the locking callback will ++ * return null even after we initialize it. So if we have already ++ * allocated mutexes, don't consider that a failure. ++ */ ++ if ((CRYPTO_get_locking_callback () == NULL) || (s_openssl_mutexes_count > 0)) + { +- assert (s_openssl_mutexes_count == 0); + /* Allocate and initialise mutexes. We will never free + these. FIXME: Is there a portable way of having a function + invoked when a solib is unloaded? -ln */ -- cgit v1.2.1