From owner-svn-ports-head@freebsd.org Sat Mar 24 22:01:35 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 BDF57F4F006; Sat, 24 Mar 2018 22:01:35 +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 6B9D182115; Sat, 24 Mar 2018 22:01:35 +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 6695B1527C; Sat, 24 Mar 2018 22:01:35 +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 w2OM1ZVD093230; Sat, 24 Mar 2018 22:01:35 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2OM1YuH093226; Sat, 24 Mar 2018 22:01:34 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201803242201.w2OM1YuH093226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Mar 2018 22:01:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465488 - in head/www/mod_md-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/www/mod_md-devel: . files X-SVN-Commit-Revision: 465488 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: Sat, 24 Mar 2018 22:01:36 -0000 Author: brnrd Date: Sat Mar 24 22:01:34 2018 New Revision: 465488 URL: https://svnweb.freebsd.org/changeset/ports/465488 Log: www/mod_md-devel: Add missing files - Pulled the trigger early on 465487 PR: 225005 Added: head/www/mod_md-devel/files/999_mod_md.conf.in (contents, props changed) head/www/mod_md-devel/files/patch-src_md__crypt.c (contents, props changed) head/www/mod_md-devel/files/pkg-message.in - copied, changed from r465487, head/www/mod_md-devel/pkg-message head/www/mod_md-devel/pkg-plist (contents, props changed) Deleted: head/www/mod_md-devel/pkg-message Added: head/www/mod_md-devel/files/999_mod_md.conf.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_md-devel/files/999_mod_md.conf.in Sat Mar 24 22:01:34 2018 (r465488) @@ -0,0 +1,20 @@ +# To enable, uncomment the LoadModule line and the +# MDCertificateAgreement line to accept the agreement +# Make sure you DON'T load the mod_md module from the +# Apache port + +# Full documentation in the project's wiki +# https://github.com/icing/mod_md/wiki +# and regular directives in Apache httpd documentation +# https://httpd.apache.org/docs/trunk/mod/mod_md.html + +# LoadModule md_module %%APACHEMODDIR%%/mod_manageddomain.so + + +# MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf +ManagedDomain your_domain.de + +# Module uses ServerAdmin email from your Apache configuration +# during registration, make sure it is up-to-date and working + + Added: head/www/mod_md-devel/files/patch-src_md__crypt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_md-devel/files/patch-src_md__crypt.c Sat Mar 24 22:01:34 2018 (r465488) @@ -0,0 +1,11 @@ +--- src/md_crypt.c.orig 2018-01-30 10:20:50 UTC ++++ src/md_crypt.c +@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppk + } + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + + #ifndef NID_tlsfeature + #define NID_tlsfeature 1020 Copied and modified: head/www/mod_md-devel/files/pkg-message.in (from r465487, head/www/mod_md-devel/pkg-message) ============================================================================== --- head/www/mod_md-devel/pkg-message Sat Mar 24 21:54:25 2018 (r465487, copy source) +++ head/www/mod_md-devel/files/pkg-message.in Sat Mar 24 22:01:34 2018 (r465488) @@ -1,27 +1,8 @@ + /!\ This is an early experience non-production-ready version /!\ -#################################################################### -# This module requires a patched Apache mod_ssl. Apply the mod_ssl # -# patch from https://github.com/icing/mod_md/tree/master/patches # -# to the www/apache24 port and rebuild/reinstall apache. # -#################################################################### +As of Apache httpd 2.4.33, the mod_md module is part of the +regular distribution. -Add the following to your make.conf to apply the patch to www/apache24 - -.if ${.CURDIR:M*/www/apache24} -EXTRA_PATCHES+=../mod_md-devel/files/extra-patch-mod_ssl -.endif - -If you want to have the md module enabled in your apache installation, -you need to add - - LoadModule md_module modules/mod_md.so - -somewhere in your config files and add a line like - - MDomain your_domain.example.org www.your_domain.example.org - -Full documentation in the project's wiki - https://github.com/icing/mod_md/wiki -and for most directives in Apache trunk documentation - https://httpd.apache.org/docs/trunk/mod/mod_md.html +The module can be enabled by editing the module's configuration file +in %%PREFIX%%/%%APACHEETCDIR%%/modules.d/999_mod_md.conf Added: head/www/mod_md-devel/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_md-devel/pkg-plist Sat Mar 24 22:01:34 2018 (r465488) @@ -0,0 +1,5 @@ +%%APACHEMODDIR%%/mod_manageddomain.so.0.0.0 +%%APACHEMODDIR%%/mod_manageddomain.so +@sample %%APACHEETCDIR%%/modules.d/999_mod_md.conf.sample +bin/a2md +