aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2020-01-09NSIS: Fix a dangling output path.Gerald Combs1-0/+2
The updates to windeployqt-to-nsis.ps1 g7a09c78f12 added SetOutPath calls to qt-dll-manifest.nsh. This means we need to reset the output path before adding our translation files. Change-Id: I4b4ede72efa67cc4617aaae5baf8d38df6952df7 Reviewed-on: https://code.wireshark.org/review/35705 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-08NSIS: Make the licensing page match reality.Gerald Combs1-6/+5
The NSIS licensing page is centered around making the user agree to a EULA. We don't have one of those. Replace the "you must accept" and "I agree" text with something more neutral. We could alternatively omit with the licensing page altogether, but the GPL is an important aspect of the project and deserves some sort of mention. Bug: 1115 Change-Id: I5fd5beac2188b61a90c2842de7d7547aa815ff4f Reviewed-on: https://code.wireshark.org/review/35624 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-07NSIS: Build Unicode installers / uninstallers.Gerald Combs1-0/+2
Recent versions of NSIS have deprecated ANSI installers, so enable Unicode. Change-Id: I263568f83b7f96871e056ba590db300b23dbdc80 Reviewed-on: https://code.wireshark.org/review/35681 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-06NSIS: Don't package .pdb files.Gerald Combs4-11/+15
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>
2020-01-01Happy New Year 2020Stig Bjørlykke1-2/+2
Change-Id: Ic569e499d40def9397203510a121ff17a495ba9a Reviewed-on: https://code.wireshark.org/review/35616 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-12-19Windows: upgrade Npcap to 0.9986Pascal Quantin1-1/+1
Change-Id: I9ee3144416eb5564aa8974aeec0e33774edc7ed7 Reviewed-on: https://code.wireshark.org/review/35498 Reviewed-by: Pascal Quantin <pascal@wireshark.org> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-12-18macOS: More ChmodBPF signing updates.Gerald Combs1-1/+1
Run osx-extras.sh before building the ChmodBPF installer package. Change-Id: Iec3f88da86e48b5aac385369c7e68f23babc4c34 Reviewed-on: https://code.wireshark.org/review/35491 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-18macOS: Sign the ChmodBPF script.Gerald Combs1-0/+85
Add macosx/osx-extras.sh, which can be used to sign the ChmodBPF script. Bug: 15782 Change-Id: I9929dd6db067f8bc1097faac28ab9467f5a89a82 Reviewed-on: https://code.wireshark.org/review/35481 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-10More Qt minimum version updates.Gerald Combs2-136/+71
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-12-02NSIS: The "Sshdump" option installs Ciscodump as well.Gerald Combs1-2/+2
Use consistent capitalization while we're here. Change-Id: I0591654b0e73d33528f9cfe990a1491ce6cccc8b Reviewed-on: https://code.wireshark.org/review/35278 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-26macOS: Switch ChmodBPF back from bash to sh.Gerald Combs1-5/+5
The default shell in macOS 10.15 is zsh[1]. Bash appears to be included for now, but it might be a good idea to start migrating away from it just in case it's removed at some point in the future. [1]https://support.apple.com/en-ca/HT208050 Change-Id: Ibe4338105d8fa1a590f84543489255ade71920d6 Reviewed-on: https://code.wireshark.org/review/35216 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-25macOS: Use the correct path when building our app bundle.Gerald Combs1-1/+1
Use the correct path to the Wireshark executable when finding dependencies and adding debugging symbols. Change-Id: Iefafa9d453ce60e77853f2d125769826b4d702c0 Reviewed-on: https://code.wireshark.org/review/35202 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-23Add c-ares to the required library list.Gerald Combs1-8/+3
Although c-ares support was techically optional, it was either on by default or required in all of our packaging. Go ahead and require it globally. C-ares is widely available and synchronous name resolution can easily result in a horrific user experience. Change-Id: Id67c797316ed6b8a0ab5052e55a43a1b9e2a2464 Reviewed-on: https://code.wireshark.org/review/35188 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-11-20NSIS: Don't run Wireshark from the installer.Gerald Combs1-2/+4
Remove the option to run Wireshark from the NSIS installer. As noted in bug 16195, this runs Wireshark as Administrator which is something we recommend against. Bug: 16195 Change-Id: I0692262a611d72d9e9f9c2131ce71cc62b4737b1 Reviewed-on: https://code.wireshark.org/review/35143 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-15CMake: Work correctly without Sparkle.Gerald Combs1-1/+1
Set or clear SPARKLE_LIBRARIES and SPARKLE_INCLUDE_DIRS in FindSparkle.cmake, similar to what we do in other modules. Use them instead of SPARKLE_LIBRARY and SPARKLE_INCLUDE_DIR. Change-Id: I023c711edd6a44421aadf85413da3207d9b08e64 Reviewed-on: https://code.wireshark.org/review/35097 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-15macOS: Application bundle fixes.Gerald Combs2-2/+3
Copy Sparkle.framework correctly. Force signing so that we replace Sparkle's signature with ours. In osx-app.sh, don't sign a file or framework if it's already signed. Fix the osx-dmg.sh usage message while we're here. Change-Id: I697073d234958e1d8386650935a132237ad88f64 Reviewed-on: https://code.wireshark.org/review/35095 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-15macOS: Add support for automatic updates using Sparkle.Gerald Combs2-0/+23
Add support for automatic updates using the Sparkle framework. Add FindSparkle.cmake and associated CMake plumbing. Add a public key and other info to Info.plist.in. Add ui/macosx/sparkle_bridge.{h,m}, which wraps the Sparkle API. Make code that's specific to WinSparkle Windows-only. Add Sparkle installation steps to the macos-setup scripts. Sparkle prints a warning if your bundle is unsigned (which is the case during development) so disable installing it by default. Updating here takes a long time. We might be able to fix that by shipping our DSYMs separately. Change-Id: I6cc6671db5657dadc514bda6bf6e1c8bbc9468a5 Reviewed-on: https://code.wireshark.org/review/35090 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-12Fix name of the "remove Wireshark from PATH" package.Guy Harris1-1/+1
Bug: 16200 Change-Id: I0e9ab373eb3f7f533fe1ae9bf0448b66b4cdf522 Reviewed-on: https://code.wireshark.org/review/35056 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-11-06Windows: upgrade Npcap to 0.9984Pascal Quantin2-7/+12
While we are at it, let's deactivate by default the legacy loopback adapter installation Change-Id: I4950e9dc6de8a2faeda272c03165a9f305862f6b Reviewed-on: https://code.wireshark.org/review/35004 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-04macOS: Remove an exit code check.Gerald Combs1-1/+1
Change-Id: I2b9d576bf6d5c49dcfa716abb00f80ea067328db Reviewed-on: https://code.wireshark.org/review/34953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-04macOS: Properly sign our extra packages.Gerald Combs1-2/+13
Use productsign to sign product archives. Change-Id: I40fd329e6f2b0abc49f1b4b0247eae380de8101b Reviewed-on: https://code.wireshark.org/review/34951 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-10-10Revert "CMake: Don't install HTML manuals twice"João Valverde2-38/+38
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 Valverde2-38/+38
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ń2-12/+50
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-09-26macOS: Remove no-longer-relevant documentation.Gerald Combs1-2/+0
Change-Id: I628395a761291a105fdc1ef79ce05db0b00a4ab3 Reviewed-on: https://code.wireshark.org/review/34630 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-26macOS: Sign our .dmg.Gerald Combs1-0/+68
Add osx-dmg.sh back and make it a simple wrapper around dmgbuild and codesign. Change-Id: I0baa21fd971aa1b06e1a6700881cd7625dffff35 Reviewed-on: https://code.wireshark.org/review/34629 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-25macOS: Sign our extra packages.Gerald Combs1-0/+6
Change-Id: If2e28e4708f1d71fa4e7b549a2ba021557711d4e Reviewed-on: https://code.wireshark.org/review/34627 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-25macOS: Increase our .dmg compression level.Gerald Combs1-1/+1
Change-Id: I273eb5174ef92146aa48eda8a2e37a13828d73f4 Reviewed-on: https://code.wireshark.org/review/34626 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-25macOS: Use dmgbuild to build our .dmg.Gerald Combs3-239/+147
Scripting the Finder in order to lay out our disk image assumes that we have access to the Finder. This might not be the case on our builder, and it arguably shoudn't be. Switch from using a Bash script + AppleScript to build and lay out our .dmg to using dmgbuild, which creates our .DS_Store directly using Python's ds_store module. Change-Id: I2e4a9dd89bc8297c9cbd9df7aa8d3a44447bde85 Reviewed-on: https://code.wireshark.org/review/34623 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-25macOS: Disable arrange_dmg.applescript.Gerald Combs1-2/+2
arrange_dmg.applescript is failing on the macOS builder, so comment it out for now. Change-Id: Ibe7bf249623832954e9f67d241513b549dff990c Reviewed-on: https://code.wireshark.org/review/34621 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-25macOS: Make Wireshark.app drag-installable.Gerald Combs34-812/+323
Create ChmodBPF installer and uninstaller packages using pkgbuild and productbuild. Place them in Wireshark.app/Resources/Extras. Add a path_helper installer and uninstaller which respectively add and remove /etc/*paths.d/Wireshark. Remove the PackageMaker and utility-launcher assets and build targets. Show a message in the main welcome screen if we don't have capture permissions. Add an link which launches the ChmodBPF installer. Add a "macOS Extras" item to About → Folders. Migrate "Read me first" from RTF to Asciidoctor, which lets us add links and looks like our other documentation. Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain text. Always run it in osx-dmg.sh. Bug: 6991 Bug: 12593 Bug: 11399 Ping-Bug: 16074 Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90 Reviewed-on: https://code.wireshark.org/review/31047 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-23Add RADIUS dictionary for Aptilo Access ControllersMarcus Sundberg1-0/+1
Change-Id: I058aacf1bdb2a6151ad370ed09febe79b1886701 Reviewed-on: https://code.wireshark.org/review/34594 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-23rpm: use python3 to fix CentOS 7 buildsPeter Wu1-3/+2
CentOS 7 (1908) started including python3 (Python 3.6), see https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7.1908 Change-Id: I6418e7839f1119cf1152f445759e92acd4f39cc4 Reviewed-on: https://code.wireshark.org/review/34593 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-18macOS: Don't clobber Wireshark.app during installation.Gerald Combs1-3/+6
Removing Wireshark.app during preflight is the wrong way to ensure that we uninstall old assets. Bug: 16050 Change-Id: I39a0129e29830f8b6bc7ef228f3886db51d963ec Reviewed-on: https://code.wireshark.org/review/34542 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-05Windows: upgrade Npcap to 0.9983Pascal Quantin1-1/+1
Change-Id: I05a0eb274d8890711d47c95db1b925682baa63cd Reviewed-on: https://code.wireshark.org/review/34457 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 Smolinski3-4/+16
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-08-16Windows: upgrade Npcap to 0.9982, USBPcap to 1.5.3.0 and nghttp2 to 1.39.2Pascal Quantin1-2/+2
Change-Id: I9dcff1c6714c6bbe211997195ff78537c334fdbd Reviewed-on: https://code.wireshark.org/review/34303 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-08-15Diameter: Add MS-CHAP/MS-CHAPv2 AVP support for EAP-TLSPeter Wu1-0/+1
Created the Microsoft Diameter file based on MS-CHAP-* AVPs listed at https://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-10 Many values are displayed as bytes for simplicit. The MS-CHAP2-Success attribute could for example be dissected further as 1 byte followed by a string, but that requires more effort. Allow padding to be missing since the eap-ttls-mschapv2.pcapng capture would throw a Malformed Packet exception otherwise. Bug: 15603 Change-Id: I9efc322a86802e78bb6cd4bc3df1c1282a45fe9e Reviewed-on: https://code.wireshark.org/review/34291 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-27HTTPS In Still More Places, update more URLs.Guy Harris2-2/+3
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-27Remove trailing space.Guy Harris1-1/+1
Change-Id: I6dd49a21c76e9a126a40872a08ce1dc13aefc195 Reviewed-on: https://code.wireshark.org/review/34097 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27HTTPS In More Places, update some URLs.Guy Harris9-19/+19
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26HTTPS (almost) everywhere.Guy Harris2-2/+2
Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-24Windows+CMake: Updates for Visual Studio 2019.Gerald Combs2-2/+7
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-07-05macOS: Fix our token wait. Again.Gerald Combs1-1/+1
altool isn't guaranteed to clean up after itself, e.g. if an earthquake takes down the Developer ID Notary Service (thanks to Jim Young for tracking this down). Instead of checking for the existence of tokens, check their existence and age. Change-Id: Iac216d524a4894115ecf33589af1bbdebcc9cbab Reviewed-on: https://code.wireshark.org/review/33856 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-07-03Windows: upgrade USBPcap to 1.5.2.0Pascal Quantin1-1/+1
Change-Id: I06b7e507277af2c8cdf76dfeaf0b5347a56a0eae Reviewed-on: https://code.wireshark.org/review/33833 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-07-03Windows: upgrade USBPcap to 1.5.1.0Pascal Quantin1-1/+1
Change-Id: Id376763c07ba97dc7105f7265a6ebb3d30a9adbf Reviewed-on: https://code.wireshark.org/review/33824 Reviewed-by: Pascal Quantin <pascal@wireshark.org> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-26macOS: Fix our token wait.Gerald Combs1-2/+2
Change-Id: I3a678267b38a598f43322a1440dd87fa42acf901 Reviewed-on: https://code.wireshark.org/review/33750 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-26macOS: Add a notarization upload wait check.Gerald Combs1-2/+21
altool appears to only support one notarization upload at a time. Add a loop that waits for an empty upload token directory. Convert the status check to a timeout loop. Change-Id: I30fd15b6f098acfe5d9bdcd72237c56cc066dda4 Reviewed-on: https://code.wireshark.org/review/33749 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-26macOS: Make sure we bundle our plugin dependencies.Gerald Combs1-2/+3
Add our plugins to the bundle binary list. Copy libraries using `install` in order to ensure that we can doctor them up. Bug: 15867 Change-Id: I864455f6ef7312938e89493015fd55874ab0a0c3 Reviewed-on: https://code.wireshark.org/review/33744 Reviewed-by: Gerald Combs <gerald@wireshark.org>