diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-02 11:24:31 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-02 21:59:21 +0000 |
| commit | f529ab5d0a27173ed68aa017a638b36b3dcf585f (patch) | |
| tree | 7b580a462fa2e4f30f883b9c0654afc2ac99955b /debian/patches | |
| parent | 84c7246e4c086f7bcfd7646a1d9f0c08c13dd41b (diff) | |
Remove the endpoint "Map" feature.
Remove the endpoint map and its button from the Qt and GTK+ UIs. It
depends on GeoIP Legacy for coordinate information and those databases
are being deprecated in favor of MaxMind DB. We *could* upgrade the code
to use mmdbresolve, but according to
https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to
remove coordinate information from GeoLite2:
"In addition, in 2019, latitude and longitude coordinates in the
GeoLite2 databases will be removed.* Latitude and longitude coordinates
will continue to be provided in GeoIP2 databases. Please check back for
updates."
Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e
Reviewed-on: https://code.wireshark.org/review/26229
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/02_use_packaged_openlayers_js.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/debian/patches/02_use_packaged_openlayers_js.patch b/debian/patches/02_use_packaged_openlayers_js.patch deleted file mode 100644 index 593efa9a9d..0000000000 --- a/debian/patches/02_use_packaged_openlayers_js.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Use system's OpenLayers.js to avoid privacy breach -Forwarded: not-needed -Author: Balint Reczey <balint@balintreczey.hu> - -diff --git a/ipmap.html b/ipmap.html -index c1e83d0..94f4535 100644 ---- a/ipmap.html -+++ b/ipmap.html -@@ -8,7 +8,7 @@ - line-height: 17px; - } - </style> -- <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script> -+ <script type="text/javascript" src="file:///usr/share/javascript/openlayers/OpenLayers.js"></script> - <script type="text/javascript" src="http://openstreetmap.org/openlayers/OpenStreetMap.js"></script> - - <script type="text/javascript"> diff --git a/debian/patches/series b/debian/patches/series index 1c2ddbf31c..b89567a9c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -02_use_packaged_openlayers_js.patch 04_asn2wrs_ply.patch 05_note-README-when-running-as-root.patch 06_release-version.patch |