1 |
commit: f30c3ae397bd27e0df5777819887979e889c7d8d |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 3 21:21:49 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 3 21:21:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30c3ae3 |
7 |
|
8 |
dev-db/mysql-connector-c: drop 8.0.22, 8.0.23-r1, 8.0.25, 8.0.25-r1, 8.0.26 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/822258 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
dev-db/mysql-connector-c/Manifest | 4 - |
14 |
...nector-c-8.0.25-add-OpenSSL-3.0.0-support.patch | 294 --------------------- |
15 |
.../mysql-connector-c-8.0.22.ebuild | 110 -------- |
16 |
.../mysql-connector-c-8.0.23-r1.ebuild | 118 --------- |
17 |
.../mysql-connector-c-8.0.25-r1.ebuild | 122 --------- |
18 |
.../mysql-connector-c-8.0.25.ebuild | 121 --------- |
19 |
.../mysql-connector-c-8.0.26.ebuild | 122 --------- |
20 |
7 files changed, 891 deletions(-) |
21 |
|
22 |
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest |
23 |
index c3a4a68bf2a4..c567c6cfb162 100644 |
24 |
--- a/dev-db/mysql-connector-c/Manifest |
25 |
+++ b/dev-db/mysql-connector-c/Manifest |
26 |
@@ -1,5 +1 @@ |
27 |
-DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6 SHA512 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612 |
28 |
-DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 3a7d3e05c774085d6078d0d3effd58d2df47521615356a2aa5efc2ea2ef8457e19ad57a054926ccff0a4752ca71d0464daa7fe9a3ac6c1b1d3bd86a9a82dfc58 SHA512 b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8 |
29 |
-DIST mysql-boost-8.0.25.tar.gz 290265324 BLAKE2B 5393a2a2525a886d9ece19777deae01e6c0b24b9ff5a0a5ffb9075740ed912d0df59a165b6ec9ceb60c7c28f3062cda5cceb4da3a8280f42549984c846f1ce5c SHA512 af653ccff66a9d87221b46ad4f7bcc629700549f758998b9a7fb22e4573b9495a28624e031f016f9ad8fe0dfcf481b82f1ffe224aa48c2d45531570026b26081 |
30 |
-DIST mysql-boost-8.0.26.tar.gz 291285918 BLAKE2B 6198ca8982a8c9df7e6ee4df5e2c1e0d64d2eb4d83cb7265317b58d55f6787c3240c8e40d196f2326ff3d66926ad7dab0705edd92e5a82881ce6ddb7f0c510b9 SHA512 63d47cb52407a816dc9f4330b99924624dfee46e57e7fdce19eff32909dd9e23251e2439d1807b002a1661b547173222c77465a3ca4dbb312414a84927809cfc |
31 |
DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891 |
32 |
|
33 |
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch |
34 |
deleted file mode 100644 |
35 |
index f566e0fba5b6..000000000000 |
36 |
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch |
37 |
+++ /dev/null |
38 |
@@ -1,294 +0,0 @@ |
39 |
-From 3bf91fabf641f3f5114bf3893de40a31aae36e13 Mon Sep 17 00:00:00 2001 |
40 |
-From: Thomas Deutschmann <whissi@g.o> |
41 |
-Date: Tue, 22 Jun 2021 23:56:54 +0200 |
42 |
-Subject: [PATCH 5/5] Add OpenSSL 3.0.0 support |
43 |
- |
44 |
-Signed-off-by: Thomas Deutschmann <whissi@g.o> |
45 |
---- |
46 |
- cmake/ssl.cmake | 59 +++++++++++++------ |
47 |
- mysys/my_md5.cc | 2 + |
48 |
- .../bindings/xcom/xcom/xcom_ssl_transport.cc | 4 ++ |
49 |
- plugin/x/client/xconnection_impl.cc | 4 ++ |
50 |
- sql-common/client.cc | 2 + |
51 |
- sql/mysqld.cc | 2 + |
52 |
- sql/sys_vars.cc | 18 +++++- |
53 |
- vio/viosslfactories.cc | 2 + |
54 |
- 8 files changed, 74 insertions(+), 19 deletions(-) |
55 |
- |
56 |
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake |
57 |
-index 18c95dfac..dd2f7e657 100644 |
58 |
---- a/cmake/ssl.cmake |
59 |
-+++ b/cmake/ssl.cmake |
60 |
-@@ -201,34 +201,59 @@ MACRO (MYSQL_CHECK_SSL) |
61 |
- NAMES crypto libcrypto libeay32 |
62 |
- HINTS ${OPENSSL_ROOT_DIR}/lib) |
63 |
- |
64 |
-- IF(OPENSSL_INCLUDE_DIR) |
65 |
-+ IF(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") |
66 |
- # Verify version number. Version information looks like: |
67 |
- # #define OPENSSL_VERSION_NUMBER 0x1000103fL |
68 |
- # Encoded as MNNFFPPS: major minor fix patch status |
69 |
- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" |
70 |
- OPENSSL_VERSION_NUMBER |
71 |
-- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" |
72 |
-- ) |
73 |
-- STRING(REGEX REPLACE |
74 |
-- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" |
75 |
-- OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" |
76 |
-- ) |
77 |
-- STRING(REGEX REPLACE |
78 |
-- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" |
79 |
-- OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}" |
80 |
-- ) |
81 |
-- STRING(REGEX REPLACE |
82 |
-- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" |
83 |
-- OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" |
84 |
-+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" |
85 |
- ) |
86 |
-+ |
87 |
-+ IF(OPENSSL_VERSION_NUMBER) |
88 |
-+ STRING(REGEX REPLACE |
89 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" |
90 |
-+ OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" |
91 |
-+ ) |
92 |
-+ STRING(REGEX REPLACE |
93 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" |
94 |
-+ OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}" |
95 |
-+ ) |
96 |
-+ STRING(REGEX REPLACE |
97 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" |
98 |
-+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" |
99 |
-+ ) |
100 |
-+ ELSE() |
101 |
-+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" |
102 |
-+ OPENSSL_VERSION_STR |
103 |
-+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t ]+\"([0-9])+\\.([0-9])+\\.([0-9])+\".*" |
104 |
-+ ) |
105 |
-+ |
106 |
-+ STRING(REGEX REPLACE |
107 |
-+ "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+)\\.[0-9]+\\.[0-9]+\".*$" "\\1" |
108 |
-+ OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_STR}" |
109 |
-+ ) |
110 |
-+ STRING(REGEX REPLACE |
111 |
-+ "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.([0-9]+)\\.[0-9]+\".*$" "\\1" |
112 |
-+ OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_STR}" |
113 |
-+ ) |
114 |
-+ STRING(REGEX REPLACE |
115 |
-+ "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.[0-9]+\\.([0-9]+)\".*$" "\\1" |
116 |
-+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_STR}" |
117 |
-+ ) |
118 |
-+ ENDIF() |
119 |
- ENDIF() |
120 |
-- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") |
121 |
-+ |
122 |
-+ INCLUDE(CheckSymbolExists) |
123 |
-+ |
124 |
-+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) |
125 |
-+ IF(HAVE_TLS1_3_VERSION) |
126 |
- ADD_DEFINITIONS(-DHAVE_TLSv13) |
127 |
- ENDIF() |
128 |
- IF(OPENSSL_INCLUDE_DIR AND |
129 |
- OPENSSL_LIBRARY AND |
130 |
- CRYPTO_LIBRARY AND |
131 |
-- OPENSSL_MAJOR_VERSION STREQUAL "1" |
132 |
-+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" |
133 |
- ) |
134 |
- SET(OPENSSL_FOUND TRUE) |
135 |
- FIND_PROGRAM(OPENSSL_EXECUTABLE openssl |
136 |
-@@ -292,8 +317,6 @@ MACRO (MYSQL_CHECK_SSL) |
137 |
- MESSAGE(STATUS "OPENSSL_MINOR_VERSION = ${OPENSSL_MINOR_VERSION}") |
138 |
- MESSAGE(STATUS "OPENSSL_FIX_VERSION = ${OPENSSL_FIX_VERSION}") |
139 |
- |
140 |
-- INCLUDE(CheckSymbolExists) |
141 |
-- |
142 |
- CMAKE_PUSH_CHECK_STATE() |
143 |
- SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) |
144 |
- CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" |
145 |
-diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc |
146 |
-index 86203619f..37ed3c8b2 100644 |
147 |
---- a/mysys/my_md5.cc |
148 |
-+++ b/mysys/my_md5.cc |
149 |
-@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, |
150 |
- int compute_md5_hash(char *digest, const char *buf, int len) { |
151 |
- int retval = 0; |
152 |
- int fips_mode = 0; |
153 |
-+#if defined(OPENSSL_FIPS) |
154 |
- fips_mode = FIPS_mode(); |
155 |
-+#endif |
156 |
- /* If fips mode is ON/STRICT restricted method calls will result into abort, |
157 |
- * skipping call. */ |
158 |
- if (fips_mode == 0) { |
159 |
-diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc |
160 |
-index 4ed9f9ac9..895443166 100644 |
161 |
---- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc |
162 |
-+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc |
163 |
-@@ -325,6 +325,7 @@ error: |
164 |
- return 1; |
165 |
- } |
166 |
- |
167 |
-+#if defined(OPENSSL_FIPS) |
168 |
- #define OPENSSL_ERROR_LENGTH 512 |
169 |
- static int configure_ssl_fips_mode(const uint fips_mode) { |
170 |
- int rc = -1; |
171 |
-@@ -348,6 +349,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) { |
172 |
- EXIT: |
173 |
- return rc; |
174 |
- } |
175 |
-+#endif |
176 |
- |
177 |
- static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file, |
178 |
- const char *ca_path) { |
179 |
-@@ -544,10 +546,12 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file, |
180 |
- int verify_server = SSL_VERIFY_NONE; |
181 |
- int verify_client = SSL_VERIFY_NONE; |
182 |
- |
183 |
-+#if defined(OPENSSL_FIPS) |
184 |
- if (configure_ssl_fips_mode(ssl_fips_mode) != 1) { |
185 |
- G_ERROR("Error setting the ssl fips mode"); |
186 |
- goto error; |
187 |
- } |
188 |
-+#endif |
189 |
- |
190 |
- SSL_library_init(); |
191 |
- SSL_load_error_strings(); |
192 |
-diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc |
193 |
-index c1686c6d5..3ae34fdfd 100644 |
194 |
---- a/plugin/x/client/xconnection_impl.cc |
195 |
-+++ b/plugin/x/client/xconnection_impl.cc |
196 |
-@@ -617,6 +617,7 @@ XError Connection_impl::get_ssl_error(const int error_id) { |
197 |
- return XError(CR_SSL_CONNECTION_ERROR, buffer); |
198 |
- } |
199 |
- |
200 |
-+#if defined(OPENSSL_FIPS) |
201 |
- /** |
202 |
- Set fips mode in openssl library, |
203 |
- When we set fips mode ON/STRICT, it will perform following operations: |
204 |
-@@ -656,6 +657,7 @@ int set_fips_mode(const uint32_t fips_mode, |
205 |
- EXIT: |
206 |
- return rc; |
207 |
- } |
208 |
-+#endif |
209 |
- |
210 |
- XError Connection_impl::activate_tls() { |
211 |
- if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET); |
212 |
-@@ -666,12 +668,14 @@ XError Connection_impl::activate_tls() { |
213 |
- if (!m_context->m_ssl_config.is_configured()) |
214 |
- return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true}; |
215 |
- |
216 |
-+#if defined(OPENSSL_FIPS) |
217 |
- char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
218 |
- if (set_fips_mode( |
219 |
- static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode), |
220 |
- err_string) != 1) { |
221 |
- return XError{CR_SSL_CONNECTION_ERROR, err_string, true}; |
222 |
- } |
223 |
-+#endif |
224 |
- auto ssl_ctx_flags = process_tls_version( |
225 |
- details::null_when_empty(m_context->m_ssl_config.m_tls_version)); |
226 |
- |
227 |
-diff --git a/sql-common/client.cc b/sql-common/client.cc |
228 |
-index 1316d54a7..554970378 100644 |
229 |
---- a/sql-common/client.cc |
230 |
-+++ b/sql-common/client.cc |
231 |
-@@ -8019,6 +8019,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option, |
232 |
- return 1; |
233 |
- break; |
234 |
- case MYSQL_OPT_SSL_FIPS_MODE: { |
235 |
-+#if defined(OPENSSL_FIPS) |
236 |
- char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
237 |
- ENSURE_EXTENSIONS_PRESENT(&mysql->options); |
238 |
- mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg); |
239 |
-@@ -8030,6 +8031,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option, |
240 |
- "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string); |
241 |
- return 1; |
242 |
- } |
243 |
-+#endif |
244 |
- } break; |
245 |
- case MYSQL_OPT_SSL_MODE: |
246 |
- ENSURE_EXTENSIONS_PRESENT(&mysql->options); |
247 |
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc |
248 |
-index 83643f76a..dfdc23ab7 100644 |
249 |
---- a/sql/mysqld.cc |
250 |
-+++ b/sql/mysqld.cc |
251 |
-@@ -5134,12 +5134,14 @@ static void init_ssl() { |
252 |
- } |
253 |
- |
254 |
- static int init_ssl_communication() { |
255 |
-+#if defined(OPENSSL_FIPS) |
256 |
- char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
257 |
- int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); |
258 |
- if (ret_fips_mode != 1) { |
259 |
- LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string); |
260 |
- return 1; |
261 |
- } |
262 |
-+#endif |
263 |
- if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl, |
264 |
- &server_main_callback, opt_initialize)) |
265 |
- return 1; |
266 |
-diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc |
267 |
-index 3b8473bd1..c22c38305 100644 |
268 |
---- a/sql/sys_vars.cc |
269 |
-+++ b/sql/sys_vars.cc |
270 |
-@@ -4614,6 +4614,7 @@ static Sys_var_ulong Sys_max_execution_time( |
271 |
- HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG), |
272 |
- VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); |
273 |
- |
274 |
-+#if defined(OPENSSL_FIPS) |
275 |
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) { |
276 |
- char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
277 |
- if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) { |
278 |
-@@ -4624,15 +4625,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) { |
279 |
- return false; |
280 |
- } |
281 |
- } |
282 |
-+#endif |
283 |
- |
284 |
-+#if defined(OPENSSL_FIPS) |
285 |
- static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr}; |
286 |
-+#else |
287 |
-+static const char *ssl_fips_mode_names[] = {"OFF", 0}; |
288 |
-+#endif |
289 |
- static Sys_var_enum Sys_ssl_fips_mode( |
290 |
- "ssl_fips_mode", |
291 |
- "SSL FIPS mode (applies only for OpenSSL); " |
292 |
-+#if defined(OPENSSL_FIPS) |
293 |
- "permitted values are: OFF, ON, STRICT", |
294 |
-+#else |
295 |
-+ "permitted values are: OFF", |
296 |
-+#endif |
297 |
- GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE), |
298 |
- ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, |
299 |
-- ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr); |
300 |
-+ ON_CHECK(NULL), |
301 |
-+#if defined(OPENSSL_FIPS) |
302 |
-+ ON_UPDATE(update_fips_mode), |
303 |
-+#else |
304 |
-+ ON_UPDATE(NULL), |
305 |
-+#endif |
306 |
-+ NULL); |
307 |
- |
308 |
- static Sys_var_bool Sys_auto_generate_certs( |
309 |
- "auto_generate_certs", |
310 |
-diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc |
311 |
-index c25117bd0..11b466bcf 100644 |
312 |
---- a/vio/viosslfactories.cc |
313 |
-+++ b/vio/viosslfactories.cc |
314 |
-@@ -472,6 +472,7 @@ void ssl_start() { |
315 |
- } |
316 |
- } |
317 |
- |
318 |
-+#if defined(OPENSSL_FIPS) |
319 |
- /** |
320 |
- Set fips mode in openssl library, |
321 |
- When we set fips mode ON/STRICT, it will perform following operations: |
322 |
-@@ -525,6 +526,7 @@ EXIT: |
323 |
- @returns openssl current fips mode |
324 |
- */ |
325 |
- uint get_fips_mode() { return FIPS_mode(); } |
326 |
-+#endif |
327 |
- |
328 |
- long process_tls_version(const char *tls_version) { |
329 |
- const char *separator = ","; |
330 |
--- |
331 |
-2.32.0 |
332 |
- |
333 |
|
334 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild |
335 |
deleted file mode 100644 |
336 |
index 0cd2c65693f6..000000000000 |
337 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild |
338 |
+++ /dev/null |
339 |
@@ -1,110 +0,0 @@ |
340 |
-# Copyright 1999-2021 Gentoo Authors |
341 |
-# Distributed under the terms of the GNU General Public License v2 |
342 |
- |
343 |
-EAPI=7 |
344 |
- |
345 |
-inherit cmake-multilib |
346 |
- |
347 |
-# wrap the config script |
348 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
349 |
- |
350 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
351 |
-HOMEPAGE="https://dev.mysql.com/downloads/" |
352 |
-LICENSE="GPL-2" |
353 |
- |
354 |
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" |
355 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" |
356 |
- |
357 |
-SLOT="0/21" |
358 |
-IUSE="ldap static-libs" |
359 |
- |
360 |
-RDEPEND=" |
361 |
- >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] |
362 |
- app-arch/zstd:=[${MULTILIB_USEDEP}] |
363 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
364 |
- ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) |
365 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
366 |
- " |
367 |
-DEPEND="${RDEPEND}" |
368 |
- |
369 |
-# Avoid file collisions, #692580 |
370 |
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1" |
371 |
-RDEPEND+=" !=dev-db/mysql-5.7.23*" |
372 |
-RDEPEND+=" !=dev-db/mysql-5.7.24*" |
373 |
-RDEPEND+=" !=dev-db/mysql-5.7.25*" |
374 |
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0" |
375 |
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0" |
376 |
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" |
377 |
- |
378 |
-DOCS=( README ) |
379 |
- |
380 |
-S="${WORKDIR}/mysql-${PV}" |
381 |
- |
382 |
-PATCHES=( |
383 |
- "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch |
384 |
- "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch |
385 |
-) |
386 |
- |
387 |
-src_prepare() { |
388 |
- sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die |
389 |
- |
390 |
- # All these are for the server only. |
391 |
- # Disable rpm call which would trigger sandbox, #692368 |
392 |
- sed -i \ |
393 |
- -e '/MYSQL_CHECK_LIBEVENT/d' \ |
394 |
- -e '/MYSQL_CHECK_RAPIDJSON/d' \ |
395 |
- -e '/MYSQL_CHECK_ICU/d' \ |
396 |
- -e '/MYSQL_CHECK_EDITLINE/d' \ |
397 |
- -e '/MYSQL_CHECK_CURL/d' \ |
398 |
- -e '/ADD_SUBDIRECTORY(man)/d' \ |
399 |
- -e '/ADD_SUBDIRECTORY(share)/d' \ |
400 |
- -e '/INCLUDE(cmake\/boost/d' \ |
401 |
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ |
402 |
- CMakeLists.txt || die |
403 |
- |
404 |
- # Skip building clients |
405 |
- echo > client/CMakeLists.txt || die |
406 |
- |
407 |
- # Forcefully disable auth plugin |
408 |
- if ! use ldap ; then |
409 |
- sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die |
410 |
- echo > libmysql/authentication_ldap/CMakeLists.txt || die |
411 |
- fi |
412 |
- |
413 |
- cmake-utils_src_prepare |
414 |
-} |
415 |
- |
416 |
-multilib_src_configure() { |
417 |
- local mycmakeargs=( |
418 |
- -DINSTALL_LAYOUT=RPM |
419 |
- -DINSTALL_LIBDIR=$(get_libdir) |
420 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
421 |
- -DENABLED_LOCAL_INFILE=ON |
422 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" |
423 |
- -DWITH_LZ4=system |
424 |
- -DWITH_NUMA=OFF |
425 |
- -DWITH_SSL=system |
426 |
- -DWITH_ZLIB=system |
427 |
- -DWITH_ZSTD=system |
428 |
- -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient |
429 |
- -DSHARED_LIB_PATCH_VERSION="0" |
430 |
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
431 |
- -DWITHOUT_SERVER=ON |
432 |
- ) |
433 |
- cmake-utils_src_configure |
434 |
-} |
435 |
- |
436 |
-multilib_src_install() { |
437 |
- cmake-utils_src_install |
438 |
-} |
439 |
- |
440 |
-multilib_src_install_all() { |
441 |
- doman \ |
442 |
- man/my_print_defaults.1 \ |
443 |
- man/perror.1 \ |
444 |
- man/zlib_decompress.1 |
445 |
- |
446 |
- if ! use static-libs ; then |
447 |
- find "${ED}" -name "*.a" -delete || die |
448 |
- fi |
449 |
-} |
450 |
|
451 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild |
452 |
deleted file mode 100644 |
453 |
index d90ed6a38415..000000000000 |
454 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild |
455 |
+++ /dev/null |
456 |
@@ -1,118 +0,0 @@ |
457 |
-# Copyright 1999-2021 Gentoo Authors |
458 |
-# Distributed under the terms of the GNU General Public License v2 |
459 |
- |
460 |
-EAPI=7 |
461 |
- |
462 |
-CMAKE_ECLASS=cmake |
463 |
-inherit cmake-multilib |
464 |
- |
465 |
-# wrap the config script |
466 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
467 |
- |
468 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
469 |
-HOMEPAGE="https://dev.mysql.com/downloads/" |
470 |
- |
471 |
-if [[ ${PV} == "9999" ]]; then |
472 |
- EGIT_REPO_URI="https://github.com/mysql/mysql-server.git" |
473 |
- |
474 |
- inherit git-r3 |
475 |
-else |
476 |
- SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" |
477 |
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86" |
478 |
- |
479 |
- S="${WORKDIR}/mysql-${PV}" |
480 |
-fi |
481 |
- |
482 |
-LICENSE="GPL-2" |
483 |
-SLOT="0/21" |
484 |
-IUSE="ldap static-libs" |
485 |
- |
486 |
-RDEPEND=" |
487 |
- >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] |
488 |
- app-arch/zstd:=[${MULTILIB_USEDEP}] |
489 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
490 |
- ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) |
491 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
492 |
-" |
493 |
-DEPEND="${RDEPEND}" |
494 |
- |
495 |
-# Avoid file collisions, #692580 |
496 |
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1" |
497 |
-RDEPEND+=" !=dev-db/mysql-5.7.23*" |
498 |
-RDEPEND+=" !=dev-db/mysql-5.7.24*" |
499 |
-RDEPEND+=" !=dev-db/mysql-5.7.25*" |
500 |
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0" |
501 |
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0" |
502 |
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" |
503 |
- |
504 |
-DOCS=( README ) |
505 |
- |
506 |
-PATCHES=( |
507 |
- "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch |
508 |
- "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch |
509 |
-) |
510 |
- |
511 |
-src_prepare() { |
512 |
- sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die |
513 |
- |
514 |
- # All these are for the server only. |
515 |
- # Disable rpm call which would trigger sandbox, #692368 |
516 |
- sed -i \ |
517 |
- -e '/MYSQL_CHECK_LIBEVENT/d' \ |
518 |
- -e '/MYSQL_CHECK_RAPIDJSON/d' \ |
519 |
- -e '/MYSQL_CHECK_ICU/d' \ |
520 |
- -e '/MYSQL_CHECK_EDITLINE/d' \ |
521 |
- -e '/MYSQL_CHECK_CURL/d' \ |
522 |
- -e '/ADD_SUBDIRECTORY(man)/d' \ |
523 |
- -e '/ADD_SUBDIRECTORY(share)/d' \ |
524 |
- -e '/INCLUDE(cmake\/boost/d' \ |
525 |
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ |
526 |
- CMakeLists.txt || die |
527 |
- |
528 |
- # Skip building clients |
529 |
- echo > client/CMakeLists.txt || die |
530 |
- |
531 |
- # Forcefully disable auth plugin |
532 |
- if ! use ldap ; then |
533 |
- sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die |
534 |
- echo > libmysql/authentication_ldap/CMakeLists.txt || die |
535 |
- fi |
536 |
- |
537 |
- cmake_src_prepare |
538 |
-} |
539 |
- |
540 |
-multilib_src_configure() { |
541 |
- CMAKE_BUILD_TYPE="RelWithDebInfo" |
542 |
- |
543 |
- local mycmakeargs=( |
544 |
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG |
545 |
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG |
546 |
- -DINSTALL_LAYOUT=RPM |
547 |
- -DINSTALL_LIBDIR=$(get_libdir) |
548 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
549 |
- -DENABLED_LOCAL_INFILE=ON |
550 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" |
551 |
- -DWITH_LZ4=system |
552 |
- -DWITH_NUMA=OFF |
553 |
- -DWITH_SSL=system |
554 |
- -DWITH_ZLIB=system |
555 |
- -DWITH_ZSTD=system |
556 |
- -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient |
557 |
- -DSHARED_LIB_PATCH_VERSION="0" |
558 |
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
559 |
- -DWITHOUT_SERVER=ON |
560 |
- ) |
561 |
- |
562 |
- cmake_src_configure |
563 |
-} |
564 |
- |
565 |
-multilib_src_install_all() { |
566 |
- doman \ |
567 |
- man/my_print_defaults.1 \ |
568 |
- man/perror.1 \ |
569 |
- man/zlib_decompress.1 |
570 |
- |
571 |
- if ! use static-libs ; then |
572 |
- find "${ED}" -name "*.a" -delete || die |
573 |
- fi |
574 |
-} |
575 |
|
576 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.25-r1.ebuild |
577 |
deleted file mode 100644 |
578 |
index fa385e807a46..000000000000 |
579 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25-r1.ebuild |
580 |
+++ /dev/null |
581 |
@@ -1,122 +0,0 @@ |
582 |
-# Copyright 1999-2021 Gentoo Authors |
583 |
-# Distributed under the terms of the GNU General Public License v2 |
584 |
- |
585 |
-EAPI=7 |
586 |
- |
587 |
-CMAKE_ECLASS=cmake |
588 |
-inherit cmake-multilib flag-o-matic |
589 |
- |
590 |
-# wrap the config script |
591 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
592 |
- |
593 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
594 |
-HOMEPAGE="https://dev.mysql.com/downloads/" |
595 |
- |
596 |
-if [[ ${PV} == "9999" ]]; then |
597 |
- EGIT_REPO_URI="https://github.com/mysql/mysql-server.git" |
598 |
- |
599 |
- inherit git-r3 |
600 |
-else |
601 |
- SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" |
602 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
603 |
- |
604 |
- S="${WORKDIR}/mysql-${PV}" |
605 |
-fi |
606 |
- |
607 |
-LICENSE="GPL-2" |
608 |
-SLOT="0/21" |
609 |
-IUSE="ldap static-libs" |
610 |
- |
611 |
-RDEPEND=" |
612 |
- >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] |
613 |
- app-arch/zstd:=[${MULTILIB_USEDEP}] |
614 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
615 |
- ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) |
616 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
617 |
-" |
618 |
-DEPEND="${RDEPEND}" |
619 |
- |
620 |
-# Avoid file collisions, #692580 |
621 |
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1" |
622 |
-RDEPEND+=" !=dev-db/mysql-5.7.23*" |
623 |
-RDEPEND+=" !=dev-db/mysql-5.7.24*" |
624 |
-RDEPEND+=" !=dev-db/mysql-5.7.25*" |
625 |
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0" |
626 |
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0" |
627 |
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" |
628 |
- |
629 |
-DOCS=( README ) |
630 |
- |
631 |
-PATCHES=( |
632 |
- "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch |
633 |
- "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch |
634 |
- "${FILESDIR}"/${PN}-8.0.25-add-OpenSSL-3.0.0-support.patch |
635 |
-) |
636 |
- |
637 |
-src_prepare() { |
638 |
- sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die |
639 |
- |
640 |
- # All these are for the server only. |
641 |
- # Disable rpm call which would trigger sandbox, #692368 |
642 |
- sed -i \ |
643 |
- -e '/MYSQL_CHECK_LIBEVENT/d' \ |
644 |
- -e '/MYSQL_CHECK_RAPIDJSON/d' \ |
645 |
- -e '/MYSQL_CHECK_ICU/d' \ |
646 |
- -e '/MYSQL_CHECK_EDITLINE/d' \ |
647 |
- -e '/MYSQL_CHECK_CURL/d' \ |
648 |
- -e '/ADD_SUBDIRECTORY(man)/d' \ |
649 |
- -e '/ADD_SUBDIRECTORY(share)/d' \ |
650 |
- -e '/INCLUDE(cmake\/boost/d' \ |
651 |
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ |
652 |
- CMakeLists.txt || die |
653 |
- |
654 |
- # Skip building clients |
655 |
- echo > client/CMakeLists.txt || die |
656 |
- |
657 |
- # Forcefully disable auth plugin |
658 |
- if ! use ldap ; then |
659 |
- sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die |
660 |
- echo > libmysql/authentication_ldap/CMakeLists.txt || die |
661 |
- fi |
662 |
- |
663 |
- cmake_src_prepare |
664 |
-} |
665 |
- |
666 |
-multilib_src_configure() { |
667 |
- CMAKE_BUILD_TYPE="RelWithDebInfo" |
668 |
- |
669 |
- # code is not C++17 ready, bug #786402 |
670 |
- append-cxxflags -std=c++14 |
671 |
- |
672 |
- local mycmakeargs=( |
673 |
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG |
674 |
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG |
675 |
- -DINSTALL_LAYOUT=RPM |
676 |
- -DINSTALL_LIBDIR=$(get_libdir) |
677 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
678 |
- -DENABLED_LOCAL_INFILE=ON |
679 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" |
680 |
- -DWITH_LZ4=system |
681 |
- -DWITH_NUMA=OFF |
682 |
- -DWITH_SSL=system |
683 |
- -DWITH_ZLIB=system |
684 |
- -DWITH_ZSTD=system |
685 |
- -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient |
686 |
- -DSHARED_LIB_PATCH_VERSION="0" |
687 |
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
688 |
- -DWITHOUT_SERVER=ON |
689 |
- ) |
690 |
- |
691 |
- cmake_src_configure |
692 |
-} |
693 |
- |
694 |
-multilib_src_install_all() { |
695 |
- doman \ |
696 |
- man/my_print_defaults.1 \ |
697 |
- man/perror.1 \ |
698 |
- man/zlib_decompress.1 |
699 |
- |
700 |
- if ! use static-libs ; then |
701 |
- find "${ED}" -name "*.a" -delete || die |
702 |
- fi |
703 |
-} |
704 |
|
705 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild |
706 |
deleted file mode 100644 |
707 |
index a8126e853fd8..000000000000 |
708 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild |
709 |
+++ /dev/null |
710 |
@@ -1,121 +0,0 @@ |
711 |
-# Copyright 1999-2021 Gentoo Authors |
712 |
-# Distributed under the terms of the GNU General Public License v2 |
713 |
- |
714 |
-EAPI=7 |
715 |
- |
716 |
-CMAKE_ECLASS=cmake |
717 |
-inherit cmake-multilib flag-o-matic |
718 |
- |
719 |
-# wrap the config script |
720 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
721 |
- |
722 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
723 |
-HOMEPAGE="https://dev.mysql.com/downloads/" |
724 |
- |
725 |
-if [[ ${PV} == "9999" ]]; then |
726 |
- EGIT_REPO_URI="https://github.com/mysql/mysql-server.git" |
727 |
- |
728 |
- inherit git-r3 |
729 |
-else |
730 |
- SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" |
731 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" |
732 |
- |
733 |
- S="${WORKDIR}/mysql-${PV}" |
734 |
-fi |
735 |
- |
736 |
-LICENSE="GPL-2" |
737 |
-SLOT="0/21" |
738 |
-IUSE="ldap static-libs" |
739 |
- |
740 |
-RDEPEND=" |
741 |
- >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] |
742 |
- app-arch/zstd:=[${MULTILIB_USEDEP}] |
743 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
744 |
- ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) |
745 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
746 |
-" |
747 |
-DEPEND="${RDEPEND}" |
748 |
- |
749 |
-# Avoid file collisions, #692580 |
750 |
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1" |
751 |
-RDEPEND+=" !=dev-db/mysql-5.7.23*" |
752 |
-RDEPEND+=" !=dev-db/mysql-5.7.24*" |
753 |
-RDEPEND+=" !=dev-db/mysql-5.7.25*" |
754 |
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0" |
755 |
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0" |
756 |
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" |
757 |
- |
758 |
-DOCS=( README ) |
759 |
- |
760 |
-PATCHES=( |
761 |
- "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch |
762 |
- "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch |
763 |
-) |
764 |
- |
765 |
-src_prepare() { |
766 |
- sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die |
767 |
- |
768 |
- # All these are for the server only. |
769 |
- # Disable rpm call which would trigger sandbox, #692368 |
770 |
- sed -i \ |
771 |
- -e '/MYSQL_CHECK_LIBEVENT/d' \ |
772 |
- -e '/MYSQL_CHECK_RAPIDJSON/d' \ |
773 |
- -e '/MYSQL_CHECK_ICU/d' \ |
774 |
- -e '/MYSQL_CHECK_EDITLINE/d' \ |
775 |
- -e '/MYSQL_CHECK_CURL/d' \ |
776 |
- -e '/ADD_SUBDIRECTORY(man)/d' \ |
777 |
- -e '/ADD_SUBDIRECTORY(share)/d' \ |
778 |
- -e '/INCLUDE(cmake\/boost/d' \ |
779 |
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ |
780 |
- CMakeLists.txt || die |
781 |
- |
782 |
- # Skip building clients |
783 |
- echo > client/CMakeLists.txt || die |
784 |
- |
785 |
- # Forcefully disable auth plugin |
786 |
- if ! use ldap ; then |
787 |
- sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die |
788 |
- echo > libmysql/authentication_ldap/CMakeLists.txt || die |
789 |
- fi |
790 |
- |
791 |
- cmake_src_prepare |
792 |
-} |
793 |
- |
794 |
-multilib_src_configure() { |
795 |
- CMAKE_BUILD_TYPE="RelWithDebInfo" |
796 |
- |
797 |
- # code is not C++17 ready, bug #786402 |
798 |
- append-cxxflags -std=c++14 |
799 |
- |
800 |
- local mycmakeargs=( |
801 |
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG |
802 |
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG |
803 |
- -DINSTALL_LAYOUT=RPM |
804 |
- -DINSTALL_LIBDIR=$(get_libdir) |
805 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
806 |
- -DENABLED_LOCAL_INFILE=ON |
807 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" |
808 |
- -DWITH_LZ4=system |
809 |
- -DWITH_NUMA=OFF |
810 |
- -DWITH_SSL=system |
811 |
- -DWITH_ZLIB=system |
812 |
- -DWITH_ZSTD=system |
813 |
- -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient |
814 |
- -DSHARED_LIB_PATCH_VERSION="0" |
815 |
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
816 |
- -DWITHOUT_SERVER=ON |
817 |
- ) |
818 |
- |
819 |
- cmake_src_configure |
820 |
-} |
821 |
- |
822 |
-multilib_src_install_all() { |
823 |
- doman \ |
824 |
- man/my_print_defaults.1 \ |
825 |
- man/perror.1 \ |
826 |
- man/zlib_decompress.1 |
827 |
- |
828 |
- if ! use static-libs ; then |
829 |
- find "${ED}" -name "*.a" -delete || die |
830 |
- fi |
831 |
-} |
832 |
|
833 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.26.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.26.ebuild |
834 |
deleted file mode 100644 |
835 |
index fa385e807a46..000000000000 |
836 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.26.ebuild |
837 |
+++ /dev/null |
838 |
@@ -1,122 +0,0 @@ |
839 |
-# Copyright 1999-2021 Gentoo Authors |
840 |
-# Distributed under the terms of the GNU General Public License v2 |
841 |
- |
842 |
-EAPI=7 |
843 |
- |
844 |
-CMAKE_ECLASS=cmake |
845 |
-inherit cmake-multilib flag-o-matic |
846 |
- |
847 |
-# wrap the config script |
848 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
849 |
- |
850 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
851 |
-HOMEPAGE="https://dev.mysql.com/downloads/" |
852 |
- |
853 |
-if [[ ${PV} == "9999" ]]; then |
854 |
- EGIT_REPO_URI="https://github.com/mysql/mysql-server.git" |
855 |
- |
856 |
- inherit git-r3 |
857 |
-else |
858 |
- SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" |
859 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
860 |
- |
861 |
- S="${WORKDIR}/mysql-${PV}" |
862 |
-fi |
863 |
- |
864 |
-LICENSE="GPL-2" |
865 |
-SLOT="0/21" |
866 |
-IUSE="ldap static-libs" |
867 |
- |
868 |
-RDEPEND=" |
869 |
- >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] |
870 |
- app-arch/zstd:=[${MULTILIB_USEDEP}] |
871 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
872 |
- ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) |
873 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
874 |
-" |
875 |
-DEPEND="${RDEPEND}" |
876 |
- |
877 |
-# Avoid file collisions, #692580 |
878 |
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1" |
879 |
-RDEPEND+=" !=dev-db/mysql-5.7.23*" |
880 |
-RDEPEND+=" !=dev-db/mysql-5.7.24*" |
881 |
-RDEPEND+=" !=dev-db/mysql-5.7.25*" |
882 |
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0" |
883 |
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0" |
884 |
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" |
885 |
- |
886 |
-DOCS=( README ) |
887 |
- |
888 |
-PATCHES=( |
889 |
- "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch |
890 |
- "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch |
891 |
- "${FILESDIR}"/${PN}-8.0.25-add-OpenSSL-3.0.0-support.patch |
892 |
-) |
893 |
- |
894 |
-src_prepare() { |
895 |
- sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die |
896 |
- |
897 |
- # All these are for the server only. |
898 |
- # Disable rpm call which would trigger sandbox, #692368 |
899 |
- sed -i \ |
900 |
- -e '/MYSQL_CHECK_LIBEVENT/d' \ |
901 |
- -e '/MYSQL_CHECK_RAPIDJSON/d' \ |
902 |
- -e '/MYSQL_CHECK_ICU/d' \ |
903 |
- -e '/MYSQL_CHECK_EDITLINE/d' \ |
904 |
- -e '/MYSQL_CHECK_CURL/d' \ |
905 |
- -e '/ADD_SUBDIRECTORY(man)/d' \ |
906 |
- -e '/ADD_SUBDIRECTORY(share)/d' \ |
907 |
- -e '/INCLUDE(cmake\/boost/d' \ |
908 |
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ |
909 |
- CMakeLists.txt || die |
910 |
- |
911 |
- # Skip building clients |
912 |
- echo > client/CMakeLists.txt || die |
913 |
- |
914 |
- # Forcefully disable auth plugin |
915 |
- if ! use ldap ; then |
916 |
- sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die |
917 |
- echo > libmysql/authentication_ldap/CMakeLists.txt || die |
918 |
- fi |
919 |
- |
920 |
- cmake_src_prepare |
921 |
-} |
922 |
- |
923 |
-multilib_src_configure() { |
924 |
- CMAKE_BUILD_TYPE="RelWithDebInfo" |
925 |
- |
926 |
- # code is not C++17 ready, bug #786402 |
927 |
- append-cxxflags -std=c++14 |
928 |
- |
929 |
- local mycmakeargs=( |
930 |
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG |
931 |
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG |
932 |
- -DINSTALL_LAYOUT=RPM |
933 |
- -DINSTALL_LIBDIR=$(get_libdir) |
934 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
935 |
- -DENABLED_LOCAL_INFILE=ON |
936 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" |
937 |
- -DWITH_LZ4=system |
938 |
- -DWITH_NUMA=OFF |
939 |
- -DWITH_SSL=system |
940 |
- -DWITH_ZLIB=system |
941 |
- -DWITH_ZSTD=system |
942 |
- -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient |
943 |
- -DSHARED_LIB_PATCH_VERSION="0" |
944 |
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
945 |
- -DWITHOUT_SERVER=ON |
946 |
- ) |
947 |
- |
948 |
- cmake_src_configure |
949 |
-} |
950 |
- |
951 |
-multilib_src_install_all() { |
952 |
- doman \ |
953 |
- man/my_print_defaults.1 \ |
954 |
- man/perror.1 \ |
955 |
- man/zlib_decompress.1 |
956 |
- |
957 |
- if ! use static-libs ; then |
958 |
- find "${ED}" -name "*.a" -delete || die |
959 |
- fi |
960 |
-} |