1.4.x has its own branch; the trunk is for 1.5.x.
Add USBPcap.
Rename pcap_create() to pcap_create_interface().

pcap_create() is now a libpcap API, so rename the internal function not
to collide with it.

Also, initialize a variable, and fix a comment to make it clear it's not
pcap_close() that's called directly.
Rename pcap_findalldevs() to pcap_findalldevs_interfaces().

pcap_findalldevs() is now a libpcap API, and expects the main "find all
interfaces" call for the platform to be named
pcap_findalldevs_interfaces(); make it so.

Also, note that the first PacketGetAdapterNames() is trying to find out
how big the packet buffer should be, and should always return FALSE.
Initialize the NameLength variable, because PacketGetAdapterNames() may
refer to it before it's set (harmlessly, but might as well be clean
here, at least until it's fixed to check the pointer argument first).
"Has PF_PACKET and SO_ATTACH_FILTER" does not imply "is Linux".

Solaris 11, for example, appears to support PF_PACKET sockets and socket
filters, presumably for for Linux compatibility, but it's not Linux and
doesn't have /usr/include/linux by default.
More "don't assume it's Linux if it has PF_PACKET and SO_ATTACH_FILTER".
Don't try to handle AF_PACKET on Solaris.
Note that we fixed Solaris 11 build problems.
Add a test program for the open, close, and filter compile/set code paths.

This is to test for both libpcap bugs *and* Valgrind bugs; Valgrind on
OS X (and probably other systems using BPF) and Linux reports bogus
errors when setting a filter (because it blindly checks that the
*entire* bpf_program structure for BIOCSETF and the *entire* sock_fprog
structure for setsockopt(SOL_SOCKET, SO_ATTACH_FILTER) has been
initialized, rather than checking only the structure members and not the
padding, and *doesn't* check whether the program *pointed to* by that
structure has been initialized).  See

	https://bugs.kde.org/show_bug.cgi?id=312989

(I'll be filing a similar bug, with a similar patch to fix it, for
Valgrind-on-Linux).
Use raw ioctls or setsockopts to set the bad filters.

That guarantees that libpcap doesn't test the filter and decide the
kernel can't handle it, or attempt to fix it to work as a kernel filter,
and also avoids warnings from libpcap looking at the filter rather than
the system call looking at the filter.
Make the PCAP_DONT_INCLUDE_PCAP_BPF_H stuff BPF-only.

We don't need it on Linux and, in fact, it doesn't work on Linux, as
Linux doesn't define "struct bpf_program", libpcap does.
Fix tpo.
Oops, forgot to define USE_SOCKET_FILTERS on Linux.
Added DLTs for Fibre Channel ARPHRDs. Added dummy set_datalink for pcap-linux to allow setting DLT.
pcap-dbus code from Jakub Zawadzki
Merge pull request #29 from blueCommand/master

Added DLT choices for Fibre Channel interfaces
Merge remote-tracking branch 'github/master'
Pick up some fixes from a comment for the SourceForge bug for D-Bus support.

Fix the help message for --enable-dbus to say --enable-dbus, not
--enable-can, and call pcap_cleanup_live_common() rather than the
nonexistent pcap_live_cleanup_common().

Also, say "D-Bus capture" in the help message, to spell it correctly and
to clarify that we're only adding support for capturing on D-Bus (not
adding support for libpcap using D-Bus for some purpose or another).
Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/libpcap
Fix D-Bus checks.

Check whether dbus-1 is installed before trying to get flags for it.
That way, if you don't have dbus-1 installed, you don't get pkg-config
errors printed.

Don't expect the shell to be able to run a command inside $() and have
the result expand to the standard output of that command; that's not a
feature present in all Bourne-compatible shells.  Use backquotes
instead.

If the user specified --enable-dbus, and dbus-1 wasn't found, fail -
they asked for D-Bus sniffing support, but we can't give it to them, so
let them know that they can't have what they want.  They either need to
install the package or stop specifying --enable-dbus.