Date: Mon, 30 Mar 2020 08:35:23 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529869 - in head/security/fragroute: . files Message-ID: <202003300835.02U8ZNlu033665@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Mar 30 08:35:23 2020 New Revision: 529869 URL: https://svnweb.freebsd.org/changeset/ports/529869 Log: net/fragroute: Unbreak on CURRENT fragtest.c:102:39: warning: implicit declaration of function 'TAILQ_END' is invalid in C99 [-Wimplicit-function-declaration] for (pkt = TAILQ_FIRST(pktq); pkt != TAILQ_END(pktq); pkt = next) { ^ It was accidentally using sys/queue.h (which no longer has TAILQ_END) instead of the bundled version. Make this explicit and add a definition for TAILQ_END to avoid adding more patches. Added: head/security/fragroute/files/patch-mod.c (contents, props changed) head/security/fragroute/files/patch-pkt.h (contents, props changed) Modified: head/security/fragroute/Makefile Modified: head/security/fragroute/Makefile ============================================================================== --- head/security/fragroute/Makefile Mon Mar 30 08:31:12 2020 (r529868) +++ head/security/fragroute/Makefile Mon Mar 30 08:35:23 2020 (r529869) @@ -3,7 +3,7 @@ PORTNAME= fragroute PORTVERSION= 1.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= security net MASTER_SITES= http://monkey.org/~dugsong/fragroute/ \ PACKETSTORM/UNIX/security Added: head/security/fragroute/files/patch-mod.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/fragroute/files/patch-mod.c Mon Mar 30 08:35:23 2020 (r529869) @@ -0,0 +1,11 @@ +--- mod.c.orig 2020-03-22 06:34:47 UTC ++++ mod.c +@@ -151,7 +151,7 @@ mod_close(void) + { + struct rule *rule; + +- TAILQ_FOREACH_REVERSE(rule, &rules, next, head) { ++ TAILQ_FOREACH_REVERSE(rule, &rules, head, next) { + if (rule->mod->close != NULL) + rule->data = rule->mod->close(rule->data); + TAILQ_REMOVE(&rules, rule, next); Added: head/security/fragroute/files/patch-pkt.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/fragroute/files/patch-pkt.h Mon Mar 30 08:35:23 2020 (r529869) @@ -0,0 +1,18 @@ +--- pkt.h.orig 2002-04-07 22:55:20 UTC ++++ pkt.h +@@ -9,10 +9,14 @@ + #ifndef PKT_H + #define PKT_H + ++#include <sys/queue.h> + #include <sys/time.h> + #include <dnet.h> + #include <event.h> +-#include "queue.h" ++ ++#ifndef TAILQ_END ++#define TAILQ_END(head) NULL ++#endif + + #define PKT_BUF_LEN (ETH_HDR_LEN + ETH_MTU) + #define PKT_BUF_ALIGN 2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003300835.02U8ZNlu033665>