dev-db/mysql: Add OpenSSL 1.1 support for MysqL 5.6

Compile support only. No test coverage.

Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/dev-db/mysql/mysql-5.6.44.ebuild b/dev-db/mysql/mysql-5.6.44.ebuild
index 0b99352c70a7d00859c48f3600db2c0154a6385f..db524e08ba432ba56651c5fe3e9b08c900cf4032 100644 (file)
--- a/dev-db/mysql/mysql-5.6.44.ebuild
+++ b/dev-db/mysql/mysql-5.6.44.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
        "${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
        "${MY_PATCH_DIR}"/20036_all_mysql-5.6-fix-rpl_semi_sync_shutdown_hang.test.patch
        "${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-fix-libressl-support.patch
+       "${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-add-openssl-1.1-support.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -82,7 +83,7 @@ COMMON_DEPEND="
        tcmalloc? ( dev-util/google-perftools:0= )
        systemtap? ( >=dev-util/systemtap-1.3:0= )
        !yassl? (
-               !libressl? ( =dev-libs/openssl-1.0.2*:0= )
+               !libressl? ( >=dev-libs/openssl-1.0.0:0= )
                libressl? ( =dev-libs/libressl-2.6.5*:0= )
        )
        >=sys-libs/zlib-1.2.3:0=

diff --git a/dev-db/mysql/mysql-5.6.45.ebuild b/dev-db/mysql/mysql-5.6.45.ebuild
index 853675b36ad2f9b79d8410e12824c2b3f3b0f75b..d25d5ae4af39e3b9931d36cef5b529a46322b043 100644 (file)
--- a/dev-db/mysql/mysql-5.6.45.ebuild
+++ b/dev-db/mysql/mysql-5.6.45.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
        "${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
        "${MY_PATCH_DIR}"/20036_all_mysql-5.6-fix-rpl_semi_sync_shutdown_hang.test.patch
        "${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-fix-libressl-support.patch
+       "${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-add-openssl-1.1-support.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -81,7 +82,7 @@ COMMON_DEPEND="
        tcmalloc? ( dev-util/google-perftools:0= )
        systemtap? ( >=dev-util/systemtap-1.3:0= )
        !yassl? (
-               !libressl? ( =dev-libs/openssl-1.0.2*:0= )
+               !libressl? ( >=dev-libs/openssl-1.0.0:0= )
                libressl? ( =dev-libs/libressl-2.6.5*:0= )
        )
        >=sys-libs/zlib-1.2.3:0=