From f529ab5d0a27173ed68aa017a638b36b3dcf585f Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 2 Mar 2018 11:24:31 -0800
Subject: 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>
---
 packaging/macosx/Scripts/wireshark-postinstall.sh | 7 -------
 packaging/nsis/uninstall.nsi                      | 1 -
 packaging/nsis/wireshark.nsi                      | 1 -
 packaging/wix/ComponentGroups.wxi                 | 3 ---
 4 files changed, 12 deletions(-)

(limited to 'packaging')

diff --git a/packaging/macosx/Scripts/wireshark-postinstall.sh b/packaging/macosx/Scripts/wireshark-postinstall.sh
index 3ab2576de8..e570fc8f57 100755
--- a/packaging/macosx/Scripts/wireshark-postinstall.sh
+++ b/packaging/macosx/Scripts/wireshark-postinstall.sh
@@ -19,13 +19,6 @@ do
 	rm -f "$PLUGINS_PATH"/$plugin.so "$PLUGINS_PATH"/$plugin.la
 done
 
-#
-# Get rid of any ipmap.html file that was dropped into Contents/MacOS;
-# it belongs in, and is installed in, Contents/Resources/share/wireshark,
-# and we don't need the extra copy.
-#
-rm -f "$2/Wireshark.app/Contents/MacOS/ipmap.html"
-
 # Setting PATH
 # if /etc/paths.d/Wireshark already exists we overwrite it.
 #
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index 1a8565c846..f552ffed74 100644
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -228,7 +228,6 @@ Delete "$INSTDIR\pdml2html.xsl"
 Delete "$INSTDIR\pcrepattern.3.txt"
 Delete "$INSTDIR\user-guide.chm"
 Delete "$INSTDIR\example_snmp_users_file"
-Delete "$INSTDIR\ipmap.html"
 Delete "$INSTDIR\radius\*.*"
 Delete "$INSTDIR\dtds\*.*"
 Delete "$SMPROGRAMS\${PROGRAM_NAME}\*.*"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 184a4755a3..91f4d68b7b 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -451,7 +451,6 @@ File "${STAGING_DIR}\wireshark-filter.html"
 File "${STAGING_DIR}\dumpcap.exe"
 File "${STAGING_DIR}\dumpcap.html"
 File "${STAGING_DIR}\extcap.html"
-File "${STAGING_DIR}\ipmap.html"
 
 ; C-runtime redistributable
 !ifdef VCREDIST_EXE
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 9415ea3cbd..d2d5a0fbf8 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -75,9 +75,6 @@
         <Component Id="cmpExtcap_html" Guid="*">
           <File Id="filExtcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\extcap.html" />
         </Component>
-        <Component Id="cmpIpmap_html" Guid="*">
-          <File Id="filIpmap_html" KeyPath="yes" Source="$(var.Staging.Dir)\ipmap.html" />
-        </Component>
       </DirectoryRef>
     </Fragment>
     <Fragment>
-- 
cgit v1.2.3