aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
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>
2019-06-25Fix a couple of shellcheck issues.Gerald Combs1-1/+1
Change-Id: Iaebbe5227ffcc581e794a3be1f8b9020fd600f68 Reviewed-on: https://code.wireshark.org/review/33739 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-18Windows: upgrade Npcap to 0.996 and USBPcap to 1.5.0.0Pascal Quantin1-2/+2
Change-Id: Ie6590e1a31a5aaa6e96f6f718991cc42a1e40d8a Reviewed-on: https://code.wireshark.org/review/33639 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-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 Quantin2-0/+35
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 Valverde2-5/+0
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5 Reviewed-on: https://code.wireshark.org/review/33068 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-08New Diameter AVPSakuchekar1-0/+2
Change-Id: Ic7fca037cdf041988bc93f6b4066eb190e3028d0 Reviewed-on: https://code.wireshark.org/review/33461 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-07Windows: upgrade USBPcap to 1.4.1.0Pascal Quantin1-1/+1
Change-Id: I1a9d97a58201dadc6c50a15d1518053c980bd62f Reviewed-on: https://code.wireshark.org/review/33514 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-31macOS: Notarization count fix.Gerald Combs1-1/+1
Change-Id: If2be00ebf08655d967273ae3a84f4345ea10f06a Reviewed-on: https://code.wireshark.org/review/33435 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-31macOS: Notarization updates.Gerald Combs1-2/+2
Increase our timeout from 10 minutes to 20. Fixup our ID formatting. Change-Id: I143c08880de4f285bd0bc6dbf6619d565ef97b3a Reviewed-on: https://code.wireshark.org/review/33434 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-26Windows: upgrade USBPcap to 1.4.0.0Pascal Quantin1-1/+1
Change-Id: I79b8ece52e89e4e646954e965649b0cf5ae69a6a Reviewed-on: https://code.wireshark.org/review/33379 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-11Windows: upgrade Npcap to 0.995Pascal Quantin1-1/+1
Change-Id: I9e1bea5daf8aa49e4de4efa070819da8d3844fc1 Reviewed-on: https://code.wireshark.org/review/33156 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10Revert "Windows: upgrade Npcap to 0.994"Pascal Quantin1-1/+1
This reverts commit 2f82518f7212e13186a4e0bbe65a9838e16178b8. Npcap 0.994 introduced a crash that will be fixed in next version: https://github.com/nmap/nmap/issues/1591 Change-Id: Iff9a29e6d28c57774844d25f2990e0f8c214bf75 Reviewed-on: https://code.wireshark.org/review/33143 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-08Windows: upgrade Npcap to 0.994Pascal Quantin1-1/+1
Change-Id: I3b64041723a72600a9ef5a6fb9d22b0b30578cfc Reviewed-on: https://code.wireshark.org/review/33114 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-05-07Windows: upgrade Npcap to 0.993Pascal Quantin1-1/+1
Change-Id: Ibe19a77b5ced8be4f1008450fb6df92c841a43c5 Reviewed-on: https://code.wireshark.org/review/33092 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-04-26macOS: Add a workaround for libbrotli.Gerald Combs1-0/+6
When gathering our dependencies, work around an issue with libbrotli's install name similar to what we do with libssh. Bug: 15730 Change-Id: I571746848e3343d81c286be66f6fe6510c698d6f Reviewed-on: https://code.wireshark.org/review/32990 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-23NSIS/WIX: fix BROTLI packaging (missing DLL)Alexis La Goutte2-3/+3
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-04-22Add brotli decompression support for HTTP and HTTP2 dissectors.Dániel Bakai1-0/+24
Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22rpm: update rpm package dependencies and spec to work on current os versionsDániel Bakai1-0/+30
Change-Id: Iaa0bd9513869e65b96b6014d66ca3cfd917dbe64 Reviewed-on: https://code.wireshark.org/review/32938 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-21macOS: Add a notarization script.Gerald Combs1-0/+99
According to https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution notarization will be required in a future release of macOS. Add a script for doing so. The process requires submitting our .dmg to Apple, waiting for it to finish, and stapling a ticket to our .dmg. Change-Id: I5b9c0c36cc2182fdd0baeada823aaacba7730a88 Reviewed-on: https://code.wireshark.org/review/32906 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-20RPM: fix build since GLIB2_MIN_VERSION was removedPeter Wu1-2/+2
Instead of reintroducing the variable, inline the version. This matches with other version checks in the same file and debian/control. Change-Id: I4dc178575b8f24e7f8e07e8d761e245f14c65ffa Fixes: v3.1.0rc0-566-g8c26217548 ("CMake: bail out if minimum GLib version is not satisfied") Reviewed-on: https://code.wireshark.org/review/32917 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10radius: add Meraki dictionaryEthan Everett1-0/+1
Change-Id: Ibba2254bd9711b9cbac2d8f3ef2e209ccdc45bc0 Reviewed-on: https://code.wireshark.org/review/32621 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-03macOS: Update a comment in osx-app.sh.in.Gerald Combs1-3/+3
The answer to the question "do we need to add hardened runtime entitlements or exceptions?" in osx-app.sh is "yes". Update a comment accordingly. Change-Id: Icc6f9ed31838aa6342f405a244e726586e9c0c4d Reviewed-on: https://code.wireshark.org/review/32703 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-03osx app bundle: add entitlement to allow loading 3rd party plugnsJason Cohen2-0/+9
This adds the entitlement to everything we sign. I cannot test a more granular approach without access to an Apple issued codesigning cert/key pair. Bug: 15667 Change-Id: I9fe962a06b681d33853b0944765987e21d21be2d Reviewed-on: https://code.wireshark.org/review/32700 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-02Windows: upgrade USBPcap to 1.3.0.0 and Npcap to 0.992Pascal Quantin1-2/+2
Change-Id: Ie27c2cb36dc90a20851f1e2c53c1af2220465a39 Reviewed-on: https://code.wireshark.org/review/32678 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-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>