aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2019-03-22macOS: Restore dark mode support.Gerald Combs1-0/+2
Comment out the NSRequiresAquaSystemAppearance key in Info.plist under the assumption that both we and Qt will have dark mode support in usable shape by the next release. Ping-Bug: 15511 Change-Id: Ic5960034ce302d81dcc624cbd0e2c017865f44e2 Reviewed-on: https://code.wireshark.org/review/32504 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-21NSIS: Add logic to package Qt debug DLLsJoão Valverde2-3/+12
Bug: 15623 Change-Id: I4898fe2797d987e35bc334211ece8f2f58c562c7 Reviewed-on: https://code.wireshark.org/review/32493 Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 Quantin2-2/+2
Follow-up of gacc96e5206 Change-Id: Ibf49c4812b46ed282dccddb4fe6869154f6f9fed Reviewed-on: https://code.wireshark.org/review/32487 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-03-18NSIS: Fix our extra installer location.Gerald Combs3-9/+4
We know the native Windows library path early on in the configure process. Use it to set the location of the Npcap and USBPcap installers instead of trying to derive it from the GLib DLL path. Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1 Reviewed-on: https://code.wireshark.org/review/32475 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18Windows: Switch to Npcap 0.991.Gerald Combs1-1/+1
Change-Id: I4f5d82bf0d205b9410db2098abe64dde1a33b21d Reviewed-on: https://code.wireshark.org/review/32473 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-28CMake: Don't build Windows package targets by default.Gerald Combs3-7/+28
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-22macOS: Replace Wireshark.app when upgrading.Gerald Combs4-21/+15
The packages that PackageMaker creates don't remove old files when upgrading. Add a preflight script that removes Wireshark.app if it exists. Fix a version check while we're here. Change-Id: I8be8cbf51b34fef8a2d4259478b7d3199d976de3 Reviewed-on: https://code.wireshark.org/review/32150 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-17macOS: Fixup our libssh workaround.Gerald Combs1-8/+4
On the previous builder, `otool -L /path/to/libssh.4.dylib` returned a bare "libssh.4.dylib", which required a workaround. On the new builder it returns "@rpath/libssh.4.dylib". Adjust the workaround accordinly. Remove a couple of chmods while we're here. Permission issues are better addressed elsewhere. Change-Id: If0692219d9558c77b45620e7aad309853012b7e8 Reviewed-on: https://code.wireshark.org/review/32059 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> 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 Harris2-108/+122
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 Wu3-0/+5
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 Harris2-0/+22
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-15NSIS: Add ERROR_PRODUCT_VERSION to the vcredist checks.Gerald Combs1-0/+2
If the Visual C++ Redistributable installer returns 1638 (ERROR_PRODUCT_VERSION) treat it as a success. Bug: 15509 Change-Id: I136704ddc3266abc1a79f0fdcdd0b6cb7e33266e Reviewed-on: https://code.wireshark.org/review/32041 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-02-15NSIS: Fix packaging.Gerald Combs1-9/+0
Remove leftover help entries. Change-Id: I6c1402ecffda1196a12e4165b91b21d15c4380ca Reviewed-on: https://code.wireshark.org/review/32038 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-14Convert the FAQ to Asciidoctor and remove old help files.Gerald Combs6-53/+26
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-02-14macOS: Try to work around .dmg packaging issues.Gerald Combs1-2/+6
The new macOS builder sometimes fails due to busy disk images. Try to work around the issue by adding a sleep (in case the culprit is Spotlight) and by forcibly detaching disk images. Change-Id: I65bd46420e7ae69d03b7c9a15a2bb0385a1cedff Reviewed-on: https://code.wireshark.org/review/32035 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-14macOS: Packaging and code signing updates.Gerald Combs2-52/+87
Sign our bundle as described in Apple's Code Signing Guide. Enable the Hardened Runtime when signing. Look for packagemaker in our PATH before checking specific locations. Switch from zlib to bzip2 compression for our .dmg. Sign our .dmg. To do: Notarization. Change-Id: Ia6556e67998ff247dd3d77d6f040773e070f66cc Reviewed-on: https://code.wireshark.org/review/32032 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-13macOS: Fix our plugin path.Gerald Combs1-1/+1
In CMake we only used PROJECT_RELEASE_VERSION to construct our plugin path, so rename it to PLUGIN_PATH_ID. Use a dash to separate version numbers on macOS in order to allow code signing and a period elsewhere. In the C code we only used VERSION_RELEASE to construct our plugin path, so rename it to PLUGIN_PATH_ID. Change-Id: I02abc591d7857269e8d47b414b61df4b28a25f2d Reviewed-on: https://code.wireshark.org/review/32013 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-13Fix directory containing compiled plugins in macOS.Guy Harris1-1/+1
They weren't getting put in the version-number subdirectory, so the plugin loader wasn't finding them. If that causes problems with codesign, then we need to either 1) figure out how to make it work with codesign or 2) for macOS, not put plugins in a version-number subdirectory ***AND*** change the plugin loading process not to look for compiled in a version-number subdirectory. Change-Id: I58d344b728d05369d35edef4e4e530f10034e930 Reviewed-on: https://code.wireshark.org/review/32000 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-12MacOS: Fix a path.Gerald Combs1-1/+1
Change-Id: Ie964e6294e5351627c6fbc4a6c7f855558bee55c Reviewed-on: https://code.wireshark.org/review/31998 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-12MacOS: Bundle and packaging updatesGerald Combs2-10/+32
Update the code signing portions of the packaging scripts to match newer versions of macOS. Change-Id: I5e03611d8db61416955e797edcadfcff1404cc38 Reviewed-on: https://code.wireshark.org/review/31996 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-10RPM: respect options for disabling Qt, SpanDSP and BCG729Peter Wu1-2/+2
"%bcond_without" enables a feature by default. Be sure to explicitly disable features to match the requested configuration. Change-Id: I90687f35bcd953670e147be9e70af03aaeaef5dc Ping-Bug: 14606 Reviewed-on: https://code.wireshark.org/review/31933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-06Windows: uncheck WinPcap API-compatible mode in Npcap installerPascal Quantin1-2/+2
Uninstalling WinPcap through recent Npcap installers seem to fail for some users. For now install Npcap native mode instead. Bug: 15476 Change-Id: I9114eb824fb1bd99d5da82e8bff87f7b7eb49a74 Reviewed-on: https://code.wireshark.org/review/31870 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-02-05rpm: unconditionally add doc files.Dario Lombardo1-8/+0
The doc files have been added in v2.9.1rc0-618-g1bb1ffa9ca, and since then, rpm builds complain: RPM build errors: File listed twice: /usr/local/bin/dumpcap Installed (but unpackaged) file(s) found: /usr/local/share/doc/wireshark/androiddump.html /usr/local/share/doc/wireshark/capinfos.html /usr/local/share/doc/wireshark/captype.html [cut] The "with ninja" condition has been removed as well since it leads to a dead end. Change-Id: I95185ba8cb0d488a7fd222c04ff7ff2a637a817a Reviewed-on: https://code.wireshark.org/review/31873 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-02-05NSIS: Remove a duplicate definition.Gerald Combs1-1/+0
Change-Id: I6fea08b4170d71f5dead12dd9592a9bdd6689281 Reviewed-on: https://code.wireshark.org/review/31889 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 4b39f1b996e8124703cd86da69c43e157810cc02) Reviewed-on: https://code.wireshark.org/review/31890
2019-02-05CMake: Fix config.nsh generation.Gerald Combs2-27/+24
Make sure we always define VERSION_MINOR. Change-Id: I4a79c6d25c1392834703d9ab3cbab2c0f9794ac5 Reviewed-on: https://code.wireshark.org/review/31886 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 2c77f8899ce145a41ede5e848c67ba6cdef31b47) Reviewed-on: https://code.wireshark.org/review/31887
2019-01-23Windows: upgrade Npcap to 0.99-r9Pascal Quantin2-2/+2
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-14RPM: remove dependency on the which utilityPeter Wu1-2/+2
It is not necessary to know the full path to a program. Instead use the 'type' shell builtin (part of POSIX) to detect availability. Change-Id: Id68b298625d389a1f7843f52f56312bf81d97b80 Reviewed-on: https://code.wireshark.org/review/31540 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-14tarball+RPM: Fetch our version from CMake.Gerald Combs2-2/+61
Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 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>
2019-01-12Fix copy-and-pasteo.Guy Harris1-2/+2
Change-Id: Ib31602f79203a6bd3313b55ea9d83cf56933c171 Reviewed-on: https://code.wireshark.org/review/31514 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-11Add captype and reordercap to the list of command-line binaries.Guy Harris1-0/+2
Change-Id: I7e9460960b83d673727aca1783c03952622aabb5 Reviewed-on: https://code.wireshark.org/review/31500 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-11Add randpkt to the Windows installers.Guy Harris3-0/+27
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 Harris2-0/+10
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 Combs2-2/+2
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>
2019-01-01Happy New Year 2019!Stig Bjørlykke1-2/+2
Change-Id: Ic140aafdb32e649e88bf3f00bda3cec9404e555a Reviewed-on: https://code.wireshark.org/review/31284 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-12-29CMake output: Show Windows paths for the VC redist filesGraham Bloice2-3/+4
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-21macOS: Make sure we package our own libraries.Gerald Combs1-2/+9
As of 25e1e2c848 we no longer set LIBRARY_OUTPUT_DIRECTORY to Wireshark.app/Contents/Frameworks. As a result we need to copy them into place during our packaging process. Change-Id: Idbdea289dce60e9acf9ab317f4151bfe2c993ddd Reviewed-on: https://code.wireshark.org/review/31160 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-21macOS: Minimize our dsyms.Gerald Combs1-8/+13
Pass --minimize to dsymutil, which reduces the size of our dsyms. Print the name of each file as we dsymify it. Change-Id: Ic8b14daa2ceaa07c2c9ca3162020e5861d165f6d Ping-bug: 15361 Reviewed-on: https://code.wireshark.org/review/31150 Reviewed-by: Anders Broman <a.broman58@gmail.com>
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-12-19NSIS: Expand our vcredist exit code check.Gerald Combs1-4/+18
Along with checking for exit code 3010 (reboot required), check for other errors and show a warning as needed. Add a note about the Universal CRT to the User's Guide. Bug: 15358 Change-Id: Ia49dbdc66edc8ea68f957ec353f1115536002d13 Reviewed-on: https://code.wireshark.org/review/31100 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-18Windows: upgrade Npcap to 0.99-r8Pascal Quantin2-3/+3
While we are at it, let's propose by default to upgrade to Npcap when WinPcap is intalled. Change-Id: Id9aeb3a507127b5956185fba2b74c60cf1dfdf96 Reviewed-on: https://code.wireshark.org/review/31079 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-16macOS: Fix a .dmg build path.Gerald Combs1-1/+1
Fix the "Read me first" path. Change-Id: I6d1a13a26db2023a30b7ae72caca86500d00f5b7 Reviewed-on: https://code.wireshark.org/review/31064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-15CMake: Make sure we use the same minimum macOS version everywhere.Gerald Combs3-42/+43
Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 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-12NSIS: Increase our verbosity.Gerald Combs1-6/+7
Pass /V4 to makensis so that we can see what files are in our package. Change-Id: I4d1225f8cfce66945d086bc6481f739a56f16549 Reviewed-on: https://code.wireshark.org/review/31023 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12Packaging: Add initial support for AppImage.Gerald Combs1-0/+24
Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-30win32: adjust some names in the Npcap installation pagePascal Quantin1-2/+2
Change-Id: I29c573628c01771fd82c88c58053bb7066ac8239 Reviewed-on: https://code.wireshark.org/review/30844 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-30NSIS: Install NPcap instead of WinPcap.Gerald Combs7-207/+80
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 Combs2-0/+8
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 Wu2-3/+3
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 01:25:26 +0000