Commit Graph

352 Commits

Author SHA1 Message Date
Gerald Combs ecbfda08c4 macOS: Update our extra package versions.
Track our extra package versions using CMake variables and bump each
version.
2023-02-09 17:52:55 +00:00
Gerald Combs 3e07c0dc01 macOS: Forget our ChmodBPF package when uninstalling
Add `pkgutil --forget org.wireshark.ChmodBPF.pkg` to the "Uninstall
ChmodBPF" postinstall script. The `pkgutil` man page says

    --forget package-id
        Discard all receipt data about package-id, but do not touch the
        installed files.  DO NOT use this command from an installer package
        script to fix broken package design.

but Homebrew's Wireshark cask does this, and it should help to work
around issue #18734.

Add `pkgutil --forget org.wireshark.path_helper.pkg` to the "Remove
Wireshark from the system path" postinstall script.
2023-02-07 21:24:34 +00:00
Gerald Combs e1db561aa2 macOS: Fixup our signature identifiers
Pass a prefix to `codesign` so that our signature identifier is
"org.wireshark.foo" instead of "foo" for our command line utilities,
libraries, and ChmodBPF.
2023-02-07 01:43:13 +00:00
Gerald Combs 75742c81b6 macOS: Copy our top-level .pkgs instead of symlinking them
Make copies of our top-level packages instead of symlinking them. Blind
attempt at fixing #18830.

Switch to UDZO for our application disk images as recommended in
https://developer.apple.com/forums/thread/128166

[skip ci]
2023-01-29 18:54:50 +00:00
Gerald Combs 29ca9c289f macOS: Add an initial donation page to the .dmg
Add a donation page to the .dmg package.
2023-01-11 18:42:39 +00:00
Stig Bjørlykke 67a788b29c Happy New Year 2023 2023-01-01 10:22:36 +01:00
Gerald Combs b15eb8a82f macOS: Don't try to copy a nonexistent plist
In the ChmodBPF postinstall script, don't try to copy
org.wireshark.ChmodBPF.plist from a nonexistent location.

Ping #18734.
2022-12-30 18:05:01 -08:00
Gerald Combs d44c4193e0 macOS packaging: Clarify an issue with libbrotli. 2022-12-11 20:31:46 +00:00
Gerald Combs 3b074f7344 Update our Logray icons.
Enlarge the left fin, which makes the 16x16 blob look a little better.
Shorten the tail.
2022-10-08 15:08:22 -07:00
Gerald Combs ab4a4304ee Add Logray icons.
Add lricon.svg and lriconinst.svg, which provide the core graphic
element for the various Logray icons. Add lricon*.png, which were
created using the templates at
https://developer.apple.com/design/resources/. Add Logray.icns,
logray.ico, and lograyinst.ico, and use them in various packaging
resources.
2022-09-04 23:01:06 +00:00
Gerald Combs b984e6e29d CMake: Split more Wireshark/Logray variables.
Split our macOS application bundle variables into Wireshark- and
Logray-specific ones. Make sure Logray's PkgInfo and CFBundleSignature
match.
2022-09-01 09:05:58 -07:00
Gerald Combs 308d9d1856 macOS: Make sure we rpathify QtNetwork.
QtNetwork might be linked with brotli, so make sure we fix up its rpath.
2022-08-18 12:19:54 -07:00
Gerald Combs bf6f2068ab macOS: Try to make sure we can find brotli.
libbrotlidec and libbrotlicommon show up in `otool -L` without any path
information on the macOS builders, similar to what's described at

https://github.com/google/brotli/issues/934

Try to work around this in osx-app.sh.
2022-08-18 11:11:14 -07:00
Gerald Combs 75efbb1ac4 Rename Logwolf to Logray
Switch to the name "Logray" for the log analyzer. Rays are biological
cousins of sharks and more people like the name "Logray" in a completely
unscientific survey here. Apologies for any inconvenience this might
cause.
2022-07-06 15:04:25 +00:00
Gerald Combs c253dda269 CMake+Packaging: Add a logwolf_dmg target. 2022-06-08 17:39:54 +00:00
Gerald Combs c5e265f852 CMake: Deduplicate some version variables.
Use PROJECT_VERSION instead of VERSION. Prepend "PROJECT_" or
"LOG_PROJECT_" as needed to other variables. Remove the leftover unused
variables.
2022-06-07 16:04:17 -07:00
Gerald Combs 370c58f913 macOS: Add Logwolf packaging targets.
Rename the following build targets:

app_bundle to wireshark_app_bundle
dmg_package_prep to wireshark_dmg_prep
dmg_package to wireshark_dmg

Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and
packaging assets. Update the documentation.

