aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/wix
AgeCommit message (Collapse)AuthorFilesLines
2020-01-06NSIS: Don't package .pdb files.Gerald Combs2-0/+4
We run `windeployqt ... --pdbs` at build time, which means that we need to be careful not to include them in the NSIS package. Switch from using wildcards ("File ...\*") to using separate "File" commands for each file. Simplify the PDB Zip package command while we're here. Bug: 16307 Change-Id: Ibd9bcbdfdc216f1f6a067baf711bbc184845143f Reviewed-on: https://code.wireshark.org/review/35670 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-10More Qt minimum version updates.Gerald Combs1-92/+47
Update the minimum version in various documents. Remove some no-longer-needed code from scripts that call windeployqt. Change-Id: I16da4bced9780c9f1b1969aae7c52e2fce1968aa Reviewed-on: https://code.wireshark.org/review/35391 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-10-10Revert "CMake: Don't install HTML manuals twice"João Valverde1-19/+19
This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993. NSIS package is broken with this commit. Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6 Reviewed-on: https://code.wireshark.org/review/34758 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-09CMake: Don't install HTML manuals twiceJoão Valverde1-19/+19
HTML docs are installed to both $docdir and $pkgdatadir. Fix that to install to $docdir only. Change-Id: I115158585b6df9170d9a01249adbc8548df91f14 Reviewed-on: https://code.wireshark.org/review/34640 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-04CMake: Include glib dlls in Windows installerTomasz Moń1-11/+39
In debug builds different glib .dll files are being used than in release builds. List all .dll files in (generated) nsis all-manifest.nsh and WiX DependentComponents.wxs guarding the debug files under BUNDLE_DEBUG_DLLS ifdef. CMake generator expression is used to include /DBUNDLE_DEBUG_DLLS parameter to MakeNSIS in debug builds. Similarly, -dBUNDLE_DEBUG_DLLS is added to WiX candle in debug builds. Change-Id: Ibfe7a640d25ba25f14bb910708ab83d0634d48db Reviewed-on: https://code.wireshark.org/review/34703 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-08-20Kafka: include zstd compression in Kafka message batchesPiotr Smolinski1-2/+2
Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-27HTTPS In Still More Places, update more URLs.Guy Harris1-1/+2
Microsoft reshuffled their documentation - almost all of it moved from msdn.microsoft.com to docs.microsoft.com. Some blogs moved to devblogs.microsoft.com; the comments *didn't* move, so in one case we go to the Wayback Machine - the link isn't dead, but it formats horribly, at least on my browser, but the archived version formats OK. Use the Wayback Machine for some URLs, and update others. Update the sections for MS-ADTS. Point to the HTML versions of some RFCs and I-Ds. Change-Id: I344b20f880de63f1ae2a4e3f9ff98af78a7fe139 Reviewed-on: https://code.wireshark.org/review/34101 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-24Windows+CMake: Updates for Visual Studio 2019.Gerald Combs1-1/+3
Update our redistributable search logic for VS 2019. Change-Id: Icccc550bbe062a91206d4ffddeef7bbfbdb8829b Reviewed-on: https://code.wireshark.org/review/34064 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-20epan,packaging: convert http URLs to httpsPeter Wu2-3/+3
Ensure that public text in error messages and dialogs point to https. Ensure that the generated PDML files include scripts over https. Change-Id: I75d42704c2bbb33b05492261b3e1d45dc6e301f9 Reviewed-on: https://code.wireshark.org/review/34027 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11wix: fix packaging of various pluginsPascal Quantin2-12/+11
Change-Id: I4ae23792abe2409ab833802b9d7dffc076234db5 Reviewed-on: https://code.wireshark.org/review/33563 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11Windows: package codec pluginsPascal Quantin1-0/+30
Change-Id: Id0e43d0272cb62e171e74b5cf957fadfe0bd7a24 Reviewed-on: https://code.wireshark.org/review/33562 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11Kill libwscodecs plugin library, just use pluginsJoão Valverde1-4/+0
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5 Reviewed-on: https://code.wireshark.org/review/33068 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-23NSIS/WIX: fix BROTLI packaging (missing DLL)Alexis La Goutte1-2/+2
Change-Id: Iaacee6f2f91f66b2ca044f4d4082c6993f16a1dc Reviewed-on: https://code.wireshark.org/review/32957 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-22CMake+WiX: Add a note about merge module deprecation.Gerald Combs1-0/+3
Change-Id: I2dd2b70e218b50cb43d47200de28b9d7d2e48abd Reviewed-on: https://code.wireshark.org/review/32942 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-20WiX: Fix another libxml2 variable.Gerald Combs1-1/+1
Change-Id: If032c0876ab2ba80b8df7b84e1e1c8e8f1ac425c Reviewed-on: https://code.wireshark.org/review/32490 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-20Windows: fix addition of Libxml2 DLLs in installersPascal Quantin1-1/+1
Follow-up of gacc96e5206 Change-Id: Ibf49c4812b46ed282dccddb4fe6869154f6f9fed Reviewed-on: https://code.wireshark.org/review/32487 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-02-28CMake: Don't build Windows package targets by default.Gerald Combs1-2/+8
Explicitly exclude our various Windows package targets from the Visual Studio default build. This will hopefully keep the 32-bit Windows builder from trying to build the portableapps_runtime target when it shouldn't. Change-Id: Id8481e92abda9b1a4784b8c8e8b5a1b3f1b4647e Reviewed-on: https://code.wireshark.org/review/32256 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-17Include the HTML IP map in the CG.WiresharkRequired component group.Guy Harris1-0/+1
It might currently only be used by the Wireshark app, but somebody might, at some point, have a TShark option to generate a PDF or JPEG or... with a map image. Hopefully this fixes the build of the WiX installer. Change-Id: Iac9d65b23156d0c1d4c3cceef7d0b74fdcce64c1 Reviewed-on: https://code.wireshark.org/review/32065 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-16Don't fail in CMake on Windows if you've disabled building Wireshark.Guy Harris1-61/+67
It's possible to do a *build* on Windows without the Wireshark app being built; however, the *installers* can't currently be built. If we have NSIS or WiX, and Wireshark isn't being built, report a warning, and don't have targets for building the installers. Change-Id: I2cc9c1f6ba375dbcb6d5b7520d2fa33ad97ba9fe Reviewed-on: https://code.wireshark.org/review/32061 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-16Re-implement "Map" feature for EndpointsPeter Wu1-0/+3
This feature was removed in v2.5.1rc0-427-gf529ab5d0a, anticipating that MaxMind would remove support for it in 2019. They have however changed their mind and maintained latitude and longitude information. They recommend displaying an accuracy radius, but the reported values are 50, 100, 200 and 1000km. When implemented literally, a marker in Ireland would cover the whole island plus mainland, so I have instead opted to use a fixed radius of 1km at deeper zoom levels. The old ipmap.html file was outdated and had broken tiles, I rewrote a new one from scratch using the light-weight Leaflet library combined with tiles from OpenStreetMap. This is more mobile-friendly and secure (https, SRI). To improve handling of nearby or overlapping nodes, clustering is used (individual nodes can still be inspected). Browser compatibility results: IE8 is unusable, IE9 partially works (tooltips sometimes disappear and the cluster radius control is gone), IE11 works. Of course Firefox 65 and Chromium 72 have no issues. The map popup description in the generated GeoJSON structure is now split in several properties, allowing presentation to be handled by the HTML page instead of the C code. Bug: 14693 Change-Id: If2ec9c518f7723ac0ab27b6272463356875a0ff2 Reviewed-on: https://code.wireshark.org/review/31952 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-16Don't allow NSIS or WiX installers if we aren't building Wireshark.Guy Harris1-0/+11
In both cases, a file used in the process of building the installer is generated from the Wireshark binary, so, unless we also arrange not to put that file in the installer if Wireshark isn't being built, we can't build the installer. Have ADD_NSIS_PACKAGE_TARGET and ADD_WIX_PACKAGE_TARGET check whether we're building Wireshark and fail if we aren't. That way, *if* we're including the NSIS or WiX packages in the build files, we fail if we aren't building Wireshark. Change-Id: Icfe4d2491bd721cdd5fef424e9a7565c4990defa Reviewed-on: https://code.wireshark.org/review/32053 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-14Convert the FAQ to Asciidoctor and remove old help files.Gerald Combs3-46/+17
Convert our self-generating FAQ to Asciidoctor via the following steps: - `help/faq.py > /tmp/faq.html`. - `pandoc -t asciidoc -o docbook/faq.adoc /tmp/faq.html`. - Manually clean up the markup using a text editor. Question and answer content was left intact. Removing or updating obsolete content will have to be done in a separate change. The Asciidoctor project uses the .adoc extension, so start using it here as well. The contents of the "help" directory appear to have been used for offline support in help_url.c, but that functionality was removed in 2008 in 242e3b78bc. Its content is covered in the User's Guide and man pages so remove it. Change-Id: I9060eefe97cfc137f8b414077c30f814379b576a Reviewed-on: https://code.wireshark.org/review/32014 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-23Windows: upgrade Npcap to 0.99-r9Pascal Quantin1-1/+1
Change-Id: Ie2b90a448415d7b8637aac03cee07fa9e5ab217f Reviewed-on: https://code.wireshark.org/review/31691 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-11Add randpkt to the Windows installers.Guy Harris1-0/+18
Bug: 15395 Change-Id: Ic0c28b42a5e70edc5eb6441f71b6b614deae9d9f Reviewed-on: https://code.wireshark.org/review/31497 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-11Include the reordercap and dftest documentation in Windows packages.Guy Harris1-0/+8
We package the documentation for other programs we supply, so we should package the documentation for them as well. Change-Id: I37854631bad4aa799fb6ebb009bea3f4692fe530 Reviewed-on: https://code.wireshark.org/review/31492 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-10Move make-version.pl to tools.Gerald Combs1-1/+1
Move make-version.pl to the tools directory. Change-Id: I7c3ec8951a682d45d650e3fdb1580d90bf19e8b4 Reviewed-on: https://code.wireshark.org/review/31473 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29CMake output: Show Windows paths for the VC redist filesGraham Bloice1-2/+2
Purely cosmetic, show the various VC redist paths using the native format. Change-Id: I96d0b088f703e3e8dea6623ec258139eff066d90 Reviewed-on: https://code.wireshark.org/review/31251 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-19WiX: Build packages verbosely.Gerald Combs2-3/+3
Pass the `-v` flag to candle, light, and heat. Remove a couple of apparently unused and definitely misleading variables. Change-Id: If3c50f3f1596f244e8354b77bbd443779f5aa981 Reviewed-on: https://code.wireshark.org/review/31132 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-30NSIS: Install NPcap instead of WinPcap.Gerald Combs1-11/+0
Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-27Add a "No Reassembly" profile.Gerald Combs1-0/+6
Add a script that disables all of our desegmentation and reassembly preferences and use it to create a "No Reassembly" profile. Change-Id: Icd0b72e9e271a511e637acde9018f3aae018e589 Reviewed-on: https://code.wireshark.org/review/30799 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20Drop JSON-GLib completelyPeter Wu1-2/+2
JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h). Remove the remaining traces and additionally remove GObject from FindGLIB2.cmake since it was only added for JSON-GLib. Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0 Reviewed-on: https://code.wireshark.org/review/30733 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-16Windows: upgrade USBPcap to 1.2.0.4Pascal Quantin1-1/+1
Change-Id: I1ab4bbc410f2f896aea323c3d4884207150f9beb Ping-Bug: 14657 Bug: 14982 Reviewed-on: https://code.wireshark.org/review/29154 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-07-24CMake: Fixup some documentation dependencies.Gerald Combs1-3/+1
Change the dependencies of various wsug targets to update_tools_help instead of the files it generates. Have the nsis_package_prep and wix_package_prep targets depend on user_guide_chm instead of update_tools_help. This should make parallel builds of all_guides, wix_package_prep and possibly other targets more reliable. Change-Id: I473f0e608aade1ac0053c03bef0942c69c650f65 Reviewed-on: https://code.wireshark.org/review/28838 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-28Windows: run update_tools_help target when building installerPascal Quantin1-0/+1
It ensures to have up to date help output for our command line tools Change-Id: I5b900be692c05d6231678cf3ca82e86ef843d01c Reviewed-on: https://code.wireshark.org/review/28476 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-15CMake: require at least CMake 3.5Peter Wu1-2/+2
CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-11WiX: Remove remaining GTK+ content.Gerald Combs4-69/+1
Change-Id: I3dc06b62f8a6afa2de82b2a2a5f7dc8a63400ac3 Reviewed-on: https://code.wireshark.org/review/27451 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-03WiX: Options dialog updates.Gerald Combs4-346/+88
Remove GTK+. Add links to Npcap, WinPcap, and USBPcap. Move the capture options to the top of the options dialog. Replace group boxes with simple titles. Add an EditorConfig entry for our WiX files. Change-Id: Ibd581fa09f333fa84228f0a6f723ab62df85ee8e Reviewed-on: https://code.wireshark.org/review/27292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-20Windows: blind attempt to fix WiX installer generationPascal Quantin1-1/+2
Change-Id: I32cc4ac54dee7cd8ef9cfa4af367206eec8259cc Reviewed-on: https://code.wireshark.org/review/27052 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-20Windows: add JSON-GLib libraryPascal Quantin1-1/+1
Change-Id: I9b266bffc74779f9d28eabb5642644a2b0afa7cf Reviewed-on: https://code.wireshark.org/review/27049 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo1-21/+0
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-06Remove some references to Qt4.Gerald Combs1-22/+0
Change-Id: I50f5abafb8adf18a5407427f7feb260301df45cc Reviewed-on: https://code.wireshark.org/review/26771 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05GTK Cmake: Remove the option to build the GTK UI.AndersBroman1-120/+0
Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0 Reviewed-on: https://code.wireshark.org/review/26747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo1-13/+1
Change-Id: Ia1650bc02511f7bd47fb90be91b623177f05bcbd Reviewed-on: https://code.wireshark.org/review/26337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07NSIS, WiX: Handle the presence or absence of mmdbresolve.Gerald Combs4-5/+16
Only install mmdbresolve if MAXMINDDB_FOUND is true. Fixup the Qt about box and WiX GTK defines while we're here. Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e Reviewed-on: https://code.wireshark.org/review/26299 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs3-4/+30
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>
2018-03-04Windows: Remove support for MSVC older than VS2015Graham Bloice1-2/+0
Cleanup the support for older versions of Visual Studio Change-Id: Ieb97d56e9bff6a5902433e8d99b27276bc7034f7 Reviewed-on: https://code.wireshark.org/review/26247 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-03WiX: install the other plugin types as wellJaap Keuter2-1/+31
The WiX toolset configuration files have to be extended to handle the new plugin directory structure as well. Apart from the EPAN plugins the wiretap and codec plugins have to be included as well. Change-Id: I173e6b87a88e4ef8aa3283a308e2b5207f0d6ba2 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/26176 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-02Remove an ipmap remnant.Gerald Combs1-1/+0
Change-Id: I391043aa0fdfce132a552e063d850d17bcf5a4de Reviewed-on: https://code.wireshark.org/review/26230 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Remove the endpoint "Map" feature.Gerald Combs1-3/+0
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>
2018-03-02Windows: Update target version infoGraham Bloice1-2/+6
Set the API target level to Win7, along with installer changes to match. Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a Reviewed-on: https://code.wireshark.org/review/26218 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>