www/mod_md-devel: Add missing files

 - Pulled the trigger early on 465487

PR:		225005

5 files changed, 44 insertions, 27 deletions

diff --git a/www/mod_md-devel/files/999_mod_md.conf.in b/www/mod_md-devel/files/999_mod_md.conf.in
new file mode 100644
index 000000000000..8df16e9f82e3
--- /dev/null
+++ b/www/mod_md-devel/files/999_mod_md.conf.in
@@ -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
+
+<IfModule md_module>
+# 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
+
+</IfModule>
diff --git a/www/mod_md-devel/files/patch-src_md__crypt.c b/www/mod_md-devel/files/patch-src_md__crypt.c
new file mode 100644
index 000000000000..e16232ad253d
--- /dev/null
+++ b/www/mod_md-devel/files/patch-src_md__crypt.c
@@ -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
diff --git a/www/mod_md-devel/files/pkg-message.in b/www/mod_md-devel/files/pkg-message.in
new file mode 100644
index 000000000000..9549f60f862a
--- /dev/null
+++ b/www/mod_md-devel/files/pkg-message.in
@@ -0,0 +1,8 @@
+ 
+/!\   This is an early experience non-production-ready version   /!\
+
+As of Apache httpd 2.4.33, the mod_md module is part of the
+regular distribution.
+
+The module can be enabled by editing the module's configuration file
+in %%PREFIX%%/%%APACHEETCDIR%%/modules.d/999_mod_md.conf
diff --git a/www/mod_md-devel/pkg-message b/www/mod_md-devel/pkg-message
deleted file mode 100644
index 98a75da7d1cb..000000000000
--- a/www/mod_md-devel/pkg-message
+++ /dev/null
@@ -1,27 +0,0 @@
-/!\   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.           #
-####################################################################
-
-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
diff --git a/www/mod_md-devel/pkg-plist b/www/mod_md-devel/pkg-plist
new file mode 100644
index 000000000000..58b5eccba820
--- /dev/null
+++ b/www/mod_md-devel/pkg-plist
@@ -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
+