We need to add a set of Logwolf version variables to CMake and
make-version.pl. Add a static logwolf-version attribute to
attributes.adoc in the mean time.
2022-05-26 20:29:20 +00:00
Gerald Combs c2fd505516 macOS: Even more Sparkle 2 signing fixes.
Sparkle's XPC services are only needed if we're sandboxing, so remove
them.

[skip ci]
2022-04-20 14:28:17 -07:00
Gerald Combs d024502c8b macOS: More Sparkle 2 signing fixes.
Sign our XPCs. Add another Brotli fixup.
2022-04-20 12:50:29 -07:00
Gerald Combs 486fd46fe9 macOS: Update our app bundle for Sparkle 2.
Update our application bundle script to handle Sparkle 2 and its assets.
2022-04-20 11:23:24 -07:00
Gerald Combs 167d44ea6d CMake+packaging: Create our macOS Frameworks directory in osx-app.sh. 2022-04-04 09:39:27 -07:00
Gerald Combs 211353c873 CMake+packaging: Add a logwolf_app_bundle target.
Add a logwolf_app_bundle target and update osx-app.sh to handle
different application bundle names.
2022-04-04 09:39:27 -07:00
Gerald Combs 5d3ffe9b57 More Logshark to Logwolf renaming. 2022-04-04 09:39:27 -07:00
Gerald Combs 245f988e9e Logshark: Add initial UI.
Add a separate UI application named "Logshark". It's currently a very
thin superclass of Wireshark, but that will change over time. Based on
work by Loris Degioanni.
2022-04-04 09:39:26 -07:00
Gerald Combs 2fdf85c6eb Create Wireshark and Logshark info plists.
Rename Info.plist.in to WiresharkInfo.plist.in and copy it to
LogsharkInfo.plist.in.
2022-04-04 09:39:26 -07:00
Gerald Combs 93d9b799b7 macOS: Fix our dSYM bundle name. 2022-03-05 15:49:01 -08:00
Gerald Combs 1677e0a8f9 Packaging: Ship macOS dSYMs in their own .dmg.
Create a Wireshark.dSYM bundle for our debugging symbols. Create a
separate .dmg for the dSYM bundle, similar to what we do for Windows.
`dwarfdump --uuid run/Wireshark.dSYM` returns what app

This reduces the size of the application bundle and .dmg quite a bit
(sizes measured with `du -sm`):

51	Wireshark 3.7.0 Intel 64.dmg
81	Wireshark dSYM 3.7.0 Intel 64.dmg
182	Wireshark.app
262	Wireshark.dSYM
2022-03-05 14:32:53 -08:00
Gerald Combs 0e427ac837 Packaging: Update our macOS notarization check.
It looks like altool changed its "info" argument from --eval-info to
--notarization-info at some point.
2022-02-22 18:36:35 -08:00
Stig Bjørlykke d8474fdee7 Happy New Year 2022 2022-01-01 14:08:38 +01:00
Gerald Combs 261d223a30 Packaging: Remove a macOS notarization wait.
Older versions of altool couldn't submit uploads concurrently. According
to

https://threadreaderapp.com/thread/1146464491288219653.html

that's no longer the case for version 4.0 and later. Remove our hacky
concurrency check.
2021-12-01 15:43:15 -08:00
Gerald Combs 54ef97cc01 Packaging: Specify host architectures in our macOS Extras packages.
Add 'hostArchitectures="arm64,x86_64"' to the ChmodBPF and path_helper
distribution XML files. "arm64" isn't specified in

https://developer.apple.com/library/archive/documentation/DeveloperTools/Reference/DistributionDefinitionRef/Chapters/Distribution_XML_Ref.html

but seems to be correct:

https://developer.apple.com/forums/thread/667672
https://stackoverflow.com/questions/11487596/making-macos-installer-packages-which-are-developer-id-ready

