1 |
commit: 8b4cdbbea6c56a831eab3dc7c29380f833f5eba9 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 17 13:47:00 2018 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 17 13:47:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4cdbbe |
7 |
|
8 |
www-servers/h2o: remove unused patch |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
www-servers/h2o/files/h2o-2.2.4-libressl.patch | 54 -------------------------- |
13 |
1 file changed, 54 deletions(-) |
14 |
|
15 |
diff --git a/www-servers/h2o/files/h2o-2.2.4-libressl.patch b/www-servers/h2o/files/h2o-2.2.4-libressl.patch |
16 |
deleted file mode 100644 |
17 |
index 3849dd0e2b6..00000000000 |
18 |
--- a/www-servers/h2o/files/h2o-2.2.4-libressl.patch |
19 |
+++ /dev/null |
20 |
@@ -1,54 +0,0 @@ |
21 |
---- a/include/h2o/openssl_backport.h |
22 |
-+++ b/include/h2o/openssl_backport.h |
23 |
-@@ -25,7 +25,7 @@ |
24 |
- #include <stdlib.h> |
25 |
- |
26 |
- /* backports for OpenSSL 1.0.2 */ |
27 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
28 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
29 |
- |
30 |
- #define BIO_get_data(bio) ((bio)->ptr) |
31 |
- #define BIO_set_data(bio, p) ((bio)->ptr = (p)) |
32 |
-@@ -57,7 +58,7 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) |
33 |
- #endif |
34 |
- |
35 |
- /* backports for OpenSSL 1.0.1 and LibreSSL */ |
36 |
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) |
37 |
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
38 |
- |
39 |
- #define SSL_is_server(ssl) ((ssl)->server) |
40 |
- |
41 |
---- a/deps/neverbleed/neverbleed.c |
42 |
-+++ b/deps/neverbleed/neverbleed.c |
43 |
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf) |
44 |
- return 0; |
45 |
- } |
46 |
- |
47 |
--#if !OPENSSL_1_1_API |
48 |
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
49 |
- |
50 |
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) |
51 |
- { |
52 |
- |
53 |
---- a/deps/picotls/lib/openssl.c |
54 |
-+++ b/deps/picotls/lib/openssl.c |
55 |
-@@ -41,13 +41,15 @@ |
56 |
- #include "picotls.h" |
57 |
- #include "picotls/openssl.h" |
58 |
- |
59 |
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) |
60 |
--#define OPENSSL_1_0_API 1 |
61 |
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L |
62 |
-+#define OPENSSL_1_1_API 1 |
63 |
-+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL |
64 |
-+#define OPENSSL_1_1_API 1 |
65 |
- #else |
66 |
--#define OPENSSL_1_0_API 0 |
67 |
-+#define OPENSSL_1_1_API 0 |
68 |
- #endif |
69 |
- |
70 |
--#if OPENSSL_1_0_API |
71 |
-+#if !OPENSSL_1_1_API |
72 |
- |
73 |
- #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY) |
74 |
- #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE) |