[Midnightbsd-cvs] src [8322] trunk/usr.sbin/tcpdump/tcpdump: sync with freebsd 9.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 17 18:46:22 EDT 2016
Revision: 8322
http://svnweb.midnightbsd.org/src/?rev=8322
Author: laffer1
Date: 2016-09-17 18:46:22 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
sync with freebsd 9.2
Modified Paths:
--------------
trunk/usr.sbin/tcpdump/tcpdump/Makefile
trunk/usr.sbin/tcpdump/tcpdump/config.h
Modified: trunk/usr.sbin/tcpdump/tcpdump/Makefile
===================================================================
--- trunk/usr.sbin/tcpdump/tcpdump/Makefile 2016-09-17 22:44:52 UTC (rev 8321)
+++ trunk/usr.sbin/tcpdump/tcpdump/Makefile 2016-09-17 22:46:22 UTC (rev 8322)
@@ -1,5 +1,5 @@
-# $FreeBSD: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.45.2.1 2007/10/19 03:04:02 mlaier Exp $
# $MidnightBSD$
+# $FreeBSD: release/9.2.0/usr.sbin/tcpdump/tcpdump/Makefile 252283 2013-06-27 00:37:59Z delphij $
.include <bsd.own.mk>
@@ -8,30 +8,136 @@
PROG= tcpdump
-SRCS = addrtoname.c af.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
- nlpid.c l2vpn.c machdep.c parsenfsfh.c \
- print-802_11.c print-ap1394.c print-ah.c print-arcnet.c \
- print-aodv.c print-arp.c print-ascii.c print-atalk.c print-atm.c \
- print-beep.c print-bfd.c print-bgp.c print-bootp.c print-cdp.c \
- print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
- print-domain.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-gre.c print-hsrp.c print-icmp.c print-igmp.c \
- print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c \
- print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c \
- print-l2tp.c print-lane.c print-ldp.c print-llc.c \
- print-lmp.c print-lspping.c \
- print-lwres.c print-mobile.c print-mpls.c print-msdp.c \
- print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \
- print-pgm.c print-pim.c print-ppp.c print-pppoe.c \
- print-pptp.c print-radius.c print-raw.c print-rip.c \
- print-rsvp.c print-rx.c print-sctp.c print-sip.c print-sl.c print-sll.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-udp.c print-vjc.c print-vrrp.c \
- print-wb.c print-zephyr.c setsignal.c tcpdump.c util.c \
- print-smb.c smbutil.c \
+SRCS= addrtoname.c \
+ af.c \
+ checksum.c \
+ cpack.c \
+ gmpls.c \
+ gmt2local.c \
+ in_cksum.c \
+ ipproto.c \
+ l2vpn.c \
+ machdep.c \
+ nlpid.c \
+ oui.c \
+ parsenfsfh.c \
+ print-802_11.c \
+ print-802_15_4.c \
+ print-ah.c \
+ print-aodv.c \
+ print-ap1394.c \
+ print-arcnet.c \
+ print-arp.c \
+ print-ascii.c \
+ print-atalk.c \
+ print-atm.c \
+ print-beep.c \
+ print-bfd.c \
+ print-bgp.c \
+ print-bootp.c \
+ print-bt.c \
+ print-carp.c \
+ print-cdp.c \
+ print-cfm.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-eap.c \
+ print-egp.c \
+ print-eigrp.c \
+ print-enc.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-isakmp.c \
+ print-isoclns.c \
+ print-juniper.c \
+ print-krb.c \
+ print-l2tp.c \
+ print-lane.c \
+ print-ldp.c \
+ print-llc.c \
+ print-lldp.c \
+ print-lmp.c \
+ print-lspping.c \
+ print-lwapp.c \
+ print-lwres.c \
+ print-mobile.c \
+ print-mpcp.c \
+ print-mpls.c \
+ print-msdp.c \
+ print-msnlb.c \
+ print-nfs.c \
+ print-ntp.c \
+ print-null.c \
+ print-olsr.c \
+ print-ospf.c \
+ print-otv.c \
+ print-pfsync.c \
+ print-pgm.c \
+ print-pim.c \
+ print-ppi.c \
+ print-ppp.c \
+ print-pppoe.c \
+ print-pptp.c \
+ print-radius.c \
+ print-raw.c \
+ print-rip.c \
+ print-rpki-rtr.c \
+ print-rrcp.c \
+ print-rsvp.c \
+ print-rx.c \
+ print-sctp.c \
+ print-sflow.c \
+ print-sip.c \
+ print-sl.c \
+ print-sll.c \
+ print-slow.c \
+ print-smb.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-tipc.c \
+ print-token.c \
+ print-udld.c \
+ print-udp.c \
+ print-vjc.c \
+ print-vqp.c \
+ print-vrrp.c \
+ print-vtp.c \
+ print-vxlan.c \
+ print-wb.c \
+ print-zephyr.c \
+ print-zeromq.c \
+ setsignal.c \
+ signature.c \
+ smbutil.c \
+ tcpdump.c \
+ util.c \
version.c
CLEANFILES+= version.c
@@ -40,11 +146,19 @@
CFLAGS+= -D_U_="__attribute__((unused))"
.if ${MK_INET6_SUPPORT} != "no"
-SRCS+= print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c \
- print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c
+SRCS+= print-babel.c \
+ print-dhcp6.c \
+ print-frag6.c \
+ print-icmp6.c \
+ print-ip6.c \
+ print-ip6opts.c \
+ print-mobility.c \
+ print-ospf6.c \
+ print-ripng.c \
+ print-rt6.c
CFLAGS+= -DINET6
.endif
-.if ${MACHINE_ARCH} != "i386"
+.if ${MACHINE_CPUARCH} != "i386"
CFLAGS+= -DLBL_ALIGN
.endif
@@ -54,7 +168,7 @@
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
CFLAGS+= -I${DESTDIR}/usr/include/openssl
-CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H
+CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H
.endif
.if ${MK_PF} != "no"
Modified: trunk/usr.sbin/tcpdump/tcpdump/config.h
===================================================================
--- trunk/usr.sbin/tcpdump/tcpdump/config.h 2016-09-17 22:44:52 UTC (rev 8321)
+++ trunk/usr.sbin/tcpdump/tcpdump/config.h 2016-09-17 22:46:22 UTC (rev 8322)
@@ -1,15 +1,12 @@
/* $MidnightBSD$ */
-/* $FreeBSD: src/usr.sbin/tcpdump/tcpdump/config.h,v 1.7.10.1 2007/10/19 03:04:02 mlaier Exp $ */
+/* $FreeBSD: release/9.2.0/usr.sbin/tcpdump/tcpdump/config.h 252283 2013-06-27 00:37:59Z delphij $ */
/* This is an edited copy of the config.h generated by configure. */
-/* config.h. Generated by configure. */
+/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
/* "generated automatically" means DO NOT MAKE CHANGES TO config.h.in --
* make them to acconfig.h and rerun autoheader */
-/* Define if you have SSLeay 0.9.0b with the buggy cast128. */
-/* #undef HAVE_BUGGY_CAST128 */
-
/* Define if you enable IPv6 support */
/* See Makefile */
/* #undef INET6 */
@@ -17,23 +14,6 @@
/* Define if you enable support for the libsmi. */
/* #undef LIBSMI */
-/* Define if you have the <smi.h> header file. */
-/* #undef HAVE_SMI_H */
-
-/* define if you have struct __res_state_ext */
-/* #undef HAVE_RES_STATE_EXT */
-
-/* define if your struct __res_state has the nsort member */
-/* #undef HAVE_NEW_RES_STATE */
-
-/*
- * define if struct ether_header.ether_dhost is a struct with ether_addr_octet
- */
-/* #undef ETHER_HEADER_HAS_EA */
-
-/* define if struct ether_arp contains arp_xsha */
-/* #undef ETHER_ARP_HAS_X */
-
/* define if you have the addrinfo function. */
#define HAVE_ADDRINFO 1
@@ -43,24 +23,6 @@
/* define ifyou have the h_errno variable. */
#define HAVE_H_ERRNO 1
-/* define if IN6ADDRSZ is defined (XXX not used!) */
-#define HAVE_IN6ADDRSZ 1
-
-/* define if INADDRSZ is defined (XXX not used!) */
-#define HAVE_INADDRSZ 1
-
-/* define if this is a development version, to use additional prototypes. */
-/* #undef HAVE_OS_PROTO_H */
-
-/* define if <unistd.h> defines __P() */
-/* #undef HAVE_PORTABLE_PROTOTYPE */
-
-/* define if RES_USE_INET6 is defined */
-#define HAVE_RES_USE_INET6 1
-
-/* define if struct sockaddr has the sa_len member */
-#define HAVE_SOCKADDR_SA_LEN 1
-
/* define if you have struct sockaddr_storage */
#define HAVE_SOCKADDR_STORAGE 1
@@ -97,21 +59,6 @@
/* define if you have getrpcbynumber() */
#define HAVE_GETRPCBYNUMBER 1
-/* define if unaligned memory accesses fail */
-/* #undef LBL_ALIGN */
-
-/* The successful return value from signal (?)XXX */
-#define RETSIGVAL
-
-/* Define this on IRIX */
-/* #undef _BSD_SIGNALS */
-
-/* For HP/UX ANSI compiler? */
-/* #undef _HPUX_SOURCE */
-
-/* AIX hack. */
-/* #undef _SUN */
-
/* Workaround for missing 64-bit formats */
/* #undef PRId64 */
/* #undef PRIo64 */
@@ -121,14 +68,6 @@
/* Whether or not to include the possibly-buggy SMB printer */
#define TCPDUMP_DO_SMB 1
-/* Long story short: aclocal.m4 depends on autoconf 2.13
- * implementation details wrt "const"; newer versions
- * have different implementation details so for now we
- * put "const" here. This may cause duplicate definitions
- * in config.h but that should be OK since they're the same.
- */
-/* #undef const */
-
/* Define if you have the dnet_htoa function. */
/* #undef HAVE_DNET_HTOA */
@@ -157,8 +96,8 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
-/* Define to 1 if you have the `getaddrinfo' function. */
-#define HAVE_GETADDRINFO 1
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
/* Define to 1 if you have the `getnameinfo' function. */
#define HAVE_GETNAMEINFO 1
@@ -196,9 +135,18 @@
/* See Makefile */
/* #undef HAVE_OPENSSL_EVP_H 1 */
+/* if there's an os_proto.h for this platform, to use additional prototypes */
+/* #undef HAVE_OS_PROTO_H */
+
+/* Define to 1 if you have the <pcap/bluetooth.h> header file. */
+/* #undef HAVE_PCAP_BLUETOOTH_H */
+
/* Define to 1 if you have the `pcap_breakloop' function. */
#define HAVE_PCAP_BREAKLOOP 1
+/* Define to 1 if you have the `pcap_create' function. */
+#define HAVE_PCAP_CREATE 1
+
/* Define to 1 if you have the `pcap_dump_flush' function. */
#define HAVE_PCAP_DUMP_FLUSH 1
@@ -211,6 +159,12 @@
/* Define to 1 if you have the `pcap_lib_version' function. */
#define HAVE_PCAP_LIB_VERSION 1
+/* Define to 1 if you have the `pcap_set_tstamp_type' function. */
+#define HAVE_PCAP_SET_TSTAMP_TYPE 1
+
+/* Define to 1 if you have the <pcap/usb.h> header file. */
+/* #undef HAVE_PCAP_USB_H */
+
/* Define to 1 if you have the `pfopen' function. */
/* #undef HAVE_PFOPEN */
@@ -217,6 +171,9 @@
/* Define to 1 if you have the <rpc/rpcent.h> header file. */
#define HAVE_RPC_RPCENT_H 1
+/* Define to 1 if you have the <rpc/rpc.h> header file. */
+#define HAVE_RPC_RPC_H 1
+
/* Define to 1 if you have the `setlinebuf' function. */
#define HAVE_SETLINEBUF 1
@@ -232,6 +189,9 @@
/* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1
+/* if struct sockaddr has the sa_len member */
+#define HAVE_SOCKADDR_SA_LEN 1
+
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -277,6 +237,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
/* Define to 1 if you have the `vfprintf' function. */
#define HAVE_VFPRINTF 1
@@ -286,11 +249,14 @@
/* define if your compiler has __attribute__ */
#define HAVE___ATTRIBUTE__ 1
+/* if unaligned access fails */
+/* #undef LBL_ALIGN */
+
/* Define to 1 if netinet/ether.h declares `ether_ntohost' */
/* #undef NETINET_ETHER_H_DECLARES_ETHER_NTOHOST */
/* Define to 1 if netinet/if_ether.h declares `ether_ntohost' */
-#define NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST
+#define NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST /**/
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
@@ -310,22 +276,9 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
+/* return value of signal handlers */
+#define RETSIGVAL /**/
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-/* XXX: This is wrong, but possibly unused */
-#define SIZEOF_LONG 4
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -332,6 +285,22 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
+/* get BSD semantics on Irix */
+/* #undef _BSD_SIGNALS */
+
+/* needed on HP-UX */
+/* #undef _HPUX_SOURCE */
+
+/* define on AIX to get certain functions */
+/* #undef _SUN */
+
+/* define if your compiler allows __attribute__((format)) to be applied to
+ function pointers */
+#define __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS 1
+
+/* to handle Ultrix compilers that don't support const in prototypes */
+/* #undef const */
+
/* Define as token for inline if inlining supported */
#define inline inline
More information about the Midnightbsd-cvs
mailing list