1 |
commit: aa38d35a7bfbd3c943c6def2f9fcb51b3d558c3f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 3 18:27:06 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 3 18:45:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa38d35a |
7 |
|
8 |
dev-db/mysql-connector-c++: drop obsolete LibreSSL patches |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
...connector-c++-8.0.19-fix-libressl-support.patch | 89 ---------------------- |
13 |
...connector-c++-8.0.20-fix-libressl-support.patch | 88 --------------------- |
14 |
2 files changed, 177 deletions(-) |
15 |
|
16 |
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch |
17 |
deleted file mode 100644 |
18 |
index fc6eb777063..00000000000 |
19 |
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch |
20 |
+++ /dev/null |
21 |
@@ -1,89 +0,0 @@ |
22 |
---- a/cdk/cmake/DepFindSSL.cmake |
23 |
-+++ b/cdk/cmake/DepFindSSL.cmake |
24 |
-@@ -88,7 +88,7 @@ function(main) |
25 |
- |
26 |
- set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") |
27 |
- |
28 |
-- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) |
29 |
-+ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) |
30 |
- message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") |
31 |
- else() |
32 |
- message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") |
33 |
-@@ -182,42 +182,33 @@ function(find_openssl) |
34 |
- set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" PARENT_SCOPE) |
35 |
- message("-- found OpenSSL headers at: ${OPENSSL_INCLUDE_DIR}") |
36 |
- |
37 |
-- |
38 |
- # Verify version number. Version information looks like: |
39 |
-- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" |
40 |
-- |
41 |
-+ # #define OPENSSL_VERSION_NUMBER 0x1000103fL |
42 |
-+ # Encoded as MNNFFPPS: major minor fix patch status |
43 |
- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" |
44 |
- OPENSSL_VERSION_NUMBER |
45 |
-- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" |
46 |
-+ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" |
47 |
- ) |
48 |
-- |
49 |
-- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") |
50 |
- STRING(REGEX REPLACE |
51 |
-- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]*)[\t ].*$" |
52 |
-- "\\1;\\2;\\3;\\4" |
53 |
-- version_list "${OPENSSL_VERSION_NUMBER}" |
54 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" |
55 |
-+ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" |
56 |
-+ ) |
57 |
-+ STRING(REGEX REPLACE |
58 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" |
59 |
-+ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" |
60 |
-+ ) |
61 |
-+ STRING(REGEX REPLACE |
62 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" |
63 |
-+ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" |
64 |
- ) |
65 |
-- #message("-- OPENSSL_VERSION: ${version_list}") |
66 |
-- |
67 |
-- list(GET version_list 0 OPENSSL_VERSION_MAJOR) |
68 |
-- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) |
69 |
-- |
70 |
-- list(GET version_list 1 OPENSSL_VERSION_MINOR) |
71 |
-- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) |
72 |
-- |
73 |
-- list(GET version_list 2 OPENSSL_VERSION_FIX) |
74 |
-- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) |
75 |
-- |
76 |
-- list(GET version_list 3 OPENSSL_VERSION_PATCH) |
77 |
-- |
78 |
-- |
79 |
- |
80 |
- set(OPENSSL_VERSION |
81 |
-- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" |
82 |
-+ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" |
83 |
- PARENT_SCOPE |
84 |
- ) |
85 |
- set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) |
86 |
- |
87 |
-+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) |
88 |
- |
89 |
- find_library(OPENSSL_LIBRARY |
90 |
- NAMES ssl ssleay32 ssleay32MD libssl |
91 |
---- a/cdk/foundation/connection_openssl.cc |
92 |
-+++ b/cdk/foundation/connection_openssl.cc |
93 |
-@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) |
94 |
- case SSL_ERROR_WANT_CONNECT: |
95 |
- case SSL_ERROR_WANT_ACCEPT: |
96 |
- case SSL_ERROR_WANT_X509_LOOKUP: |
97 |
--# if OPENSSL_VERSION_NUMBER >= 0x10100000L |
98 |
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
99 |
- case SSL_ERROR_WANT_ASYNC: |
100 |
- case SSL_ERROR_WANT_ASYNC_JOB: |
101 |
- # endif |
102 |
-@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) |
103 |
- |
104 |
- SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); |
105 |
- |
106 |
--#if OPENSSL_VERSION_NUMBER>=0x1010100fL |
107 |
-+#if HAVE_TLS1_3_VERSION |
108 |
- |
109 |
- /* |
110 |
- Note: If TLSv1.3 is not enabled, there is no need to restrict |
111 |
|
112 |
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch |
113 |
deleted file mode 100644 |
114 |
index f2ae0d02ed7..00000000000 |
115 |
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch |
116 |
+++ /dev/null |
117 |
@@ -1,88 +0,0 @@ |
118 |
---- a/cdk/cmake/DepFindSSL.cmake |
119 |
-+++ b/cdk/cmake/DepFindSSL.cmake |
120 |
-@@ -88,7 +88,7 @@ function(main) |
121 |
- |
122 |
- set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") |
123 |
- |
124 |
-- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) |
125 |
-+ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) |
126 |
- message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") |
127 |
- else() |
128 |
- message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") |
129 |
-@@ -184,41 +184,35 @@ function(find_openssl) |
130 |
- |
131 |
- |
132 |
- # Verify version number. Version information looks like: |
133 |
-- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" |
134 |
-+ # #define OPENSSL_VERSION_NUMBER 0x1000103fL |
135 |
-+ # Encoded as MNNFFPPS: major minor fix patch status |
136 |
- |
137 |
- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" |
138 |
- OPENSSL_VERSION_NUMBER |
139 |
-- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" |
140 |
-+ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" |
141 |
- ) |
142 |
- |
143 |
-- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") |
144 |
-- # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1d-freebsd 10 Sep 2019" |
145 |
- STRING(REGEX REPLACE |
146 |
-- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]|)[\t \\-].*$" |
147 |
-- "\\1;\\2;\\3;\\4" |
148 |
-- version_list "${OPENSSL_VERSION_NUMBER}" |
149 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" |
150 |
-+ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" |
151 |
-+ ) |
152 |
-+ STRING(REGEX REPLACE |
153 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" |
154 |
-+ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" |
155 |
-+ ) |
156 |
-+ STRING(REGEX REPLACE |
157 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" |
158 |
-+ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" |
159 |
- ) |
160 |
-- #message("-- OPENSSL_VERSION: ${version_list}") |
161 |
-- |
162 |
-- list(GET version_list 0 OPENSSL_VERSION_MAJOR) |
163 |
-- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) |
164 |
-- |
165 |
-- list(GET version_list 1 OPENSSL_VERSION_MINOR) |
166 |
-- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) |
167 |
-- |
168 |
-- list(GET version_list 2 OPENSSL_VERSION_FIX) |
169 |
-- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) |
170 |
-- |
171 |
-- list(GET version_list 3 OPENSSL_VERSION_PATCH) |
172 |
-- |
173 |
- |
174 |
- |
175 |
- set(OPENSSL_VERSION |
176 |
-- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" |
177 |
-+ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" |
178 |
- PARENT_SCOPE |
179 |
- ) |
180 |
- set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) |
181 |
- |
182 |
-+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) |
183 |
- |
184 |
- find_library(OPENSSL_LIBRARY |
185 |
- NAMES ssl ssleay32 ssleay32MD libssl |
186 |
---- a/cdk/foundation/connection_openssl.cc |
187 |
-+++ b/cdk/foundation/connection_openssl.cc |
188 |
-@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) |
189 |
- case SSL_ERROR_WANT_CONNECT: |
190 |
- case SSL_ERROR_WANT_ACCEPT: |
191 |
- case SSL_ERROR_WANT_X509_LOOKUP: |
192 |
--# if OPENSSL_VERSION_NUMBER >= 0x10100000L |
193 |
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
194 |
- case SSL_ERROR_WANT_ASYNC: |
195 |
- case SSL_ERROR_WANT_ASYNC_JOB: |
196 |
- # endif |
197 |
-@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) |
198 |
- |
199 |
- SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); |
200 |
- |
201 |
--#if OPENSSL_VERSION_NUMBER>=0x1010100fL |
202 |
-+#if HAVE_TLS1_3_VERSION |
203 |
- |
204 |
- /* |
205 |
- Note: If TLSv1.3 is not enabled, there is no need to restrict |