diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-02-24 10:33:54 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-02-24 10:33:54 +0000 |
| commit | 16b3e5dda812222f0b2ecacdd59bc8bd736dce57 (patch) | |
| tree | 0e4dec52b76e8c1751e8199bb3d124899fbb8ef0 /www/apache22 | |
| parent | Fix LICENSE_FILE location. (diff) | |
www/apache22: Add upstream fix
- Upstream fixes no longer released as point versions
- Register BROKEN with various libssl providers
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 7 | ||||
| -rw-r--r-- | www/apache22/files/patch-modules__proxy__mod_proxy_util.c | 22 |
2 files changed, 28 insertions, 1 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index dc02e108a662..78ac3de2ab97 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -2,7 +2,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.34 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -14,6 +14,11 @@ COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM} MPM 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 \ libpcre.so:devel/pcre \ diff --git a/www/apache22/files/patch-modules__proxy__mod_proxy_util.c b/www/apache22/files/patch-modules__proxy__mod_proxy_util.c new file mode 100644 index 000000000000..31a0c27ea6ad --- /dev/null +++ b/www/apache22/files/patch-modules__proxy__mod_proxy_util.c @@ -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; |