From owner-svn-ports-all@freebsd.org Sat Feb 24 10:33:55 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08487F2ABA6; Sat, 24 Feb 2018 10:33:55 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE6C77A3A0; Sat, 24 Feb 2018 10:33:54 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F3CA245AD; Sat, 24 Feb 2018 10:33:54 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1OAXsjf077760; Sat, 24 Feb 2018 10:33:54 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1OAXsiN077758; Sat, 24 Feb 2018 10:33:54 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201802241033.w1OAXsiN077758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Feb 2018 10:33:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462786 - in head/www/apache22: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/www/apache22: . files X-SVN-Commit-Revision: 462786 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Feb 2018 10:33:55 -0000 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;