Page MenuHomeFreeBSD
Files F106032007

D17668.diff
No OneTemporary
Actions

D17668.diff
View Options

Index: head/www/apache24/Makefile
===================================================================
--- head/www/apache24/Makefile
+++ head/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 @@
. 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
Index: head/www/apache24/distinfo
===================================================================
--- head/www/apache24/distinfo
+++ head/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
Index: head/www/apache24/files/patch-modules_ssl_mod__ssl.c
===================================================================
--- head/www/apache24/files/patch-modules_ssl_mod__ssl.c
+++ head/www/apache24/files/patch-modules_ssl_mod__ssl.c
@@ -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();
Index: head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c
===================================================================
--- head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c
+++ head/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 */

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 4:54 AM (9 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15594548
Default Alt Text
D17668.diff (3 KB)

Event Timeline