From owner-svn-ports-head@freebsd.org Mon Dec 25 11:49:11 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCAAEE85EB1; Mon, 25 Dec 2017 11:49:11 +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 mx1.freebsd.org (Postfix) with ESMTPS id 96CB91D61; Mon, 25 Dec 2017 11:49:11 +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 vBPBnAKH051700; Mon, 25 Dec 2017 11:49:10 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBPBnADo051699; Mon, 25 Dec 2017 11:49:10 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201712251149.vBPBnADo051699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 25 Dec 2017 11:49:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457221 - head/www/mod_md-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/www/mod_md-devel/files X-SVN-Commit-Revision: 457221 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Mon, 25 Dec 2017 11:49:11 -0000 Author: brnrd Date: Mon Dec 25 11:49:10 2017 New Revision: 457221 URL: https://svnweb.freebsd.org/changeset/ports/457221 Log: www/mod_md-devel: Update Apache mod_ssl patch Modified: head/www/mod_md-devel/files/extra-patch-mod_ssl Modified: head/www/mod_md-devel/files/extra-patch-mod_ssl ============================================================================== --- head/www/mod_md-devel/files/extra-patch-mod_ssl Mon Dec 25 11:47:17 2017 (r457220) +++ head/www/mod_md-devel/files/extra-patch-mod_ssl Mon Dec 25 11:49:10 2017 (r457221) @@ -1,8 +1,3 @@ -https://github.com/icing/mod_md/blob/master/patches/mod_ssl_md-2.4.x-v5.diff - -Fix for using a fallback certificate on initial signup of a -Managed Domain. Requires also a changed mod_ssl patch (v5) to take effect. - Index: modules/ssl/ssl_engine_init.c =================================================================== --- modules/ssl/ssl_engine_init.c (revision 1808124) @@ -182,7 +177,7 @@ Index: modules/ssl/ssl_engine_kernel.c + + if (SSL_check_private_key(ssl) < 1) { + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, c, APLOGNO() -+ "Challenbge certificate and private key %s " ++ "Challenge certificate and private key %s " + "do not match", servername); + return APR_EGENERAL; + } @@ -208,7 +203,7 @@ Index: modules/ssl/ssl_private.h server_rec *server; const char *cipher_suite; /* cipher suite used in last reneg */ -+ int service_unavailable; /* thouugh we negotiate SSL, no requests will be served */ ++ int service_unavailable; /* though we negotiate SSL, no requests will be served */ } SSLConnRec; /* BIG FAT WARNING: SSLModConfigRec has unusual memory lifetime: it is