1 |
commit: c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 3 18:37:18 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 3 18:42:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=c08bdd10 |
7 |
|
8 |
Replace mysql LibreSSL patch |
9 |
|
10 |
Bug: https://bugs.gentoo.org/678682 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
...pport.patch => 20018_all_mysql-5.7.25-fix-libressl-support.patch | 6 +++--- |
14 |
1 file changed, 3 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/20018_all_mysql-5.7.23-fix-libressl-support.patch b/20018_all_mysql-5.7.25-fix-libressl-support.patch |
17 |
similarity index 98% |
18 |
rename from 20018_all_mysql-5.7.23-fix-libressl-support.patch |
19 |
rename to 20018_all_mysql-5.7.25-fix-libressl-support.patch |
20 |
index 6e4bd50..63eda07 100644 |
21 |
--- a/20018_all_mysql-5.7.23-fix-libressl-support.patch |
22 |
+++ b/20018_all_mysql-5.7.25-fix-libressl-support.patch |
23 |
@@ -10,7 +10,7 @@ https://bugs.gentoo.org/668894 |
24 |
m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); |
25 |
-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L |
26 |
+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
27 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) |
28 |
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) |
29 |
EVP_MD_CTX_cleanup(md_context); |
30 |
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
31 |
EVP_MD_CTX_reset(md_context); |
32 |
@@ -22,7 +22,7 @@ https://bugs.gentoo.org/668894 |
33 |
#ifndef HAVE_YASSL |
34 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
35 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
36 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
37 |
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090000fL) |
38 |
CRYPTO_malloc_init(); |
39 |
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
40 |
OPENSSL_malloc_init(); |
41 |
@@ -60,4 +60,4 @@ https://bugs.gentoo.org/668894 |
42 |
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
43 |
} |
44 |
return(dh); |
45 |
- } |
46 |
+ } |
47 |
\ No newline at end of file |