svn commit: r462786 - in head/www/apache22: . files

[Bernard Spil]

Author: brnrd
Date: Sat Feb 24 10:33:54 2018
New Revision: 462786
URL: https://svnweb.freebsd.org/changeset/ports/462786

Log:
  www/apache22: Add upstream fix
  
   - Upstream fixes no longer released as point versions
   - Register BROKEN with various libssl providers

Added:
  head/www/apache22/files/patch-modules__proxy__mod_proxy_util.c   (contents, props changed)
Modified:
  head/www/apache22/Makefile

Modified: head/www/apache22/Makefile
==============================================================================
--- head/www/apache22/Makefile	Sat Feb 24 09:54:58 2018	(r462785)
+++ head/www/apache22/Makefile	Sat Feb 24 10:33:54 2018	(r462786)
@@ -2,7 +2,7 @@
 
 PORTNAME=	apache22
 PORTVERSION=	2.2.34
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}
@@ -13,6 +13,11 @@ COMMENT?=	Version 2.2.x of Apache web server with ${WI
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BROKEN_SSL=	openssl-devel libressl libressl-devel
+BROKEN_SSL_REASON_openssl-devel=	configure: Error... SSL/TLS libraries were missing or unusable
+BROKEN_SSL_REASON_libressl=		error: no member named 'state' in 'struct ssl_st'
+BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libapr-1.so:devel/apr1 \

Added: head/www/apache22/files/patch-modules__proxy__mod_proxy_util.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/apache22/files/patch-modules__proxy__mod_proxy_util.c	Sat Feb 24 10:33:54 2018	(r462786)
@@ -0,0 +1,22 @@
+https://www.apache.org/dist/httpd/patches/apply_to_2.2.34/2.2.x-mod_proxy-without-APR_HAS_THREADS.patch
+
+Index: modules/proxy/proxy_util.c
+===================================================================
+--- modules/proxy/proxy_util.c	(revision 1821521)
++++ modules/proxy/proxy_util.c	(working copy)
+@@ -1398,7 +1398,6 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_get_worker(
+     return max_worker;
+ }
+ 
+-#if APR_HAS_THREADS
+ static void socket_cleanup(proxy_conn_rec *conn)
+ {
+     conn->sock = NULL;
+@@ -1407,6 +1406,7 @@ static void socket_cleanup(proxy_conn_rec *conn)
+     apr_pool_clear(conn->scpool);
+ }
+ 
++#if APR_HAS_THREADS
+ static apr_status_t conn_pool_cleanup(void *theworker)
+ {
+     proxy_worker *worker = (proxy_worker *)theworker;