diff options
author | Gerald Combs <gerald@wireshark.org> | 2018-02-08 17:20:26 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2018-03-06 18:02:21 +0000 |
commit | a1da75c554881667dd92e11f098630f2d604872b (patch) | |
tree | b1d6a60a663bf93f1eede809a0c383544508d6e2 /debian | |
parent | b2d3680558d19998c55b48e9807a26e145756eba (diff) |
Transition from GeoIP Legacy to MaxMindDB.
MaxMind is discontinuing its legacy databases in April in favor of
GeoIP2, which use a newer database format (MaxMind DB). The reference C
library (libmaxminddb) is available under the Apache 2.0 license which
isn't quite compatible with ours.
Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin
and prints resolved information on stdout. Place it under a liberal
license (MIT) so that we can keep libmaxminddb at arm's length. Add
epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it
via stdio.
Migrate the preferences and documentation to MaxMindDB.
Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the
geographic coordinate fields to FT_DOUBLEs.
Bug: 10658
Change-Id: I24aeed637bea1b41d173270bda413af230f4425f
Reviewed-on: https://code.wireshark.org/review/26214
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | debian/libwireshark-data.install | 2 | ||||
-rw-r--r-- | debian/libwireshark0.symbols | 9 | ||||
-rw-r--r-- | debian/maxmind_db_paths (renamed from debian/geoip_db_paths) | 0 |
4 files changed, 6 insertions, 9 deletions
diff --git a/debian/control b/debian/control index 2f1c62fd29..e1b1511cdd 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: libgtk-3-dev, lsb-release, # enable backports-compatible libgnutls-dev libgnutls-dev, libgcrypt-dev, portaudio19-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev, - libgeoip-dev, dpkg-dev (>= 1.16.1~), + libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor, cmake (>= 2.8.12), libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev, liblz4-dev, libsnappy-dev, libspandsp-dev, libxml2-dev @@ -198,7 +198,7 @@ Multi-Arch: foreign Depends: ${misc:Depends} Conflicts: wireshark-common (<< 1.4.0~rc2-1) Replaces: wireshark-common (<< 1.4.0~rc2-1) -Recommends: geoip-database, geoip-database-extra +#Recommends: geoip-database-contrib # Only includes legacy? Suggests: snmp-mibs-downloader Description: network packet dissection library -- data files The libwireshark library provides the network packet dissection services diff --git a/debian/libwireshark-data.install b/debian/libwireshark-data.install index 568526fc2e..b717c62e2a 100644 --- a/debian/libwireshark-data.install +++ b/debian/libwireshark-data.install @@ -1,3 +1,3 @@ usr/share/wireshark/* etc/wireshark/init.lua -debian/geoip_db_paths /usr/share/wireshark +debian/maxmind_db_paths /usr/share/wireshark diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index a1bdc2116f..ea313849ce 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -699,12 +699,6 @@ libwireshark.so.0 libwireshark0 #MINVER# gcamel_StatSRT@Base 1.9.1 gcp_cmd_type@Base 1.9.1 gcp_term_types@Base 1.9.1 - geoip_db_get_paths@Base 1.9.1 - geoip_db_lookup_ipv4@Base 1.9.1 - geoip_db_lookup_ipv6@Base 1.9.1 - geoip_db_name@Base 1.9.1 - geoip_db_num_dbs@Base 1.9.1 - geoip_db_type@Base 1.9.1 get_8859_1_string@Base 1.12.0~rc1 get_CDR_any@Base 1.9.1 get_CDR_boolean@Base 1.9.1 @@ -902,6 +896,9 @@ libwireshark.so.0 libwireshark0 #MINVER# make_printable_string@Base 1.9.1 manually_resolve_cleanup@Base 1.12.0~rc1 mark_frame_as_depended_upon@Base 1.9.1 + maxmind_db_get_paths@Base 2.5.0 + maxmind_db_lookup_ipv4@Base 2.5.0 + maxmind_db_lookup_ipv6@Base 2.5.0 mbim_register_uuid_ext@Base 1.12.0~rc1 memory_usage_component_register@Base 1.12.0~rc1 memory_usage_gc@Base 1.12.0~rc1 diff --git a/debian/geoip_db_paths b/debian/maxmind_db_paths index 0ca498c9b8..0ca498c9b8 100644 --- a/debian/geoip_db_paths +++ b/debian/maxmind_db_paths |