From owner-svn-ports-head@freebsd.org Thu May 3 19:37:37 2018 Return-Path: Delivered-To: svn-ports-head@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 96952FB7863; Thu, 3 May 2018 19:37:37 +0000 (UTC) (envelope-from brnrd@freebsd.org) Received: from smtp01.qsp.nl (smtp01.qsp.nl [193.254.214.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8F2D6DEA7; Thu, 3 May 2018 19:37:35 +0000 (UTC) (envelope-from brnrd@freebsd.org) Received: from smtp01.qsp.nl (localhost [127.0.0.1]) by smtp01.qsp.nl (Postfix) with ESMTP id 4987325A7A; Thu, 3 May 2018 21:37:27 +0200 (CEST) Received: from mail.brnrd.eu (unknown [193.164.217.85]) by smtp01.qsp.nl (Postfix) with ESMTPSA; Thu, 3 May 2018 21:37:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=brnrd.eu; h=date:from:to:subject:message-id; s=default; bh=kTC2KPhNLwMQ0etPbNDWjJMBk5wcW32T3o8kzOFNJgQ=; b=tZRcKv9v8ueYLVjMZ1bbeWxW3nZHfcHfo79g925I+79NyYnbyq8TiZmmn7ZuqYa+V0mhWh4HXMNqSn5dAym948MMBWGG5u0TyWO4Z2LGS3PuHCjubWPnCIQK6i4ITwOFz4Vp1s1ti87nBDy/QtOrPrTXoxL4BsaIUWbN4IeOatIi8HGCwI1pvQ0DDI/cQf2+nqKYDR3tkSQ2oPP5gkndSuZDTi1sRPaBH65gmKYryMnytnpo5F5xVll7ZIc2aD/BNBA0dRnq73qy6Tpt9Y1Eruq5Y8YajIp+Eo2kR78p4pNEsq0jp4HZUMes6uIXr1bq/i3fRANErSjO9AkE+RP9fg== Received: by bachfreund.nl (OpenSMTPD) with ESMTPSA id 50691b45 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO; Thu, 3 May 2018 21:37:24 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 03 May 2018 21:37:24 +0200 From: Bernard Spil To: "Philip M. Gollucci" Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r468867 - in head/www/apache24: . files In-Reply-To: References: <201805021903.w42J3IKh023987@repo.freebsd.org> Message-ID: <5e04aefce1e33ca0df1a58946e7d61ef@freebsd.org> X-Sender: brnrd@freebsd.org User-Agent: Roundcube Webmail/1.3.6 X-SMTP-Virus-Scanned: clamav at smtp01 X-Spam-Status: No, score=0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HK_RANDOM_ENVFROM,UNPARSEABLE_RELAY autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on svfilter04.qsp.nl X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 May 2018 19:37:37 -0000 On 2018-05-03 2:51, Philip M. Gollucci wrote: > Did you send this upstream to dev@httpd.apache.org ? > > On Wed, May 2, 2018 at 3:03 PM, Bernard Spil wrote: > >> 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 >> _______________________________________________ >> svn-ports-all@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-ports-all >> To unsubscribe, send any mail to >> "svn-ports-all-unsubscribe@freebsd.org" > > -- > > --------------------------------------------------------------------------------- > 4096R/D21D2752 ECDF B597 B54B 7F92 753E E0EA F699 A450 D21D 2752 > Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 > Member, Apache Software Foundation > Committer, FreeBSD Foundation > Consultant, P6M7G8 Inc. > Director Cloud Technology, Capital One > > What doesn't kill us can only make us stronger; > Except it almost kills you. Hi Philip, My patches were already merged in trunk (2.5.1) but have yet to be backported to 2.4. Must hurry up, I feel a 2.4.34 coming up :D Cheers, Bernard.