Module Name: src Committed By: christos Date: Mon Sep 3 15:26:44 UTC 2018
Modified Files: src/external/bsd/libpcap/dist: bpf_dump.c bpf_filter.c bpf_image.c config.guess config.sub dlpisubs.c etherent.c fad-getad.c fad-gifc.c fad-glifc.c gencode.c gencode.h grammar.y nametoaddr.c optimize.c pcap-bpf.c pcap-bt-linux.c pcap-bt-linux.h pcap-bt-monitor-linux.c pcap-bt-monitor-linux.h pcap-common.c pcap-common.h pcap-config.in pcap-dag.c pcap-dag.h pcap-dbus.c pcap-dbus.h pcap-dlpi.c pcap-dos.c pcap-enet.c pcap-int.h pcap-libdlpi.c pcap-linux.c pcap-netfilter-linux.c pcap-netfilter-linux.h pcap-nit.c pcap-null.c pcap-pf.c pcap-septel.c pcap-septel.h pcap-sita.c pcap-snf.c pcap-snf.h pcap-snit.c pcap-snoop.c pcap-usb-linux.c pcap-usb-linux.h pcap.3pcap.in pcap.c pcap_activate.3pcap pcap_breakloop.3pcap pcap_can_set_rfmon.3pcap pcap_datalink_name_to_val.3pcap pcap_datalink_val_to_name.3pcap pcap_dump_ftell.3pcap pcap_dump_open.3pcap.in pcap_fileno.3pcap pcap_findalldevs.3pcap pcap_get_selectable_fd.3pcap pcap_geterr.3pcap pcap_is_swapped.3pcap pcap_lookupdev.3pcap pcap_loop.3pcap pcap_major_version.3pcap pcap_next_ex.3pcap pcap_open_live.3pcap pcap_open_offline.3pcap.in pcap_set_timeout.3pcap savefile.c scanner.l sf-pcap.c src/external/bsd/libpcap/dist/pcap: bluetooth.h bpf.h namedb.h nflog.h pcap.h sll.h usb.h vlan.h src/external/bsd/libpcap/include: config.h src/external/bsd/libpcap/lib: Makefile shlib_version Removed Files: src/external/bsd/libpcap/dist: GenVersion.bat INSTALL.txt README README.Win32 README.aix README.dag README.hpux README.linux README.macosx README.septel README.sita README.tru64 fad-helpers.c gen_version_c.sh gen_version_header.sh inet.c pcap-stdinc.h pcap-win32.c pcap_version.h.in remote-ext.h sf-pcap-ng.c sf-pcap-ng.h src/external/bsd/libpcap/dist/SUNOS4: nit_if.o.sparc nit_if.o.sun3 nit_if.o.sun4c.4.0.3c src/external/bsd/libpcap/dist/Win32/Include: Gnuc.h src/external/bsd/libpcap/dist/Win32/Include/net: if.h src/external/bsd/libpcap/dist/bpf/net: bpf_filter.c src/external/bsd/libpcap/dist/cmake: preconfigure.cmake src/external/bsd/libpcap/dist/config: have_siocglifconf.c src/external/bsd/libpcap/dist/msdos: common.dj ndis2.c ndis2.h ndis_0.asm src/external/bsd/libpcap/dist/pcap: export-defs.h src/external/bsd/libpcap/dist/tests: CMakeLists.txt can_set_rfmon_test.c capturetest.c filtertest.c findalldevstest.c opentest.c reactivatetest.c selpolltest.c valgrindtest.c src/external/bsd/libpcap/lib: pcap_version.c pcap_version.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libpcap/dist/GenVersion.bat \ src/external/bsd/libpcap/dist/README.macosx \ src/external/bsd/libpcap/dist/fad-helpers.c \ src/external/bsd/libpcap/dist/gen_version_c.sh \ src/external/bsd/libpcap/dist/gen_version_header.sh \ src/external/bsd/libpcap/dist/pcap_version.h.in \ src/external/bsd/libpcap/dist/remote-ext.h cvs rdiff -u -r1.1.1.6 -r0 src/external/bsd/libpcap/dist/INSTALL.txt \ src/external/bsd/libpcap/dist/README cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libpcap/dist/README.Win32 \ src/external/bsd/libpcap/dist/README.dag \ src/external/bsd/libpcap/dist/README.hpux \ src/external/bsd/libpcap/dist/README.septel \ src/external/bsd/libpcap/dist/README.sita \ src/external/bsd/libpcap/dist/README.tru64 cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/libpcap/dist/README.aix cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/libpcap/dist/README.linux cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/bpf_dump.c \ src/external/bsd/libpcap/dist/bpf_image.c \ src/external/bsd/libpcap/dist/dlpisubs.c \ src/external/bsd/libpcap/dist/etherent.c \ src/external/bsd/libpcap/dist/fad-getad.c \ src/external/bsd/libpcap/dist/fad-glifc.c \ src/external/bsd/libpcap/dist/nametoaddr.c \ src/external/bsd/libpcap/dist/pcap-bt-linux.h \ src/external/bsd/libpcap/dist/pcap-config.in \ src/external/bsd/libpcap/dist/pcap-dag.h \ src/external/bsd/libpcap/dist/pcap-libdlpi.c \ src/external/bsd/libpcap/dist/pcap-netfilter-linux.h \ src/external/bsd/libpcap/dist/pcap-null.c \ src/external/bsd/libpcap/dist/pcap-usb-linux.h \ src/external/bsd/libpcap/dist/pcap_activate.3pcap \ src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap \ src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap \ src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap \ src/external/bsd/libpcap/dist/pcap_fileno.3pcap \ src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap \ src/external/bsd/libpcap/dist/pcap_geterr.3pcap \ src/external/bsd/libpcap/dist/pcap_is_swapped.3pcap \ src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap \ src/external/bsd/libpcap/dist/pcap_major_version.3pcap \ src/external/bsd/libpcap/dist/pcap_next_ex.3pcap \ src/external/bsd/libpcap/dist/pcap_open_live.3pcap \ src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/libpcap/dist/bpf_filter.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/config.guess \ src/external/bsd/libpcap/dist/config.sub \ src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h \ src/external/bsd/libpcap/dist/pcap-common.h \ src/external/bsd/libpcap/dist/pcap-dbus.h \ src/external/bsd/libpcap/dist/pcap-enet.c \ src/external/bsd/libpcap/dist/pcap-septel.h \ src/external/bsd/libpcap/dist/pcap-snf.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/fad-gifc.c \ src/external/bsd/libpcap/dist/pcap-bt-linux.c \ src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c \ src/external/bsd/libpcap/dist/pcap-dag.c \ src/external/bsd/libpcap/dist/pcap-dbus.c \ src/external/bsd/libpcap/dist/pcap-dlpi.c \ src/external/bsd/libpcap/dist/pcap-dos.c \ src/external/bsd/libpcap/dist/pcap-int.h \ src/external/bsd/libpcap/dist/pcap-linux.c \ src/external/bsd/libpcap/dist/pcap-netfilter-linux.c \ src/external/bsd/libpcap/dist/pcap-nit.c \ src/external/bsd/libpcap/dist/pcap-pf.c \ src/external/bsd/libpcap/dist/pcap-septel.c \ src/external/bsd/libpcap/dist/pcap-sita.c \ src/external/bsd/libpcap/dist/pcap-snf.c \ src/external/bsd/libpcap/dist/pcap-snit.c \ src/external/bsd/libpcap/dist/pcap-snoop.c \ src/external/bsd/libpcap/dist/pcap-usb-linux.c \ src/external/bsd/libpcap/dist/pcap_breakloop.3pcap \ src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap \ src/external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap \ src/external/bsd/libpcap/dist/pcap_loop.3pcap \ src/external/bsd/libpcap/dist/savefile.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/libpcap/dist/gencode.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/gencode.h \ src/external/bsd/libpcap/dist/pcap-common.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/dist/grammar.y \ src/external/bsd/libpcap/dist/pcap-bpf.c \ src/external/bsd/libpcap/dist/pcap.3pcap.in \ src/external/bsd/libpcap/dist/pcap.c \ src/external/bsd/libpcap/dist/sf-pcap.c cvs rdiff -u -r1.4 -r0 src/external/bsd/libpcap/dist/inet.c \ src/external/bsd/libpcap/dist/pcap-win32.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libpcap/dist/optimize.c \ src/external/bsd/libpcap/dist/scanner.l cvs rdiff -u -r1.3 -r0 src/external/bsd/libpcap/dist/pcap-stdinc.h cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in \ src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in cvs rdiff -u -r1.7 -r0 src/external/bsd/libpcap/dist/sf-pcap-ng.c cvs rdiff -u -r1.2 -r0 src/external/bsd/libpcap/dist/sf-pcap-ng.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libpcap/dist/SUNOS4/nit_if.o.sparc \ src/external/bsd/libpcap/dist/SUNOS4/nit_if.o.sun3 cvs rdiff -u -r1.1.1.4 -r0 \ src/external/bsd/libpcap/dist/SUNOS4/nit_if.o.sun4c.4.0.3c cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/libpcap/dist/Win32/Include/Gnuc.h cvs rdiff -u -r1.1.1.4 -r0 \ src/external/bsd/libpcap/dist/Win32/Include/net/if.h cvs rdiff -u -r1.7 -r0 src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libpcap/dist/cmake/preconfigure.cmake cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/libpcap/dist/config/have_siocglifconf.c cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/libpcap/dist/msdos/common.dj cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/libpcap/dist/msdos/ndis2.c \ src/external/bsd/libpcap/dist/msdos/ndis2.h cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libpcap/dist/msdos/ndis_0.asm cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/pcap/bluetooth.h \ src/external/bsd/libpcap/dist/pcap/usb.h cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libpcap/dist/pcap/bpf.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libpcap/dist/pcap/export-defs.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/pcap/namedb.h \ src/external/bsd/libpcap/dist/pcap/nflog.h \ src/external/bsd/libpcap/dist/pcap/sll.h cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/dist/pcap/pcap.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/pcap/vlan.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libpcap/dist/tests/CMakeLists.txt \ src/external/bsd/libpcap/dist/tests/can_set_rfmon_test.c cvs rdiff -u -r1.3 -r0 src/external/bsd/libpcap/dist/tests/capturetest.c \ src/external/bsd/libpcap/dist/tests/opentest.c \ src/external/bsd/libpcap/dist/tests/reactivatetest.c \ src/external/bsd/libpcap/dist/tests/selpolltest.c cvs rdiff -u -r1.4 -r0 src/external/bsd/libpcap/dist/tests/filtertest.c \ src/external/bsd/libpcap/dist/tests/findalldevstest.c \ src/external/bsd/libpcap/dist/tests/valgrindtest.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libpcap/include/config.h cvs rdiff -u -r1.16 -r1.17 src/external/bsd/libpcap/lib/Makefile cvs rdiff -u -r1.1 -r0 src/external/bsd/libpcap/lib/pcap_version.c \ src/external/bsd/libpcap/lib/pcap_version.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.