connectivity/Library_mysqlc.mk | 1
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 17
+++++--
external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 22
++++++++--
3 files changed, 33 insertions(+), 7 deletions(-)
New commits:
commit e9450100b4654b9a242c548dbd57cfa1a98ba1f8
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Dec 1 20:05:32 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:14:40 2021 +0100
mariadb-connector-c: enable WNT-only pvio_npipe/pvio_shmem plugins
They were already compiled in some way.
Change-Id: Ic1b8563a53bad5be03bce2c0d3d2cf841e303f02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107007
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107027
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index c811473e11ce..3458089ce99e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -72,9 +72,9 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt
\
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \
- , \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \
+ , \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \
) \
))
diff --git
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index b34c3490661c..241e12db6581 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -36,11 +36,19 @@ $(eval $(call
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
extern struct st_mysql_client_plugin
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin
caching_sha2_password_client_plugin\; \
extern struct st_mysql_client_plugin
mysql_native_password_client_plugin\; \
+ $(if $(filter WNT,$(OS)), \
+ extern struct st_mysql_client_plugin
pvio_shmem_client_plugin\; \
+ extern struct st_mysql_client_plugin
pvio_npipe_client_plugin\; \
+ ) \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin
*)\&caching_sha2_password_client_plugin$(COMMA) \
(struct st_mysql_client_plugin
*)\&mysql_native_password_client_plugin$(COMMA) \
+ $(if $(filter WNT,$(OS)), \
+ (struct st_mysql_client_plugin
*)\&pvio_shmem_client_plugin$(COMMA) \
+ (struct st_mysql_client_plugin
*)\&pvio_npipe_client_plugin$(COMMA) \
+ ) \
/' \
> libmariadb/ma_client_plugin.c \
))
commit d8b01437afcc7d97f0c44b462e1e9c5a0d13226c
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Dec 1 19:58:23 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:14:27 2021 +0100
tdf#135202 mariadb-connector-c: enable native_password plugin
... and remove dialog authentication plugin; it quite uselessly defaults
to asking for a password on stdin, unless a function symbol is defined
by the library that links the connector static library.
There are more authentication plugins but no idea if those are needed.
Change-Id: I88ee9629e4763fb548c3f294b552cff3d739e6cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107006
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit b746633b2b251695134e7f8c268a75e45cf97c82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107021
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 6de1738312a7..c811473e11ce 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -66,7 +66,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
- UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
diff --git
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 2f679294f7c6..b34c3490661c 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -35,10 +35,12 @@ $(eval $(call
gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
-e 's/@EXTERNAL_PLUGINS@/ \
extern struct st_mysql_client_plugin
pvio_socket_client_plugin\; \
extern struct st_mysql_client_plugin
caching_sha2_password_client_plugin\; \
+ extern struct st_mysql_client_plugin
mysql_native_password_client_plugin\; \
/' \
-e 's/@BUILTIN_PLUGINS@/ \
(struct st_mysql_client_plugin
*)\&pvio_socket_client_plugin$(COMMA) \
(struct st_mysql_client_plugin
*)\&caching_sha2_password_client_plugin$(COMMA) \
+ (struct st_mysql_client_plugin
*)\&mysql_native_password_client_plugin$(COMMA) \
/' \
> libmariadb/ma_client_plugin.c \
))
commit f8bbe21053e714818467836336943453bc70d7a8
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Nov 13 19:00:53 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:14:13 2021 +0100
tdf#135202: Mysql declare more plugins for native password
Add pvio_npipe + pvio_shmem + dialog
Change-Id: I48d828e5cdf8d269aef3a40d75235a9519af8dc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105804
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index dc1164a8a3a8..6de1738312a7 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -66,6 +66,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
@@ -73,6 +74,8 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt
\
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \
, \
+ UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \
+ UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \
) \
))
commit e59949dfacf435e14bce15718b2ee2895880cb32
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Nov 10 11:14:19 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:13:58 2021 +0100
mariadb-connector-c: fix makefile for GNU make 3.82
Old make thinks that ; terminates the recipe, have to escape it.
(other changes are just cosmetic)
(regression from 8c9b8c5970a08c2ef0ccddb7a691f3731d39175a)
Change-Id: Ib0119511977bbff077f037fbb5975df9f860ae58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105516
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index a4b35c5e650a..2f679294f7c6 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -32,15 +32,15 @@ $(eval $(call
gb_UnpackedTarball_add_patches,mariadb-connector-c,\
# TODO are any "plugins" needed?
$(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
< libmariadb/ma_client_plugin.c.in sed \
- -e 's/@EXTERNAL_PLUGINS@/\
- extern struct st_mysql_client_plugin
pvio_socket_client_plugin;\
- extern struct st_mysql_client_plugin
caching_sha2_password_client_plugin;\
+ -e 's/@EXTERNAL_PLUGINS@/ \
+ extern struct st_mysql_client_plugin
pvio_socket_client_plugin\; \
+ extern struct st_mysql_client_plugin
caching_sha2_password_client_plugin\; \
/' \
- -e 's/@BUILTIN_PLUGINS@/\
- (struct st_mysql_client_plugin
*)\&pvio_socket_client_plugin$(COMMA)\
- (struct st_mysql_client_plugin
*)\&caching_sha2_password_client_plugin$(COMMA)\
+ -e 's/@BUILTIN_PLUGINS@/ \
+ (struct st_mysql_client_plugin
*)\&pvio_socket_client_plugin$(COMMA) \
+ (struct st_mysql_client_plugin
*)\&caching_sha2_password_client_plugin$(COMMA) \
/' \
- > libmariadb/ma_client_plugin.c \
+ > libmariadb/ma_client_plugin.c \
))
commit 0b0b5746190397015aa7d6d3078d8aab0e2c73fd
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Nov 5 18:22:08 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:13:43 2021 +0100
tdf#135202: Mysql use openssl libs to be able to use caching_sha2_pw
Change-Id: I7552b65022b725c6e87fef61478dc6e9c4322559
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105376
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 0999b46d3eec..f765fb1e305f 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,mysqlc))
$(eval $(call gb_Library_use_externals,mysqlc,\
boost_headers \
mariadb-connector-c \
+ openssl \
))
$(eval $(call gb_Library_set_include,mysqlc,\
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index e3a8d0fc69e7..dc1164a8a3a8 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -21,8 +21,8 @@ $(eval $(call
gb_StaticLibrary_set_include,mariadb-connector-c,\
# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
# but the static library then contains unreferenced symbols.
# This macro enables a re-definition to native Win32 APIs in my_global.h.
-## TODO missing enable: -DHAVE_OPENSSL -D HAVE_COMPRESS
-## (but then need to add "-lssl -lcrypto -lz" to mysqlcppconn linking)
+## TODO missing enable: -D HAVE_COMPRESS
+## (but then need to add "-lz" to mysqlcppconn linking)
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D
ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
ifeq ($(OS),WNT)
@@ -31,6 +31,9 @@ $(eval $(call
gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
))
+else
+$(eval $(call
gb_StaticLibrary_use_external,mariadb-connector-c,openssl_headers))
+$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_OPENSSL))
endif
$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
@@ -68,7 +71,10 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt
\
- UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv) \
+ UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \
+ , \
+
UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \
+ ) \
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 3d8ca9295131..a4b35c5e650a 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -32,8 +32,14 @@ $(eval $(call
gb_UnpackedTarball_add_patches,mariadb-connector-c,\
# TODO are any "plugins" needed?
$(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
< libmariadb/ma_client_plugin.c.in sed \
- -e 's/@EXTERNAL_PLUGINS@/extern struct st_mysql_client_plugin
pvio_socket_client_plugin;/' \
- -e 's/@BUILTIN_PLUGINS@/(struct st_mysql_client_plugin
*)\&pvio_socket_client_plugin$(COMMA)/' \
+ -e 's/@EXTERNAL_PLUGINS@/\
+ extern struct st_mysql_client_plugin
pvio_socket_client_plugin;\
+ extern struct st_mysql_client_plugin
caching_sha2_password_client_plugin;\
+ /' \
+ -e 's/@BUILTIN_PLUGINS@/\
+ (struct st_mysql_client_plugin
*)\&pvio_socket_client_plugin$(COMMA)\
+ (struct st_mysql_client_plugin
*)\&caching_sha2_password_client_plugin$(COMMA)\
+ /' \
> libmariadb/ma_client_plugin.c \
))
commit 83d91902f6ff2360ef86615ffef88d518569da5d
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 10 18:14:47 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:13:28 2021 +0100
Related tdf#122560 tdf#135202: build plugin caching_sha2_pw for
MariaDb/Mysql
Taking a look at:
https://dev.mysql.com/doc/refman/8.0/en/caching-sha2-pluggable-authentication.html
"caching_sha2_password" is better than "sha256_password" plugin
Notice that "sha2" in "caching_sha2_password" refers, as the quoted url
indicates:
'more generally to the SHA-2 class of encryption algorithms, of which
256-bit encryption is one instance'
Change-Id: Icbbe45f4f20345da2fb5a262b4d85bce3a1fecd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104172
Tested-by: Julien Nabet <serval2...@yahoo.fr>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index df7b865781ef..e3a8d0fc69e7 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -63,6 +63,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
commit 69ef6536dcc798fd57082e997d57628b0f7d716e
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Tue Oct 6 21:04:59 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:13:15 2021 +0100
Related tdf#135202: declare libmariadb/secure/win_crypt in mk file for
MariaDB
Change-Id: Ib9634d9e88d7e97a5c03ff4d8b7808c598c3b8bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104040
Tested-by: Michael Stahl <michael.st...@cib.de>
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index fee019afa4f8..df7b865781ef 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -66,6 +66,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
+ UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt
\
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv) \
))
commit c0d0e6a25df3ae92d891b21b6cf96a9ab5e8a197
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 10 13:06:02 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 4 12:13:00 2021 +0100
external/mariadb-connector-c: ma_bmove_upp is defined twice
...in UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp and in
workdir/UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec.c.
Given
that the first of the two contains nothing but that redundant declaration,
lets
drop it from the (hand-curated?) list of included source files.
(I came across this when experimenting with --enable-lto on Linux and
temporarily including static libraries as --whole-archive, which thus
caused a
"multiple definition" error when linking StaticLibrary_mariadb-connector-c
into
Library_mysqlc.)
Change-Id: I8c5f4de476a4bbd036fd25940cdb44d11954ecc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100427
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index b0c62e1b160e..fee019afa4f8 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -34,7 +34,6 @@ $(eval $(call
gb_StaticLibrary_set_include,mariadb-connector-c,\
endif
$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
- UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp \
UnpackedTarball/mariadb-connector-c/libmariadb/get_password \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_alloc \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_array \
