summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-08-17 02:30:23 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-08-17 02:50:04 +0200
commit89bfc65152efe054e9b4832dd2fcaacdf1b64732 (patch)
tree04d133b712d8b30b9adcef87def6487497f28d65 /dev-db/mysql
parentdev-db/mysql: Fix LibreSSL patch (diff)
downloadgentoo-89bfc65152efe054e9b4832dd2fcaacdf1b64732.tar.gz
gentoo-89bfc65152efe054e9b4832dd2fcaacdf1b64732.tar.bz2
gentoo-89bfc65152efe054e9b4832dd2fcaacdf1b64732.zip
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>
Diffstat (limited to 'dev-db/mysql')
-rw-r--r--dev-db/mysql/mysql-5.6.44.ebuild3
-rw-r--r--dev-db/mysql/mysql-5.6.45.ebuild3
2 files changed, 4 insertions, 2 deletions
diff --git a/dev-db/mysql/mysql-5.6.44.ebuild b/dev-db/mysql/mysql-5.6.44.ebuild
index 0b99352c70a7..db524e08ba43 100644
--- 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 853675b36ad2..d25d5ae4af39 100644
--- 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=