gentoo resync : 10.02.2019

2 files changed, 0 insertions, 98 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 6eb54667c291..b2f3ea841b84 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,4 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
-AUX apache-2.4.33-libressl-compatibility.patch 4026 BLAKE2B 6220ac8de57df3146b51d1fc23cbeae1f5e9a2db5e2dd0e5ac16c40939b1396b658de97e6ec4fa12b1932deb3e13147f57446ae8e89f2da10e4e233833bf1152 SHA512 582a3f8b9839e4f4d9d368634b8d499f73d9f06ce171061435aa82331d93d32819f69d887115d07b88b216628bcdcee583df8cf6d27cde815711adc355b330a7
 AUX apache-2.4.34-PR62557.patch 8393 BLAKE2B 2e87763186f63be89d28b68d5a9fbec55afa883f1d8cf42b7ea2182365fe81a5681b2a7ca722074f1cfb79bdea3361d68f37e02a9152a45392e93546669375ea SHA512 d87fc2942c7ada9b91c8ab495b4bbc91b3fefa376586b76a1975f3bb1ef2bb4ac2a73b30c2538aa5af10ef1d1d0e33b3de39b2bb0f00c3e44a432d0adea14196
 AUX apache-2.4.34-suexec_parallel_install.patch 578 BLAKE2B f0d89b8f2d29017d653db1cf562a476db6e841d132588b895c48db35fedc1a3a5c21bd4f0d3fc877138d05001802353411cb608fa4daa4c8cc2d8cd1fe14f6ca SHA512 8e07c444eb0e1130bdd73540da7bd2ea4e9d261f4d3700e8183cd49ec309f667a93aeea9afb70a83e8f1e4d92e982b45ad29ac2c00c2760271129a4dfdc0381b
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
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
deleted file mode 100644
index a326cc698eee..000000000000
--- a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-# based on upstream commit from:
-# https://github.com/apache/httpd/commit/8134addfabf2685e08da6d51167775b628fda0dc
-# this should be included in the next release (2.4.34?)
-
-diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c
-index 66682eaf4d..8f0def2805 100644
---- a/modules/md/md_crypt.c
-+++ b/modules/md/md_crypt.c
-@@ -190,7 +190,7 @@ static int pem_passwd(char *buf, int size, int rwflag, void *baton)
-  */
- static apr_time_t md_asn1_time_get(const ASN1_TIME* time)
- {
--#ifdef LIBRESSL_VERSION_NUMBER
-+#ifdef LIBRESSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-     /* courtesy: https://stackoverflow.com/questions/10975542/asn1-time-to-time-t-conversion#11263731
-      * all bugs are mine */
-     apr_time_exp_t t;
-@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppkey, apr_pool_t *p, md_pkey_spec_t *spec)
-     }
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
- 
- #ifndef NID_tlsfeature
- #define NID_tlsfeature          1020
-diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
-index 48d64cb624..2392019aed 100644
---- a/modules/ssl/mod_ssl.c
-+++ b/modules/ssl/mod_ssl.c
-@@ -398,7 +398,7 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
-     /* We must register the library in full, to ensure our configuration
-      * code can successfully test the SSL environment.
-      */
--#if MODSSL_USE_OPENSSL_PRE_1_1_API
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API || defined(LIBRESSL_VERSION_NUMBER)
-     (void)CRYPTO_malloc_init();
- #else
-     OPENSSL_malloc_init();
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index a3a74f474c..88c0939cab 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -546,7 +546,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
-     char *cp;
-     int protocol = mctx->protocol;
-     SSLSrvConfigRec *sc = mySrvConfig(s);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \
-+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L)
-     int prot;
- #endif
- 
-@@ -616,7 +617,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
- 
-     SSL_CTX_set_options(ctx, SSL_OP_ALL);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L)
-     /* always disable SSLv2, as per RFC 6176 */
-     SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
- 
-diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
-index a39569cbf7..e0e1b37087 100644
---- a/modules/ssl/ssl_private.h
-+++ b/modules/ssl/ssl_private.h
-@@ -132,13 +132,14 @@
-         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
- #define SSL_CTX_set_max_proto_version(ctx, version) \
-         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
--#endif
--/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
-- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...), so
-- * we have to work around this...
-+#elif LIBRESSL_VERSION_NUMBER < 0x2070000f
-+/* LibreSSL before 2.7 declares OPENSSL_VERSION_NUMBER == 2.0 but does not
-+ * include most changes from OpenSSL >= 1.1 (new functions, macros, 
-+ * deprecations, ...), so we have to work around this...
-  */
- #define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
--#else
-+#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */
-+#else /* defined(LIBRESSL_VERSION_NUMBER) */
- #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
- #endif
- 
-@@ -238,7 +239,8 @@ void init_bio_methods(void);
- void free_bio_methods(void);
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || \
-+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
- #define X509_STORE_CTX_get0_store(x) (x->ctx)
- #endif
-