From owner-svn-ports-head@freebsd.org Sat Sep 21 04:47:20 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27261F63D8; Sat, 21 Sep 2019 04:47:20 +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 46Zyk008Zdz45R1; Sat, 21 Sep 2019 04:47:20 +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 DDC3A8F74; Sat, 21 Sep 2019 04:47:19 +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 x8L4lJlM069933; Sat, 21 Sep 2019 04:47:19 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8L4lJL7069930; Sat, 21 Sep 2019 04:47:19 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201909210447.x8L4lJL7069930@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 21 Sep 2019 04:47:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512465 - head/www/hiawatha X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/www/hiawatha X-SVN-Commit-Revision: 512465 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.29 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, 21 Sep 2019 04:47:20 -0000 Author: tobik Date: Sat Sep 21 04:47:19 2019 New Revision: 512465 URL: https://svnweb.freebsd.org/changeset/ports/512465 Log: www/hiawatha: Update to 10.10 - Remove no longer supported and now always on options Changes: https://www.hiawatha-webserver.org/changelog Modified: head/www/hiawatha/Makefile head/www/hiawatha/distinfo head/www/hiawatha/pkg-help Modified: head/www/hiawatha/Makefile ============================================================================== --- head/www/hiawatha/Makefile Sat Sep 21 04:44:11 2019 (r512464) +++ head/www/hiawatha/Makefile Sat Sep 21 04:47:19 2019 (r512465) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hiawatha -PORTVERSION= 10.9 -PORTREVISION= 2 +PORTVERSION= 10.10 CATEGORIES= www MASTER_SITES= https://www.hiawatha-webserver.org/files/ @@ -13,17 +12,20 @@ COMMENT= Advanced and secure webserver for Unix LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake:insource compiler:c11 shebangfix +LIB_DEPENDS= libmbedtls.so:security/mbedtls + +USES= cmake:insource compiler:c11 localbase:ldflags 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} +CMAKE_ON= USE_SYSTEM_MBEDTLS -OPTIONS_DEFINE= CACHE CGIWRAPPER IPV6 LEFH LOADCHECK MBEDTLS MONITOR \ - RPROXY TOMAHAWK TOOLKIT XSLT -OPTIONS_DEFAULT= CACHE CGIWRAPPER MBEDTLS RPROXY TOOLKIT XSLT +OPTIONS_DEFINE= CACHE CGIWRAPPER LEFH LOADCHECK MONITOR RPROXY TOMAHAWK \ + TOOLKIT XSLT +OPTIONS_DEFAULT= CACHE CGIWRAPPER RPROXY TOOLKIT XSLT OPTIONS_SUB= yes CACHE_DESC= Caching support @@ -37,13 +39,8 @@ TOOLKIT_DESC= URL toolkit support 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_LIB_DEPENDS= libmbedtls.so:security/mbedtls -MBEDTLS_USES= localbase:ldflags -MBEDTLS_CMAKE_BOOL= ENABLE_TLS USE_SYSTEM_MBEDTLS MONITOR_CMAKE_BOOL= ENABLE_MONITOR RPROXY_CMAKE_BOOL= ENABLE_RPROXY TOMAHAWK_CMAKE_BOOL= ENABLE_TOMAHAWK Modified: head/www/hiawatha/distinfo ============================================================================== --- head/www/hiawatha/distinfo Sat Sep 21 04:44:11 2019 (r512464) +++ head/www/hiawatha/distinfo Sat Sep 21 04:47:19 2019 (r512465) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550525987 -SHA256 (hiawatha-10.9.tar.gz) = 74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8 -SIZE (hiawatha-10.9.tar.gz) = 1139702 +TIMESTAMP = 1568958968 +SHA256 (hiawatha-10.10.tar.gz) = b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9 +SIZE (hiawatha-10.10.tar.gz) = 1168325 Modified: head/www/hiawatha/pkg-help ============================================================================== --- head/www/hiawatha/pkg-help Sat Sep 21 04:44:11 2019 (r512464) +++ head/www/hiawatha/pkg-help Sat Sep 21 04:47:19 2019 (r512465) @@ -13,19 +13,14 @@ properly, the CGI wrapper binary needs to have the 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. +obtaining and maintaining Let's Encrypt certificates. It requires +PHP. LOADCHECK Enable experimental support for MaxServerLoad. When the host has a load higher than that value, Hiawatha will drop incoming connections. Officially this feature is only available on Linux. FreeBSD support is largely untested. - -MBEDTLS -Enable TLS support via security/mbedtls. It is required for the -MinTLSversion, PublicKeyPins, RequiredCA, RequireTLS, and TLScertFile -settings. MONITOR Enable Hiawatha Monitor support. The MonitorServer setting enables