From owner-svn-ports-all@freebsd.org Mon Feb 18 22:26:31 2019 Return-Path: Delivered-To: svn-ports-all@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 76D4E14EDEBA; Mon, 18 Feb 2019 22:26:31 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1C37988F71; Mon, 18 Feb 2019 22:26:31 +0000 (UTC) (envelope-from tobik@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 E5709C4AE; Mon, 18 Feb 2019 22:26:30 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1IMQUmi087716; Mon, 18 Feb 2019 22:26:30 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1IMQULj087710; Mon, 18 Feb 2019 22:26:30 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201902182226.x1IMQULj087710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 18 Feb 2019 22:26:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493331 - head/www/hiawatha X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/www/hiawatha X-SVN-Commit-Revision: 493331 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1C37988F71 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2019 22:26:31 -0000 Author: tobik Date: Mon Feb 18 22:26:29 2019 New Revision: 493331 URL: https://svnweb.freebsd.org/changeset/ports/493331 Log: www/hiawatha: Update to 10.9 Changes: https://www.hiawatha-webserver.org/changelog Modified: head/www/hiawatha/Makefile head/www/hiawatha/distinfo head/www/hiawatha/pkg-help head/www/hiawatha/pkg-plist Modified: head/www/hiawatha/Makefile ============================================================================== --- head/www/hiawatha/Makefile Mon Feb 18 22:19:31 2019 (r493330) +++ head/www/hiawatha/Makefile Mon Feb 18 22:26:29 2019 (r493331) @@ -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 Modified: head/www/hiawatha/distinfo ============================================================================== --- head/www/hiawatha/distinfo Mon Feb 18 22:19:31 2019 (r493330) +++ head/www/hiawatha/distinfo Mon Feb 18 22:26:29 2019 (r493331) @@ -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 Modified: head/www/hiawatha/pkg-help ============================================================================== --- head/www/hiawatha/pkg-help Mon Feb 18 22:19:31 2019 (r493330) +++ head/www/hiawatha/pkg-help Mon Feb 18 22:26:29 2019 (r493331) @@ -11,6 +11,11 @@ Install cgi-wrapper(1), which can be used to run certa 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. Modified: head/www/hiawatha/pkg-plist ============================================================================== --- head/www/hiawatha/pkg-plist Mon Feb 18 22:19:31 2019 (r493330) +++ head/www/hiawatha/pkg-plist Mon Feb 18 22:26:29 2019 (r493331) @@ -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