From 6fd5319b66979327da1fe1c54e4b63eac37030be Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 24 Feb 2022 02:07:46 +0100 Subject: [PATCH] Fixup for: 0d4a89ed9 "Fix md5 in FIPS mode with OpenSSL 3.0.0" The 'mariadb-fips.patch' patch has to be applied conditionally. It will FTBFS on releases without OpenSSL 3. --- /builddir/build/BUILD/mariadb-10.5.15-downstream_modified/mysys_ssl/my_md5.cc: In function 'void md5_init(EVP_MD_CTX*)': /builddir/build/BUILD/mariadb-10.5.15-downstream_modified/mysys_ssl/my_md5.cc:56:9: error: 'EVP_MD_fetch' was not declared in this scope; did you mean 'EVP_MD_flags'? 56 | md5 = EVP_MD_fetch(NULL, "MD5", "fips=no"); | ^~~~~~~~~~~~ | EVP_MD_flags /builddir/build/BUILD/mariadb-10.5.15-downstream_modified/mysys_ssl/my_md5.cc:63:3: error: 'EVP_MD_free' was not declared in this scope; did you mean 'EVP_MD_type'? 63 | EVP_MD_free(md5); | ^~~~~~~~~~~ | EVP_MD_type gmake[2]: *** [mysys_ssl/CMakeFiles/mysys_ssl.dir/build.make:149: mysys_ssl/CMakeFiles/mysys_ssl.dir/my_md5.cc.o] Error 1 -- Related: #2092370 --- mariadb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mariadb.spec b/mariadb.spec index cbdd8b7..3326952 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -751,8 +751,8 @@ rm -r storage/rocksdb/ %patch11 -p1 %if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 %patch12 -p1 -%endif %patch16 -p1 +%endif # generate a list of tests that fail, but are not disabled by upstream cat %{SOURCE50} | tee -a mysql-test/unstable-tests