Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libstrophe/files/
Date: Mon, 03 May 2021 18:46:38
Message-Id: 1620067537.1e95ece9d8cc7640388c85675c62550449aa347c.sam@gentoo
1 commit: 1e95ece9d8cc7640388c85675c62550449aa347c
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 18:32:04 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 18:45:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e95ece9
7
8 dev-libs/libstrophe: drop obsolete LibreSSL patch
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../libstrophe/files/libstrophe-0.9.2-libressl.patch | 20 --------------------
13 1 file changed, 20 deletions(-)
14
15 diff --git a/dev-libs/libstrophe/files/libstrophe-0.9.2-libressl.patch b/dev-libs/libstrophe/files/libstrophe-0.9.2-libressl.patch
16 deleted file mode 100644
17 index 1c0cf239cdf..00000000000
18 --- a/dev-libs/libstrophe/files/libstrophe-0.9.2-libressl.patch
19 +++ /dev/null
20 @@ -1,20 +0,0 @@
21 ---- a/src/tls_openssl.c
22 -+++ b/src/tls_openssl.c
23 -@@ -51,7 +51,7 @@
24 -
25 - void tls_initialize(void)
26 - {
27 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
28 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
29 - SSL_library_init();
30 - SSL_load_error_strings();
31 - #else
32 -@@ -120,7 +120,7 @@
33 - /* Trust server's certificate when user sets the flag explicitly. */
34 - mode = conn->tls_trust ? SSL_VERIFY_NONE : SSL_VERIFY_PEER;
35 - SSL_set_verify(tls->ssl, mode, 0);
36 --#if OPENSSL_VERSION_NUMBER >= 0x10002000L
37 -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
38 - /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
39 - X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl);
40 -