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 /packaging | |
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 'packaging')
-rwxr-xr-x | packaging/macosx/Scripts/cli-postinstall.sh | 1 | ||||
-rw-r--r-- | packaging/nsis/CMakeLists.txt | 7 | ||||
-rw-r--r-- | packaging/nsis/uninstall.nsi | 18 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 8 | ||||
-rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 4 | ||||
-rw-r--r-- | packaging/wix/CMakeLists.txt | 13 | ||||
-rw-r--r-- | packaging/wix/ComponentGroups.wxi | 18 | ||||
-rw-r--r-- | packaging/wix/Features.wxi | 3 |
8 files changed, 55 insertions, 17 deletions
diff --git a/packaging/macosx/Scripts/cli-postinstall.sh b/packaging/macosx/Scripts/cli-postinstall.sh index f83cf4faac..4c74a42847 100755 --- a/packaging/macosx/Scripts/cli-postinstall.sh +++ b/packaging/macosx/Scripts/cli-postinstall.sh @@ -7,6 +7,7 @@ BINARIES=" dumpcap editcap mergecap + mmdbresolve randpkt rawshark text2pcap diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 6237f5b382..ce6024ad7b 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -139,10 +139,13 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.nsh" "${_config_nsh_contents}") # all-manifest.nsh. Can be created at configure time. set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh") set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n") -foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} +foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} + ${ZLIB_DLL} + # Needed for mmdbresolve + ${MAXMINDDB_DLL} ) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") endforeach() diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index f552ffed74..74d2e28eae 100644 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -125,22 +125,22 @@ SetShellVarContext all !insertmacro IsWiresharkRunning Push "${EXECUTABLE_MARKER}" +Push "${PROGRAM_NAME}" Push "androiddump" +Push "capinfos" Push "ciscodump" -Push "sshdump" -Push "udpdump" +Push "dftest" Push "dumpcap" -Push "${PROGRAM_NAME}" -Push "tshark" -Push "qtshark" Push "editcap" -Push "text2pcap" Push "mergecap" +Push "mmdbresolve" Push "randpktdump" -Push "reordercap" -Push "capinfos" Push "rawshark" -Push "dftest" +Push "reordercap" +Push "sshdump" +Push "text2pcap" +Push "tshark" +Push "udpdump" Pop $EXECUTABLE ${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER} diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 21c67e31a5..404c6a326d 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1117,6 +1117,14 @@ File "${STAGING_DIR}\rawshark.exe" File "${STAGING_DIR}\rawshark.html" SectionEnd +Section /o "MMDBResolve" SecMMDBResolve +;------------------------------------------- +SetOutPath $INSTDIR +File "${STAGING_DIR}\mmdbresolve.html" +SetOutPath $INSTDIR +File "${STAGING_DIR}\mmdbresolve.exe" +SectionEnd + Section /o "Androiddump" SecAndroiddumpinfos ;------------------------------------------- SetOutPath $INSTDIR diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 024e9fd4b2..3ddd8a00e8 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -252,8 +252,8 @@ Requires: libxml2 %endif # Uncomment these if you want to be sure you get them... -#BuildRequires: GeoIP-devel -#Requires: GeoIP +#BuildRequires: libmaxminddb-devel +#Requires: libmaxminddb # Add this for more readable fonts on some distributions/versions #Requires: dejavu-sans-mono-fonts diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index ec07991dc7..352e53f854 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -136,10 +136,13 @@ file(APPEND "${_all_manifest_wix}" "<?include InputPaths.wxi ?>\n") file(APPEND "${_all_manifest_wix}" " <Fragment>\n") file(APPEND "${_all_manifest_wix}" " <DirectoryRef Id=\"INSTALLFOLDER\">\n") SET(unique_component "") -foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} +foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} + ${ZLIB_DLL} + # Required for mmdbresolve + ${MAXMINDDB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)") @@ -161,10 +164,12 @@ file(APPEND "${_all_manifest_wix}" " </Fragment>\n") file(APPEND "${_all_manifest_wix}" " <Fragment>\n") file(APPEND "${_all_manifest_wix}" " <ComponentGroup Id=\"CG.RequiredDependencies\">\n") SET(unique_file "") -foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} +foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${ZLIB_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} + # mmdbresolve + ${MAXMINDDB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)") diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 92fc09b157..8631c805d2 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -433,6 +433,24 @@ </ComponentGroup> </Fragment> + <!-- MMDBResolve --> + <Fragment> + <DirectoryRef Id="INSTALLFOLDER"> + <Component Id="cmpMmdbresolve_exe" Guid="*"> + <File Id="filMmdbresolve_exe" KeyPath="yes" Source="$(var.Staging.Dir)\mmdbresolve.exe" /> + </Component> + <Component Id="cmpMmdbresolve_html" Guid="*"> + <File Id="filMmdbresolve_html" KeyPath="yes" Source="$(var.Staging.Dir)\rawshark.html" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Tools.MMDBResolve"> + <ComponentRef Id="cmpMmdbresolve_exe" /> + <ComponentRef Id="cmpMmdbresolve_html" /> + </ComponentGroup> + </Fragment> + <!-- Androiddump --> <Fragment> <DirectoryRef Id="dirExtcap"> diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi index 891d689b5e..277a713a14 100644 --- a/packaging/wix/Features.wxi +++ b/packaging/wix/Features.wxi @@ -81,6 +81,9 @@ <Feature Id="Fe.Tools.Rawshark" Title="Rawshark" Level="1" AllowAdvertise="yes" Display="expand" Description="Raw packet filter."> <ComponentGroupRef Id="CG.Tools.Rawshark" /> </Feature> + <Feature Id="Fe.Tools.MMDBResolve" Title="MMDBResolve" Level="1" AllowAdvertise="yes" Display="expand" Description="IP geolocation database resolution."> + <ComponentGroupRef Id="CG.Tools.MMDBResolve" /> + </Feature> <Feature Id="Fe.Tools.Androiddump" Title="Androiddump" Level="2" AllowAdvertise="yes" Display="expand" Description="Provide capture interfaces from Android devices."> <ComponentGroupRef Id="CG.Tools.Androiddump" /> </Feature> |