Hi Otto, On Tue, Feb 25, 2020 at 12:44 PM Otto Kekäläinen <[email protected]> wrote: > > I was working on a variant of mariadb-10.4 that would use system > WolfSSL in > https://salsa.debian.org/mariadb-team/mariadb-10.4/-/compare/master...feature%2Fsystem-wolfssl
Thanks! I cloned the branch and modified the Debian patch as attached.
That builds a lot further, but not all the way. The error is below.
I am kind of stuck on the line
#include "../sql/mysqld.cc"
in the file libmysqld/lib_sql.cc
> Are you familiar with Salsa?
Yes, I contribute regularly on Salsa, especially to Lintian. Great system!
> At least the package WolfSSL does not
> seem to be in version control at all.
The source was repackaged for DFSG. Somehow it did not lend itself to
Git branching. You can get the current Debian version by using dget on
the appropriate link from tracker.d.o. Upstream sources are on Github.
Also, there is a guide to the compatibility layer here:
https://www.wolfssl.com/docs/wolfssl-manual/ch13/
Unfortunately, I am a bit short on time this week. I am at the RSA
Conference (and saw the nice folks at wolfSSL today). Please feel free
to send back what you have. I will look at it tomorrow or the next
day.
Kind regards
Felix Lechner
[ 77%] Building CXX object libmysqld/CMakeFiles/sql_embedded.dir/lib_sql.cc.o
cd /lcl/lechner/mariadb/mariadb-10.4/builddir/libmysqld &&
/usr/bin/x86_64-linux-gnu-g++ -DEMBEDDED_LIBRARY -DHAVE_CONFIG_H
-DMYSQL_SERVER -D_FILE_OFFSET_BITS=64
-I/lcl/lechner/mariadb/mariadb-10.4/wsrep-lib/include
-I/lcl/lechner/mariadb/mariadb-10.4/wsrep-lib/wsrep-API/v26
-I/lcl/lechner/mariadb/mariadb-10.4/builddir/include
-I/lcl/lechner/mariadb/mariadb-10.4/include
-I/lcl/lechner/mariadb/mariadb-10.4/libmysqld
-I/lcl/lechner/mariadb/mariadb-10.4/sql
-I/lcl/lechner/mariadb/mariadb-10.4/builddir/sql
-I/usr/include/wolfssl -I/usr/include/wolfssl/wolfcrypt -g -O2
-fdebug-prefix-map=/lcl/lechner/mariadb/mariadb-10.4=.
-fstack-protector-strong -Wformat -Werror=format-security -Wdate-time
-D_FORTIFY_SOURCE=2 -pie -fPIC -Wl,-z,relro,-z,now -fstack-protector
--param=ssp-buffer-size=4 -O2 -g -static-libgcc
-fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized
-D_FORTIFY_SOURCE=2 -DDBUG_OFF -Wdate-time -D_FORTIFY_SOURCE=2
-DHAVE_WOLFSSL -DOPENSSL_EXTRA -fPIC -std=gnu++11 -o
CMakeFiles/sql_embedded.dir/lib_sql.cc.o -c
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/lib_sql.cc
In file included from /usr/include/wolfssl/ssl.h:43,
from /usr/include/wolfssl/openssl/ssl.h:35,
from
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/mysqld.cc:86,
from /lcl/lechner/mariadb/mariadb-10.4/libmysqld/lib_sql.cc:33:
/usr/include/wolfssl/callbacks.h:56:28: error: conflicting declaration
‘typedef struct timeval Timeval’
typedef struct timeval Timeval;
^~~~~~~
In file included from
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/unireg.h:153,
from
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/mysqld.cc:19,
from /lcl/lechner/mariadb/mariadb-10.4/libmysqld/lib_sql.cc:33:
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/structs.h:862:7:
note: previous declaration as ‘class Timeval’
class Timeval: public timeval
^~~~~~~
In file included from /usr/include/wolfssl/openssl/ssl.h:35,
from
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/mysqld.cc:86,
from /lcl/lechner/mariadb/mariadb-10.4/libmysqld/lib_sql.cc:33:
/usr/include/wolfssl/ssl.h:594:40: error: ‘protocol_version’
redeclared as different kind of symbol
protocol_version = 70,
^~
In file included from
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/field.h:28,
from
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/unireg.h:155,
from
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/mysqld.cc:19,
from /lcl/lechner/mariadb/mariadb-10.4/libmysqld/lib_sql.cc:33:
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/mysqld.h:173:13:
note: previous declaration ‘uint protocol_version’
extern uint protocol_version, mysqld_port, dropping_tables;
^~~~~~~~~~~~~~~~
In file included from /lcl/lechner/mariadb/mariadb-10.4/libmysqld/lib_sql.cc:33:
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/mysqld.cc: In
member function ‘void SSL_ACCEPTOR_STATS::init()’:
/lcl/lechner/mariadb/mariadb-10.4/libmysqld/../sql/mysqld.cc:4680:19:
error: ‘ssl_acceptor_fd’ was not declared in this scope
SSL_CTX *ctx= ssl_acceptor_fd->ssl_context;
^~~~~~~~~~~~~~~
0001-WIP-updated-Debian-patch.patch.xz
Description: application/xz
