diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-10-27 14:36:41 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-10-27 14:36:41 +0000 |
| commit | 367e8ff5cc7da436c293897e745f582d015a8ded (patch) | |
| tree | 5a86e3e89789ca5d205365c358ba6ac2f923f860 | |
| parent | Connect misc/kde-thumbnailer-*-kde4 ports (diff) | |
www/apache24: Update to 2.4.37
- Adds TLSv1.3 support with security/openssl111
PR: 232687
Submitted by: Pascal Christen <pascal christen hostpoint.ch>
Reported by: Markus Kohlmeyer <rootservice gmail com>
Reviewed by: ohauer
Approved by: joneum
Differential Revision: https://reviews.freebsd.org/D17668
| -rw-r--r-- | www/apache24/Makefile | 4 | ||||
| -rw-r--r-- | www/apache24/distinfo | 6 | ||||
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_mod__ssl.c | 11 | ||||
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_ssl__engine__init.c | 10 |
4 files changed, 14 insertions, 17 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index d3890b17811b..a30aa850b47d 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.35 +PORTVERSION= 2.4.37 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -136,7 +136,7 @@ IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\ . endif . if ${PORT_OPTIONS:MSESSION_CRYPTO} && \ !(exists(${APU_CRYPTO_OPENSSL}) || exists(${APU_CRYPTO_NSS})) -IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support build in.\ +IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support built in.\ Please rebuild APR with crypto openssl support . endif .endif # exists APU_CONFIG diff --git a/www/apache24/distinfo b/www/apache24/distinfo index 85815bb5df94..35b9b9493fc5 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537900540 -SHA256 (apache24/httpd-2.4.35.tar.bz2) = 2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56 -SIZE (apache24/httpd-2.4.35.tar.bz2) = 7044336 +TIMESTAMP = 1540301506 +SHA256 (apache24/httpd-2.4.37.tar.bz2) = 3498dc5c6772fac2eb7307dc7963122ffe243b5e806e0be4fb51974ff759d726 +SIZE (apache24/httpd-2.4.37.tar.bz2) = 7031632 diff --git a/www/apache24/files/patch-modules_ssl_mod__ssl.c b/www/apache24/files/patch-modules_ssl_mod__ssl.c deleted file mode 100644 index 42e793e9b5a0..000000000000 --- a/www/apache24/files/patch-modules_ssl_mod__ssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/ssl/mod_ssl.c.orig 2018-02-13 23:43:36 UTC -+++ modules/ssl/mod_ssl.c -@@ -398,7 +398,7 @@ static int ssl_hook_pre_config(apr_pool_ - /* 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/www/apache24/files/patch-modules_ssl_ssl__engine__init.c b/www/apache24/files/patch-modules_ssl_ssl__engine__init.c index 1341e4d5eb7d..01515de6a969 100644 --- a/www/apache24/files/patch-modules_ssl_ssl__engine__init.c +++ b/www/apache24/files/patch-modules_ssl_ssl__engine__init.c @@ -1,6 +1,6 @@ --- modules/ssl/ssl_engine_init.c.orig 2018-02-13 23:43:36 UTC +++ modules/ssl/ssl_engine_init.c -@@ -546,7 +546,7 @@ static apr_status_t ssl_init_ctx_protoco +@@ -547,7 +547,7 @@ static apr_status_t ssl_init_ctx_protoco char *cp; int protocol = mctx->protocol; SSLSrvConfigRec *sc = mySrvConfig(s); @@ -9,4 +9,12 @@ int prot; #endif +@@ -1492,7 +1492,7 @@ static apr_status_t ssl_init_proxy_certs + X509_STORE_CTX *sctx; + X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx); +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) + /* For OpenSSL >=1.1.1, turn on client cert support which is + * otherwise turned off by default (by design). + * https://github.com/openssl/openssl/issues/6933 */ |