From owner-svn-ports-all@freebsd.org Thu May 3 00:51: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 1E72FFB90B1 for ; Thu, 3 May 2018 00:51:55 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 87ACF73B79 for ; Thu, 3 May 2018 00:51:54 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: by mail-wm0-x233.google.com with SMTP id i3so27252012wmf.3 for ; Wed, 02 May 2018 17:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=p6m7g8-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=B72iPvGVngI9Alk3Qomqsvlfwx8ZzkCOp7lEiPrRwQo=; b=lYtpAWi7wnzp84PkJVleSZspk6EFR3q3jaIQTNSH7x6/2Na/QD+v2OWBsgkj7D2ApE nWS+yyTOPZnx5osJgrpXkI3+UVrYwOeG0Gxny9BJPcRSOaIiyQjbM4O24zMGPWnki+gF 7+c4c/8LxIh+eKkDNnD3gA+xIPQObhwwHoC95G3IT49EvpC3MLD68CeJYTPVyPIiKcPz ixkQvcf5xmlhCB7bcWUhp/QIitPeSxlw1Nlg5UA1Dr6zkb1+HLGRml1Tv3vATrkrrFby nXVWDKvkFQYKVxiAgtCw2aksMZJEzvS1pt15l+J6mUZHZhQ06jPVoE5zIZJfwHaMZJkI QF5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=B72iPvGVngI9Alk3Qomqsvlfwx8ZzkCOp7lEiPrRwQo=; b=X89GScY/hqwDpI/aukFg7ix1g7zn3R84H/Yu9CkJL0C27Wxxfmr7ckIVyt27C05geq q64Rk3Y/11LWsftm6u7xwoW6i5hoGgMcHHwkBbVLHYbG/VURQRLRlAtjifq4Jle4Ewbm e3ibltjZRK79QfgbwO1YP8R6NUpyr7zbX3vkn4FYFXfJff0BBd5Nj4qLwWdb9eL0aZuK SACKQq8a36AQgFdkUCWAxkjl0T8LnNPbR1x4mdcHX7g65ZVL8ZpU2PvVhFimv1VpRIP/ jz7rSjSCuieV5NHGjK1jMgMGoJ4PIJLGRS1yjtwAfWLY9naiF8IRAoDPMOoPtW2OOYDT ZQCg== X-Gm-Message-State: ALQs6tAWnExVDBJg6yrQDXVDPwgrsgKF5Z3ffSnkUpG3ZK16+8GRosgd UaeNbGfXGk9pa6T4sPN3DLPWrgZxlYrn0uM5ZULLKw== X-Google-Smtp-Source: AB8JxZoYJlE5PEn0L/D7E85KhBKX0/H8uVG3SdvzPr2q8X6tmqi9u8LW5V4LbWSuDrOyx76KD06RLFwWayUNlMhf8GQ= X-Received: by 2002:a50:a802:: with SMTP id j2-v6mr28624656edc.138.1525308713076; Wed, 02 May 2018 17:51:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.80.141.140 with HTTP; Wed, 2 May 2018 17:51:12 -0700 (PDT) X-Originating-IP: [108.48.199.86] In-Reply-To: <201805021903.w42J3IKh023987@repo.freebsd.org> References: <201805021903.w42J3IKh023987@repo.freebsd.org> From: "Philip M. Gollucci" Date: Wed, 2 May 2018 20:51:12 -0400 Message-ID: Subject: Re: svn commit: r468867 - in head/www/apache24: . files To: Bernard Spil Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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: Thu, 03 May 2018 00:51:55 -0000 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.