Update files for libpcap-1.3.0 and tcpdump-4.3.0 imports.

diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h
index f1ac134..ec39117 100644 (file)
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -216,7 +216,7 @@
 /* #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON */
 
 /* Define to 1 if netinet/if_ether.h declares `ether_hostton' */
-#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON 
+#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON /**/
 
 /* do not use protochain */
 /* #undef NO_PROTOCHAIN */
@@ -233,6 +233,9 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME ""
 
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
 /* Define to the version of this package. */
 #define PACKAGE_VERSION ""
 
@@ -245,6 +248,9 @@
 /* target host supports CAN sniffing */
 /* #undef PCAP_SUPPORT_CAN */
 
+/* target host supports canusb */
+/* #undef PCAP_SUPPORT_CANUSB */
+
 /* target host supports netfilter sniffing */
 /* #undef PCAP_SUPPORT_NETFILTER */
 

diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index e4a10ea..d0f3d09 100644 (file)
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@@ -12,7 +12,7 @@ SRCS= addrtoname.c af.c checksum.c cpack.c \
        print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
        print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
        print-eap.c print-eigrp.c \
-       print-esp.c print-ether.c print-fddi.c print-fr.c \
+       print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c \
        print-gre.c print-hsrp.c print-icmp.c print-igmp.c \
        print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \
        print-ipx.c print-isoclns.c print-juniper.c print-krb.c \
@@ -29,8 +29,8 @@ SRCS= addrtoname.c af.c checksum.c cpack.c \
        print-slow.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \
        print-symantec.c print-syslog.c print-tcp.c \
        print-telnet.c print-tftp.c \
-       print-timed.c print-token.c print-udld.c print-udp.c print-usb.c \
-       print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-forces.c \
+       print-timed.c print-tipc.c print-token.c print-udld.c print-udp.c \
+       print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \
        print-wb.c print-zephyr.c signature.c setsignal.c tcpdump.c util.c
 SRCS+= print-isakmp.c
 SRCS+= print-smb.c smbutil.c print-pflog.c