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
This commit is contained in:
parent
e94e1c9253
commit
56aea7f718
@ -746,8 +746,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
|
||||
|
Loading…
Reference in New Issue
Block a user