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]

5 files changed, 19 insertions, 10 deletions

diff --git a/packaging/macosx/logray-app.dmgbuild.in b/packaging/macosx/logray-app.dmgbuild.in
index d392109dd7..49d0d63900 100644
--- a/packaging/macosx/logray-app.dmgbuild.in
+++ b/packaging/macosx/logray-app.dmgbuild.in
@@ -44,7 +44,9 @@ lr_uninstall_path_helper = 'Remove Logray from the system path.pkg'
 # ULMO - UDIF lzma-compressed image (macOS 10.15+ only)
 # Volume format (see hdiutil create -help)
 
-format = defines.get('format', 'UDBZ')
+# https://developer.apple.com/forums/thread/128166
+# currently (Jan 2023) says to use UDZO
+format = defines.get('format', 'UDZO')
 
 # Compression level (if relevant)
 compression_level = 9
@@ -61,10 +63,6 @@ files = [
 # Symlinks to create
 symlinks = {
     'Applications': '/Applications',
-    lr_install_chmodbpf: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_install_chmodbpf),
-    lr_uninstall_chmodbpf: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_uninstall_chmodbpf),
-    lr_install_path_helper: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_install_path_helper),
-    lr_uninstall_path_helper: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_uninstall_path_helper),
     }
 
 # Volume icon
diff --git a/packaging/macosx/logray-dsym.dmgbuild.in b/packaging/macosx/logray-dsym.dmgbuild.in
index 30e9839da6..f02bbf5926 100644
--- a/packaging/macosx/logray-dsym.dmgbuild.in
+++ b/packaging/macosx/logray-dsym.dmgbuild.in
@@ -39,6 +39,10 @@ lw_readme_dsym = 'Debugging symbols installation.html'
 # ULFO - UDIF lzfse-compressed image (OS X 10.11+ only)
 # ULMO - UDIF lzma-compressed image (macOS 10.15+ only)
 # Volume format (see hdiutil create -help)
+
+# dSYMs are huge, so compress them with UDBZ despite what
+# https://developer.apple.com/forums/thread/128166
+# currently (Jan 2023) says.
 format = defines.get('format', 'UDBZ')
 
 # Compression level (if relevant)
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in
index ec94397c38..176916ad20 100755
--- a/packaging/macosx/osx-app.sh.in
+++ b/packaging/macosx/osx-app.sh.in
@@ -535,6 +535,7 @@ dsymutil --minimize --out "$bundle_dsym" \
 # done
 
 codesign_file () {
+	# https://developer.apple.com/forums/thread/128166
 	# https://developer.apple.com/library/archive/documentation/Security/Conceptual/CodeSigningGuide/Procedures/Procedures.html
 	# https://developer.apple.com/library/archive/technotes/tn2206/_index.html
 	# https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution/resolving_common_notarization_issues?language=objc
diff --git a/packaging/macosx/wireshark-app.dmgbuild.in b/packaging/macosx/wireshark-app.dmgbuild.in
index 0f48f58756..a24f153be0 100644
--- a/packaging/macosx/wireshark-app.dmgbuild.in
+++ b/packaging/macosx/wireshark-app.dmgbuild.in
@@ -62,7 +62,9 @@ ws_uninstall_path_helper = 'Remove Wireshark from the system path.pkg'
 # 40      Wireshark 3.7.0 Intel 64.dmg
 # 50      Wireshark dSYM 3.7.0 Intel 64.dmg
 
-format = defines.get('format', 'UDBZ')
+# https://developer.apple.com/forums/thread/128166
+# currently (Jan 2023) says to use UDZO
+format = defines.get('format', 'UDZO')
 
 # Compression level (if relevant)
 compression_level = 9
@@ -75,15 +77,15 @@ files = [
     os.path.join(ws_bindir, 'run', ws_app),
     os.path.join(ws_bindir, 'packaging', 'macosx', 'wireshark', ws_readme),
     os.path.join(ws_bindir, 'packaging', 'macosx', 'wireshark', ws_donate),
+    os.path.join(ws_bindir, 'run', ws_app, 'Contents', 'Resources', 'Extras', ws_install_chmodbpf),
+    os.path.join(ws_bindir, 'run', ws_app, 'Contents', 'Resources', 'Extras', ws_uninstall_chmodbpf),
+    os.path.join(ws_bindir, 'run', ws_app, 'Contents', 'Resources', 'Extras', ws_install_path_helper),
+    os.path.join(ws_bindir, 'run', ws_app, 'Contents', 'Resources', 'Extras', ws_uninstall_path_helper),
 ]
 
 # Symlinks to create
 symlinks = {
     'Applications': '/Applications',
-    ws_install_chmodbpf: os.path.join(ws_app, 'Contents', 'Resources', 'Extras', ws_install_chmodbpf),
-    ws_uninstall_chmodbpf: os.path.join(ws_app, 'Contents', 'Resources', 'Extras', ws_uninstall_chmodbpf),
-    ws_install_path_helper: os.path.join(ws_app, 'Contents', 'Resources', 'Extras', ws_install_path_helper),
-    ws_uninstall_path_helper: os.path.join(ws_app, 'Contents', 'Resources', 'Extras', ws_uninstall_path_helper),
     }
 
 # Volume icon
diff --git a/packaging/macosx/wireshark-dsym.dmgbuild.in b/packaging/macosx/wireshark-dsym.dmgbuild.in
index e2470d4fac..e09a52b560 100644
--- a/packaging/macosx/wireshark-dsym.dmgbuild.in
+++ b/packaging/macosx/wireshark-dsym.dmgbuild.in
@@ -39,6 +39,10 @@ ws_readme_dsym = 'Debugging symbols installation.html'
 # ULFO - UDIF lzfse-compressed image (OS X 10.11+ only)
 # ULMO - UDIF lzma-compressed image (macOS 10.15+ only)
 # Volume format (see hdiutil create -help)
+
+# dSYMs are huge, so compress them with UDBZ despite what
+# https://developer.apple.com/forums/thread/128166
+# currently (Jan 2023) says.
 format = defines.get('format', 'UDBZ')
 
 # Compression level (if relevant)