1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for using ssl with BUILD scripts.

Browse Source 
Needed as GNUTLS can't be used by MariaDB on many systems,
like OpenSuse 13.2
This commit is contained in:
Monty 2016-12-30 11:23:45 +02:00
parent ea1b25046c
commit 7567cf5aef
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BUILD/SETUP.sh
View File

@ -120,10 +120,9 @@ path=`dirname $0`
get_make_parallel_flag get_make_parallel_flag
# SSL library to use.--with-ssl will select our bundled yaSSL # SSL library to use.--with-ssl will select our bundled yaSSL
# implementation of SSL. To use OpenSSL you will need to specify # implementation of SSL. --with-ssl=yes will first try system library
# the location of OpenSSL headers and libs on your system. # then the boundled one --with-ssl=system will use the system library.
# Ex --with-ssl=/usr SSL_LIBRARY=--with-ssl=system
SSL_LIBRARY=--with-ssl
if [ "x$warning_mode" = "xpedantic" ]; then if [ "x$warning_mode" = "xpedantic" ]; then
warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE" warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"

17
cmake/configure.pl
View File

@ -165,21 +165,26 @@ foreach my $option (@ARGV)
$cmakeargs = $cmakeargs." -DWITH_LIBEVENT=bundled"; $cmakeargs = $cmakeargs." -DWITH_LIBEVENT=bundled";
next; next;
} }
if($option =~ /with-ssl=/) if($option =~ /with-ssl=yes/)
{ {
$cmakeargs = $cmakeargs." -DWITH_SSL=yes"; $cmakeargs = $cmakeargs." -DWITH_SSL=yes";
next; 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/) if($option =~ /with-debug/)
{ {
$cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF"; $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF";
next; next;
} }
if($option =~ /with-ssl/)
{
$cmakeargs = $cmakeargs." -DWITH_SSL=bundled";
next;
}
if($option =~ /prefix=/) if($option =~ /prefix=/)
{ {
$cmake_install_prefix= substr($option, 7); $cmake_install_prefix= substr($option, 7);

10
mysql-test/valgrind.supp
View File

@ -1077,6 +1077,16 @@
fun:SSL_library_init 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 libcrypto 2.2.1 leak
Memcheck:Leak Memcheck:Leak