1 |
commit: 51f811298e55ea65b00fedeaf9983807ab40da4c |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 29 10:09:03 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 6 09:32:12 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f81129 |
7 |
|
8 |
www-servers/apache: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
.../apache-2.4.33-libressl-compatibility.patch | 97 ---------------------- |
14 |
1 file changed, 97 deletions(-) |
15 |
|
16 |
diff --git a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch b/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch |
17 |
deleted file mode 100644 |
18 |
index a326cc698ee..00000000000 |
19 |
--- a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch |
20 |
+++ /dev/null |
21 |
@@ -1,97 +0,0 @@ |
22 |
-# based on upstream commit from: |
23 |
-# https://github.com/apache/httpd/commit/8134addfabf2685e08da6d51167775b628fda0dc |
24 |
-# this should be included in the next release (2.4.34?) |
25 |
- |
26 |
-diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c |
27 |
-index 66682eaf4d..8f0def2805 100644 |
28 |
---- a/modules/md/md_crypt.c |
29 |
-+++ b/modules/md/md_crypt.c |
30 |
-@@ -190,7 +190,7 @@ static int pem_passwd(char *buf, int size, int rwflag, void *baton) |
31 |
- */ |
32 |
- static apr_time_t md_asn1_time_get(const ASN1_TIME* time) |
33 |
- { |
34 |
--#ifdef LIBRESSL_VERSION_NUMBER |
35 |
-+#ifdef LIBRESSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) |
36 |
- /* courtesy: https://stackoverflow.com/questions/10975542/asn1-time-to-time-t-conversion#11263731 |
37 |
- * all bugs are mine */ |
38 |
- apr_time_exp_t t; |
39 |
-@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppkey, apr_pool_t *p, md_pkey_spec_t *spec) |
40 |
- } |
41 |
- } |
42 |
- |
43 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
44 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f) |
45 |
- |
46 |
- #ifndef NID_tlsfeature |
47 |
- #define NID_tlsfeature 1020 |
48 |
-diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c |
49 |
-index 48d64cb624..2392019aed 100644 |
50 |
---- a/modules/ssl/mod_ssl.c |
51 |
-+++ b/modules/ssl/mod_ssl.c |
52 |
-@@ -398,7 +398,7 @@ static int ssl_hook_pre_config(apr_pool_t *pconf, |
53 |
- /* We must register the library in full, to ensure our configuration |
54 |
- * code can successfully test the SSL environment. |
55 |
- */ |
56 |
--#if MODSSL_USE_OPENSSL_PRE_1_1_API |
57 |
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API || defined(LIBRESSL_VERSION_NUMBER) |
58 |
- (void)CRYPTO_malloc_init(); |
59 |
- #else |
60 |
- OPENSSL_malloc_init(); |
61 |
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c |
62 |
-index a3a74f474c..88c0939cab 100644 |
63 |
---- a/modules/ssl/ssl_engine_init.c |
64 |
-+++ b/modules/ssl/ssl_engine_init.c |
65 |
-@@ -546,7 +546,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s, |
66 |
- char *cp; |
67 |
- int protocol = mctx->protocol; |
68 |
- SSLSrvConfigRec *sc = mySrvConfig(s); |
69 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
70 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \ |
71 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L) |
72 |
- int prot; |
73 |
- #endif |
74 |
- |
75 |
-@@ -616,7 +617,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s, |
76 |
- |
77 |
- SSL_CTX_set_options(ctx, SSL_OP_ALL); |
78 |
- |
79 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
80 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
81 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L) |
82 |
- /* always disable SSLv2, as per RFC 6176 */ |
83 |
- SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); |
84 |
- |
85 |
-diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h |
86 |
-index a39569cbf7..e0e1b37087 100644 |
87 |
---- a/modules/ssl/ssl_private.h |
88 |
-+++ b/modules/ssl/ssl_private.h |
89 |
-@@ -132,13 +132,14 @@ |
90 |
- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) |
91 |
- #define SSL_CTX_set_max_proto_version(ctx, version) \ |
92 |
- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) |
93 |
--#endif |
94 |
--/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most |
95 |
-- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...), so |
96 |
-- * we have to work around this... |
97 |
-+#elif LIBRESSL_VERSION_NUMBER < 0x2070000f |
98 |
-+/* LibreSSL before 2.7 declares OPENSSL_VERSION_NUMBER == 2.0 but does not |
99 |
-+ * include most changes from OpenSSL >= 1.1 (new functions, macros, |
100 |
-+ * deprecations, ...), so we have to work around this... |
101 |
- */ |
102 |
- #define MODSSL_USE_OPENSSL_PRE_1_1_API (1) |
103 |
--#else |
104 |
-+#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */ |
105 |
-+#else /* defined(LIBRESSL_VERSION_NUMBER) */ |
106 |
- #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L) |
107 |
- #endif |
108 |
- |
109 |
-@@ -238,7 +239,8 @@ void init_bio_methods(void); |
110 |
- void free_bio_methods(void); |
111 |
- #endif |
112 |
- |
113 |
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) |
114 |
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || \ |
115 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f) |
116 |
- #define X509_STORE_CTX_get0_store(x) (x->ctx) |
117 |
- #endif |
118 |
- |