summaryrefslogtreecommitdiff
path: root/dev-db/mysql
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
commita978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree8c764c1cc0576389ce22abd317bceba71ea5732d /dev-db/mysql
parent40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
gentoo resync : 04.05.2021
Diffstat (limited to 'dev-db/mysql')
-rw-r--r--dev-db/mysql/Manifest28
-rw-r--r--dev-db/mysql/metadata.xml1
-rw-r--r--dev-db/mysql/mysql-5.7.27-r2.ebuild17
-rw-r--r--dev-db/mysql/mysql-5.7.29-r1.ebuild17
-rw-r--r--dev-db/mysql/mysql-5.7.30-r1.ebuild16
-rw-r--r--dev-db/mysql/mysql-5.7.31.ebuild16
-rw-r--r--dev-db/mysql/mysql-5.7.32.ebuild16
-rw-r--r--dev-db/mysql/mysql-5.7.33.ebuild16
-rw-r--r--dev-db/mysql/mysql-5.7.34.ebuild16
-rw-r--r--dev-db/mysql/mysql-8.0.19-r2.ebuild9
-rw-r--r--dev-db/mysql/mysql-8.0.20-r1.ebuild8
-rw-r--r--dev-db/mysql/mysql-8.0.21-r1.ebuild8
-rw-r--r--dev-db/mysql/mysql-8.0.22.ebuild8
-rw-r--r--dev-db/mysql/mysql-8.0.23.ebuild8
-rw-r--r--dev-db/mysql/mysql-8.0.24.ebuild8
15 files changed, 60 insertions, 132 deletions
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 242c47275151..da9132b1f7c8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -29,17 +29,17 @@ DIST mysql-boost-8.0.24.tar.gz 290263082 BLAKE2B a29f42b63c68b13fbe7433c7734e126
DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27 SHA512 d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f
-EBUILD mysql-5.7.27-r2.ebuild 31711 BLAKE2B 661d546b00e43b779570db72de23dc1e613dc07c30d2c4a77f413471c6d9e821b5ab9e9b7947adf8e26d449996f9e229368b1944819cd38b36810fda0156aa57 SHA512 7670ae735ab67f3ac4dde0da323204072ba4742bb58bf51cb06c39f291c23f2d6a127d18b8c6f451367b4932d83c063b31e959008aa9ffcef0c76376a9a463a0
-EBUILD mysql-5.7.29-r1.ebuild 31447 BLAKE2B 59b57240696f86ef2f0badaf7b75889e53afd735c659090365a794a8b3cb77c4b1210f6adf7ba473f44492cfa9c715aab2dced7e127a62cd0089f2fe001b4e91 SHA512 e3c6d86d9b8d889f381f3f2d943077557b83bdd678c7a769a22f670d62ac8145a48bd0ab78b41bd3624f9a1100ede5dff1517d51b8b62859e8b4a28019016041
-EBUILD mysql-5.7.30-r1.ebuild 30672 BLAKE2B d2033739b36d23a02dd61c3c876efdbe444073e37a9bf2fd9c2f8400a04b33768d4017838a59bfa622de46ce808755e1a7889ee27de7c1479de6c12d467cbd66 SHA512 a94a679d9269d3c0291d7380c8917f53991387ddbf2fd7ae9f4124ecd0616fb52ab1b59d8675f850d1d8dd50819c8d3509fc2a7f6073f4ae2c3770a87fce1fcd
-EBUILD mysql-5.7.31.ebuild 37540 BLAKE2B bc9955fd55d1628ae1ac9a5518ec860564060ab5144872ac64e2c7251cd65d4d9ff124bb97a45b707b9abd502adc48e4c5d5ccfee8eec54de1f3d792f09adb9b SHA512 7011c0e06a84ba75ac14f52db2f43113a7b41102da9436e7bbe3e7577db99260949bbeb2dc4f474345d2415a908f64e3cd8093b0857e1414b1e58a0a47f553cf
-EBUILD mysql-5.7.32.ebuild 37582 BLAKE2B 3bfc1b63f0ee120c46bf58878180554fdbc4a7030363aab9ce10c25a04c82870e9b471c0883de4f9d34add6869b699b518b1e40f80a1cfbf6ebd4addaffc4492 SHA512 15a630779de70023e6defa80ffb26e75778700d6dff1a5b6e8bf962772d16ad3800ee6664e592bb0f9b63f809bc7934d41a13c78350a2d530707220b1bdf07c6
-EBUILD mysql-5.7.33.ebuild 37797 BLAKE2B 3cb4244483f7947c31380b0603895fb214234dfc0dbbe9aa27be45a4fa758eaf40e4ffb4fd9ad2df51b5dbd4abded4058465ddaef38fe64b331047a16dc729c1 SHA512 1f0f28b8c24fea27e5714fdd629171089f33350c97e0b8f9166bd2bc32b31cc78adeae1de865b1178fde92fdca4e7ad20b4b7c172c9b9a591720c9c558cd71fb
-EBUILD mysql-5.7.34.ebuild 37868 BLAKE2B 2b4294aeb9b8152741b17351df9c7f9cedddfd80cbdcf0da83f75e106f91aaef4d3f3eabb596f39d144ae2762fab447968cdbd9cd2adbe343b1ea89aa140b9c6 SHA512 f83a32eb4e191ddfcb9b4371f44ade7ebc46c5ea60ee3350440456cf42bc2dbbb691f91048d4ab3f306181640dfb282df21c7e1ebe3ba2e4c53e3b2cfad073b3
-EBUILD mysql-8.0.19-r2.ebuild 37938 BLAKE2B e2e73a2d1ab9ffa6c52374eef4738db94c87353100c4b40afcf6b20e83e872070c50520f694ab1b11c282c1db8c780201260faad41ea646492ad90989c8dc688 SHA512 41f443c5b2cf7a76f902d59ddc66a574a73c4898dbd14aa5dd73a004f48c9b8754e41ee73f2fa1856cec52cf667e647f82a742bfda5c013a733614fc64e8bd91
-EBUILD mysql-8.0.20-r1.ebuild 37206 BLAKE2B 3556c8fb3ea88b893b3612fc313ab5c771afc490218c27405b6b9dd3255d6d5a2c6e602ceac44ed7cbf6f8f7443fcc8afcf6c456ce8b5ac273e2b5569a56e8bb SHA512 982906ddc660441f855b3ab59aaf981fbbf1a6ac1c54be0d7ea1d1019279f265579d3d1d1e2781c8f4c8af60befc5e998d36c09fd6a9abc64655fb80f530c0bb
-EBUILD mysql-8.0.21-r1.ebuild 38157 BLAKE2B 800cc8a5b52e3b465afe98a26668d04c73e449a5bd611dd53406db351f31e09ca8153b1a2dd52b900e23f3c63fbacd4e22711defc761907582a79eb134533677 SHA512 5b22b6ce8ef86454b59b03bf084a23a7fd7d45a51c441337d25c380eb10c2ddf474fcf2145c9e40afb2b8f9025c1efd937985d66ee3fbb91ca6332c62950edab
-EBUILD mysql-8.0.22.ebuild 37596 BLAKE2B 95680e1c45c4277b483d83696c73c5e78f2ba53395a42330fed37dd1da7f9d5cbdd1343b8db6189406937a74553c5612e3d1cb9e57a6913f38fab6f4b1d0f849 SHA512 135c5abf427f9569e0f406758facf03bd4d1d2f3257ddae683978ecdc70aa8554b29b70041761a8db0e321cf9c85320fedc30477f8c2c5ff47af2e58d3e7a684
-EBUILD mysql-8.0.23.ebuild 37738 BLAKE2B 81426ae92d8ff36fb3ef4aadd880a66a7615fca71bd026770859350b60604a02645c5f2c1b326ad7789536778672e7d161990716e928e0574d48d98eeac954a9 SHA512 40c8bf0f737442191895671dbd1b5cc31bd522a6a113f52f398854d7faa77347acba33af7c4780e6e54c24f7ef62f4a116be7a7b7fb65c01c791d6649c0d309b
-EBUILD mysql-8.0.24.ebuild 38205 BLAKE2B 7b3d133231d4c1bdaba3524899c19fe52e0107061c8896684630f69ee3cc7eb1bbed466e53c44818b0bdfee4fc9075bb8d14d7b5fc1e846f2367acd17f0b1702 SHA512 83865d44353f8e861de0b0e2dde2081719c3f50c1983d32770cdc0fd7c170732236774c1bbb63a6434c9e27650b3b961f637644df12b8352af5a542d37cf8f36
-MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
+EBUILD mysql-5.7.27-r2.ebuild 31243 BLAKE2B aa4ee6c81da3bd44706da720d7fe5b374773cdffbdde47293dac9dcaa936c047cf6f257940befcd97127c34730a2982e728e2469d5d00080ba4ba5a924624842 SHA512 99ce1c2b6e278eb56ab6eaf28135eda1024b7bf9b804dcd3ad0f803de3eec3da2190e83c9a4d0ec873392ef31520ad497a11445c4facea46e823f87610badbd6
+EBUILD mysql-5.7.29-r1.ebuild 30981 BLAKE2B 388d8ed498058c273524b4bbe4b442b3b10c378131f7cee0fffa5b98e711ea75cc8a7fa13a8e87b8b057246eff298446d49b6e8078628a0b6243b33e02fd7aa4 SHA512 73eac7555ba20eb74599120c8379684e92bd0787930aa1e29b64b6af0a7adccff096531384770936beb998317c8d96f3e3be6909982904b6d22d4c765eeceffc
+EBUILD mysql-5.7.30-r1.ebuild 30275 BLAKE2B 784fd18e9808de17affd5925f06042606aadfe13df5ab40172e57bb2b5881c3bcbde381451f988125181a6eb4da2e8040276b524ac546f950a6f3c1f8115354e SHA512 7df4a9594376f0efac3534b5ceb8be9b17659379ac8569b945a2716a74afa51780a124625f0ed5c389039d80a59c6a0f7f50fc1c2128043dcd4b5cdd073d2372
+EBUILD mysql-5.7.31.ebuild 37143 BLAKE2B ba9576ecbc8e486af3dcd1b7319dbae4dec7d44c4a70ac45cdcfeb58ba4e271abf6d3695f16759c10242015ca2837e484106ccc3e0668b08fbab24b71da6e32d SHA512 edf56d1e97af8641a030a6e85a0933111ce448a345146a3a374a2ad047ade4ff8ab3bd51a6a006f53b5d486893de18b836b9351c1c96fe5a8be0ab796e67eddc
+EBUILD mysql-5.7.32.ebuild 37185 BLAKE2B 13be67482bf1e3e7171b9ce7468d51c1f67dc469f61c4ec18de94548e1077bb31fb7848feecd3761b3549fb4afbfaff6a128223b0bc516b0b4601edb4729468a SHA512 e457f6cc626d3ed452d772bba59428d60eed2c40d2d7fa52a9ab91538123e332d8c86b1a1da8217f1bd81c807c459d4397d237ac04c2e22f37a2e9e775878fc9
+EBUILD mysql-5.7.33.ebuild 37400 BLAKE2B 9245b583265b65125d35d6d52c317c547ded926243c0d7d430e7739c27efc2148e40c968aa55eed964c3064c4f4df82ddeacfc180d47e62e51c5707bc7984311 SHA512 dba99a3536f75fced834e3eb9da03ae5e0f026409165cf805295f216b7e3bc2d153927f7716d1cc52bf4f1f1d88fa834383a25d16ca263e036c01f07db7935f9
+EBUILD mysql-5.7.34.ebuild 37471 BLAKE2B 0627ac23815e67d6f31b0ad1cecca4df7a5b9e06f4d43661a924881617df01d3268a2d3306c39b6ec92b57aacaad31a5db348c2575a9b363cb89ee0f5b064209 SHA512 712bbe401ca81f8fa668d42a78a1de7fdf2bc9a092071e6cebb038c04862b995c07e7e745c2730dd9601abb346d928f0a2291c7bdb63fc99bed25b6ed030fbb6
+EBUILD mysql-8.0.19-r2.ebuild 37706 BLAKE2B c8c70f4ec09c2c7fbfbdc76aa6362a0c553c1b8ae8b13edd12d2f3a0a52ab12e692c13f706813d7eb9bda5f49fc9b932fc832213056bb985c2821ec86309892a SHA512 13d96f95cdf1df2367272a1c5352501a95779b8e9c411103d55f90e6035e7b4893cf208fb92e60c1cf3df3d1ab8c6ad48a89b1096705d7f126b8462915fc2998
+EBUILD mysql-8.0.20-r1.ebuild 37043 BLAKE2B e05d79b543cda0f4ad5a4f1fe9ed72dcec32382704e41aded18e57b6c8a0f85dbe71f58d30a97a9631919272c443e85d22b269d5adedd5f01a8b004f88cfccbd SHA512 4eb892d96d3177e7aa518f1fd49aa156eab70da90cce58d2e180c1e87c8b79cb45314c5a6e52185e3fa9b5566a4be8054a37d63338c9ff5d730fe81747e45737
+EBUILD mysql-8.0.21-r1.ebuild 37994 BLAKE2B ca5f8588d0acafb0a323d92922e6a98fdaa4e41bc587f9815b6afce50d03915e8e674d243952ddc6d56e93fbb2255679536ee8d982bdfea394880631819c8d1f SHA512 eab92d18be2c4d2c2192480a66ba547b7cb94b6c903c13fc4f697f2d6eae06bbdc194c4bf07beb337aebdbdcbc8e779bfdfeb0e7d8af1721521acb54c3c8129d
+EBUILD mysql-8.0.22.ebuild 37433 BLAKE2B 7d047acfdde052e6745869ae3dc3536cc4f6d171bc04c18aaf7ce7773f2bb840f3b826ed091d6b89aa0af1167e372aa6fdcae0328a9591eb0de0e74465f9aea8 SHA512 2e7cb6a55376f03757e14d08801be88ac07ca7ec7d2afa23c73da44cd72a9f7a02212f310176de4fae076421e363b29b29b251ec98057ad54ad7ca6ea313d3f4
+EBUILD mysql-8.0.23.ebuild 37575 BLAKE2B 135ee2f924ab3b50a73ee6366ee9b84815cb81944c9be9ae48c3ed643e6f288d7b2541f6feafa3bffefa28e75b81eaead199704b93b6c3e4e02a158cea868b0b SHA512 3f0dbca7e24b4c696d5970657bb7b405878e6330a6fb26815707d5a3bee7117ab0f1434ecc799515790870544f92973a31eb871363926b5d3be4b9617484decd
+EBUILD mysql-8.0.24.ebuild 38042 BLAKE2B e9b5740a3deb1f8608e5320e850741b1ea7fb88b23c7335629e6d16e6c8c2ac15cb99179237b78a7874d6d18338833c4638c6664d3a37a73ee1d007929c9ea3d SHA512 cf3e974c346a479a4d63dfd0fc4c0559fa3c4508b7d65643fe762ae733ccce91aa1ecc753575c7eb2325a3f2e860a02e77a433eb978fa27765a543ad0536f687
+MISC metadata.xml 1360 BLAKE2B abb7dcadad78c58d6bc6a56e34795903309f1b506e49b00b09f06e9ae1cbb9a5d246295b9c351353ecc08f157a64f421072dae9c7b0d43ce93cde21d3917489e SHA512 2f676f17cff8fb79b58ec7baec00bddc9e3247ca0bd8c8202bccb08f3e8ceacd682db742b38bf73d667e84b9671d085deae1682221e684443466218c6a9fb759
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index e4197ced880b..600b98915782 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -15,7 +15,6 @@ dev-db/mariadb
<flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
<flag name="experimental">Build experimental features aka "rapid" plugins</flag>
<flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
- <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
<flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
<flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
<flag name="router">Build the MySQL router program</flag>
diff --git a/dev-db/mysql/mysql-5.7.27-r2.ebuild b/dev-db/mysql/mysql-5.7.27-r2.ebuild
index 98a59f769bd2..e1cf579b3c79 100644
--- a/dev-db/mysql/mysql-5.7.27-r2.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r2.ebuild
@@ -26,11 +26,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test yassl"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
@@ -55,7 +54,6 @@ PATCHES=(
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.26-without-clientlibs-tools.patch
- "${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-fix-libressl-support.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
@@ -94,12 +92,10 @@ COMMON_DEPEND="net-misc/curl:=
tcmalloc? ( dev-util/google-perftools:0= )
!yassl? (
client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
)
!client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.0:0=
)
)
"
@@ -309,11 +305,6 @@ src_prepare() {
man/zlib_decompress.1 \
|| die
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
}
diff --git a/dev-db/mysql/mysql-5.7.29-r1.ebuild b/dev-db/mysql/mysql-5.7.29-r1.ebuild
index 1d1fd598dd93..a68c2ae2ff7c 100644
--- a/dev-db/mysql/mysql-5.7.29-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.29-r1.ebuild
@@ -26,11 +26,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
@@ -55,7 +54,6 @@ PATCHES=(
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.29-without-clientlibs-tools.patch
- "${MY_PATCH_DIR}"/20018_all_mysql-5.7.29-fix-libressl-support.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-fix-build-without-server.patch
@@ -91,12 +89,10 @@ COMMON_DEPEND="net-misc/curl:=
systemtap? ( >=dev-util/systemtap-1.3:0= )
tcmalloc? ( dev-util/google-perftools:0= )
client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
)
!client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.0:0=
)
"
DEPEND="${COMMON_DEPEND}
@@ -305,11 +301,6 @@ src_prepare() {
man/zlib_decompress.1 \
|| die
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
}
diff --git a/dev-db/mysql/mysql-5.7.30-r1.ebuild b/dev-db/mysql/mysql-5.7.30-r1.ebuild
index 59e0d821600f..8df5b377bb6f 100644
--- a/dev-db/mysql/mysql-5.7.30-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.30-r1.ebuild
@@ -22,11 +22,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
@@ -66,12 +65,10 @@ COMMON_DEPEND="net-misc/curl:=
systemtap? ( >=dev-util/systemtap-1.3:0= )
tcmalloc? ( dev-util/google-perftools:0= )
client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
)
!client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.0:0=
)
"
DEPEND="${COMMON_DEPEND}
@@ -280,11 +277,6 @@ src_prepare() {
man/zlib_decompress.1 \
|| die
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
}
diff --git a/dev-db/mysql/mysql-5.7.31.ebuild b/dev-db/mysql/mysql-5.7.31.ebuild
index 514e06d3091d..c5a202eecc1c 100644
--- a/dev-db/mysql/mysql-5.7.31.ebuild
+++ b/dev-db/mysql/mysql-5.7.31.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
@@ -41,14 +40,12 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
client-libs? (
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
)
!client-libs? (
dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
>=sys-libs/zlib-1.2.3:0=
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.0:0=
)
server? (
>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
man/zlib_decompress.1 \
|| die
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
cmake_src_prepare
diff --git a/dev-db/mysql/mysql-5.7.32.ebuild b/dev-db/mysql/mysql-5.7.32.ebuild
index 6c3a7183a83d..c68d1e4cd86d 100644
--- a/dev-db/mysql/mysql-5.7.32.ebuild
+++ b/dev-db/mysql/mysql-5.7.32.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
@@ -41,14 +40,12 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
client-libs? (
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
)
!client-libs? (
dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
>=sys-libs/zlib-1.2.3:0=
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.0:0=
)
server? (
>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
man/zlib_decompress.1 \
|| die
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
cmake_src_prepare
diff --git a/dev-db/mysql/mysql-5.7.33.ebuild b/dev-db/mysql/mysql-5.7.33.ebuild
index 0296a2135fc5..6a24a16ccfe2 100644
--- a/dev-db/mysql/mysql-5.7.33.ebuild
+++ b/dev-db/mysql/mysql-5.7.33.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
@@ -41,14 +40,12 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
client-libs? (
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
)
!client-libs? (
dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
>=sys-libs/zlib-1.2.3:0=
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.0:0=
)
server? (
>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
man/zlib_decompress.1 \
|| die
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
cmake_src_prepare
diff --git a/dev-db/mysql/mysql-5.7.34.ebuild b/dev-db/mysql/mysql-5.7.34.ebuild
index da6fe5706221..0e825dede97b 100644
--- a/dev-db/mysql/mysql-5.7.34.ebuild
+++ b/dev-db/mysql/mysql-5.7.34.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
@@ -41,14 +40,12 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
client-libs? (
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+ >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
)
!client-libs? (
dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
>=sys-libs/zlib-1.2.3:0=
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.0:0=
)
server? (
>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
man/zlib_decompress.1 \
|| die
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
cmake_src_prepare
diff --git a/dev-db/mysql/mysql-8.0.19-r2.ebuild b/dev-db/mysql/mysql-8.0.19-r2.ebuild
index 60dd2a3f27bc..f979bb9020ff 100644
--- a/dev-db/mysql/mysql-8.0.19-r2.ebuild
+++ b/dev-db/mysql/mysql-8.0.19-r2.ebuild
@@ -29,11 +29,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
router selinux +server tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )
cjk? ( server )
@@ -64,7 +63,6 @@ PATCHES=(
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-8.0.18.patch
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
"${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-without-clientlibs-tools.patch
- "${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-libressl-support.patch
"${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-events_bugs-test.patch
)
@@ -74,8 +72,7 @@ COMMON_DEPEND="
>=app-arch/lz4-0_p131:=
sys-libs/ncurses:0=
>=sys-libs/zlib-1.2.3:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ >=dev-libs/openssl-1.0.0:0=
server? (
dev-libs/icu:=
dev-libs/libevent:=
diff --git a/dev-db/mysql/mysql-8.0.20-r1.ebuild b/dev-db/mysql/mysql-8.0.20-r1.ebuild
index 4545a1eec02b..70c3c6e5e878 100644
--- a/dev-db/mysql/mysql-8.0.20-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.20-r1.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
router selinux +server tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )
cjk? ( server )
@@ -49,8 +48,7 @@ COMMON_DEPEND="
>=app-arch/lz4-0_p131:=
sys-libs/ncurses:0=
>=sys-libs/zlib-1.2.3:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ >=dev-libs/openssl-1.0.0:0=
server? (
dev-libs/icu:=
dev-libs/libevent:=
diff --git a/dev-db/mysql/mysql-8.0.21-r1.ebuild b/dev-db/mysql/mysql-8.0.21-r1.ebuild
index b3a4bf5a2ad2..d63f3416d34e 100644
--- a/dev-db/mysql/mysql-8.0.21-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.21-r1.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
router selinux +server tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )
cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
app-arch/zstd:=
sys-libs/ncurses:0=
>=sys-libs/zlib-1.2.3:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ >=dev-libs/openssl-1.0.0:0=
server? (
dev-libs/icu:=
dev-libs/libevent:=[ssl]
diff --git a/dev-db/mysql/mysql-8.0.22.ebuild b/dev-db/mysql/mysql-8.0.22.ebuild
index 18586043f65e..1c0cd3052d7f 100644
--- a/dev-db/mysql/mysql-8.0.22.ebuild
+++ b/dev-db/mysql/mysql-8.0.22.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
router selinux +server tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )
cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
app-arch/zstd:=
sys-libs/ncurses:0=
>=sys-libs/zlib-1.2.3:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ >=dev-libs/openssl-1.0.0:0=
server? (
dev-libs/icu:=
dev-libs/libevent:=[ssl,threads]
diff --git a/dev-db/mysql/mysql-8.0.23.ebuild b/dev-db/mysql/mysql-8.0.23.ebuild
index 89c21bd9a666..4de06f95e603 100644
--- a/dev-db/mysql/mysql-8.0.23.ebuild
+++ b/dev-db/mysql/mysql-8.0.23.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
router selinux +server tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )
cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
app-arch/zstd:=
sys-libs/ncurses:0=
>=sys-libs/zlib-1.2.3:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ >=dev-libs/openssl-1.0.0:0=
server? (
dev-libs/icu:=
dev-libs/libevent:=[ssl,threads]
diff --git a/dev-db/mysql/mysql-8.0.24.ebuild b/dev-db/mysql/mysql-8.0.24.ebuild
index a76d3a37969f..608252f5a966 100644
--- a/dev-db/mysql/mysql-8.0.24.ebuild
+++ b/dev-db/mysql/mysql-8.0.24.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
router selinux +server tcmalloc test"
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )
cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
app-arch/zstd:=
sys-libs/ncurses:0=
>=sys-libs/zlib-1.2.3:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ >=dev-libs/openssl-1.0.0:0=
server? (
dev-libs/icu:=
dev-libs/libevent:=[ssl,threads]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:23:33 +0000