Attachment 228177 Details for Bug 258713 – fix useless patch

[patch] fix useless patch

mohawk.diff (text/plain), 2.53 KB, created by Freddy DISSAUX on 2021-09-25 18:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Freddy DISSAUX

Created: 2021-09-25 18:00:20 UTC

Size: 2.53 KB

patch

obsolete

>diff -ruN www/mohawk/Makefile www/mohawk.new/Makefile
>--- www/mohawk/Makefile	2021-07-20 18:50:10.000000000 +0200
>+++ www/mohawk.new/Makefile	2021-09-25 09:42:55.129980000 +0200
>@@ -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 -ruN www/mohawk/distinfo www/mohawk.new/distinfo
>--- www/mohawk/distinfo	2019-12-29 00:23:13.000000000 +0100
>+++ www/mohawk.new/distinfo	2021-09-25 09:45:38.590048000 +0200
>@@ -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 -ruN www/mohawk/files/patch-Makefile.inc www/mohawk.new/files/patch-Makefile.inc
>--- www/mohawk/files/patch-Makefile.inc	2014-10-01 01:31:37.000000000 +0200
>+++ www/mohawk.new/files/patch-Makefile.inc	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -ruN www/mohawk/files/patch-main.c www/mohawk.new/files/patch-main.c
>--- www/mohawk/files/patch-main.c	2020-03-30 08:11:25.000000000 +0200
>+++ www/mohawk.new/files/patch-main.c	1970-01-01 01:00:00.000000000 +0100
>@@ -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;
>- }
>- 
>-

Actions: View | Diff

Attachments on bug 258713: 228162 | 228177