From cc83ac38154440239f732731b8df86ce322c615e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Nov 2023 22:34:48 +0000 Subject: gentoo auto-resync : 14:11:2023 - 22:34:48 --- dev-db/mysql-connector-c/Manifest | 5 - ...nector-c-8.0.27-add-OpenSSL-3.0.0-support.patch | 313 --------------------- .../mysql-connector-c-8.0.27-r1.ebuild | 122 -------- .../mysql-connector-c-8.0.31.ebuild | 121 -------- 4 files changed, 561 deletions(-) delete mode 100644 dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch delete mode 100644 dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild delete mode 100644 dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild (limited to 'dev-db/mysql-connector-c') diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index b323c08d40dc..7e30aac9edb4 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1,12 +1,7 @@ AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af -AUX mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch 11508 BLAKE2B 1fe2341c938ce580611bb1f2ded279d02d4f1130b719c43d0c70942e9954214cc4392b86a18dfd0f88082c6b72fdf270e076647dd1600d7ebb8eb437ca10bb64 SHA512 1b7b1bf471ad6cab6c86dbfb7f6ffe506e3d20a51efcc1df503a9d65976fedb8dbcd67993897241fc0dd9e1f7356670bf3ec80c5b7f66c9246a44b4aa3eee3cc AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8da14c371500216a197602dec19b8b565bc219f98e8feb9bc660d81e32c4af7f39abb626af405d33a7f478617c8ee96c5b4453b8 SHA512 bb6315f0ac540d0723dffd9f8c2bdad9b9b1c0a3d706f80fd3bbdc9c7f276a8dda2754df94f6cb4ffecb0c3b0e65edc96c90b171eb0a4e5032fe6583e56ade85 AUX mysql-connector-c-8.0.32-musl.patch 833 BLAKE2B 92fd8e0b41ec07faf37bf94795e87883bb6bf860e7e0ba27919fe2caedb06b4a015d866d48568d5342f0557b6cba42fe912e8e8ea2f2c6c8a1a21fc05531d11e SHA512 35646ccce4f6064eb8b71cb7309db34abe851e5a46acb7b428a7c667bbe6f63de82ef74e00e58192c4fb55c82fe5ad3818551ec3eb334364fa426c106e846f5d -DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891 -DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102 SHA512 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96 DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539 SHA512 937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44 -EBUILD mysql-connector-c-8.0.27-r1.ebuild 3243 BLAKE2B e0cd9a95e8b9760309df66c35e3c22f21bed920288e91ec466cba438cbdddd9721fd37068720fc1b6155f820aa0c759cff7a06cb27aa90f97e4d6eda82d2294b SHA512 29d9d9a14042f9c18ce6bdb4e30c0bf31932f734965b001cc7dadc6d55d9fb06b78be61f5c29c5dce0242102d4c1bbd375a7c030d081c9c983b68185caf8bf7b -EBUILD mysql-connector-c-8.0.31.ebuild 3183 BLAKE2B 7c7a0735b18f7d48451b6c86aed42d85d07155d132ac38d363b2d75e9f4ff718e920f1dd3806e5240373e207e049d30a90b6a6ed805393d39e2083219b30ba12 SHA512 002090814388556e8605091b8acb08d1ccaf40ea5c624e60fb5e0bd586470bf4461e40523c72bdec5fc5b6da5eb4d856fb1b2971953592bbc13f8cd87bd71a7e EBUILD mysql-connector-c-8.0.32-r1.ebuild 3245 BLAKE2B e9ea5b835cbe956003a13add9ab19063482b0f96fa2a7ebfffd725976c9532cc22e888fcc4f85ea67b9bb85c29d7fc74bf4872c2ac090d2a19f1d17a94ec0d47 SHA512 cf32dea8d79256dc5d79ab51b7a035247592534ec02f3bde70ca49af178d3708516f5b8417bf4fc83ae8df33f1c0e6037cfd99a5fd10a3f4df4093b1af5c5cf8 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27 diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch deleted file mode 100644 index da1907db4633..000000000000 --- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch +++ /dev/null @@ -1,313 +0,0 @@ -From d5bedd07c111676695270cdf35d23f9026a78113 Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann -Date: Tue, 22 Jun 2021 23:56:54 +0200 -Subject: [PATCH 6/6] Add OpenSSL 3.0.0 support - -Signed-off-by: Thomas Deutschmann ---- - cmake/ssl.cmake | 59 +++++++++++++------ - mysys/my_md5.cc | 2 + - .../xcom_network_provider_ssl_native_lib.cc | 4 ++ - plugin/x/client/xconnection_impl.cc | 4 ++ - sql-common/client.cc | 2 + - sql/mysqld.cc | 2 + - sql/sys_vars.cc | 18 +++++- - vio/viosslfactories.cc | 6 ++ - 8 files changed, 78 insertions(+), 19 deletions(-) - -diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake -index 293281cf1..4732d8bf4 100644 ---- a/cmake/ssl.cmake -+++ b/cmake/ssl.cmake -@@ -205,34 +205,59 @@ MACRO (MYSQL_CHECK_SSL) - NAMES crypto libcrypto libeay32 - HINTS ${OPENSSL_ROOT_DIR}/lib) - -- IF(OPENSSL_INCLUDE_DIR) -+ IF(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") - # Verify version number. Version information looks like: - # #define OPENSSL_VERSION_NUMBER 0x1000103fL - # Encoded as MNNFFPPS: major minor fix patch status - FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" - OPENSSL_VERSION_NUMBER -- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" -- ) -- STRING(REGEX REPLACE -- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" -- OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" -- ) -- STRING(REGEX REPLACE -- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" -- OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}" -- ) -- STRING(REGEX REPLACE -- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" -- OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" -+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" - ) -+ -+ IF(OPENSSL_VERSION_NUMBER) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" -+ OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" -+ ) -+ ELSE() -+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" -+ OPENSSL_VERSION_STR -+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t ]+\"([0-9])+\\.([0-9])+\\.([0-9])+\".*" -+ ) -+ -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+)\\.[0-9]+\\.[0-9]+\".*$" "\\1" -+ OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_STR}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.([0-9]+)\\.[0-9]+\".*$" "\\1" -+ OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_STR}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.[0-9]+\\.([0-9]+)\".*$" "\\1" -+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_STR}" -+ ) -+ ENDIF() - ENDIF() -- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") -+ -+ INCLUDE(CheckSymbolExists) -+ -+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) -+ IF(HAVE_TLS1_3_VERSION) - ADD_DEFINITIONS(-DHAVE_TLSv13) - ENDIF() - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARY AND - CRYPTO_LIBRARY AND -- OPENSSL_MAJOR_VERSION STREQUAL "1" -+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" - ) - SET(OPENSSL_FOUND TRUE) - FIND_PROGRAM(OPENSSL_EXECUTABLE openssl -@@ -296,8 +321,6 @@ MACRO (MYSQL_CHECK_SSL) - MESSAGE(STATUS "OPENSSL_MINOR_VERSION = ${OPENSSL_MINOR_VERSION}") - MESSAGE(STATUS "OPENSSL_FIX_VERSION = ${OPENSSL_FIX_VERSION}") - -- INCLUDE(CheckSymbolExists) -- - CMAKE_PUSH_CHECK_STATE() - SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" -diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc -index 86203619f..37ed3c8b2 100644 ---- a/mysys/my_md5.cc -+++ b/mysys/my_md5.cc -@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, - int compute_md5_hash(char *digest, const char *buf, int len) { - int retval = 0; - int fips_mode = 0; -+#if defined(OPENSSL_FIPS) - fips_mode = FIPS_mode(); -+#endif - /* If fips mode is ON/STRICT restricted method calls will result into abort, - * skipping call. */ - if (fips_mode == 0) { -diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc -index 8d4af3c04..de67c9e7c 100644 ---- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc -+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc -@@ -316,6 +316,7 @@ error: - return 1; - } - -+#if defined(OPENSSL_FIPS) - #define OPENSSL_ERROR_LENGTH 512 - static int configure_ssl_fips_mode(const int fips_mode) { - int rc = -1; -@@ -339,6 +340,7 @@ static int configure_ssl_fips_mode(const int fips_mode) { - EXIT: - return rc; - } -+#endif - - static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file, - const char *ca_path) { -@@ -478,12 +480,14 @@ int Xcom_network_provider_ssl_library::xcom_init_ssl( - int verify_server = SSL_VERIFY_NONE; - int verify_client = SSL_VERIFY_NONE; - -+#if defined(OPENSSL_FIPS) - if (configure_ssl_fips_mode( - Network_provider_manager::getInstance().xcom_get_ssl_fips_mode()) != - 1) { - G_ERROR("Error setting the ssl fips mode"); - goto error; - } -+#endif - - SSL_library_init(); - SSL_load_error_strings(); -diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc -index aaf37a1b3..753944889 100644 ---- a/plugin/x/client/xconnection_impl.cc -+++ b/plugin/x/client/xconnection_impl.cc -@@ -617,6 +617,7 @@ XError Connection_impl::get_ssl_error(const int error_id) { - return XError(CR_SSL_CONNECTION_ERROR, buffer); - } - -+#if defined(OPENSSL_FIPS) - /** - Set fips mode in openssl library, - When we set fips mode ON/STRICT, it will perform following operations: -@@ -656,6 +657,7 @@ int set_fips_mode(const uint32_t fips_mode, - EXIT: - return rc; - } -+#endif - - XError Connection_impl::activate_tls() { - if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET); -@@ -666,12 +668,14 @@ XError Connection_impl::activate_tls() { - if (!m_context->m_ssl_config.is_configured()) - return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true}; - -+#if defined(OPENSSL_FIPS) - char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - if (set_fips_mode( - static_cast(m_context->m_ssl_config.m_ssl_fips_mode), - err_string) != 1) { - return XError{CR_SSL_CONNECTION_ERROR, err_string, true}; - } -+#endif - auto ssl_ctx_flags = process_tls_version( - details::null_when_empty(m_context->m_ssl_config.m_tls_version)); - -diff --git a/sql-common/client.cc b/sql-common/client.cc -index 5de2a1fb9..102e663d9 100644 ---- a/sql-common/client.cc -+++ b/sql-common/client.cc -@@ -8286,6 +8286,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option, - return 1; - break; - case MYSQL_OPT_SSL_FIPS_MODE: { -+#if defined(OPENSSL_FIPS) - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - ENSURE_EXTENSIONS_PRESENT(&mysql->options); - mysql->options.extension->ssl_fips_mode = -@@ -8298,6 +8299,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option, - "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string); - return 1; - } -+#endif - } break; - case MYSQL_OPT_SSL_MODE: - ENSURE_EXTENSIONS_PRESENT(&mysql->options); -diff --git a/sql/mysqld.cc b/sql/mysqld.cc -index 8105d4b73..b580f1c4d 100644 ---- a/sql/mysqld.cc -+++ b/sql/mysqld.cc -@@ -5292,12 +5292,14 @@ static void init_ssl() { - } - - static int init_ssl_communication() { -+#if defined(OPENSSL_FIPS) - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); - if (ret_fips_mode != 1) { - LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string); - return 1; - } -+#endif - if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl, - &server_main_callback, opt_initialize)) - return 1; -diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc -index 4592e4bbb..320f458fd 100644 ---- a/sql/sys_vars.cc -+++ b/sql/sys_vars.cc -@@ -4799,6 +4799,7 @@ static Sys_var_ulong Sys_max_execution_time( - HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); - -+#if defined(OPENSSL_FIPS) - static bool update_fips_mode(sys_var *, THD *, enum_var_type) { - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) { -@@ -4809,15 +4810,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) { - return false; - } - } -+#endif - -+#if defined(OPENSSL_FIPS) - static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr}; -+#else -+static const char *ssl_fips_mode_names[] = {"OFF", 0}; -+#endif - static Sys_var_enum Sys_ssl_fips_mode( - "ssl_fips_mode", - "SSL FIPS mode (applies only for OpenSSL); " -+#if defined(OPENSSL_FIPS) - "permitted values are: OFF, ON, STRICT", -+#else -+ "permitted values are: OFF", -+#endif - GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE), - ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, -- ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr); -+ ON_CHECK(NULL), -+#if defined(OPENSSL_FIPS) -+ ON_UPDATE(update_fips_mode), -+#else -+ ON_UPDATE(NULL), -+#endif -+ NULL); - - static Sys_var_bool Sys_auto_generate_certs( - "auto_generate_certs", -diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc -index 618be1511..672fc74ca 100644 ---- a/vio/viosslfactories.cc -+++ b/vio/viosslfactories.cc -@@ -472,6 +472,7 @@ void ssl_start() { - } - } - -+#if defined(OPENSSL_FIPS) - /** - Set fips mode in openssl library, - When we set fips mode ON/STRICT, it will perform following operations: -@@ -525,6 +526,7 @@ EXIT: - @returns openssl current fips mode - */ - uint get_fips_mode() { return FIPS_mode(); } -+#endif - - /** - Toggle FIPS mode, to see whether it is available with the current SSL library. -@@ -532,12 +534,16 @@ uint get_fips_mode() { return FIPS_mode(); } - @retval non-zero: FIPS is supported. - */ - int test_ssl_fips_mode(char *err_string) { -+#if defined(OPENSSL_FIPS) - int ret = FIPS_mode_set(FIPS_mode() == 0 ? 1 : 0); - unsigned long err = (ret == 0) ? ERR_get_error() : 0; - - if (err != 0) { - ERR_error_string_n(err, err_string, OPENSSL_ERROR_LENGTH - 1); - } -+#else -+ int ret = 0; -+#endif - return ret; - } - --- -2.34.0 - diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild deleted file mode 100644 index 124402752491..000000000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib flag-o-matic - -# wrap the config script -MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/mysql/mysql-server.git" - - inherit git-r3 -else - SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - - S="${WORKDIR}/mysql-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0/21" -IUSE="ldap static-libs" - -RDEPEND=" - >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] - app-arch/zstd:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) - dev-libs/openssl:0=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" - -# Avoid file collisions, #692580 -RDEPEND+=" ! client/CMakeLists.txt || die - - # Forcefully disable auth plugin - if ! use ldap ; then - sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die - echo > libmysql/authentication_ldap/CMakeLists.txt || die - fi - - cmake_src_prepare -} - -multilib_src_configure() { - CMAKE_BUILD_TYPE="RelWithDebInfo" - - # Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08 - append-cxxflags -std=c++17 - - local mycmakeargs=( - -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG - -DINSTALL_LAYOUT=RPM - -DINSTALL_LIBDIR=$(get_libdir) - -DWITH_DEFAULT_COMPILER_OPTIONS=OFF - -DENABLED_LOCAL_INFILE=ON - -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" - -DWITH_LZ4=system - -DWITH_NUMA=OFF - -DWITH_SSL=system - -DWITH_ZLIB=system - -DWITH_ZSTD=system - -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient - -DSHARED_LIB_PATCH_VERSION="0" - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - -DWITHOUT_SERVER=ON - ) - - cmake_src_configure -} - -multilib_src_install_all() { - doman \ - man/my_print_defaults.1 \ - man/perror.1 \ - man/zlib_decompress.1 - - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild deleted file mode 100644 index db6fbd547f17..000000000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib flag-o-matic - -# wrap the config script -MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/mysql/mysql-server.git" - - inherit git-r3 -else - SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - - S="${WORKDIR}/mysql-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0/21" -IUSE="ldap static-libs" - -RDEPEND=" - >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] - app-arch/zstd:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) - dev-libs/openssl:0=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" - -# Avoid file collisions, #692580 -RDEPEND+=" ! client/CMakeLists.txt || die - - # Forcefully disable auth plugin - if ! use ldap ; then - sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die - echo > libmysql/authentication_ldap/CMakeLists.txt || die - fi - - cmake_src_prepare -} - -multilib_src_configure() { - CMAKE_BUILD_TYPE="RelWithDebInfo" - - # Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08 - append-cxxflags -std=c++17 - - local mycmakeargs=( - -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG - -DINSTALL_LAYOUT=RPM - -DINSTALL_LIBDIR=$(get_libdir) - -DWITH_DEFAULT_COMPILER_OPTIONS=OFF - -DENABLED_LOCAL_INFILE=ON - -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" - -DWITH_LZ4=system - -DWITH_NUMA=OFF - -DWITH_SSL=system - -DWITH_ZLIB=system - -DWITH_ZSTD=system - -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient - -DSHARED_LIB_PATCH_VERSION="0" - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - -DWITHOUT_SERVER=ON - ) - - cmake_src_configure -} - -multilib_src_install_all() { - doman \ - man/my_print_defaults.1 \ - man/perror.1 \ - man/zlib_decompress.1 - - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} -- cgit v1.2.3