From 6ae4d47d2282cbe9138e995b2fe34143a196ee21 Mon Sep 17 00:00:00 2001
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Mon, 18 Feb 2019 22:26:29 +0000
Subject: [PATCH] www/hiawatha: Update to 10.9

Changes:	https://www.hiawatha-webserver.org/changelog
---
 www/hiawatha/Makefile  | 10 +++++++---
 www/hiawatha/distinfo  |  6 +++---
 www/hiawatha/pkg-help  |  5 +++++
 www/hiawatha/pkg-plist | 12 ++++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 959280258984..92b50e495771 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hiawatha
-PORTVERSION=	10.8.4
+PORTVERSION=	10.9
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 
@@ -12,21 +12,23 @@ COMMENT=	Advanced and secure webserver for Unix
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:insource compiler:c11
+USES=		cmake:insource compiler:c11 shebangfix
 USE_RC_SUBR=	hiawatha
+SHEBANG_FILES=	extra/letsencrypt/lefh.in
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DWEBROOT_DIR=${WWWDIR} \
 		-DWORK_DIR=/var/db/${PORTNAME}
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		CACHE CGIWRAPPER IPV6 LOADCHECK MBEDTLS MONITOR \
+OPTIONS_DEFINE=		CACHE CGIWRAPPER IPV6 LEFH LOADCHECK MBEDTLS MONITOR \
 			RPROXY TOMAHAWK TOOLKIT XSLT
 OPTIONS_DEFAULT=	CACHE CGIWRAPPER MBEDTLS RPROXY TOOLKIT XSLT
 OPTIONS_SUB=		yes
 
 CACHE_DESC=		Caching support
 CGIWRAPPER_DESC=	Install cgi-wrapper(1) (needs setuid bit)
+LEFH_DESC=		Install Let's Encrypt For Hiawatha script
 LOADCHECK_DESC=		Load check support (experimental)
 MONITOR_DESC=		Hiawatha Monitor support
 RPROXY_DESC=		Reverse proxy support
@@ -36,6 +38,8 @@ XSLT_DESC=		XSLT support
 
 CACHE_CMAKE_BOOL=	ENABLE_CACHE
 IPV6_CMAKE_BOOL=	ENABLE_IPV6
+LEFH_IMPLIES=		MBEDTLS
+LEFH_USES=		php:cli
 LOADCHECK_CMAKE_BOOL=	ENABLE_LOADCHECK
 MBEDTLS_CMAKE_BOOL=	ENABLE_TLS USE_SYSTEM_MBEDTLS
 MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index c0725b667808..5262a5f1b54c 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550049875
-SHA256 (hiawatha-10.8.4.tar.gz) = 7cb322e9071ad3ee909167c624c6f80b0d2a6630a9d232d52406289d83658b14
-SIZE (hiawatha-10.8.4.tar.gz) = 1095071
+TIMESTAMP = 1550525987
+SHA256 (hiawatha-10.9.tar.gz) = 74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8
+SIZE (hiawatha-10.9.tar.gz) = 1139702
diff --git a/www/hiawatha/pkg-help b/www/hiawatha/pkg-help
index af5846898963..c6db296376f9 100644
--- a/www/hiawatha/pkg-help
+++ b/www/hiawatha/pkg-help
@@ -11,6 +11,11 @@ Install cgi-wrapper(1), which can be used to run certain CGI programs
 with a different user than the webserver's user.  To function
 properly, the CGI wrapper binary needs to have the setuid bit set.
 
+LEFH
+Install the 'lefh' (Let's Encrypt For Hiawatha) tool to help in
+obtaining and maintaining Let's Encrypt certificates.  It needs PHP
+and also implies having MBEDTLS enabled.
+
 LOADCHECK
 Enable experimental support for MaxServerLoad.  When the host has
 a load higher than that value, Hiawatha will drop incoming connections.
diff --git a/www/hiawatha/pkg-plist b/www/hiawatha/pkg-plist
index 4083e61255b1..53def26ebf79 100644
--- a/www/hiawatha/pkg-plist
+++ b/www/hiawatha/pkg-plist
@@ -5,12 +5,24 @@ bin/ssi-cgi
 @sample %%ETCDIR%%/index.xslt.sample
 @sample %%ETCDIR%%/mimetype.conf.sample
 @sample %%ETCDIR%%/toolkit.conf.sample
+%%LEFH%%lib/hiawatha/letsencrypt/acmev2.php
+%%LEFH%%lib/hiawatha/letsencrypt/config.php
+%%LEFH%%lib/hiawatha/letsencrypt/hiawatha_config.php
+%%LEFH%%lib/hiawatha/letsencrypt/http.php
+%%LEFH%%lib/hiawatha/letsencrypt/https.php
+%%LEFH%%lib/hiawatha/letsencrypt/letsencrypt.conf
+%%LEFH%%lib/hiawatha/letsencrypt/letsencrypt.php
+%%LEFH%%lib/hiawatha/letsencrypt/logfile.php
+%%LEFH%%lib/hiawatha/letsencrypt/openssl.conf
+%%LEFH%%lib/hiawatha/letsencrypt/rsa.php
 %%CGIWRAPPER%%man/man1/cgi-wrapper.1.gz
 man/man1/hiawatha.1.gz
+%%LEFH%%man/man1/lefh.1.gz
 man/man1/ssi-cgi.1.gz
 man/man1/wigwam.1.gz
 %%CGIWRAPPER%%sbin/cgi-wrapper
 sbin/hiawatha
+%%LEFH%%sbin/lefh
 sbin/wigwam
 @sample %%WWWDIR%%/index.html.sample
 @dir /var/log/hiawatha