diff options
| -rw-r--r-- | net/tcpdump/Makefile | 3 | ||||
| -rw-r--r-- | net/tcpdump/distinfo | 4 | ||||
| -rw-r--r-- | net/tcpdump/files/patch-print-wb.c | 41 |
3 files changed, 3 insertions, 45 deletions
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index 811c1c20f9a..09f4d1fdb15 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tcpdump -PORTVERSION= 4.7.3 -PORTREVISION= 1 +PORTVERSION= 4.7.4 CATEGORIES= net ipv6 MASTER_SITES= http://www.tcpdump.org/release/ diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo index 0b496e31125..7a79eb8b3aa 100644 --- a/net/tcpdump/distinfo +++ b/net/tcpdump/distinfo @@ -1,2 +1,2 @@ -SHA256 (tcpdump-4.7.3.tar.gz) = 1f87fb652ce996d41e7a06c601bc6ea29b13fee922945b23770c29490f1d8ace -SIZE (tcpdump-4.7.3.tar.gz) = 1152383 +SHA256 (tcpdump-4.7.4.tar.gz) = 6be520269a89036f99c0b2126713a60965953eab921002b07608ccfc0c47d9af +SIZE (tcpdump-4.7.4.tar.gz) = 1153657 diff --git a/net/tcpdump/files/patch-print-wb.c b/net/tcpdump/files/patch-print-wb.c deleted file mode 100644 index 66a6ee08910..00000000000 --- a/net/tcpdump/files/patch-print-wb.c +++ /dev/null @@ -1,41 +0,0 @@ -From 8aa5edea1b8846740514dee4158b6c707d38fc13 Mon Sep 17 00:00:00 2001 -From: Denis Ovsienko <denis@ovsienko.info> -Date: Wed, 25 Mar 2015 22:35:12 +0000 -Subject: [PATCH] whiteboard: fixup a few reversed tests (GH #446) - -This is a follow-up to commit 3a3ec26. ---- - print-wb.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/print-wb.c b/print-wb.c -index 38c2a67..e10d532 100644 ---- a/print-wb.c -+++ print-wb.c -@@ -202,7 +202,7 @@ wb_id(netdissect_options *ndo, - len -= sizeof(*io) * nid; - io = (struct id_off *)(id + 1); - cp = (char *)(io + nid); -- if (!ND_TTEST2(cp, len)) { -+ if (ND_TTEST2(cp, len)) { - ND_PRINT((ndo, "\"")); - fn_print(ndo, (u_char *)cp, (u_char *)cp + len); - ND_PRINT((ndo, "\"")); -@@ -267,7 +267,7 @@ wb_prep(netdissect_options *ndo, - } - n = EXTRACT_32BITS(&prep->pp_n); - ps = (const struct pgstate *)(prep + 1); -- while (--n >= 0 && !ND_TTEST(*ps)) { -+ while (--n >= 0 && ND_TTEST(*ps)) { - const struct id_off *io, *ie; - char c = '<'; - -@@ -276,7 +276,7 @@ wb_prep(netdissect_options *ndo, - ipaddr_string(ndo, &ps->page.p_sid), - EXTRACT_32BITS(&ps->page.p_uid))); - io = (struct id_off *)(ps + 1); -- for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) { -+ for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) { - ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id), - EXTRACT_32BITS(&io->off))); - c = ','; |