Date: Tue, 29 Oct 2013 17:43:06 +0400 From: Gleb Smirnoff <glebius@FreeBSD.org> To: dt71@gmx.com Cc: freebsd-current@freebsd.org Subject: Re: buildworld failure: pfvar.h:44 #include <netpfil/pf/pf.h> not found Message-ID: <20131029134306.GJ52889@glebius.int.ru> In-Reply-To: <526FB9D1.1020608@gmx.com> References: <526EE1E1.6090905@gmx.com> <20131028223334.GE52889@FreeBSD.org> <526F0306.6080702@gmx.com> <20131029041936.GR52889@glebius.int.ru> <526FB9D1.1020608@gmx.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--lt3WynA+XK9Fj6D4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Tue, Oct 29, 2013 at 02:36:17PM +0100, dt71@gmx.com wrote:
d> Gleb Smirnoff wrote, On 10/29/2013 05:19:
d> > +1 patch.
d> So far, so good:
d>
d> ===> usr.sbin/tcpdump/tcpdump (depend)
+1 patch
--
Totus tuus, Glebius.
--lt3WynA+XK9Fj6D4
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="tcpdump.diff"
Index: contrib/tcpdump/print-ip.c
===================================================================
--- contrib/tcpdump/print-ip.c (revision 257321)
+++ contrib/tcpdump/print-ip.c (working copy)
@@ -483,9 +483,11 @@ again:
pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
break;
+#if defined(HAVE_NET_PFVAR_H)
case IPPROTO_PFSYNC:
pfsync_ip_print(ipds->cp, ipds->len);
break;
+#endif
default:
if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
Index: usr.sbin/tcpdump/tcpdump/Makefile
===================================================================
--- usr.sbin/tcpdump/tcpdump/Makefile (revision 257321)
+++ usr.sbin/tcpdump/tcpdump/Makefile (working copy)
@@ -89,7 +89,6 @@ SRCS= addrtoname.c \
print-olsr.c \
print-ospf.c \
print-otv.c \
- print-pfsync.c \
print-pgm.c \
print-pim.c \
print-ppi.c \
@@ -171,7 +170,8 @@ CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H
.endif
.if ${MK_PF} != "no"
-SRCS+= print-pflog.c
+SRCS+= print-pflog.c \
+ print-pfsync.c
CFLAGS+= -DHAVE_NET_PFVAR_H
.endif
--lt3WynA+XK9Fj6D4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131029134306.GJ52889>