From edecfedd29e45e6fab5198041610b3a9e230ed8b Mon Sep 17 00:00:00 2001 From: Olivier Cochard Date: Sun, 26 Sep 2021 11:57:30 +0200 Subject: [PATCH] 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(-) delete mode 100644 www/mohawk/files/patch-Makefile.inc delete mode 100644 www/mohawk/files/patch-main.c 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; - } - -