From owner-dev-commits-ports-main@freebsd.org Sun Sep 26 10:01:02 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 476186754F9; Sun, 26 Sep 2021 10:01:02 +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 4HHLrG0c6cz3RLx; Sun, 26 Sep 2021 10:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EA08B1B8D6; Sun, 26 Sep 2021 10:01:01 +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 18QA11K0039341; Sun, 26 Sep 2021 10:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18QA116S039340; Sun, 26 Sep 2021 10:01:01 GMT (envelope-from git) Date: Sun, 26 Sep 2021 10:01:01 GMT Message-Id: <202109261001.18QA116S039340@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: edecfedd29e4 - main - www/mohawk: Update to 2.0.21 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edecfedd29e45e6fab5198041610b3a9e230ed8b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Sep 2021 10:01:02 -0000 The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=edecfedd29e45e6fab5198041610b3a9e230ed8b commit edecfedd29e45e6fab5198041610b3a9e230ed8b Author: Olivier Cochard AuthorDate: 2021-09-26 09:57:30 +0000 Commit: Olivier Cochard CommitDate: 2021-09-26 10:00:45 +0000 www/mohawk: Update to 2.0.21 PR: 258713 Reported by: Freddy Dissaux (maintainer) --- www/mohawk/Makefile | 2 +- www/mohawk/distinfo | 6 +++--- www/mohawk/files/patch-Makefile.inc | 16 ---------------- www/mohawk/files/patch-main.c | 29 ----------------------------- 4 files changed, 4 insertions(+), 49 deletions(-) diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile index 1b14c6b2ac95..e4d6fa45d6a1 100644 --- a/www/mohawk/Makefile +++ b/www/mohawk/Makefile @@ -1,5 +1,5 @@ PORTNAME= mohawk -PORTVERSION= 2.0.20 +PORTVERSION= 2.0.21 CATEGORIES= www MASTER_SITES= http://fossil.bsdsx.fr/mohawk/tarball/ DISTFILES= ${DISTNAME}.tar.gz?uuid=${PORTVERSION} diff --git a/www/mohawk/distinfo b/www/mohawk/distinfo index e83e2f799a9b..245a36f57e25 100644 --- a/www/mohawk/distinfo +++ b/www/mohawk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1577524764 -SHA256 (mohawk-2.0.20.tar.gz?uuid=2.0.20) = 01a49ffcfc5fb2f6535e097cf806ce3c2dcbacbe8b6cad7bf1d6f3e697aa18df -SIZE (mohawk-2.0.20.tar.gz?uuid=2.0.20) = 41978 +TIMESTAMP = 1632555938 +SHA256 (mohawk-2.0.21.tar.gz?uuid=2.0.21) = 28270f604ca707d7084e37eb77c1cd07fd3a0846fe5c7f1fb28869cf13b25825 +SIZE (mohawk-2.0.21.tar.gz?uuid=2.0.21) = 44319 diff --git a/www/mohawk/files/patch-Makefile.inc b/www/mohawk/files/patch-Makefile.inc deleted file mode 100644 index 8869e0fabd01..000000000000 --- a/www/mohawk/files/patch-Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.inc.orig 2014-09-15 17:40:01 UTC -+++ Makefile.inc -@@ -16,13 +16,8 @@ OSVERSION!= sysctl -n kern.osreldate - YFLAGS+= -i - CLEANFILES+= parse.i - .endif --.if ${OPSYS} == "DragonFly" --LDFLAGS+= -L${PREFIX}/lib/event2 --LDADD+= -levent-2.0 --.else - LDFLAGS+= -L${PREFIX}/lib - LDADD+= -levent --.endif - - .elif ${OPSYS} == "NetBSD" - PREFIX?= /usr/pkg diff --git a/www/mohawk/files/patch-main.c b/www/mohawk/files/patch-main.c deleted file mode 100644 index 8d3baeb0b747..000000000000 --- a/www/mohawk/files/patch-main.c +++ /dev/null @@ -1,29 +0,0 @@ -main.c:387:2: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] - if (network->not) - ^ - ---- main.c.orig 2020-03-22 05:37:24 UTC -+++ main.c -@@ -384,9 +384,7 @@ access_granted_inet(struct addrinfo *ai, struct mohawk - if ((sa->sin_addr.s_addr & network->mask) != network->prefix) - return -1; - -- if (network->not) -- return 0; -- return 1; -+ return !network->not; - } - - static inline int -@@ -400,9 +398,8 @@ access_granted_inet6(struct addrinfo *ai, struct mohaw - if ((sa6->sin6_addr.s6_addr[i] & network->mask[i]) != network->prefix[i]) - return -1; - } -- if (network->not) -- return 0; -- return 1; -+ -+ return !network->not; - } - -