Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/tcpdump merge conflicts
details: https://anonhg.NetBSD.org/src/rev/a152fb162ec1
branches: trunk
changeset: 785938:a152fb162ec1
user: christos <christos%NetBSD.org@localhost>
date: Sat Apr 06 19:33:07 2013 +0000
description:
merge conflicts
diffstat:
external/bsd/tcpdump/bin/Makefile | 155 +-
external/bsd/tcpdump/dist/addrtoname.c | 33 +-
external/bsd/tcpdump/dist/af.c | 4 +-
external/bsd/tcpdump/dist/bpf_dump.c | 4 +-
external/bsd/tcpdump/dist/checksum.c | 4 +-
external/bsd/tcpdump/dist/configure | 3126 +-
external/bsd/tcpdump/dist/configure.in | 118 +-
external/bsd/tcpdump/dist/cpack.c | 4 +-
external/bsd/tcpdump/dist/cpack.h | 3 +
external/bsd/tcpdump/dist/ether.h | 1 +
external/bsd/tcpdump/dist/extract.h | 2 +-
external/bsd/tcpdump/dist/gmpls.c | 4 +-
external/bsd/tcpdump/dist/gmt2local.c | 4 +-
external/bsd/tcpdump/dist/icmp6.h | 2 +-
external/bsd/tcpdump/dist/ieee802_11_radio.h | 64 +-
external/bsd/tcpdump/dist/interface.h | 26 +-
external/bsd/tcpdump/dist/ip.h | 8 +-
external/bsd/tcpdump/dist/ip6.h | 39 +-
external/bsd/tcpdump/dist/ipproto.c | 5 +-
external/bsd/tcpdump/dist/ipproto.h | 5 +-
external/bsd/tcpdump/dist/l2vpn.c | 4 +-
external/bsd/tcpdump/dist/machdep.c | 4 +-
external/bsd/tcpdump/dist/missing/addrsize.h | 36 -
external/bsd/tcpdump/dist/missing/bittypes.h | 117 -
external/bsd/tcpdump/dist/missing/resolv6.h | 36 -
external/bsd/tcpdump/dist/missing/resolv_ext.h | 49 -
external/bsd/tcpdump/dist/nameser.h | 2 +-
external/bsd/tcpdump/dist/nfs.h | 2 +-
external/bsd/tcpdump/dist/nlpid.c | 4 +-
external/bsd/tcpdump/dist/oui.c | 5 +-
external/bsd/tcpdump/dist/parsenfsfh.c | 4 +-
external/bsd/tcpdump/dist/pcap_dump_ftell.c | 4 +-
external/bsd/tcpdump/dist/print-802_11.c | 640 +-
external/bsd/tcpdump/dist/print-ah.c | 4 +-
external/bsd/tcpdump/dist/print-aodv.c | 4 +-
external/bsd/tcpdump/dist/print-ap1394.c | 6 +-
external/bsd/tcpdump/dist/print-arcnet.c | 8 +-
external/bsd/tcpdump/dist/print-arp.c | 5 +-
external/bsd/tcpdump/dist/print-ascii.c | 4 +-
external/bsd/tcpdump/dist/print-atalk.c | 64 +-
external/bsd/tcpdump/dist/print-atm.c | 14 +-
external/bsd/tcpdump/dist/print-beep.c | 4 +-
external/bsd/tcpdump/dist/print-bfd.c | 4 +-
external/bsd/tcpdump/dist/print-bgp.c | 645 +-
external/bsd/tcpdump/dist/print-bootp.c | 4 +-
external/bsd/tcpdump/dist/print-bt.c | 4 +-
external/bsd/tcpdump/dist/print-cdp.c | 6 +-
external/bsd/tcpdump/dist/print-cfm.c | 4 +-
external/bsd/tcpdump/dist/print-chdlc.c | 6 +-
external/bsd/tcpdump/dist/print-cip.c | 4 +-
external/bsd/tcpdump/dist/print-cnfp.c | 4 +-
external/bsd/tcpdump/dist/print-dccp.c | 60 +-
external/bsd/tcpdump/dist/print-decnet.c | 4 +-
external/bsd/tcpdump/dist/print-dhcp6.c | 10 +-
external/bsd/tcpdump/dist/print-domain.c | 4 +-
external/bsd/tcpdump/dist/print-dvmrp.c | 4 +-
external/bsd/tcpdump/dist/print-eap.c | 4 +-
external/bsd/tcpdump/dist/print-egp.c | 4 +-
external/bsd/tcpdump/dist/print-eigrp.c | 4 +-
external/bsd/tcpdump/dist/print-enc.c | 6 +-
external/bsd/tcpdump/dist/print-esp.c | 4 +-
external/bsd/tcpdump/dist/print-ether.c | 201 +-
external/bsd/tcpdump/dist/print-fddi.c | 4 +-
external/bsd/tcpdump/dist/print-fr.c | 8 +-
external/bsd/tcpdump/dist/print-frag6.c | 4 +-
external/bsd/tcpdump/dist/print-gre.c | 8 +-
external/bsd/tcpdump/dist/print-hsrp.c | 4 +-
external/bsd/tcpdump/dist/print-icmp.c | 25 +-
external/bsd/tcpdump/dist/print-icmp6.c | 106 +-
external/bsd/tcpdump/dist/print-igmp.c | 16 +-
external/bsd/tcpdump/dist/print-igrp.c | 4 +-
external/bsd/tcpdump/dist/print-ip.c | 190 +-
external/bsd/tcpdump/dist/print-ip6.c | 92 +-
external/bsd/tcpdump/dist/print-ip6opts.c | 9 +-
external/bsd/tcpdump/dist/print-ipcomp.c | 4 +-
external/bsd/tcpdump/dist/print-ipfc.c | 4 +-
external/bsd/tcpdump/dist/print-ipx.c | 8 +-
external/bsd/tcpdump/dist/print-isakmp.c | 4 +-
external/bsd/tcpdump/dist/print-isoclns.c | 38 +-
external/bsd/tcpdump/dist/print-juniper.c | 20 +-
external/bsd/tcpdump/dist/print-krb.c | 4 +-
external/bsd/tcpdump/dist/print-l2tp.c | 4 +-
external/bsd/tcpdump/dist/print-lane.c | 10 +-
external/bsd/tcpdump/dist/print-ldp.c | 91 +-
external/bsd/tcpdump/dist/print-llc.c | 10 +-
external/bsd/tcpdump/dist/print-lldp.c | 532 +-
external/bsd/tcpdump/dist/print-lmp.c | 4 +-
external/bsd/tcpdump/dist/print-lspping.c | 4 +-
external/bsd/tcpdump/dist/print-lwapp.c | 7 +-
external/bsd/tcpdump/dist/print-lwres.c | 4 +-
external/bsd/tcpdump/dist/print-mobile.c | 9 +-
external/bsd/tcpdump/dist/print-mobility.c | 4 +-
external/bsd/tcpdump/dist/print-mpcp.c | 4 +-
external/bsd/tcpdump/dist/print-mpls.c | 206 +-
external/bsd/tcpdump/dist/print-msdp.c | 4 +-
external/bsd/tcpdump/dist/print-netbios.c | 4 +-
external/bsd/tcpdump/dist/print-nfs.c | 4 +-
external/bsd/tcpdump/dist/print-ntp.c | 4 +-
external/bsd/tcpdump/dist/print-null.c | 6 +-
external/bsd/tcpdump/dist/print-ospf.c | 10 +-
external/bsd/tcpdump/dist/print-ospf6.c | 207 +-
external/bsd/tcpdump/dist/print-pflog.c | 6 +-
external/bsd/tcpdump/dist/print-pgm.c | 92 +-
external/bsd/tcpdump/dist/print-pim.c | 36 +-
external/bsd/tcpdump/dist/print-ppp.c | 24 +-
external/bsd/tcpdump/dist/print-pppoe.c | 6 +-
external/bsd/tcpdump/dist/print-pptp.c | 4 +-
external/bsd/tcpdump/dist/print-radius.c | 2 +-
external/bsd/tcpdump/dist/print-raw.c | 4 +-
external/bsd/tcpdump/dist/print-rip.c | 4 +-
external/bsd/tcpdump/dist/print-ripng.c | 4 +-
external/bsd/tcpdump/dist/print-rrcp.c | 12 +-
external/bsd/tcpdump/dist/print-rsvp.c | 4 +-
external/bsd/tcpdump/dist/print-rt6.c | 4 +-
external/bsd/tcpdump/dist/print-rx.c | 4 +-
external/bsd/tcpdump/dist/print-sctp.c | 10 +-
external/bsd/tcpdump/dist/print-sflow.c | 807 +-
external/bsd/tcpdump/dist/print-sip.c | 4 +-
external/bsd/tcpdump/dist/print-sl.c | 6 +-
external/bsd/tcpdump/dist/print-sll.c | 6 +-
external/bsd/tcpdump/dist/print-slow.c | 4 +-
external/bsd/tcpdump/dist/print-smb.c | 4 +-
external/bsd/tcpdump/dist/print-snmp.c | 4 +-
external/bsd/tcpdump/dist/print-stp.c | 4 +-
external/bsd/tcpdump/dist/print-sunatm.c | 4 +-
external/bsd/tcpdump/dist/print-sunrpc.c | 14 +-
external/bsd/tcpdump/dist/print-symantec.c | 6 +-
external/bsd/tcpdump/dist/print-syslog.c | 4 +-
external/bsd/tcpdump/dist/print-tcp.c | 101 +-
external/bsd/tcpdump/dist/print-telnet.c | 4 +-
external/bsd/tcpdump/dist/print-tftp.c | 12 +-
external/bsd/tcpdump/dist/print-timed.c | 4 +-
external/bsd/tcpdump/dist/print-token.c | 4 +-
external/bsd/tcpdump/dist/print-udp.c | 134 +-
external/bsd/tcpdump/dist/print-vjc.c | 4 +-
external/bsd/tcpdump/dist/print-vqp.c | 4 +-
external/bsd/tcpdump/dist/print-vrrp.c | 16 +-
external/bsd/tcpdump/dist/print-wb.c | 4 +-
external/bsd/tcpdump/dist/print-zephyr.c | 4 +-
external/bsd/tcpdump/dist/setsignal.c | 4 +-
external/bsd/tcpdump/dist/signature.c | 4 +-
external/bsd/tcpdump/dist/sll.h | 2 +-
external/bsd/tcpdump/dist/smbutil.c | 4 +-
external/bsd/tcpdump/dist/strcasecmp.c | 4 +-
external/bsd/tcpdump/dist/tcp.h | 3 +-
external/bsd/tcpdump/dist/tcpdump.1.in | 127 +-
external/bsd/tcpdump/dist/tcpdump.c | 230 +-
external/bsd/tcpdump/dist/telnet.h | 2 +-
external/bsd/tcpdump/dist/tests/02-sunrise-sunset-esp.puu | 34 -
external/bsd/tcpdump/dist/tests/08-sunrise-sunset-aes.puu | 36 -
external/bsd/tcpdump/dist/tests/08-sunrise-sunset-esp2.puu | 43 -
external/bsd/tcpdump/dist/tests/eapon1.puu | 368 -
external/bsd/tcpdump/dist/tests/eapon2.puu | 66 -
external/bsd/tcpdump/dist/tests/espudp1.puu | 35 -
external/bsd/tcpdump/dist/tests/forces2.out | 491 -
external/bsd/tcpdump/dist/tests/forces2.pcap | Bin
external/bsd/tcpdump/dist/tests/ikev2.puu | 22231 ----------
external/bsd/tcpdump/dist/tests/ikev2four.puu | 134 -
external/bsd/tcpdump/dist/tests/ikev2pI2.puu | 24 -
external/bsd/tcpdump/dist/tests/isakmp-delete-segfault.puu | 20 -
external/bsd/tcpdump/dist/tests/isakmp-identification-segfault.puu | 11 -
external/bsd/tcpdump/dist/tests/isakmp-pointer-loop.puu | 6 -
external/bsd/tcpdump/dist/tests/isakmp4500.puu | 155 -
external/bsd/tcpdump/dist/tests/lmp.puu | 42 -
external/bsd/tcpdump/dist/tests/mpls-ldp-hello.puu | 6 -
external/bsd/tcpdump/dist/tests/ospf-gmpls.puu | 18 -
external/bsd/tcpdump/dist/tests/print-flags.puu | 151 -
external/bsd/tcpdump/dist/timed.h | 2 +-
external/bsd/tcpdump/dist/udp.h | 4 +-
external/bsd/tcpdump/dist/util.c | 4 +-
external/bsd/tcpdump/dist/vfprintf.c | 4 +-
external/bsd/tcpdump/dist/win32/Include/Arpa/tftp.h | 84 -
external/bsd/tcpdump/dist/win32/Include/Netinet/in_systm.h | 56 -
external/bsd/tcpdump/dist/win32/Include/Netinet/ip.h | 177 -
external/bsd/tcpdump/dist/win32/Include/inetprivate.h | 40 -
external/bsd/tcpdump/dist/win32/Include/telnet.h | 320 -
external/bsd/tcpdump/include/config.h | 59 +-
external/bsd/tcpdump/tcpdump2netbsd | 86 +
178 files changed, 4419 insertions(+), 29339 deletions(-)
diffs (truncated from 38936 to 300 lines):
diff -r 03cd5b4ff1a3 -r a152fb162ec1 external/bsd/tcpdump/bin/Makefile
--- a/external/bsd/tcpdump/bin/Makefile Sat Apr 06 17:57:45 2013 +0000
+++ b/external/bsd/tcpdump/bin/Makefile Sat Apr 06 19:33:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/08/17 10:48:02 christos Exp $
+# $NetBSD: Makefile,v 1.8 2013/04/06 19:33:07 christos Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -16,40 +16,127 @@
MAN= tcpdump.8
SRCS= addrtoname.c cpack.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \
- pf_print_state.c \
- print-802_11.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-bfd.c print-bgp.c \
- print-bootp.c print-beep.c print-cdp.c print-chdlc.c \
- print-cip.c print-cnfp.c print-decnet.c print-domain.c \
- print-dvmrp.c print-egp.c print-enc.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-krb.c \
- print-l2tp.c print-lane.c print-ldp.c print-llc.c print-lwres.c \
- print-msdp.c print-mobile.c print-mobility.c print-mpls.c print-nfs.c \
- print-ntp.c print-null.c print-ospf.c print-pflog.c print-pfsync.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-sl.c print-sll.c print-smb.c print-snmp.c \
- print-stp.c print-sunatm.c print-sunrpc.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 smbutil.c tcpdump.c util.c checksum.c signature.c
-SRCS+= print-eigrp.c l2vpn.c print-slow.c print-eap.c nlpid.c print-dccp.c \
- print-pgm.c ipproto.c print-syslog.c print-sip.c print-lmp.c \
- print-lspping.c print-symantec.c print-juniper.c af.c print-olsr.c \
- print-sflow.c print-vqp.c print-lwapp.c print-ipnet.c print-forces.c \
- print-vtp.c print-udld.c print-dtp.c print-rrcp.c print-mpcp.c \
- print-lldp.c print-cfm.c
-
+ setsignal.c smbutil.c tcpdump.c util.c checksum.c signature.c \
+ l2vpn.c nlpid.c ipproto.c af.c in_cksum.c pf_print_state.c
SRCS+= bpf_dump.c
-
SRCS+= version.c
-# disabled for now
-#SRCS+= print-smb.c smbutil.c
+SRCS+= \
+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-babel.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-frag6.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-mobility.c \
+print-mpcp.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-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-ripng.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-usb.c \
+print-vjc.c \
+print-vqp.c \
+print-vrrp.c \
+print-vtp.c \
+print-wb.c \
+print-zephyr.c
version.c: VERSION
${_MKTARGET_CREATE}
@@ -58,7 +145,7 @@
LDADD+= -lpcap -ll
DPADD+= ${LIBPCAP} ${LIBL}
-CPPFLAGS+= -I${.CURDIR}/../include -I${.CURDIR} -I${SRCDIR}
+CPPFLAGS+= -I${.CURDIR}/../include -I${.CURDIR} -I${SRCDIR} -DHAVE_CONFIG_H
CPPFLAGS+= -I${NETBSDSRCDIR}/dist/pf/sbin/pfctl \
-I${NETBSDSRCDIR}/sys/dist/pf
@@ -70,8 +157,8 @@
CPPFLAGS+=-DWITH_CHROOT=\"/var/chroot/tcpdump\"
.if (${USE_INET6} != "no")
-SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c print-frag6.c \
- print-rt6.c print-ospf6.c print-dhcp6.c
+SRCS+= print-ip6.c print-ip6opts.c print-icmp6.c \
+ print-rt6.c print-dhcp6.c print-ospf6.c
CPPFLAGS+=-DINET6=1 -DHAVE_RES_USE_INET6=1
.endif
diff -r 03cd5b4ff1a3 -r a152fb162ec1 external/bsd/tcpdump/dist/addrtoname.c
--- a/external/bsd/tcpdump/dist/addrtoname.c Sat Apr 06 17:57:45 2013 +0000
+++ b/external/bsd/tcpdump/dist/addrtoname.c Sat Apr 06 19:33:07 2013 +0000
@@ -25,10 +25,9 @@
#ifndef lint
#if 0
static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.119 2007-08-08 14:06:34 hannes Exp (LBL)";
-#else
-__RCSID("$NetBSD: addrtoname.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+ "@(#) Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.119 2007-08-08 14:06:34 hannes Exp (LBL)";
#endif
+__RCSID("$NetBSD: addrtoname.c,v 1.3 2013/04/06 19:33:07 christos Exp $");
#endif
#ifdef HAVE_CONFIG_H
@@ -513,6 +512,34 @@
}
const char *
+le64addr_string(const u_char *ep)
+{
+ const unsigned int len = 8;
+ register u_int i;
+ register char *cp;
+ register struct enamemem *tp;
+ char buf[BUFSIZE];
+
+ tp = lookup_bytestring(ep, len);
+ if (tp->e_name)
+ return (tp->e_name);
+
+ cp = buf;
+ for (i = len; i > 0 ; --i) {
+ *cp++ = hex[*(ep + i - 1) >> 4];
+ *cp++ = hex[*(ep + i - 1) & 0xf];
+ *cp++ = ':';
+ }
+ cp --;
+
+ *cp = '\0';
+
+ tp->e_name = strdup(buf);
+
+ return (tp->e_name);
+}
+
+const char *
linkaddr_string(const u_char *ep, const unsigned int type, const unsigned int len)
{
register u_int i;
diff -r 03cd5b4ff1a3 -r a152fb162ec1 external/bsd/tcpdump/dist/af.c
--- a/external/bsd/tcpdump/dist/af.c Sat Apr 06 17:57:45 2013 +0000
+++ b/external/bsd/tcpdump/dist/af.c Sat Apr 06 19:33:07 2013 +0000
@@ -19,9 +19,9 @@
#ifndef lint
#if 0
static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/tcpdump/af.c,v 1.3 2006-03-23 14:58:44 hannes Exp (LBL)";
+ "@(#) Header: /tcpdump/master/tcpdump/af.c,v 1.3 2006-03-23 14:58:44 hannes Exp (LBL)";
#else
-__RCSID("$NetBSD: af.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: af.c,v 1.3 2013/04/06 19:33:07 christos Exp $");
#endif
#endif
diff -r 03cd5b4ff1a3 -r a152fb162ec1 external/bsd/tcpdump/dist/bpf_dump.c
--- a/external/bsd/tcpdump/dist/bpf_dump.c Sat Apr 06 17:57:45 2013 +0000
+++ b/external/bsd/tcpdump/dist/bpf_dump.c Sat Apr 06 19:33:07 2013 +0000
@@ -22,9 +22,9 @@
#ifndef lint
#if 0
static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.17 2008-02-14 20:53:49 guy Exp (LBL)";
+ "@(#) Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.17 2008-02-14 20:53:49 guy Exp (LBL)";
#else
-__RCSID("$NetBSD: bpf_dump.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: bpf_dump.c,v 1.3 2013/04/06 19:33:07 christos Exp $");
#endif
#endif
diff -r 03cd5b4ff1a3 -r a152fb162ec1 external/bsd/tcpdump/dist/checksum.c
--- a/external/bsd/tcpdump/dist/checksum.c Sat Apr 06 17:57:45 2013 +0000
+++ b/external/bsd/tcpdump/dist/checksum.c Sat Apr 06 19:33:07 2013 +0000
@@ -21,9 +21,9 @@
#ifndef lint
#if 0
static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/tcpdump/checksum.c,v 1.4 2006-09-25 09:23:32 hannes Exp";
+ "@(#) Header: /tcpdump/master/tcpdump/checksum.c,v 1.4 2006-09-25 09:23:32 hannes Exp ";
#else
-__RCSID("$NetBSD: checksum.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: checksum.c,v 1.3 2013/04/06 19:33:07 christos Exp $");
#endif
#endif
diff -r 03cd5b4ff1a3 -r a152fb162ec1 external/bsd/tcpdump/dist/configure
--- a/external/bsd/tcpdump/dist/configure Sat Apr 06 17:57:45 2013 +0000
+++ b/external/bsd/tcpdump/dist/configure Sat Apr 06 19:33:07 2013 +0000
@@ -1267,6 +1267,7 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-universal don't build universal on OS X
--enable-smb enable possibly-buggy SMB printer default=yes
--disable-smb disable possibly-buggy SMB printer
--enable-ipv6 enable ipv6 (with ipv4) support
@@ -1845,7 +1846,7 @@
V_CCOPT="-O"
V_INCLS=""
if test "${srcdir}" != "." ; then
- V_INCLS="-I\$(srcdir)"
+ V_INCLS="-I$srcdir"
Home |
Main Index |
Thread Index |
Old Index