1 |
commit: 06f3a18c17436585c25146f35577d88529d20533 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 20 18:12:28 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 20 19:26:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f3a18c |
7 |
|
8 |
dev-db/mysql-connector-c: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
dev-db/mysql-connector-c/Manifest | 2 - |
14 |
...-8.0.17-always-build-decompress-utilities.patch | 22 -- |
15 |
.../files/mysql-connector-c-8.0.17-libressl.patch | 258 --------------------- |
16 |
.../mysql-connector-c-8.0.17-r3.ebuild | 111 --------- |
17 |
.../mysql-connector-c-8.0.18.ebuild | 110 --------- |
18 |
5 files changed, 503 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest |
21 |
index 545daa75efd..810277618eb 100644 |
22 |
--- a/dev-db/mysql-connector-c/Manifest |
23 |
+++ b/dev-db/mysql-connector-c/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d |
26 |
-DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc SHA512 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5 |
27 |
DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01 |
28 |
DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6 |
29 |
|
30 |
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch |
31 |
deleted file mode 100644 |
32 |
index 927662705aa..00000000000 |
33 |
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch |
34 |
+++ /dev/null |
35 |
@@ -1,22 +0,0 @@ |
36 |
---- a/utilities/CMakeLists.txt |
37 |
-+++ b/utilities/CMakeLists.txt |
38 |
-@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc) |
39 |
- ADD_DEPENDENCIES(perror GenError) |
40 |
- TARGET_LINK_LIBRARIES(perror mysys) |
41 |
- |
42 |
--IF (BUILD_BUNDLED_LZ4) |
43 |
-- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) |
44 |
-- TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) |
45 |
--ENDIF() |
46 |
-+MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) |
47 |
-+TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) |
48 |
- |
49 |
--IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) |
50 |
-- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) |
51 |
-- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) |
52 |
--ENDIF() |
53 |
-+MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) |
54 |
-+TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) |
55 |
- |
56 |
- IF(WITH_INNOBASE_STORAGE_ENGINE) |
57 |
- |
58 |
|
59 |
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch |
60 |
deleted file mode 100644 |
61 |
index 340f894a895..00000000000 |
62 |
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch |
63 |
+++ /dev/null |
64 |
@@ -1,258 +0,0 @@ |
65 |
-From: Stefan Strogin <steils@g.o> |
66 |
-Date: Sat, 8 Jun 2019 15:52:26 +0300 |
67 |
-Subject: [PATCH] Fix build with LibreSSL |
68 |
- |
69 |
-- Fix version checks as OPENSSL_VERSION_NUMBER in OpenSSL is always |
70 |
- 0x20000000L. |
71 |
-- FIPS support is removed from LibreSSL, do not use it. |
72 |
-- Check for TLS1_3_VERSION define, not OpenSSL/LibreSSL version. |
73 |
- Theoretically even OpenSSL >=1.1.1 can be built with TLS 1.3 disabled. |
74 |
- |
75 |
- |
76 |
---- a/cmake/ssl.cmake |
77 |
-+++ b/cmake/ssl.cmake |
78 |
-@@ -304,13 +304,14 @@ MACRO (MYSQL_CHECK_SSL) |
79 |
- OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" |
80 |
- ) |
81 |
- ENDIF() |
82 |
-- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") |
83 |
-+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) |
84 |
-+ IF(HAVE_TLS1_3_VERSION) |
85 |
- ADD_DEFINITIONS(-DHAVE_TLSv13) |
86 |
- ENDIF() |
87 |
- IF(OPENSSL_INCLUDE_DIR AND |
88 |
- OPENSSL_LIBRARY AND |
89 |
- CRYPTO_LIBRARY AND |
90 |
-- OPENSSL_MAJOR_VERSION STREQUAL "1" |
91 |
-+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" |
92 |
- ) |
93 |
- SET(OPENSSL_FOUND TRUE) |
94 |
- FIND_PROGRAM(OPENSSL_EXECUTABLE openssl |
95 |
---- a/extra/libevent/openssl-compat.h |
96 |
-+++ b/extra/libevent/openssl-compat.h |
97 |
-@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) |
98 |
- #define BIO_set_init(b, val) (b)->init = (val) |
99 |
- #define BIO_set_data(b, val) (b)->ptr = (val) |
100 |
- #define BIO_set_shutdown(b, val) (b)->shutdown = (val) |
101 |
--#define BIO_get_init(b) (b)->init |
102 |
- #define BIO_get_data(b) (b)->ptr |
103 |
- #define BIO_get_shutdown(b) (b)->shutdown |
104 |
- |
105 |
-@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) |
106 |
- |
107 |
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
108 |
- |
109 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
110 |
-+#define BIO_get_init(b) (b)->init |
111 |
-+#endif |
112 |
-+ |
113 |
- #endif /* OPENSSL_COMPAT_H */ |
114 |
---- a/mysys/my_md5.cc |
115 |
-+++ b/mysys/my_md5.cc |
116 |
-@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, |
117 |
- int compute_md5_hash(char *digest, const char *buf, int len) { |
118 |
- int retval = 0; |
119 |
- int fips_mode = 0; |
120 |
--#if !defined(HAVE_WOLFSSL) |
121 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
122 |
- fips_mode = FIPS_mode(); |
123 |
- #endif /* HAVE_WOLFSSL */ |
124 |
- /* If fips mode is ON/STRICT restricted method calls will result into abort, |
125 |
---- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c |
126 |
-+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c |
127 |
-@@ -297,7 +297,7 @@ error: |
128 |
- return 1; |
129 |
- } |
130 |
- |
131 |
--#ifndef HAVE_WOLFSSL |
132 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
133 |
- #define OPENSSL_ERROR_LENGTH 512 |
134 |
- static int configure_ssl_fips_mode(const uint fips_mode) { |
135 |
- int rc = -1; |
136 |
-@@ -521,7 +521,7 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file, |
137 |
- int verify_server = SSL_VERIFY_NONE; |
138 |
- int verify_client = SSL_VERIFY_NONE; |
139 |
- |
140 |
--#ifndef HAVE_WOLFSSL |
141 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
142 |
- if (configure_ssl_fips_mode(ssl_fips_mode) != 1) { |
143 |
- G_ERROR("Error setting the ssl fips mode"); |
144 |
- goto error; |
145 |
---- a/plugin/x/client/xconnection_impl.cc |
146 |
-+++ b/plugin/x/client/xconnection_impl.cc |
147 |
-@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_id) { |
148 |
- return XError(CR_SSL_CONNECTION_ERROR, buffer); |
149 |
- } |
150 |
- |
151 |
--#ifndef HAVE_WOLFSSL |
152 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
153 |
- /** |
154 |
- Set fips mode in openssl library, |
155 |
- When we set fips mode ON/STRICT, it will perform following operations: |
156 |
-@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() { |
157 |
- if (!m_context->m_ssl_config.is_configured()) |
158 |
- return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED}; |
159 |
- |
160 |
--#ifndef HAVE_WOLFSSL |
161 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
162 |
- char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
163 |
- if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) != |
164 |
- 1) { |
165 |
---- a/router/src/http/src/tls_client_context.cc |
166 |
-+++ b/router/src/http/src/tls_client_context.cc |
167 |
-@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) { |
168 |
- |
169 |
- void TlsClientContext::cipher_suites(const std::string &ciphers) { |
170 |
- // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites() |
171 |
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1) |
172 |
-+#ifdef TLS1_3_VERSION |
173 |
- if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) { |
174 |
- throw TlsError("set-cipher-suites"); |
175 |
- } |
176 |
---- a/router/src/http/src/tls_context.cc |
177 |
-+++ b/router/src/http/src/tls_context.cc |
178 |
-@@ -93,7 +93,7 @@ static constexpr int o11x_version(TlsVersion version) { |
179 |
- return TLS1_1_VERSION; |
180 |
- case TlsVersion::TLS_1_2: |
181 |
- return TLS1_2_VERSION; |
182 |
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1) |
183 |
-+#ifdef TLS1_3_VERSION |
184 |
- case TlsVersion::TLS_1_3: |
185 |
- return TLS1_3_VERSION; |
186 |
- #endif |
187 |
-@@ -123,9 +123,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) { |
188 |
- default: |
189 |
- // unknown, leave all disabled |
190 |
- // fallthrough |
191 |
-+#ifdef TLS1_3_VERSION |
192 |
- case TlsVersion::TLS_1_3: |
193 |
- opts |= SSL_OP_NO_TLSv1_2; |
194 |
- // fallthrough |
195 |
-+#endif |
196 |
- case TlsVersion::TLS_1_2: |
197 |
- opts |= SSL_OP_NO_TLSv1_1; |
198 |
- // fallthrough |
199 |
-@@ -172,8 +174,10 @@ TlsVersion TlsContext::min_version() const { |
200 |
- return TlsVersion::TLS_1_1; |
201 |
- case TLS1_2_VERSION: |
202 |
- return TlsVersion::TLS_1_2; |
203 |
-+#ifdef TLS1_3_VERSION |
204 |
- case TLS1_3_VERSION: |
205 |
- return TlsVersion::TLS_1_3; |
206 |
-+#endif |
207 |
- case 0: |
208 |
- return TlsVersion::AUTO; |
209 |
- default: |
210 |
---- a/router/src/http/src/tls_server_context.cc |
211 |
-+++ b/router/src/http/src/tls_server_context.cc |
212 |
-@@ -170,7 +170,8 @@ void TlsServerContext::init_tmp_dh(const std::string &dh_params) { |
213 |
- } |
214 |
- |
215 |
- } else { |
216 |
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) |
217 |
-+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \ |
218 |
-+ !defined(LIBRESSL_VERSION_NUMBER) |
219 |
- dh2048.reset(DH_get_2048_256()); |
220 |
- #else |
221 |
- /* |
222 |
---- a/sql-common/client.cc |
223 |
-+++ b/sql-common/client.cc |
224 |
-@@ -7602,7 +7602,8 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option, |
225 |
- #endif |
226 |
- break; |
227 |
- case MYSQL_OPT_SSL_FIPS_MODE: { |
228 |
--#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) |
229 |
-+#if defined(HAVE_OPENSSL) && \ |
230 |
-+ !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
231 |
- char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
232 |
- ENSURE_EXTENSIONS_PRESENT(&mysql->options); |
233 |
- mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg); |
234 |
---- a/sql/mysqld.cc |
235 |
-+++ b/sql/mysqld.cc |
236 |
-@@ -4795,7 +4795,7 @@ static int init_thread_environment() { |
237 |
- |
238 |
- static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; |
239 |
- |
240 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
241 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
242 |
- #define FILE_LINE_ARGS |
243 |
- #else |
244 |
- #define FILE_LINE_ARGS , const char *, int |
245 |
-@@ -4831,7 +4831,7 @@ static void init_ssl() { |
246 |
- } |
247 |
- |
248 |
- static int init_ssl_communication() { |
249 |
--#ifndef HAVE_WOLFSSL |
250 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
251 |
- char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
252 |
- int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); |
253 |
- if (ret_fips_mode != 1) { |
254 |
---- a/sql/sys_vars.cc |
255 |
-+++ b/sql/sys_vars.cc |
256 |
-@@ -4377,7 +4377,7 @@ static Sys_var_ulong Sys_max_execution_time( |
257 |
- HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG), |
258 |
- VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); |
259 |
- |
260 |
--#ifndef HAVE_WOLFSSL |
261 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
262 |
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) { |
263 |
- char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
264 |
- if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) { |
265 |
-@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) { |
266 |
- } |
267 |
- #endif |
268 |
- |
269 |
--#ifdef HAVE_WOLFSSL |
270 |
-+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) |
271 |
- static const char *ssl_fips_mode_names[] = {"OFF", 0}; |
272 |
- #else |
273 |
- static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0}; |
274 |
-@@ -4398,7 +4398,7 @@ static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0}; |
275 |
- static Sys_var_enum Sys_ssl_fips_mode( |
276 |
- "ssl_fips_mode", |
277 |
- "SSL FIPS mode (applies only for OpenSSL); " |
278 |
--#ifndef HAVE_WOLFSSL |
279 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
280 |
- "permitted values are: OFF, ON, STRICT", |
281 |
- #else |
282 |
- "permitted values are: OFF", |
283 |
-@@ -4406,7 +4406,7 @@ static Sys_var_enum Sys_ssl_fips_mode( |
284 |
- GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE), |
285 |
- ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, |
286 |
- ON_CHECK(NULL), |
287 |
--#ifndef HAVE_WOLFSSL |
288 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
289 |
- ON_UPDATE(update_fips_mode), |
290 |
- #else |
291 |
- ON_UPDATE(NULL), |
292 |
---- a/vio/viossl.cc |
293 |
-+++ b/vio/viossl.cc |
294 |
-@@ -507,7 +507,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, |
295 |
- #if !defined(HAVE_WOLFSSL) && !defined(DBUG_OFF) |
296 |
- { |
297 |
- STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; |
298 |
-- ssl_comp_methods = SSL_COMP_get_compression_methods(); |
299 |
-+ ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods(); |
300 |
- n = sk_SSL_COMP_num(ssl_comp_methods); |
301 |
- DBUG_PRINT("info", ("Available compression methods:\n")); |
302 |
- if (n == 0) |
303 |
-@@ -515,7 +515,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, |
304 |
- else |
305 |
- for (j = 0; j < n; j++) { |
306 |
- SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); |
307 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
308 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
309 |
- DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); |
310 |
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
311 |
- DBUG_PRINT("info", |
312 |
---- a/vio/viosslfactories.cc |
313 |
-+++ b/vio/viosslfactories.cc |
314 |
-@@ -429,7 +429,7 @@ void ssl_start() { |
315 |
- } |
316 |
- } |
317 |
- |
318 |
--#ifndef HAVE_WOLFSSL |
319 |
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) |
320 |
- /** |
321 |
- Set fips mode in openssl library, |
322 |
- When we set fips mode ON/STRICT, it will perform following operations: |
323 |
|
324 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild |
325 |
deleted file mode 100644 |
326 |
index 3c047b80fc2..00000000000 |
327 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild |
328 |
+++ /dev/null |
329 |
@@ -1,111 +0,0 @@ |
330 |
-# Copyright 1999-2019 Gentoo Authors |
331 |
-# Distributed under the terms of the GNU General Public License v2 |
332 |
- |
333 |
-EAPI=7 |
334 |
- |
335 |
-inherit cmake-multilib |
336 |
- |
337 |
-# wrap the config script |
338 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
339 |
- |
340 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
341 |
-HOMEPAGE="https://dev.mysql.com/downloads/" |
342 |
-LICENSE="GPL-2" |
343 |
- |
344 |
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" |
345 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
346 |
- |
347 |
-SLOT="0/21" |
348 |
-IUSE="ldap libressl static-libs" |
349 |
- |
350 |
-RDEPEND=" |
351 |
- >=app-arch/lz4-0_p131:= |
352 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
353 |
- ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) |
354 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
355 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
356 |
- " |
357 |
-DEPEND="${RDEPEND}" |
358 |
- |
359 |
-# Avoid file collisions, #692580 |
360 |
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1" |
361 |
-RDEPEND+=" !=dev-db/mysql-5.7.23*" |
362 |
-RDEPEND+=" !=dev-db/mysql-5.7.24*" |
363 |
-RDEPEND+=" !=dev-db/mysql-5.7.25*" |
364 |
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0" |
365 |
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0" |
366 |
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" |
367 |
- |
368 |
-DOCS=( README ) |
369 |
- |
370 |
-S="${WORKDIR}/mysql-${PV}" |
371 |
- |
372 |
-PATCHES=( |
373 |
- "${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch |
374 |
- "${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch |
375 |
- "${FILESDIR}"/${PN}-8.0.17-libressl.patch |
376 |
-) |
377 |
- |
378 |
-src_prepare() { |
379 |
- sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die |
380 |
- |
381 |
- # All these are for the server only. |
382 |
- # Disable rpm call which would trigger sandbox, #692368 |
383 |
- sed -i \ |
384 |
- -e '/MYSQL_CHECK_LIBEVENT/d' \ |
385 |
- -e '/MYSQL_CHECK_RAPIDJSON/d' \ |
386 |
- -e '/MYSQL_CHECK_ICU/d' \ |
387 |
- -e '/MYSQL_CHECK_RE2/d' \ |
388 |
- -e '/MYSQL_CHECK_EDITLINE/d' \ |
389 |
- -e '/MYSQL_CHECK_CURL/d' \ |
390 |
- -e '/ADD_SUBDIRECTORY(man)/d' \ |
391 |
- -e '/ADD_SUBDIRECTORY(share)/d' \ |
392 |
- -e '/INCLUDE(cmake\/boost/d' \ |
393 |
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ |
394 |
- CMakeLists.txt || die |
395 |
- |
396 |
- # Skip building clients |
397 |
- echo > client/CMakeLists.txt || die |
398 |
- |
399 |
- # Forcefully disable auth plugin |
400 |
- if ! use ldap ; then |
401 |
- sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die |
402 |
- echo > libmysql/authentication_ldap/CMakeLists.txt || die |
403 |
- fi |
404 |
- |
405 |
- cmake-utils_src_prepare |
406 |
-} |
407 |
- |
408 |
-multilib_src_configure() { |
409 |
- local mycmakeargs=( |
410 |
- -DINSTALL_LAYOUT=RPM |
411 |
- -DINSTALL_LIBDIR=$(get_libdir) |
412 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
413 |
- -DWITH_DEFAULT_FEATURE_SET=OFF |
414 |
- -DENABLED_LOCAL_INFILE=ON |
415 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" |
416 |
- -DWITH_ZLIB=system |
417 |
- -DWITH_SSL=system |
418 |
- -DWITH_NUMA=OFF |
419 |
- -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient |
420 |
- -DSHARED_LIB_PATCH_VERSION="0" |
421 |
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
422 |
- -DWITHOUT_SERVER=ON |
423 |
- ) |
424 |
- cmake-utils_src_configure |
425 |
-} |
426 |
- |
427 |
-multilib_src_install() { |
428 |
- cmake-utils_src_install |
429 |
-} |
430 |
- |
431 |
-multilib_src_install_all() { |
432 |
- doman \ |
433 |
- man/my_print_defaults.1 \ |
434 |
- man/perror.1 \ |
435 |
- man/zlib_decompress.1 |
436 |
- |
437 |
- if ! use static-libs ; then |
438 |
- find "${ED}" -name "*.a" -delete || die |
439 |
- fi |
440 |
-} |
441 |
|
442 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild |
443 |
deleted file mode 100644 |
444 |
index 6f10fa81b8b..00000000000 |
445 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild |
446 |
+++ /dev/null |
447 |
@@ -1,110 +0,0 @@ |
448 |
-# Copyright 1999-2019 Gentoo Authors |
449 |
-# Distributed under the terms of the GNU General Public License v2 |
450 |
- |
451 |
-EAPI=7 |
452 |
- |
453 |
-inherit cmake-multilib |
454 |
- |
455 |
-# wrap the config script |
456 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) |
457 |
- |
458 |
-DESCRIPTION="C client library for MariaDB/MySQL" |
459 |
-HOMEPAGE="https://dev.mysql.com/downloads/" |
460 |
-LICENSE="GPL-2" |
461 |
- |
462 |
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" |
463 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
464 |
- |
465 |
-SLOT="0/21" |
466 |
-IUSE="ldap libressl static-libs" |
467 |
- |
468 |
-RDEPEND=" |
469 |
- >=app-arch/lz4-0_p131:= |
470 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
471 |
- ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) |
472 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
473 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
474 |
- " |
475 |
-DEPEND="${RDEPEND}" |
476 |
- |
477 |
-# Avoid file collisions, #692580 |
478 |
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1" |
479 |
-RDEPEND+=" !=dev-db/mysql-5.7.23*" |
480 |
-RDEPEND+=" !=dev-db/mysql-5.7.24*" |
481 |
-RDEPEND+=" !=dev-db/mysql-5.7.25*" |
482 |
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0" |
483 |
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0" |
484 |
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" |
485 |
- |
486 |
-DOCS=( README ) |
487 |
- |
488 |
-S="${WORKDIR}/mysql-${PV}" |
489 |
- |
490 |
-PATCHES=( |
491 |
- "${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch |
492 |
- "${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch |
493 |
- #"${FILESDIR}"/${PN}-8.0.17-libressl.patch |
494 |
-) |
495 |
- |
496 |
-src_prepare() { |
497 |
- sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die |
498 |
- |
499 |
- # All these are for the server only. |
500 |
- # Disable rpm call which would trigger sandbox, #692368 |
501 |
- sed -i \ |
502 |
- -e '/MYSQL_CHECK_LIBEVENT/d' \ |
503 |
- -e '/MYSQL_CHECK_RAPIDJSON/d' \ |
504 |
- -e '/MYSQL_CHECK_ICU/d' \ |
505 |
- -e '/MYSQL_CHECK_EDITLINE/d' \ |
506 |
- -e '/MYSQL_CHECK_CURL/d' \ |
507 |
- -e '/ADD_SUBDIRECTORY(man)/d' \ |
508 |
- -e '/ADD_SUBDIRECTORY(share)/d' \ |
509 |
- -e '/INCLUDE(cmake\/boost/d' \ |
510 |
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ |
511 |
- CMakeLists.txt || die |
512 |
- |
513 |
- # Skip building clients |
514 |
- echo > client/CMakeLists.txt || die |
515 |
- |
516 |
- # Forcefully disable auth plugin |
517 |
- if ! use ldap ; then |
518 |
- sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die |
519 |
- echo > libmysql/authentication_ldap/CMakeLists.txt || die |
520 |
- fi |
521 |
- |
522 |
- cmake-utils_src_prepare |
523 |
-} |
524 |
- |
525 |
-multilib_src_configure() { |
526 |
- local mycmakeargs=( |
527 |
- -DINSTALL_LAYOUT=RPM |
528 |
- -DINSTALL_LIBDIR=$(get_libdir) |
529 |
- -DWITH_DEFAULT_COMPILER_OPTIONS=OFF |
530 |
- -DWITH_DEFAULT_FEATURE_SET=OFF |
531 |
- -DENABLED_LOCAL_INFILE=ON |
532 |
- -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" |
533 |
- -DWITH_ZLIB=system |
534 |
- -DWITH_SSL=system |
535 |
- -DWITH_NUMA=OFF |
536 |
- -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient |
537 |
- -DSHARED_LIB_PATCH_VERSION="0" |
538 |
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
539 |
- -DWITHOUT_SERVER=ON |
540 |
- ) |
541 |
- cmake-utils_src_configure |
542 |
-} |
543 |
- |
544 |
-multilib_src_install() { |
545 |
- cmake-utils_src_install |
546 |
-} |
547 |
- |
548 |
-multilib_src_install_all() { |
549 |
- doman \ |
550 |
- man/my_print_defaults.1 \ |
551 |
- man/perror.1 \ |
552 |
- man/zlib_decompress.1 |
553 |
- |
554 |
- if ! use static-libs ; then |
555 |
- find "${ED}" -name "*.a" -delete || die |
556 |
- fi |
557 |
-} |