Date: Sat, 27 Oct 2018 14:36:41 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483139 - in head/www/apache24: . files Message-ID: <201810271436.w9REafeR040613@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Oct 27 14:36:41 2018 New Revision: 483139 URL: https://svnweb.freebsd.org/changeset/ports/483139 Log: 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 Deleted: head/www/apache24/files/patch-modules_ssl_mod__ssl.c Modified: head/www/apache24/Makefile head/www/apache24/distinfo head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Sat Oct 27 14:10:04 2018 (r483138) +++ head/www/apache24/Makefile Sat Oct 27 14:36:41 2018 (r483139) @@ -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 . 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 Modified: head/www/apache24/distinfo ============================================================================== --- head/www/apache24/distinfo Sat Oct 27 14:10:04 2018 (r483138) +++ head/www/apache24/distinfo Sat Oct 27 14:36:41 2018 (r483139) @@ -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 Modified: head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c ============================================================================== --- head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c Sat Oct 27 14:10:04 2018 (r483138) +++ head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c Sat Oct 27 14:36:41 2018 (r483139) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810271436.w9REafeR040613>