forked from pool/mariadb
Adam Majer
e4b2876888
- update to 10.2.12 GA * release notes and changelog: https://mariadb.com/kb/en/library/mariadb-10212-release-notes/ https://mariadb.com/kb/en/library/mariadb-10212-changelog/ - remove mysql-community-server-5.5.6-safe-process-in-bin.patch becuase this moving is done in the specfile - get rid of the archive with patches (remove mysql-patches.tar.xz and series files), handle patches in the standard way - add comments to the section with removing unused files (based on https://lists.launchpad.net/maria-developers/msg11028.html) - put rm statements together - install the new upstream systemd-tmpfiles configuration file 'tmpfiles.conf' and rename it to 'mariadb.conf' in order to follow the manual - remove the new upstream systemd-sysusers configuration file as we handle creating of mysql user in the specfile - mysql.service: remove calling of the wait function and let systemd to do this job. Switch from 'Type=simple' to 'Type=notify' and add TimeoutSec=300 - rename unit files from mysql to mariadb and add mysql alias for the backward compatibility [bsc#1067443] * mysql.service -> mariadb.service * mysql.target -> mariadb.target * mysql@.service -> mariadb@.service - remove configuration-tweaks.tar.xz and move configuration to my.ini/my.cnf file (omit default_plugins.cnf as all configuration here was commented out) - add a numeric prefix for galera.cnf file in order to allow users to speficy in which order the configs will be loaded within the my.cnf.d directory [bsc#1055268] OBS-URL: https://build.opensuse.org/request/show/563119 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=203
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
PATCH-P1-SUSE: Fix running with our patched openssl
|
|
|
|
- Disable openssl compatibility checking
|
|
* the check uses CRYPTO_set_mem_functions() to set debugging
|
|
memory allocation function. The setting only succeeds if no allocation
|
|
was done before. Our fips self-tests, which are run from the library
|
|
constructor, however, do allocate memory, so the subsequent call to
|
|
CRYPTO_set_mem_functions causes the compatibility check to fail
|
|
|
|
Maintainer: Vitezslav Cizek <vcizek@suse.com>
|
|
|
|
Index: mariadb-10.2.10/mysys_ssl/openssl.c
|
|
===================================================================
|
|
--- mariadb-10.2.10.orig/mysys_ssl/openssl.c 2017-10-30 09:10:45.000000000 +0100
|
|
+++ mariadb-10.2.10/mysys_ssl/openssl.c 2017-11-29 13:43:20.022236791 +0100
|
|
@@ -47,26 +47,6 @@ static void *coc_malloc(size_t size, con
|
|
|
|
int check_openssl_compatibility()
|
|
{
|
|
- EVP_CIPHER_CTX *evp_ctx;
|
|
- EVP_MD_CTX *md5_ctx;
|
|
-
|
|
- if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL))
|
|
- return 1;
|
|
-
|
|
- testing= 1;
|
|
- alloc_size= alloc_count= 0;
|
|
- evp_ctx= EVP_CIPHER_CTX_new();
|
|
- EVP_CIPHER_CTX_free(evp_ctx);
|
|
- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_CIPHER_CTX_SIZE)
|
|
- return 1;
|
|
-
|
|
- alloc_size= alloc_count= 0;
|
|
- md5_ctx= EVP_MD_CTX_create();
|
|
- EVP_MD_CTX_destroy(md5_ctx);
|
|
- if (alloc_count != 1 || !alloc_size || alloc_size > EVP_MD_CTX_SIZE)
|
|
- return 1;
|
|
-
|
|
- testing= 0;
|
|
return 0;
|
|
}
|
|
#endif
|