[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/mariadb-connector-c

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Mon Oct 12 09:23:37 UTC 2020


 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit e3c2dcceb0e885a5a2c76bb69eac6e2dbba98d6d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Oct 10 18:14:47 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Oct 12 11:23:03 2020 +0200

    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 <serval2412 at yahoo.fr>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit ee8d735f0a59f41fb1f5cbabfe089c222ca948e3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104150
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at 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 89d4bfbe954e..86d127c2af62 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -64,6 +64,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 \


More information about the Libreoffice-commits mailing list