Blind attempt at fixing #17757.
2021-11-30 09:24:02 -08:00
Gerald Combs 64275ff196 macOS: Update some comments in osx-app.sh. 2021-11-15 09:26:20 -08:00
Gerald Combs e3159ae631 macOS: Add a workaround for libpcre2.
Work around an issue with libpcre2 similar to what we do for libsnappy
and libssh.
2021-11-14 17:06:38 -08:00
Gerald Combs 348d356594 Packaging: Update the macOS notarization failure error message.
Apple provides a status page for various developer services at
https://developer.apple.com/system-status/, including the status of the
Developer ID Notary Service. Show the URL notarization fails so that
troubleshooting is easier.
2021-09-01 10:24:58 -07:00
Gerald Combs 28c4c947c0 GitLab CI: Enable macOS Arm notarization.
Enable code signing & notarization in the macOS Arm Package job. Add
"needs: []". Verify the .dmg after notarizing it.
2021-08-25 20:40:29 +00:00
Gerald Combs d2979e1976 GitLab CI: Initial macOS Arm build.
Add a "macOS Arm Package" job to .gitlab-ci.yml. Fixup a check in
osx-dmg.sh.
2021-08-24 21:22:41 +00:00
Gerald Combs ffc5522a35 Packaging: "Acorn RISC Machine" was a long time ago.
Use "Arm 64" instead of "ARM 64" for our .dmg names.
2021-05-31 07:41:32 +00:00
Gerald Combs a714805628 macOS: Name our .dmgs according to our architecture.
In osx-dmg.sh, add "ARM 64" or "Intel 64" to our .dmg name depending on
the architecture of Wireshark.app/Contents/MacOS/Wireshark.
2021-05-30 17:32:32 +00:00
Guy Harris 5d39e36198 doc: Clean up lists of file types.
Add missing entries, regularize the descriptions, etc..

Note that pcap and pcapng are the native formats.

Fix various issues.

Update the editcap -F output to match urrent reality.

While we're at it, sort the libwiretap modules, putting observer.c in
the right place.
2021-03-13 10:02:02 +00:00
Guy Harris e0afa7f2a4 Observer is now a product of Viavi.
JDSU bought Network Instruments, and then split into Viavi and Lumentum,
with Viavi getting Observer.
2021-03-11 20:02:14 +00:00
Stig Bjørlykke 85bf15fd76 Happy New Year 2021 2021-01-01 11:36:23 +00:00
Gerald Combs b3352bd639 macOS: Force dark mode support.
We initially disabled dark mode support in Info.plist when we didn't
support it very well, and later passively enabled it depending on our
SDK version. Go ahead and force it on since we officially support dark
mode. Closes #17098.
2020-12-22 19:37:22 +00:00
Gerald Combs bf45e8c3f1 macOS: Add a workaround for libsnappy.
Work around an issue with libsnappy similar to what we do with libssh.
2020-12-16 21:31:29 +00:00
Gerald Combs 59483604de macOS: Switch ChmodBPF to zsh.
Switch the ChmodBPF script to /bin/zsh since it

- Has known behavior, unlike /bin/sh, which execs whatever
  /private/var/select/sh points to.

- Supports 'read -n 0' and other nice features.

- Is unlikely to be deprecated, since it was made the default shell in
  Catalina[1].

- Exists in older macOS releases, unlike dash[2].

Closes #16826.

[1]https://support.apple.com/en-us/HT208050
[2]https://scriptingosx.com/2020/06/about-bash-zsh-sh-and-dash-in-macos-catalina-and-beyond/
2020-09-18 16:34:24 +00:00
Michael Schmitt 34ff98c860 Assign access_bpf to GID less than 500
When installing ChmodBPF on macOS, assign the access_bpf group to the first
free GID greater than 100, rather to the default which starts at 500. Using
a GID less than 500 hides it in the System Preferences Users & Groups pane.

Bug: 6402
Change-Id: I62ed63bc64cb2721880467ffd0dc290ea57c8461
Reviewed-on: https://code.wireshark.org/review/37676
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-07-15 16:52:47 +00:00
Gerald Combs 290ddeeed4 macOS: Make the dmg_package target fail noisily.
Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639
Reviewed-on: https://code.wireshark.org/review/36270
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 17:22:30 +00:00
Gerald Combs 574aa22870 macOS: Fix a sanity check.
Change-Id: I1ae61bcc70f5994661b88d6a3c1a93e038b6b6cf
Reviewed-on: https://code.wireshark.org/review/36199
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-02-26 21:52:21 +00:00
Gerald Combs 47bd34873b macOS: Add a sanity check.
Check the file permissions in our application bundle.

Ping-Bug: 16407
Change-Id: I41c9dc903f764ea74b6f34a21ecb99d44bd1658f
Reviewed-on: https://code.wireshark.org/review/36193
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-02-26 21:03:08 +00:00
Gerald Combs 9266a27264 macOS: Remove a version check from osx-app.sh.
In osx-app.sh, $VERSION used to hold the minor version of the OS. We no
longer set it and it's probably safe to assume that we're building on
Lion or later, so remove it.

Change-Id: I8e85cd7c2fe2162019c7c436b7865be95d4a33e2
Reviewed-on: https://code.wireshark.org/review/36039
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-02-06 17:52:32 +00:00
Gerald Combs dd4b562df2 macOS: Add a disk volume icon.
Add a badge icon (custom removable disk icon) for our disk image volume.

Change-Id: If2a88efb76061bbf72ddc9844435429d20da6183
Reviewed-on: https://code.wireshark.org/review/35867
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-20 07:50:46 +00:00