diff options
| author | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
| commit | f937dcf2bd0584087acec5d8dc92dd5dba177113 (patch) | |
| tree | 8cbef21f45f26a80647ff8a0604c3c9c65c2bb40 /usr.sbin | |
| parent | eeff801556700aefbd569ad4bac5acdebcc3b9a8 (diff) | |
| download | FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.zip FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.tar.gz | |
Bulk sync of pf changes from head, in attempt to fixup broken build I
made in r263029.
Merge r257186,257215,257349,259736,261797.
These changesets split pfvar.h into several smaller headers and make
userland utilities to include only some of them.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bsnmpd/modules/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/tcpdump/Makefile | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile index d5706fe..45558b7 100644 --- a/usr.sbin/bsnmpd/modules/Makefile +++ b/usr.sbin/bsnmpd/modules/Makefile @@ -13,12 +13,15 @@ SUBDIR= ${_snmp_atm} \ snmp_hast \ snmp_hostres \ snmp_mibII \ - snmp_pf \ snmp_target \ snmp_usm \ snmp_vacm \ snmp_wlan +.if ${MK_PF} != "no" +SUBDIR+=snmp_pf +.endif + .if ${MK_NETGRAPH_SUPPORT} != "no" SUBDIR+=snmp_netgraph .endif diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index fe2a001..3ec7efd 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -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 |
