On Sun, Nov 06, 2016 at 04:39:03PM +0400, Stepan Golosunov wrote: Hi,
> 06.11.2016 в 16:18:32 +0400 Stepan Golosunov написал: > > 03.11.2016 в 09:24:19 +0100 Bernhard Schmidt написал(а): > > > - Asterisk is doing some weird stuff with macros in > > > > > > https://sources.debian.net/src/asterisk/1:13.11.2~dfsg-1/main/libasteriskssl.c/ > > > that causes the build against 1.1.0 to fail. This is beyond my C > > > knowledge. I will gladly test and accept any patch for that. > > > > I think that > > > > #if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10100000L > > /* No explicit initialization is needed with OpenSSL 1.1.0. > > All the functions called or overridden in this file were removed. */ > > #undef HAVE_OPENSSL > > #endif > > > > should be added after ASTERISK_FILE_VERSION in libasteriskssl.c. > > After or inside > > #ifdef HAVE_OPENSSL > #include <openssl/ssl.h> > #include <openssl/err.h> > #endif > > seems more apropriate as #include is still needed to get > OPENSSL_VERSION_NUMBER. Thanks a lot, your suggestion together with https://anonscm.debian.org/cgit/pkg-voip/asterisk.git/commit/?id=ec0143a92f4ced996be419bf49115be8f236e3ea leads to something that builds and runs. Yay! @Tzafrir: What do you think of this? Your patch is touching main/libasteriskssl.c as well, but Stepan suggested to drop even more. Bernhard
signature.asc
Description: Digital signature
