Date: Wed, 2 May 2018 20:51:12 -0400 From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: Bernard Spil <brnrd@freebsd.org> 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 Message-ID: <CACM2dAZA8zG_tvDwHzUJGkpEoD-S%2BNuojZVrijh8O5Zmvc6=PA@mail.gmail.com> In-Reply-To: <201805021903.w42J3IKh023987@repo.freebsd.org> References: <201805021903.w42J3IKh023987@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Did you send this upstream to dev@httpd.apache.org ? On Wed, May 2, 2018 at 3:03 PM, Bernard Spil <brnrd@freebsd.org> 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 <mozilla tuxproject de> > 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 <http://pgp.mit.edu/pks/lookup?op=get&search=0xF699A450D21D2752>; 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACM2dAZA8zG_tvDwHzUJGkpEoD-S%2BNuojZVrijh8O5Zmvc6=PA>