From 04eefab6958498c1f6ed408b21148da77af9e2fc Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 30 Oct 2010 16:25:08 +0000 Subject: [PATCH] Regenerate our usr.sbin/tcpdump/tcpdump/config.h for tcpdump 4.1.1, and remove unused HAVE_RC5_H and HAVE_CAST_H defines from CFLAGS. --- usr.sbin/tcpdump/tcpdump/Makefile | 2 +- usr.sbin/tcpdump/tcpdump/config.h | 93 +++++++++++++------------------ 2 files changed, 41 insertions(+), 54 deletions(-) diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 3b459af3057b..bf39a291c583 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -56,7 +56,7 @@ LDADD= -ll -lpcap 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_CAST_H -DHAVE_OPENSSL_EVP_H .endif .if ${MK_PF} != "no" diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index b7b85a56e8b2..16374051c503 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -1,14 +1,11 @@ /* $FreeBSD$ */ /* 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 */ @@ -16,23 +13,12 @@ /* Define if you enable support for the libsmi. */ /* #undef LIBSMI */ -/* Define if you have the 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 @@ -48,18 +34,9 @@ /* 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 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 @@ -96,18 +73,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 */ @@ -120,14 +85,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 */ @@ -156,9 +113,6 @@ /* Define to 1 if you have the 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 `getnameinfo' function. */ #define HAVE_GETNAMEINFO 1 @@ -195,9 +149,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 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 @@ -210,6 +173,9 @@ /* Define to 1 if you have the `pcap_lib_version' function. */ #define HAVE_PCAP_LIB_VERSION 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PCAP_USB_H */ + /* Define to 1 if you have the `pfopen' function. */ /* #undef HAVE_PFOPEN */ @@ -231,6 +197,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 header file. */ #define HAVE_STDINT_H 1 @@ -285,6 +254,9 @@ /* 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 */ @@ -309,21 +281,23 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void +/* return value of signal handlers */ +#define RETSIGVAL + /* The size of `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 +#undef SIZEOF_CHAR /* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 +#undef SIZEOF_INT /* The size of `long', as computed by sizeof. */ -/* XXX: This is wrong, but possibly unused */ -#define SIZEOF_LONG 4 +#undef SIZEOF_LONG /* The size of `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 +#undef SIZEOF_LONG_LONG /* The size of `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 +#undef SIZEOF_SHORT /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -331,6 +305,19 @@ /* Define to 1 if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1 +/* get BSD semantics on Irix */ +/* #undef _BSD_SIGNALS */ + +/* needed on HP-UX */ +/* #undef _HPUX_SOURCE */ + +/* 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