From nobody Wed Aug 31 17:41:04 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MHs0d1t1Kz4Zkfd; Wed, 31 Aug 2022 17:41:05 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MHs0c6t5qz45B5; Wed, 31 Aug 2022 17:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661967665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSERT0z0OaUAe+Wh2sxTGG+S4CO1Dg+A9IGG8YVwuYc=; b=eisFHY9svqe02X0ZidUdjQo1A89o8c8r45bmNAmBWkjUY5M+MMU0cXJwHjMpoTe+Q5NsAS ecR032K2BgiAaaaZxF9pzPvaPhZgMG6v1tpjEARw/gVO1c+7N/LIJQ+Qiq9ICdQqA5Px7f m65YKA/9OnW37K3gYb5jGqO09tSH2jrRL0yf643uG2zuYtt0hWWfRsud1cEOsspPyHCWcS snBb259HCdQfbucwArHhPsW1Mknehgss0VGpBDl+BUUiYL95fvDQqXFhq1vi8Dlrh2XE7F EBU8SysIYSTgVMKqZ1qFJHRcUJf6V2pki2erGIt6lGcu/3SXbVDhyw2O5y+DVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MHs0c5vDGz1Bx9; Wed, 31 Aug 2022 17:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27VHf4VF046840; Wed, 31 Aug 2022 17:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VHf4sO046839; Wed, 31 Aug 2022 17:41:04 GMT (envelope-from git) Date: Wed, 31 Aug 2022 17:41:04 GMT Message-Id: <202208311741.27VHf4sO046839@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 127558d3ce30 - main - www/hiawatha: Update to 11.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 127558d3ce3058d807feedd20696fe41c7d75bfb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661967665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSERT0z0OaUAe+Wh2sxTGG+S4CO1Dg+A9IGG8YVwuYc=; b=KY7Nav+ALxQ4yHFRiXkfm6OUq5c+XwqREbPjbZkJCTlcH3mGyis1mCSKifCaiYhwm1jrHU OM1MyBjSjaxwhHhxboQaPz7fj4fxRJ8JI1GGRpbfQ+6ORJsoazUSWjmbfu/zeqIb5yzHO+ 086c9NY3j9zOkVTBo2X+GWAY5FkcRzXVCoO3FgFXepNStBgKLvXjj1v3skt256+2ZJXXGl d4CDByYvB3v5cVDwDuzmduFGXSiFhEuyK4aPlML8UmHQL7G+YGM7zNOnCvZ3s+P8eBRxLl +v81PW36Jo4RyLq6pV/Rl6g5h3leDmy824eifsy9hREp7i9OMijrOrJQwRaG/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661967665; a=rsa-sha256; cv=none; b=dGC2n+0rNAOOpKDR8FEUH+rY1OZanCa4OiesRMW5S/ia/3HfPMQdUMYNNo4H+dwjQeOjvZ zBm3inOE5AP2yyu/aP+Qe0Uh2SIfnp0jrCUtnoMIrbQWKZvj9ujeMklw9+oUmqhTtu75Gs 1XhtiFKLJtyQipcnIWXxylVYpoJUTYA1Q4nsxrlTjbce0sSMGq2LAb+t+dxf0rpXgTbR5f /9EGWS29ecf9cxsQePtG7IgN6OhSuG0ts0YINH37gBXYPLaHzEhBjM31TfPkpRwxNYivE2 0g1N7atrcFqq2WNLvyDNf9WAn6lnaELb4+1Skw1FRdvqWCPRvXq0lAXY3JZhgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=127558d3ce3058d807feedd20696fe41c7d75bfb commit 127558d3ce3058d807feedd20696fe41c7d75bfb Author: Neel Chauhan AuthorDate: 2022-08-31 17:41:03 +0000 Commit: Neel Chauhan CommitDate: 2022-08-31 17:41:03 +0000 www/hiawatha: Update to 11.2 --- www/hiawatha/Makefile | 7 +++---- www/hiawatha/distinfo | 6 +++--- www/hiawatha/files/patch-CMakeLists.txt | 4 ++-- www/hiawatha/files/patch-config.h.in | 4 ++-- www/hiawatha/files/patch-src_hiawatha.c | 8 ++++---- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 8fa4f92d4868..1df719bdde60 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,6 +1,5 @@ PORTNAME= hiawatha -PORTVERSION= 10.12 -PORTREVISION= 3 +PORTVERSION= 11.2 CATEGORIES= www MASTER_SITES= https://www.hiawatha-webserver.org/files/ @@ -58,8 +57,8 @@ post-patch: ${WRKSRC}/man/hiawatha.1.in post-install: -.for f in hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf \ - error.xslt index.xslt +.for f in hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf error.xslt \ + index.xslt ${INSTALL_DATA} ${WRKSRC}/config/${f} \ ${STAGEDIR}${PREFIX}/etc/hiawatha/${f}.sample .endfor diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo index 15a940c01607..3352a5fbd423 100644 --- a/www/hiawatha/distinfo +++ b/www/hiawatha/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617048335 -SHA256 (hiawatha-10.12.tar.gz) = 61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d -SIZE (hiawatha-10.12.tar.gz) = 1454134 +TIMESTAMP = 1661965966 +SHA256 (hiawatha-11.2.tar.gz) = 99c64f76927f93469f062ab76b74eb79a397ea4be12da86bf746b2bb57cf1bc5 +SIZE (hiawatha-11.2.tar.gz) = 1583611 diff --git a/www/hiawatha/files/patch-CMakeLists.txt b/www/hiawatha/files/patch-CMakeLists.txt index 8dbbd214729d..fc0ccada759f 100644 --- a/www/hiawatha/files/patch-CMakeLists.txt +++ b/www/hiawatha/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2018-09-11 05:44:11 UTC +--- CMakeLists.txt.orig 2022-06-01 21:01:35 UTC +++ CMakeLists.txt -@@ -39,7 +39,8 @@ include(FindZLIB) +@@ -36,7 +36,8 @@ include(cmake/CopyIfNotExists.cmake) include(cmake/CopyIfNotExists.cmake) # Settings diff --git a/www/hiawatha/files/patch-config.h.in b/www/hiawatha/files/patch-config.h.in index 8efdf0534fc8..b71043215465 100644 --- a/www/hiawatha/files/patch-config.h.in +++ b/www/hiawatha/files/patch-config.h.in @@ -1,6 +1,6 @@ ---- config.h.in.orig 2017-03-13 19:58:34 UTC +--- config.h.in.orig 2022-01-23 19:44:44 UTC +++ config.h.in -@@ -46,6 +46,7 @@ +@@ -43,6 +43,7 @@ /* Functions */ #cmakedefine HAVE_CRYPT_R ${HAVE_CRYPT_R} diff --git a/www/hiawatha/files/patch-src_hiawatha.c b/www/hiawatha/files/patch-src_hiawatha.c index e345ec2ec194..4aa62c339cf9 100644 --- a/www/hiawatha/files/patch-src_hiawatha.c +++ b/www/hiawatha/files/patch-src_hiawatha.c @@ -1,6 +1,6 @@ ---- src/hiawatha.c.orig 2018-09-16 08:22:32 UTC +--- src/hiawatha.c.orig 2021-07-22 15:18:13 UTC +++ src/hiawatha.c -@@ -156,8 +156,12 @@ void task_runner(t_config *config) { +@@ -141,8 +141,12 @@ void task_runner(t_config *config) { int delay = 0; time_t now; #ifdef ENABLE_LOADCHECK @@ -13,7 +13,7 @@ #ifdef ENABLE_MONITOR int load_monitor_timer = 0; #endif -@@ -228,6 +232,21 @@ void task_runner(t_config *config) { +@@ -213,6 +217,21 @@ void task_runner(t_config *config) { #ifdef ENABLE_LOADCHECK if (config->max_server_load > 0) { @@ -35,7 +35,7 @@ if ((load_fp = fopen("/proc/loadavg", "r")) != NULL) { if (fgets(load_str, 49, load_fp) != NULL) { load_str[49] = '\0'; -@@ -253,6 +272,7 @@ void task_runner(t_config *config) { +@@ -238,6 +257,7 @@ void task_runner(t_config *config) { } else { current_server_load = 0; }