]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
MFC r313695, r313760, r314769, r314863, r314865, r316125
authordelphij <delphij@FreeBSD.org>
Wed, 31 May 2017 05:20:59 +0000 (05:20 +0000)
committerdelphij <delphij@FreeBSD.org>
Wed, 31 May 2017 05:20:59 +0000 (05:20 +0000)
commit4b7bf2a87440f1bc207c6b856bbe3f0ff00a539c
tree697c4c465034ee4bd79277857f775508ce3567b3
parentbfde52da67b17e680ca5da34f553788ce1cbf7ef
MFC r313695, r313760, r314769, r314863, r314865, r316125

r313695:
MFV r313676: libpcap 1.8.1

r313760:
MFV r313759: license change for a few headers (4 clause BSD to 3 clause BSD).

X-MFC-with: r313695

r314769:
Remove compatibility with old libpcap.

Differential Revision: https://reviews.freebsd.org/D9606

r314863:
Stop installing pcap-int.h, which is the internal interface for libpcap.

Reference: https://github.com/the-tcpdump-group/libpcap/issues/560
PR: 217221

r314865:
Bump __FreeBSD_version for removal of pcap-int.h.

PR: 217221

r316125:
MFV r316124: Fix build when WITHOUT_INET6.

Reported by: Randy Westlund <rwestlun gmail com>
184 files changed:
ObsoleteFiles.inc
contrib/libpcap/CHANGES
contrib/libpcap/CREDITS
contrib/libpcap/INSTALL.txt
contrib/libpcap/LICENSE
contrib/libpcap/Makefile-devel-adds
contrib/libpcap/Makefile.in
contrib/libpcap/README
contrib/libpcap/TODO
contrib/libpcap/VERSION
contrib/libpcap/bpf/net/bpf_filter.c
contrib/libpcap/bpf_dump.c
contrib/libpcap/bpf_image.c
contrib/libpcap/config.guess
contrib/libpcap/config.h.in
contrib/libpcap/config.sub
contrib/libpcap/config/have_siocglifconf.c [new file with mode: 0644]
contrib/libpcap/configure
contrib/libpcap/configure.ac [moved from contrib/libpcap/configure.in with 69% similarity]
contrib/libpcap/dlpisubs.c
contrib/libpcap/etherent.c
contrib/libpcap/ethertype.h
contrib/libpcap/extract.h [new file with mode: 0644]
contrib/libpcap/fad-getad.c
contrib/libpcap/fad-gifc.c
contrib/libpcap/fad-glifc.c
contrib/libpcap/fad-helpers.c [new file with mode: 0644]
contrib/libpcap/fad-sita.c [deleted file]
contrib/libpcap/gen_version_c.sh [new file with mode: 0755]
contrib/libpcap/gen_version_header.sh [new file with mode: 0755]
contrib/libpcap/gencode.c
contrib/libpcap/gencode.h
contrib/libpcap/grammar.y
contrib/libpcap/inet.c
contrib/libpcap/install-sh
contrib/libpcap/lbl/os-aix7.h [new file with mode: 0644]
contrib/libpcap/lbl/os-osf4.h
contrib/libpcap/lbl/os-osf5.h
contrib/libpcap/lbl/os-solaris2.h
contrib/libpcap/lbl/os-sunos4.h
contrib/libpcap/lbl/os-ultrix4.h
contrib/libpcap/missing/getopt.c [new file with mode: 0644]
contrib/libpcap/missing/getopt.h [new file with mode: 0644]
contrib/libpcap/missing/snprintf.c
contrib/libpcap/missing/strtok_r.c [new file with mode: 0644]
contrib/libpcap/missing/win_snprintf.c [new file with mode: 0644]
contrib/libpcap/mkdep
contrib/libpcap/nametoaddr.c
contrib/libpcap/nametoaddr.h [new file with mode: 0644]
contrib/libpcap/optimize.c
contrib/libpcap/pcap-bpf.c
contrib/libpcap/pcap-bpf.h
contrib/libpcap/pcap-bt-linux.c
contrib/libpcap/pcap-bt-linux.h
contrib/libpcap/pcap-bt-monitor-linux.c
contrib/libpcap/pcap-can-linux.c [deleted file]
contrib/libpcap/pcap-can-linux.h [deleted file]
contrib/libpcap/pcap-canusb-linux.c [deleted file]
contrib/libpcap/pcap-common.c
contrib/libpcap/pcap-config.1
contrib/libpcap/pcap-dag.c
contrib/libpcap/pcap-dag.h
contrib/libpcap/pcap-dbus.c
contrib/libpcap/pcap-dlpi.c
contrib/libpcap/pcap-dos.c
contrib/libpcap/pcap-dos.h
contrib/libpcap/pcap-filter.manmisc.in
contrib/libpcap/pcap-int.h
contrib/libpcap/pcap-libdlpi.c
contrib/libpcap/pcap-linktype.manmisc.in
contrib/libpcap/pcap-linux.c
contrib/libpcap/pcap-netfilter-linux.c
contrib/libpcap/pcap-netfilter-linux.h
contrib/libpcap/pcap-new.c [new file with mode: 0644]
contrib/libpcap/pcap-nit.c
contrib/libpcap/pcap-null.c
contrib/libpcap/pcap-pf.c
contrib/libpcap/pcap-rpcap.c [new file with mode: 0644]
contrib/libpcap/pcap-rpcap.h [new file with mode: 0644]
contrib/libpcap/pcap-savefile.manfile.in
contrib/libpcap/pcap-septel.c
contrib/libpcap/pcap-sita.c
contrib/libpcap/pcap-snf.c
contrib/libpcap/pcap-snit.c
contrib/libpcap/pcap-snoop.c
contrib/libpcap/pcap-stdinc.h
contrib/libpcap/pcap-tc.c [new file with mode: 0644]
contrib/libpcap/pcap-tc.h [moved from contrib/libpcap/pcap-canusb-linux.h with 68% similarity]
contrib/libpcap/pcap-tstamp.manmisc.in
contrib/libpcap/pcap-usb-linux.c
contrib/libpcap/pcap-usb-linux.h
contrib/libpcap/pcap-win32.c
contrib/libpcap/pcap.3pcap.in
contrib/libpcap/pcap.c
contrib/libpcap/pcap/bluetooth.h
contrib/libpcap/pcap/bpf.h
contrib/libpcap/pcap/can_socketcan.h [new file with mode: 0644]
contrib/libpcap/pcap/dlt.h [new file with mode: 0644]
contrib/libpcap/pcap/export-defs.h [new file with mode: 0644]
contrib/libpcap/pcap/namedb.h
contrib/libpcap/pcap/nflog.h
contrib/libpcap/pcap/pcap.h
contrib/libpcap/pcap/sll.h
contrib/libpcap/pcap/usb.h
contrib/libpcap/pcap_activate.3pcap
contrib/libpcap/pcap_breakloop.3pcap
contrib/libpcap/pcap_can_set_rfmon.3pcap
contrib/libpcap/pcap_close.3pcap
contrib/libpcap/pcap_compile.3pcap.in
contrib/libpcap/pcap_create.3pcap
contrib/libpcap/pcap_datalink.3pcap.in
contrib/libpcap/pcap_datalink_name_to_val.3pcap
contrib/libpcap/pcap_datalink_val_to_name.3pcap
contrib/libpcap/pcap_dump.3pcap
contrib/libpcap/pcap_dump_close.3pcap
contrib/libpcap/pcap_dump_file.3pcap
contrib/libpcap/pcap_dump_flush.3pcap
contrib/libpcap/pcap_dump_ftell.3pcap
contrib/libpcap/pcap_dump_open.3pcap.in
contrib/libpcap/pcap_file.3pcap
contrib/libpcap/pcap_fileno.3pcap
contrib/libpcap/pcap_findalldevs.3pcap
contrib/libpcap/pcap_freecode.3pcap
contrib/libpcap/pcap_get_selectable_fd.3pcap
contrib/libpcap/pcap_get_tstamp_precision.3pcap.in
contrib/libpcap/pcap_geterr.3pcap
contrib/libpcap/pcap_inject.3pcap
contrib/libpcap/pcap_is_swapped.3pcap
contrib/libpcap/pcap_lib_version.3pcap
contrib/libpcap/pcap_list_datalinks.3pcap.in
contrib/libpcap/pcap_list_tstamp_types.3pcap.in
contrib/libpcap/pcap_lookupdev.3pcap
contrib/libpcap/pcap_lookupnet.3pcap
contrib/libpcap/pcap_loop.3pcap
contrib/libpcap/pcap_major_version.3pcap
contrib/libpcap/pcap_next_ex.3pcap
contrib/libpcap/pcap_offline_filter.3pcap
contrib/libpcap/pcap_open_dead.3pcap.in
contrib/libpcap/pcap_open_live.3pcap
contrib/libpcap/pcap_open_offline.3pcap.in
contrib/libpcap/pcap_set_buffer_size.3pcap
contrib/libpcap/pcap_set_datalink.3pcap
contrib/libpcap/pcap_set_immediate_mode.3pcap
contrib/libpcap/pcap_set_promisc.3pcap
contrib/libpcap/pcap_set_rfmon.3pcap
contrib/libpcap/pcap_set_snaplen.3pcap
contrib/libpcap/pcap_set_timeout.3pcap
contrib/libpcap/pcap_set_tstamp_precision.3pcap.in
contrib/libpcap/pcap_set_tstamp_type.3pcap.in
contrib/libpcap/pcap_setdirection.3pcap
contrib/libpcap/pcap_setfilter.3pcap
contrib/libpcap/pcap_setnonblock.3pcap
contrib/libpcap/pcap_snapshot.3pcap
contrib/libpcap/pcap_stats.3pcap
contrib/libpcap/pcap_statustostr.3pcap
contrib/libpcap/pcap_strerror.3pcap
contrib/libpcap/pcap_tstamp_type_name_to_val.3pcap
contrib/libpcap/pcap_tstamp_type_val_to_name.3pcap
contrib/libpcap/pcap_version.h.in [new file with mode: 0644]
contrib/libpcap/portability.h [new file with mode: 0644]
contrib/libpcap/remote-ext.h [new file with mode: 0644]
contrib/libpcap/runlex.sh [deleted file]
contrib/libpcap/savefile.c
contrib/libpcap/scanner.l
contrib/libpcap/sf-pcap-ng.c
contrib/libpcap/sf-pcap.c
contrib/libpcap/sockutils.c [new file with mode: 0644]
contrib/libpcap/sockutils.h [new file with mode: 0644]
contrib/libpcap/tests/can_set_rfmon_test.c [new file with mode: 0644]
contrib/libpcap/tests/capturetest.c
contrib/libpcap/tests/filtertest.c
contrib/libpcap/tests/findalldevstest.c
contrib/libpcap/tests/opentest.c
contrib/libpcap/tests/reactivatetest.c
contrib/libpcap/tests/selpolltest.c
contrib/libpcap/tests/valgrindtest.c
lib/libpcap/Makefile
lib/libpcap/config.h
lib/libpcap/pcap-netmap.c
sbin/pflogd/Makefile
sys/net/bpf.h
sys/net/dlt.h [new file with mode: 0644]
sys/sys/param.h
usr.sbin/ipfwpcap/Makefile