Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/tcpdump/dist Friday, September 20, 2019, by mcr...



details:   https://anonhg.NetBSD.org/src/rev/59f6cabeb2ab
branches:  trunk
changeset: 845403:59f6cabeb2ab
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/config.h.in                                     |    11 +-
 external/bsd/tcpdump/dist/configure.ac                                    |  1003 ++++++++++
 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 
 158 files changed, 2441 insertions(+), 153 deletions(-)

diffs (truncated from 3549 to 300 lines):

diff -r 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/CHANGES
--- a/external/bsd/tcpdump/dist/CHANGES Tue Oct 01 16:02:55 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 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/CONTRIBUTING
--- a/external/bsd/tcpdump/dist/CONTRIBUTING    Tue Oct 01 16:02:55 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 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/INSTALL.txt
--- a/external/bsd/tcpdump/dist/INSTALL.txt     Tue Oct 01 16:02:55 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 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/Makefile-devel-adds
--- a/external/bsd/tcpdump/dist/Makefile-devel-adds     Tue Oct 01 16:02:55 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 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/Makefile.in
--- a/external/bsd/tcpdump/dist/Makefile.in     Tue Oct 01 16:02:55 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 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/Readme.Win32
--- a/external/bsd/tcpdump/dist/Readme.Win32    Tue Oct 01 16:02:55 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 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/VERSION
--- a/external/bsd/tcpdump/dist/VERSION Tue Oct 01 16:02:55 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 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/config.h.in
--- a/external/bsd/tcpdump/dist/config.h.in     Tue Oct 01 16:02:55 2019 +0000
+++ b/external/bsd/tcpdump/dist/config.h.in     Tue Oct 01 16:04:24 2019 +0000
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* define if you want to build the possibly-buggy SMB printer */
 #undef ENABLE_SMB
@@ -28,9 +28,6 @@
    don't. */
 #undef HAVE_DECL_ETHER_NTOHOST
 
-/* define if you have the dnet_htoa function */
-#undef HAVE_DNET_HTOA
-
 /* Define to 1 if you have the `ether_ntohost' function. */
 #undef HAVE_ETHER_NTOHOST
 
@@ -67,12 +64,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the <netdnet/dnetdb.h> header file. */
-#undef HAVE_NETDNET_DNETDB_H
-
-/* define if you have a dnet_htoa declaration in <netdnet/dnetdb.h> */
-#undef HAVE_NETDNET_DNETDB_H_DNET_HTOA
-
 /* Define to 1 if you have the <netinet/ether.h> header file. */
 #undef HAVE_NETINET_ETHER_H
 
diff -r 1ce16d968b1a -r 59f6cabeb2ab external/bsd/tcpdump/dist/configure.ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/tcpdump/dist/configure.ac    Tue Oct 01 16:04:24 2019 +0000
@@ -0,0 +1,1003 @@
+dnl Copyright (c) 1994, 1995, 1996, 1997
+dnl    The Regents of the University of California.  All rights reserved.
+dnl
+dnl Process this file with autoconf to produce a configure script.
+dnl
+
+#
+# See
+#
+#      http://ftp.gnu.org/gnu/config/README
+#
+# for the URLs to use to fetch new versions of config.guess and
+# config.sub.
+#
+
+AC_PREREQ(2.61)
+AC_INIT(tcpdump.c)
+
+AC_CANONICAL_HOST
+
+AC_LBL_C_INIT_BEFORE_CC(V_INCLS)
+AC_PROG_CC
+AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+AC_LBL_C_INLINE
+AC_C___ATTRIBUTE__
+if test "$ac_cv___attribute__" = "yes"; then
+       AC_C___ATTRIBUTE___UNUSED
+       AC_C___ATTRIBUTE___NORETURN_FUNCTION_POINTER
+       AC_C___ATTRIBUTE___FORMAT
+       if test "$ac_cv___attribute___format" = "yes"; then
+               AC_C___ATTRIBUTE___FORMAT_FUNCTION_POINTER
+       fi
+fi
+
+AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h)
+AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>])
+if test "$ac_cv_header_net_pfvar_h" = yes; then
+       AC_CHECK_HEADERS(net/if_pflog.h, , , [#include <sys/types.h>
+       #include <sys/socket.h>
+       #include <net/if.h>
+       #include <net/pfvar.h>])
+       if test "$ac_cv_header_net_if_pflog_h" = yes; then
+               LOCALSRC="print-pflog.c $LOCALSRC"
+       fi
+fi
+AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
+#include <sys/socket.h>])
+if test "$ac_cv_header_netinet_if_ether_h" != yes; then
+       #
+       # The simple test didn't work.
+       # Do we need to include <net/if.h> first?
+       # Unset ac_cv_header_netinet_if_ether_h so we don't
+       # treat the previous failure as a cached value and
+       # suppress the next test.
+       #
+       AC_MSG_NOTICE([Rechecking with some additional includes])
+       unset ac_cv_header_netinet_if_ether_h
+       AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+struct mbuf;
+struct rtentry;
+#include <net/if.h>])
+fi
+
+AC_HEADER_TIME
+
+case "$host_os" in
+
+darwin*)
+       AC_ARG_ENABLE(universal,
+       AC_HELP_STRING([--disable-universal],[don't build universal on OS X]))
+       if test "$enable_universal" != "no"; then
+               case "$host_os" in
+
+               darwin9.*)
+                       #
+                       # Leopard.  Build for x86 and 32-bit PowerPC, with
+                       # x86 first.  (That's what Apple does.)
+                       #
+                       V_CCOPT="$V_CCOPT -arch i386 -arch ppc"
+                       LDFLAGS="$LDFLAGS -arch i386 -arch ppc"
+                       ;;
+
+               darwin10.*)
+                       #
+                       # Snow Leopard.  Build for x86-64 and x86, with
+                       # x86-64 first.  (That's what Apple does.)
+                       #
+                       V_CCOPT="$V_CCOPT -arch x86_64 -arch i386"
+                       LDFLAGS="$LDFLAGS -arch x86_64 -arch i386"
+                       ;;
+               esac
+       fi
+       ;;
+esac
+
+
+AC_ARG_WITH(smi,
+[  --with-smi              link with libsmi (allows to load MIBs on the fly to decode SNMP packets. [default=yes]
+  --without-smi           don't link with libsmi],,
+   with_smi=yes)
+
+if test "x$with_smi" != "xno" ; then
+       AC_CHECK_HEADER(smi.h,
+       [
+               #
+               # OK, we found smi.h.  Do we have libsmi with smiInit?
+               #
+               AC_CHECK_LIB(smi, smiInit,
+               [
+                       #
+                       # OK, we have libsmi with smiInit.  Can we use it?
+                       #
+                       AC_MSG_CHECKING([whether to enable libsmi])
+                       savedlibs="$LIBS"
+                       LIBS="-lsmi $LIBS"
+                       AC_TRY_RUN(
+                               [
+/* libsmi available check */
+#include <smi.h>
+main()
+{
+  int current, revision, age, n;
+  const int required = 2;
+  if (smiInit(""))
+    exit(1);
+  if (strcmp(SMI_LIBRARY_VERSION, smi_library_version))
+    exit(2);
+  n = sscanf(smi_library_version, "%d:%d:%d", &current, &revision, &age);
+  if (n != 3)
+    exit(3);



Home | Main Index | Thread Index | Old Index