Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/TCPDUMP]: src/external/bsd/tcpdump/dist Friday, September 20, 2019, by m...
details: https://anonhg.NetBSD.org/src/rev/7999cc93d49d
branches: TCPDUMP
changeset: 454888:7999cc93d49d
user: christos <christos%NetBSD.org@localhost>
date: Tue Oct 01 16:04:24 2019 +0000
description:
Friday, September 20, 2019, by mcr%sandelman.ca@localhost
A huge thank you to Denis, Francois-Xavier and Guy who did much of the heavy lifting.
Summary for 4.9.3 tcpdump release
Fix buffer overflow/overread vulnerabilities:
CVE-2017-16808 (AoE)
CVE-2018-14468 (FrameRelay)
CVE-2018-14469 (IKEv1)
CVE-2018-14470 (BABEL)
CVE-2018-14466 (AFS/RX)
CVE-2018-14461 (LDP)
CVE-2018-14462 (ICMP)
CVE-2018-14465 (RSVP)
CVE-2018-14881 (BGP)
CVE-2018-14464 (LMP)
CVE-2018-14463 (VRRP)
CVE-2018-14467 (BGP)
CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled)
CVE-2018-10105 (SMB - too unreliably reproduced, SMB printing disabled)
CVE-2018-14880 (OSPF6)
CVE-2018-16451 (SMB)
CVE-2018-14882 (RPL)
CVE-2018-16227 (802.11)
CVE-2018-16229 (DCCP)
CVE-2018-16301 (was fixed in libpcap)
CVE-2018-16230 (BGP)
CVE-2018-16452 (SMB)
CVE-2018-16300 (BGP)
CVE-2018-16228 (HNCP)
CVE-2019-15166 (LMP)
CVE-2019-15167 (VRRP)
Fix for cmdline argument/local issues:
CVE-2018-14879 (tcpdump -V)
diffstat:
external/bsd/tcpdump/dist/CHANGES | 33 +
external/bsd/tcpdump/dist/CONTRIBUTING | 2 +-
external/bsd/tcpdump/dist/INSTALL.txt | 2 +-
external/bsd/tcpdump/dist/Makefile-devel-adds | 4 +-
external/bsd/tcpdump/dist/Makefile.in | 6 +-
external/bsd/tcpdump/dist/Readme.Win32 | 2 +-
external/bsd/tcpdump/dist/VERSION | 2 +-
external/bsd/tcpdump/dist/addrtoname.c | 7 +-
external/bsd/tcpdump/dist/config.guess | 685 ++-
external/bsd/tcpdump/dist/config.h.in | 11 +-
external/bsd/tcpdump/dist/config.sub | 1707 +++++----
external/bsd/tcpdump/dist/configure | 108 +-
external/bsd/tcpdump/dist/configure.ac | 1003 +++++
external/bsd/tcpdump/dist/netdissect.h | 2 +-
external/bsd/tcpdump/dist/print-802_11.c | 15 +-
external/bsd/tcpdump/dist/print-aoe.c | 2 +
external/bsd/tcpdump/dist/print-babel.c | 4 +-
external/bsd/tcpdump/dist/print-bfd.c | 203 +-
external/bsd/tcpdump/dist/print-bgp.c | 49 +-
external/bsd/tcpdump/dist/print-bootp.c | 7 +-
external/bsd/tcpdump/dist/print-dccp.c | 53 +-
external/bsd/tcpdump/dist/print-decnet.c | 33 -
external/bsd/tcpdump/dist/print-domain.c | 7 +
external/bsd/tcpdump/dist/print-dvmrp.c | 26 +-
external/bsd/tcpdump/dist/print-eigrp.c | 2 +
external/bsd/tcpdump/dist/print-esp.c | 91 +-
external/bsd/tcpdump/dist/print-fr.c | 9 +
external/bsd/tcpdump/dist/print-hncp.c | 14 +-
external/bsd/tcpdump/dist/print-icmp.c | 14 +-
external/bsd/tcpdump/dist/print-icmp6.c | 31 +-
external/bsd/tcpdump/dist/print-ipnet.c | 44 +-
external/bsd/tcpdump/dist/print-isakmp.c | 1 +
external/bsd/tcpdump/dist/print-juniper.c | 5 +
external/bsd/tcpdump/dist/print-l2tp.c | 232 +-
external/bsd/tcpdump/dist/print-ldp.c | 28 +-
external/bsd/tcpdump/dist/print-lmp.c | 59 +-
external/bsd/tcpdump/dist/print-nfs.c | 4 +-
external/bsd/tcpdump/dist/print-openflow.c | 8 +-
external/bsd/tcpdump/dist/print-ospf.c | 4 +-
external/bsd/tcpdump/dist/print-ospf6.c | 3 +-
external/bsd/tcpdump/dist/print-ppi.c | 4 +
external/bsd/tcpdump/dist/print-rsvp.c | 2 +
external/bsd/tcpdump/dist/print-rx.c | 8 +-
external/bsd/tcpdump/dist/print-sflow.c | 10 +
external/bsd/tcpdump/dist/print-sl.c | 34 +-
external/bsd/tcpdump/dist/print-sll.c | 11 +
external/bsd/tcpdump/dist/print-smb.c | 13 +-
external/bsd/tcpdump/dist/print-tcp.c | 14 +-
external/bsd/tcpdump/dist/print-vrrp.c | 8 +-
external/bsd/tcpdump/dist/print-vtp.c | 2 +-
external/bsd/tcpdump/dist/print-wb.c | 2 +-
external/bsd/tcpdump/dist/signature.c | 4 +-
external/bsd/tcpdump/dist/smbutil.c | 42 +-
external/bsd/tcpdump/dist/tcpdump.1.in | 8 +-
external/bsd/tcpdump/dist/tcpdump.c | 17 +-
external/bsd/tcpdump/dist/tests/SMBLIST | 12 +
external/bsd/tcpdump/dist/tests/TESTLIST | 62 +-
external/bsd/tcpdump/dist/tests/TESTonce | 127 +-
external/bsd/tcpdump/dist/tests/TESTrun.sh | 69 +-
external/bsd/tcpdump/dist/tests/aoe-oobr-1.out | 3 +
external/bsd/tcpdump/dist/tests/aoe-oobr-1.pcap | Bin
external/bsd/tcpdump/dist/tests/arp-too-long-tha.pcap | Bin
external/bsd/tcpdump/dist/tests/babel_update_oobr.out | 66 +
external/bsd/tcpdump/dist/tests/babel_update_oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/bgp-bgp_capabilities_print-oobr-1.out | 27 +
external/bsd/tcpdump/dist/tests/bgp-bgp_capabilities_print-oobr-1.pcap | Bin
external/bsd/tcpdump/dist/tests/bgp-bgp_capabilities_print-oobr-2.out | 26 +
external/bsd/tcpdump/dist/tests/bgp-bgp_capabilities_print-oobr-2.pcap | Bin
external/bsd/tcpdump/dist/tests/bgp_mp_reach_nlri-oobr.out | 277 +
external/bsd/tcpdump/dist/tests/bgp_mp_reach_nlri-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/crypto.sh | 90 +-
external/bsd/tcpdump/dist/tests/cve-2018-10105-segv-sflowprint.out | 2 +
external/bsd/tcpdump/dist/tests/cve-2018-10105-segv-sflowprint.pcapng | Bin
external/bsd/tcpdump/dist/tests/cve-2018-10105_smbprint-readofsize1.out | 8 +
external/bsd/tcpdump/dist/tests/cve-2018-10105_smbprint-readofsize1.pcap | Bin
external/bsd/tcpdump/dist/tests/cve-2018-10105_smbutil_withoutasan.out | 101 +
external/bsd/tcpdump/dist/tests/cve-2018-10105_smbutil_withoutasan.pcap | Bin
external/bsd/tcpdump/dist/tests/cve2015-0261-ipv6.out | 3 +-
external/bsd/tcpdump/dist/tests/cve2015-0261-ipv6.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/dccp_options-oobr.out | 19 +
external/bsd/tcpdump/dist/tests/dccp_options-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/dns-zlip-1.out | 2 +-
external/bsd/tcpdump/dist/tests/dns-zlip-2.out | 2 +-
external/bsd/tcpdump/dist/tests/dns-zlip-3.out | 2 +-
external/bsd/tcpdump/dist/tests/eapon2.out | 61 +
external/bsd/tcpdump/dist/tests/eapon2.pcap | Bin
external/bsd/tcpdump/dist/tests/esp4.out | 8 +
external/bsd/tcpdump/dist/tests/frf16_magic_ie-oobr.out | 2 +
external/bsd/tcpdump/dist/tests/frf16_magic_ie-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/hncp_prefix-oobr.out | 48 +
external/bsd/tcpdump/dist/tests/hncp_prefix-oobr.pcapng | Bin
external/bsd/tcpdump/dist/tests/icmp-icmp_print-oobr-1.out | 7 +
external/bsd/tcpdump/dist/tests/icmp-icmp_print-oobr-1.pcap | Bin
external/bsd/tcpdump/dist/tests/icmp-icmp_print-oobr-2.out | 5 +
external/bsd/tcpdump/dist/tests/icmp-icmp_print-oobr-2.pcap | Bin
external/bsd/tcpdump/dist/tests/icmp6_mobileprefix_asan.out | 2 +-
external/bsd/tcpdump/dist/tests/icmp6_nodeinfo_oobr.out | 2 +-
external/bsd/tcpdump/dist/tests/icmpv6.out | 2 +-
external/bsd/tcpdump/dist/tests/icmpv6_opt24-v.out | 4 +-
external/bsd/tcpdump/dist/tests/ieee802.11_meshhdr-oobr.out | 1 +
external/bsd/tcpdump/dist/tests/ieee802.11_meshhdr-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/isakmp-ikev1_n_print-oobr.out | 8 +
external/bsd/tcpdump/dist/tests/isakmp-ikev1_n_print-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/isis-seg-fault-1-v.sh | 21 +-
external/bsd/tcpdump/dist/tests/juniper_header-heapoverflow.pcap | Bin
external/bsd/tcpdump/dist/tests/kday1.out | 3 +-
external/bsd/tcpdump/dist/tests/kday1.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kday2.out | 3 +-
external/bsd/tcpdump/dist/tests/kday2.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kday3.out | 3 +-
external/bsd/tcpdump/dist/tests/kday3.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kday4.out | 3 +-
external/bsd/tcpdump/dist/tests/kday4.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kday5.out | 3 +-
external/bsd/tcpdump/dist/tests/kday5.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kday6.out | 3 +-
external/bsd/tcpdump/dist/tests/kday6.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kday7.out | 3 +-
external/bsd/tcpdump/dist/tests/kday7.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kday8.out | 3 +-
external/bsd/tcpdump/dist/tests/kday8.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-001.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-001.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-001.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-002.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-002.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-002.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-003.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-003.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-003.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-004.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-004.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-004.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-005.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-005.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-005.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-006.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-006.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-006.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-007.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-007.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-007.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-008.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-008.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-008.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-009.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-009.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-009.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-010.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-010.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-010.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-addrfail-011.out | 2 +
external/bsd/tcpdump/dist/tests/kh-addrfail-011.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/kh-addrfail-011.pcap | 3 +
external/bsd/tcpdump/dist/tests/kh-tcpdump-001.out | 17 +
external/bsd/tcpdump/dist/tests/kh-tcpdump-001.pcap | Bin
external/bsd/tcpdump/dist/tests/kh-tcpdump-002.out | 1 +
external/bsd/tcpdump/dist/tests/kh-tcpdump-002.pcap | Bin
external/bsd/tcpdump/dist/tests/kh-tcpdump-004.pcap | Bin
external/bsd/tcpdump/dist/tests/l2tp-avp-overflow.out | 3 +-
external/bsd/tcpdump/dist/tests/l2tp-avp-overflow.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/ldp-ldp_tlv_print-oobr.out | 6 +
external/bsd/tcpdump/dist/tests/ldp-ldp_tlv_print-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/lmp-lmp_print_data_link_subobjs-oobr.out | 20 +
external/bsd/tcpdump/dist/tests/lmp-lmp_print_data_link_subobjs-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/lmp-v.sh | 22 +-
external/bsd/tcpdump/dist/tests/lmpv1_busyloop.out | 3 +-
external/bsd/tcpdump/dist/tests/nflog-e.sh | 18 +-
external/bsd/tcpdump/dist/tests/of10_7050sx_bsn-oobr.out | 16 +
external/bsd/tcpdump/dist/tests/of10_7050sx_bsn-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/ospf6_print_lshdr-oobr.out | 59 +
external/bsd/tcpdump/dist/tests/ospf6_print_lshdr-oobr.pcapng | Bin
external/bsd/tcpdump/dist/tests/pcap-invalid-version-1.out | 3 +-
external/bsd/tcpdump/dist/tests/pcap-invalid-version-1.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/pcap-invalid-version-2.out | 3 +-
external/bsd/tcpdump/dist/tests/pcap-invalid-version-2.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/pcapng-invalid-vers-1.out | 2 +
external/bsd/tcpdump/dist/tests/pcapng-invalid-vers-1.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/pcapng-invalid-vers-1.pcapng | Bin
external/bsd/tcpdump/dist/tests/pcapng-invalid-vers-2.out | 2 +
external/bsd/tcpdump/dist/tests/pcapng-invalid-vers-2.out.stderr | 1 +
external/bsd/tcpdump/dist/tests/pcapng-invalid-vers-2.pcapng | Bin
external/bsd/tcpdump/dist/tests/pktap-heap-overflow.out | 3 +-
external/bsd/tcpdump/dist/tests/pktap-heap-overflow.out.stderr | 2 +
external/bsd/tcpdump/dist/tests/relts-0x80000000.pcap | Bin
external/bsd/tcpdump/dist/tests/rpl-19-pickdag.out | 2 +-
external/bsd/tcpdump/dist/tests/rpl-19-pickdagvvv.out | 2 +-
external/bsd/tcpdump/dist/tests/rpl-dao-oobr.out | 1 +
external/bsd/tcpdump/dist/tests/rpl-dao-oobr.pcapng | Bin
external/bsd/tcpdump/dist/tests/rsvp-rsvp_obj_print-oobr.out | 7 +
external/bsd/tcpdump/dist/tests/rsvp-rsvp_obj_print-oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/rx_serviceid_oobr.out | 3 +
external/bsd/tcpdump/dist/tests/rx_serviceid_oobr.pcap | Bin
external/bsd/tcpdump/dist/tests/smb.sh | 49 +
external/bsd/tcpdump/dist/tests/smb_print_trans-oobr1.out | 39 +
external/bsd/tcpdump/dist/tests/smb_print_trans-oobr1.pcapng | Bin
external/bsd/tcpdump/dist/tests/smb_print_trans-oobr2.out | 37 +
external/bsd/tcpdump/dist/tests/smb_print_trans-oobr2.pcap | Bin
external/bsd/tcpdump/dist/tests/stp-v4-length-sigsegv.pcap | Bin
external/bsd/tcpdump/dist/tests/tftp-heapoverflow.pcap | Bin
external/bsd/tcpdump/dist/tests/vrrp-vrrp_print-oobr-2.out | 20 +
external/bsd/tcpdump/dist/tests/vrrp-vrrp_print-oobr-2.pcap | Bin
external/bsd/tcpdump/dist/tests/vrrp-vrrp_print-oobr.out | 6 +
external/bsd/tcpdump/dist/tests/vrrp-vrrp_print-oobr.pcap | Bin
external/bsd/tcpdump/dist/util-print.c | 20 +-
205 files changed, 4385 insertions(+), 1865 deletions(-)
diffs (truncated from 10623 to 300 lines):
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/CHANGES
--- a/external/bsd/tcpdump/dist/CHANGES Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/CHANGES Tue Oct 01 16:04:24 2019 +0000
@@ -1,3 +1,36 @@
+Friday, September 20, 2019, by mcr%sandelman.ca@localhost
+ A huge thank you to Denis, Francois-Xavier and Guy who did much of the heavy lifting.
+ Summary for 4.9.3 tcpdump release
+ Fix buffer overflow/overread vulnerabilities:
+ CVE-2017-16808 (AoE)
+ CVE-2018-14468 (FrameRelay)
+ CVE-2018-14469 (IKEv1)
+ CVE-2018-14470 (BABEL)
+ CVE-2018-14466 (AFS/RX)
+ CVE-2018-14461 (LDP)
+ CVE-2018-14462 (ICMP)
+ CVE-2018-14465 (RSVP)
+ CVE-2018-14881 (BGP)
+ CVE-2018-14464 (LMP)
+ CVE-2018-14463 (VRRP)
+ CVE-2018-14467 (BGP)
+ CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled)
+ CVE-2018-10105 (SMB - too unreliably reproduced, SMB printing disabled)
+ CVE-2018-14880 (OSPF6)
+ CVE-2018-16451 (SMB)
+ CVE-2018-14882 (RPL)
+ CVE-2018-16227 (802.11)
+ CVE-2018-16229 (DCCP)
+ CVE-2018-16301 (was fixed in libpcap)
+ CVE-2018-16230 (BGP)
+ CVE-2018-16452 (SMB)
+ CVE-2018-16300 (BGP)
+ CVE-2018-16228 (HNCP)
+ CVE-2019-15166 (LMP)
+ CVE-2019-15167 (VRRP)
+ Fix for cmdline argument/local issues:
+ CVE-2018-14879 (tcpdump -V)
+
Sunday September 3, 2017 denis%ovsienko.info@localhost
Summary for 4.9.2 tcpdump release
Do not use getprotobynumber() for protocol name resolution. Do not do
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/CONTRIBUTING
--- a/external/bsd/tcpdump/dist/CONTRIBUTING Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/CONTRIBUTING Tue Oct 01 16:04:24 2019 +0000
@@ -31,7 +31,7 @@
would not be too intrusive, it would be best to contribute some development time
and open a pull request instead as discussed below.
-Still not sure how to do? Feel free to [subscribe](http://www.tcpdump.org/#mailing-lists)
+Still not sure how to do? Feel free to [subscribe](https://www.tcpdump.org/#mailing-lists)
to the mailing list tcpdump-workers%lists.tcpdump.org@localhost and ask!
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/INSTALL.txt
--- a/external/bsd/tcpdump/dist/INSTALL.txt Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/INSTALL.txt Tue Oct 01 16:04:24 2019 +0000
@@ -63,7 +63,7 @@
config.h.in - autoconf input
config.sub - autoconf support
configure - configure script (run this first)
-configure.in - configure script source
+configure.ac - configure script source
ether.h - Ethernet definitions
ethertype.h - Ethernet type value definitions
extract.h - alignment definitions
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/Makefile-devel-adds
--- a/external/bsd/tcpdump/dist/Makefile-devel-adds Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/Makefile-devel-adds Tue Oct 01 16:04:24 2019 +0000
@@ -2,12 +2,12 @@
# Auto-regenerate configure script or Makefile when things change.
# From autoconf.info . Works best with GNU Make.
#
-${srcdir}/configure: configure.in aclocal.m4
+${srcdir}/configure: configure.ac aclocal.m4
cd ${srcdir} && autoconf
# autoheader might not change config.h.in, so touch a stamp file.
${srcdir}/config.h.in: ${srcdir}/stamp-h.in
-${srcdir}/stamp-h.in: configure.in aclocal.m4
+${srcdir}/stamp-h.in: configure.ac aclocal.m4
cd ${srcdir} && autoheader
echo timestamp > ${srcdir}/stamp-h.in
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/Makefile.in
--- a/external/bsd/tcpdump/dist/Makefile.in Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/Makefile.in Tue Oct 01 16:04:24 2019 +0000
@@ -334,7 +334,7 @@
config.h.in \
config.sub \
configure \
- configure.in \
+ configure.ac \
install-sh \
lbl/os-osf4.h \
lbl/os-solaris2.h \
@@ -366,7 +366,7 @@
win32/prj/WinDump.vcproj \
win32/src/ether_ntohost.c
-TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -type f \! -name '.*' \! -name '*~' -print`
+TEST_DIST= `git ls-files tests | grep -v 'tests/\..*'`
all: $(PROG) $(LIBNETDISSECT)
@@ -438,7 +438,7 @@
rm -rf autom4te.cache tests/DIFF tests/NEW
check: tcpdump
- (cd tests && ./TESTrun.sh)
+ (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh )
extags: $(TAGFILES)
ctags $(TAGFILES)
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/Readme.Win32
--- a/external/bsd/tcpdump/dist/Readme.Win32 Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/Readme.Win32 Tue Oct 01 16:04:24 2019 +0000
@@ -7,7 +7,7 @@
for IPv6 support. You can download it from http://www.microsoft.com/sdk
- the WinPcap source code, that includes libpcap for win32. Download it
from http://winpcap.polito.it or download libpcap sources from
-http://www.tcpdump.org and follow the instructions in the README.Win32
+https://www.tcpdump.org and follow the instructions in the README.Win32
file.
First, extract tcpdump and WinPcap in the same folder, and build WinPcap.
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/VERSION
--- a/external/bsd/tcpdump/dist/VERSION Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/VERSION Tue Oct 01 16:04:24 2019 +0000
@@ -1,1 +1,1 @@
-4.9.2
+4.9.3
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/addrtoname.c
--- a/external/bsd/tcpdump/dist/addrtoname.c Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/addrtoname.c Tue Oct 01 16:04:24 2019 +0000
@@ -120,7 +120,7 @@
hname, sizeof(hname), NULL, 0, 0)) {
return NULL;
} else {
- strcpy(host.h_name, hname);
+ strlcpy(host.h_name, hname, NI_MAXHOST);
return &host;
}
break;
@@ -1226,10 +1226,7 @@
tp->addr = dnaddr;
tp->nxt = newhnamemem(ndo);
- if (ndo->ndo_nflag)
- tp->name = dnnum_string(ndo, dnaddr);
- else
- tp->name = dnname_string(ndo, dnaddr);
+ tp->name = dnnum_string(ndo, dnaddr);
return(tp->name);
}
diff -r b1d2d8828922 -r 7999cc93d49d external/bsd/tcpdump/dist/config.guess
--- a/external/bsd/tcpdump/dist/config.guess Tue Oct 01 16:00:25 2019 +0000
+++ b/external/bsd/tcpdump/dist/config.guess Tue Oct 01 16:04:24 2019 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2015-02-23'
+timestamp='2018-07-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches%gnu.org@localhost>.
@@ -39,7 +39,7 @@
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -101,15 +101,15 @@
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp 2>/dev/null) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
+case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+ ,,) echo "int x;" > "$dummy.c" ;
for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
@@ -132,14 +132,14 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ eval "$set_cc_for_build"
+ cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +149,20 @@
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,27 +176,30 @@
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ # to ELF recently (or will in the future) and ABI.
+ case "$UNAME_MACHINE_ARCH" in
Home |
Main Index |
Thread Index |
Old Index