From: Peter Avalos Date: Sat, 4 Jul 2009 21:45:21 +0000 (-1000) Subject: Merge branch 'vendor/TCPDUMP' X-Git-Url: https://gitweb.dragonflybsd.org/~syl/dragonfly.git/commitdiff_plain/97fecd825dd1a70c628493b90a9b1b1724f151df Merge branch 'vendor/TCPDUMP' --- 97fecd825dd1a70c628493b90a9b1b1724f151df diff --cc contrib/tcpdump/README.DELETED index b2af9f546b,0000000000..b2af9f546b mode 100644,000000..100644 --- a/contrib/tcpdump/README.DELETED +++ b/contrib/tcpdump/README.DELETED diff --cc contrib/tcpdump/README.DRAGONFLY index 600912a3b2,0000000000..c1d4aba1c2 mode 100644,000000..100644 --- a/contrib/tcpdump/README.DRAGONFLY +++ b/contrib/tcpdump/README.DRAGONFLY @@@ -1,15 -1,0 +1,12 @@@ +Original Source can be downloaded from: +http://www.tcpdump.org/release/ + - cvs import hint: - cvs import src/contrib/tcpdump-3.9 TCPDUMP v3_9_? - +A list of files and directories removed is in README.DELETED + +# update config.h in usr.sbin/tcpdump/tcpdump/: +./configure --without-crypto --disable-ipv6 + +These sources are used in: +usr.sbin/ndp/ +usr.sbin/tcpdump/tcpdump/ +usr.sbin/tcpdump/tcpslice/ diff --cc usr.sbin/ndp/Makefile index 55d4a55042,0000000000..fcdec2841c mode 100644,000000..100644 --- a/usr.sbin/ndp/Makefile +++ b/usr.sbin/ndp/Makefile @@@ -1,29 -1,0 +1,29 @@@ +# Copyright (c) 1996 WIDE Project. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modifications, are permitted provided that the above copyright notice +# and this paragraph are duplicated in all such forms and that any +# documentation, advertising materials, and other materials related to +# such distribution and use acknowledge that the software was developed +# by the WIDE Project, Japan. The name of the Project may not be used to +# endorse or promote products derived from this software without +# specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' +# AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT +# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE. +# $FreeBSD: src/usr.sbin/ndp/Makefile,v 1.1.2.1 2001/04/25 12:10:20 ru Exp $ +# $DragonFly: src/usr.sbin/ndp/Makefile,v 1.4 2006/12/25 02:37:09 pavalos Exp $ + - .PATH: ${.CURDIR}/../../contrib/tcpdump-3.9 ++.PATH: ${.CURDIR}/../../contrib/tcpdump + +PROG= ndp +SRCS= ndp.c gmt2local.c +MAN= ndp.8 +WARNS?= 2 + +CFLAGS+=-DINET6 - CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../tcpdump/tcpdump -I${.CURDIR}/../../contrib/tcpdump-3.9 ++CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../tcpdump/tcpdump -I${.CURDIR}/../../contrib/tcpdump +CFLAGS+= -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" + + +.include diff --cc usr.sbin/tcpdump/tcpdump/Makefile index 12975cc0ad,0000000000..a2a8bfe711 mode 100644,000000..100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@@ -1,71 -1,0 +1,71 @@@ +# $FreeBSD: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.25.2.6 2002/07/05 11:30:32 fenner Exp $ +# $DragonFly: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.13 2007/10/11 02:46:51 pavalos Exp $ + + - TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump-3.9 ++TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump +.PATH: ${TCPDUMP_DISTDIR} + +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-pflog.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 +SRCS+= print-smb.c smbutil.c version.c +CLEANFILES+= version.c + +CONTRIBDIR= ${TCPDUMP_DISTDIR} +SRCS+= tcpdump.1.no_obj.patch print-pflog.c.patch + +CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR} +CFLAGS+= -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" + +CFLAGS+= -DHAVE_RES_STATE_EXT -DHAVE_NEW_RES_STATE -DUSE_GETIPNODEBY +CFLAGS+= -DHAVE_PCAP_VERSION -UHAVE_YYDEBUG -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO +CFLAGS+= -DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H + +.if !defined(NOINET6) +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-ospf6.c.patch +CFLAGS+= -DINET6 +.endif +.if ${MACHINE_ARCH} != "i386" +CFLAGS+= -DLBL_ALIGN +.endif + +DPADD= ${LIBL} ${LIBPCAP} +LDADD= -ll -lpcap +.if exists(../../../secure) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \ + !defined(RELEASE_CRUNCH) +DISTRIBUTION=crypto +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto +CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H +.endif + +version.c: ${TCPDUMP_DISTDIR}/VERSION + @rm -f $@ + sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION > $@ + +.include diff --cc usr.sbin/tcpdump/tcpslice/Makefile index f64ad32a2b,0000000000..e06031b25a mode 100644,000000..100644 --- a/usr.sbin/tcpdump/tcpslice/Makefile +++ b/usr.sbin/tcpdump/tcpslice/Makefile @@@ -1,22 -1,0 +1,22 @@@ +# @(#)Makefile 0.1 (RWGrimes) 3/24/93 +# $FreeBSD: src/usr.sbin/tcpdump/tcpslice/Makefile,v 1.10.6.1 2001/04/25 12:11:03 ru Exp $ +# $DragonFly: src/usr.sbin/tcpdump/tcpslice/Makefile,v 1.4 2006/12/25 00:42:01 pavalos Exp $ + +PROG= tcpslice +CFLAGS+= -I. +SRCS= gwtm2secs.c search.c tcpslice.c util.c version.c version.h +CLEANFILES+= version.c version.h +DPADD+= ${LIBPCAP} +LDADD+= -lpcap + - TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump-3.9 ++TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump + +.ORDER: version.c version.h +version.c version.h: ${TCPDUMP_DISTDIR}/VERSION + rm -f version.c ; \ + sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION > version.c + set `sed 's/\([0-9]*\)\.\([0-9]*\).*/\1 \2/' ${TCPDUMP_DISTDIR}/VERSION` ; \ + { echo '#define VERSION_MAJOR' $$1 ; \ + echo '#define VERSION_MINOR' $$2 ; } > version.h + +.include