From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- dev-db/mysql-cluster/Manifest | 8 ++++---- dev-db/mysql-cluster/metadata.xml | 1 - dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild | 15 ++++----------- dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 15 ++++----------- dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 15 ++++----------- 5 files changed, 16 insertions(+), 38 deletions(-) (limited to 'dev-db/mysql-cluster') diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest index 17ae7287b06b..61533f14cf02 100644 --- a/dev-db/mysql-cluster/Manifest +++ b/dev-db/mysql-cluster/Manifest @@ -5,7 +5,7 @@ DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B b9337cf8ae6742c58f92ae64b8 DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae SHA512 ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3 DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4 SHA512 48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5 DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc SHA512 2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05 -EBUILD mysql-cluster-7.2.34.ebuild 25565 BLAKE2B b7078cad7b6a074ef349e8186a854397270bd2f07e9190e8d43420fa972e56d30df5083041052e73bfcb149b38490a4451f33be89fbe38c8a48ed7df4624b1cc SHA512 e21777d337ac4a5245322b1149b16aeda9b87e88dc884e307f70a0d67657e3fe8ff5d4a2a80d54158eeda9f412a781eed1654a556f2bcf02f3e9f7ba675ae3c5 -EBUILD mysql-cluster-7.3.22.ebuild 26021 BLAKE2B 58405a45bf041018f155f20bdd43f3e1919974921311b489935e4ac37f56e442648ab8f58795c1274983b906a253f0f97444871ff10dc19f50ef6fffa2a80e63 SHA512 786e179f84b206ff51361e12f461098400a8bc553ac3986397491dcbccea47799602221a90b102244ca13981c575fb706c69d5cb3d0b650cd92bb28955487ebb -EBUILD mysql-cluster-7.4.21.ebuild 26021 BLAKE2B 5dc4e9382892630f825dc07735dc64084cb6c204630607850e6f436cc12b64c48c8116d25b5bc706e313158d672584cd5b1b010ac26c8e860c1d57377d8f9340 SHA512 da9036473459491f2f6c0e91f370c7fb0d5dab7b889768be88cda46372233f2546e28c2a75907dafc6cdcacc2cfc98e93d7c6284a947fcbb3307fc70e411c856 -MISC metadata.xml 1248 BLAKE2B 02eec2cf13c1d1ec71d92a3a6e15a65966e3a6de1595f5027159e8eb6c6c67a38994fe7c051746ff9f820138c51f21afd46214c0a686e9e107668b3eaba9950d SHA512 ce4c1b021cf1d5381c4523b9c047ce3a580ea807cfa81557d398ef5bf92bb0d30d1145d0fde299f1dbab8837b09731eea1767a864964ec9d66393096e61661f5 +EBUILD mysql-cluster-7.2.34.ebuild 25253 BLAKE2B 8e11f13fc932e847ff9727597ae21c6c3285f6a2834f3df0ae9b7a3c66e321ebea77752ae82e82dab837569db987fa3b6b142934dcfb837bae832a898cb9d756 SHA512 cac4e4db56cc39316cd9cb516cdd69de24a9622aa09f75c3224c9668df0622318cc53c659412becc0a301750c6da0113c8ca36dedb6fda90b728c2fdc07d35be +EBUILD mysql-cluster-7.3.22.ebuild 25709 BLAKE2B 31bf348240afdd8bd94fc7b2dd4c9f0ad9db18e18eda871320f2eba9c9c0beab841ad3b051202dfaedcca91000fd1d3929c1717a0fdcdc5b695c5158cb30015c SHA512 0dad574f9eab20450078dbc6094c40961855f34d2992927f742bac258f62d43f70a6924fbeed3da185809c1ed578539b3ffd1fbf2c05a2cad16f71d8c0736c6a +EBUILD mysql-cluster-7.4.21.ebuild 25709 BLAKE2B b00417ed38df0304a4976eec949ec277c1e1f1a92ba406a7750f4fba24865950575d2ef919c2801e03e186beb33c32a3fcbdc1ba63122c0b9825322652d559e7 SHA512 71a9fcd958d7d8a4a8c67f31439ad7fca3fe4694497039abca39a4dd24db645fbf9c62c6167447912eae21397fcb8f105e544862856affc9410c61b1d678e388 +MISC metadata.xml 1138 BLAKE2B 04b798f7c631682ba123338226c0c2932d5ca89827a390b96a1b63cc8690a2bcbbe6922e50c81cc3a32edaacaecda0c253b33f3efabc541d5fe6937788728020 SHA512 ccfa5aba6c89cc7885d54001bdcb9d978646d1cd002125bb4356891dc15b69c4f2785c21956f6df5420672067ff577dd66e3cfcca1b2cab2623a356e0386ebb3 diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml index c82ebfd6fc59..13a8c6dcbb33 100644 --- a/dev-db/mysql-cluster/metadata.xml +++ b/dev-db/mysql-cluster/metadata.xml @@ -9,7 +9,6 @@ Build the client libraries from the server package instead of the C Connector packages (not recommended) Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition) Use LATIN1 encoding instead of UTF8 - Enable SSL connections and crypto functions using dev-libs/libressl Enable NUMA support using sys-process/numactl (NUMA kernel support is also required) Add support for statement profiling (requires USE=community). Build the server program diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild index bd54a6729ec9..31bc6c2f2198 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/" DESCRIPTION="An enhanced, drop-in replacement for MySQL" LICENSE="GPL-2" SLOT="0" -IUSE="bindist client-libs debug extraengine java jemalloc latin1 libressl +IUSE="bindist client-libs debug extraengine java jemalloc latin1 +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="!bindist? ( bindist ) !test? ( test ) libressl? ( test )" +RESTRICT="!bindist? ( bindist ) !test? ( test )" REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )" @@ -78,8 +77,7 @@ COMMON_DEPEND=" tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( - !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= @@ -196,11 +194,6 @@ src_prepare() { echo > "${S}/support-files/SELinux/CMakeLists.txt" || die fi - if use libressl ; then - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ - "${S}/cmake/ssl.cmake" || die - fi - local plugin local server_plugins=( semisync ) local test_plugins=( audit_null daemon_example fulltext ) diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild index 7969b44c5892..fdbc2cad350a 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/" DESCRIPTION="An enhanced, drop-in replacement for MySQL" LICENSE="GPL-2" SLOT="0" -IUSE="client-libs debug extraengine jemalloc latin1 libressl numa +IUSE="client-libs debug extraengine 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 )" @@ -80,8 +79,7 @@ COMMON_DEPEND=" tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( - !libressl? ( >=dev-libs/openssl-1.0.0:0= ) - libressl? ( dev-libs/libressl:0= ) + >=dev-libs/openssl-1.0.0:0= ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= @@ -197,11 +195,6 @@ src_prepare() { echo > "${S}/support-files/SELinux/CMakeLists.txt" || die fi - if use libressl ; then - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ - "${S}/cmake/ssl.cmake" || die - fi - local plugin local server_plugins=( semisync ) local test_plugins=( audit_null daemon_example fulltext ) diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild index ad252c1349b3..d78696ae60ea 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/" DESCRIPTION="An enhanced, drop-in replacement for MySQL" LICENSE="GPL-2" SLOT="0" -IUSE="client-libs debug extraengine jemalloc latin1 libressl numa +IUSE="client-libs debug extraengine 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 )" @@ -80,8 +79,7 @@ COMMON_DEPEND=" tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( - !libressl? ( >=dev-libs/openssl-1.0.0:0= ) - libressl? ( dev-libs/libressl:0= ) + >=dev-libs/openssl-1.0.0:0= ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= @@ -197,11 +195,6 @@ src_prepare() { echo > "${S}/support-files/SELinux/CMakeLists.txt" || die fi - if use libressl ; then - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ - "${S}/cmake/ssl.cmake" || die - fi - local plugin local server_plugins=( semisync ) local test_plugins=( audit_null daemon_example fulltext ) -- cgit v1.2.3