From owner-svn-ports-all@freebsd.org Wed May 2 19:03:20 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 D5813FB1A12; Wed, 2 May 2018 19:03:19 +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 84D93850E9; Wed, 2 May 2018 19:03:19 +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 6557F14FD9; Wed, 2 May 2018 19:03:19 +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 w42J3J38023991; Wed, 2 May 2018 19:03:19 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42J3IKh023987; Wed, 2 May 2018 19:03:18 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201805021903.w42J3IKh023987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 2 May 2018 19:03:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468867 - in head/www/apache24: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/www/apache24: . files X-SVN-Commit-Revision: 468867 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: Wed, 02 May 2018 19:03:20 -0000 Author: brnrd Date: Wed May 2 19:03:18 2018 New Revision: 468867 URL: https://svnweb.freebsd.org/changeset/ports/468867 Log: www/apache24: Fix runtime failure with LibreSSL 2.7 - Fix LOG_FORENSIC in plist while here PR: 227868 Reported by: Jens K. Loewe Approved by: hat (apache@) Added: head/www/apache24/files/patch-modules_ssl_mod__ssl.c (contents, props changed) head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c (contents, props changed) Modified: head/www/apache24/Makefile head/www/apache24/pkg-plist Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Wed May 2 18:39:57 2018 (r468866) +++ head/www/apache24/Makefile Wed May 2 19:03:18 2018 (r468867) @@ -2,6 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.33 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Added: head/www/apache24/files/patch-modules_ssl_mod__ssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apache24/files/patch-modules_ssl_mod__ssl.c Wed May 2 19:03:18 2018 (r468867) @@ -0,0 +1,11 @@ +--- 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(); Added: head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c Wed May 2 19:03:18 2018 (r468867) @@ -0,0 +1,12 @@ +--- 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 + char *cp; + int protocol = mctx->protocol; + SSLSrvConfigRec *sc = mySrvConfig(s); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + int prot; + #endif + + Modified: head/www/apache24/pkg-plist ============================================================================== --- head/www/apache24/pkg-plist Wed May 2 18:39:57 2018 (r468866) +++ head/www/apache24/pkg-plist Wed May 2 19:03:18 2018 (r468867) @@ -230,7 +230,7 @@ man/man8/rotatelogs.8.gz man/man8/suexec.8.gz sbin/apachectl sbin/apxs -%%FORENSIC%%sbin/check_forensic +%%LOG_FORENSIC%%sbin/check_forensic sbin/checkgid sbin/dbmmanage sbin/envvars