Fixes for using ssl with BUILD scripts.
Needed as GNUTLS can't be used by MariaDB on many systems, like OpenSuse 13.2
This commit is contained in:
parent
ea1b25046c
commit
7567cf5aef
@ -120,10 +120,9 @@ path=`dirname $0`
|
||||
get_make_parallel_flag
|
||||
|
||||
# SSL library to use.--with-ssl will select our bundled yaSSL
|
||||
# implementation of SSL. To use OpenSSL you will need to specify
|
||||
# the location of OpenSSL headers and libs on your system.
|
||||
# Ex --with-ssl=/usr
|
||||
SSL_LIBRARY=--with-ssl
|
||||
# implementation of SSL. --with-ssl=yes will first try system library
|
||||
# then the boundled one --with-ssl=system will use the system library.
|
||||
SSL_LIBRARY=--with-ssl=system
|
||||
|
||||
if [ "x$warning_mode" = "xpedantic" ]; then
|
||||
warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
|
||||
|
@ -165,21 +165,26 @@ foreach my $option (@ARGV)
|
||||
$cmakeargs = $cmakeargs." -DWITH_LIBEVENT=bundled";
|
||||
next;
|
||||
}
|
||||
if($option =~ /with-ssl=/)
|
||||
if($option =~ /with-ssl=yes/)
|
||||
{
|
||||
$cmakeargs = $cmakeargs." -DWITH_SSL=yes";
|
||||
next;
|
||||
}
|
||||
if($option =~ /with-ssl=system/)
|
||||
{
|
||||
$cmakeargs = $cmakeargs." -DWITH_SSL=system";
|
||||
next;
|
||||
}
|
||||
if($option =~ /with-ssl$/)
|
||||
{
|
||||
$cmakeargs = $cmakeargs." -DWITH_SSL=bundled";
|
||||
next;
|
||||
}
|
||||
if($option =~ /with-debug/)
|
||||
{
|
||||
$cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF";
|
||||
next;
|
||||
}
|
||||
if($option =~ /with-ssl/)
|
||||
{
|
||||
$cmakeargs = $cmakeargs." -DWITH_SSL=bundled";
|
||||
next;
|
||||
}
|
||||
if($option =~ /prefix=/)
|
||||
{
|
||||
$cmake_install_prefix= substr($option, 7);
|
||||
|
@ -1077,6 +1077,16 @@
|
||||
fun:SSL_library_init
|
||||
}
|
||||
|
||||
{
|
||||
OpenSSL still reachable.
|
||||
Memcheck:Leak
|
||||
fun:*alloc
|
||||
fun:CRYPTO_malloc
|
||||
fun:sk_new
|
||||
fun:SSL_COMP_get_compression_methods
|
||||
fun:SSL_library_init
|
||||
}
|
||||
|
||||
{
|
||||
libcrypto 2.2.1 leak
|
||||
Memcheck:Leak
|
||||
|
Loading…
x
Reference in New Issue
Block a user