diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /packaging/macosx | |
parent | Adding debian version 4.2.6-1. (diff) | |
download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/macosx')
-rwxr-xr-x | packaging/macosx/ChmodBPF/install-scripts/postinstall | 1 | ||||
-rw-r--r-- | packaging/macosx/LograyInfo.plist.in | 4 | ||||
-rw-r--r-- | packaging/macosx/WiresharkInfo.plist.in | 24 |
3 files changed, 23 insertions, 6 deletions
diff --git a/packaging/macosx/ChmodBPF/install-scripts/postinstall b/packaging/macosx/ChmodBPF/install-scripts/postinstall index 8f5035de..02b92e61 100755 --- a/packaging/macosx/ChmodBPF/install-scripts/postinstall +++ b/packaging/macosx/ChmodBPF/install-scripts/postinstall @@ -24,6 +24,7 @@ if ! dscl . -read /Groups/"$BPF_GROUP" > /dev/null 2>&1; then dseditgroup -q -o create -i $free_gid -r "$BPF_GROUP_NAME" "$BPF_GROUP" fi +dseditgroup -q -o edit -a admin -t group "$BPF_GROUP" dseditgroup -q -o edit -a "$USER" -t user "$BPF_GROUP" chmod u=rw,g=r,o=r "$CHMOD_BPF_PLIST" diff --git a/packaging/macosx/LograyInfo.plist.in b/packaging/macosx/LograyInfo.plist.in index 1074f1a2..a90fca5a 100644 --- a/packaging/macosx/LograyInfo.plist.in +++ b/packaging/macosx/LograyInfo.plist.in @@ -6,8 +6,6 @@ <string>English</string> <key>CFBundleExecutable</key> <string>Logray</string> - <key>CFBundleGetInfoString</key> - <string>@LOG_PROJECT_VERSION@, Copyright 1998-2024 Wireshark Development Team</string> <key>CFBundleIconFile</key> <string>Logray.icns</string> <key>CFBundleIdentifier</key> @@ -40,7 +38,7 @@ <key>CFBundleVersion</key> <string>@LOG_PROJECT_VERSION@</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 1998-2024 Wireshark Developers, GNU General Public License.</string> + <string>Copyright 1998-2024 the Wireshark developer community</string> <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHighResolutionCapable</key> diff --git a/packaging/macosx/WiresharkInfo.plist.in b/packaging/macosx/WiresharkInfo.plist.in index 64ae6119..caa064a8 100644 --- a/packaging/macosx/WiresharkInfo.plist.in +++ b/packaging/macosx/WiresharkInfo.plist.in @@ -6,8 +6,6 @@ <string>English</string> <key>CFBundleExecutable</key> <string>Wireshark</string> - <key>CFBundleGetInfoString</key> - <string>@PROJECT_VERSION@, Copyright 1998-2024 Wireshark Development Team</string> <key>CFBundleIconFile</key> <string>Wireshark.icns</string> <key>CFBundleIdentifier</key> @@ -126,9 +124,17 @@ <key>CFBundleTypeExtensions</key> <array> <string>pcapng</string> + <string>scap</string> <string>ntar</string> <string>pcapng.gz</string> + <string>scap.gz</string> <string>ntar.gz</string> + <string>pcapng.lz4</string> + <string>scap.lz4</string> + <string>ntar.lz4</string> + <string>pcapng.zst</string> + <string>scap.zst</string> + <string>ntar.zst</string> </array> <key>CFBundleTypeIconFile</key> <string>Wiresharkdoc.icns</string> @@ -232,6 +238,18 @@ <key>CFBundleTypeRole</key> <string>Viewer</string> </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>ems</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>Wiresharkdoc.icns</string> + <key>CFBundleTypeName</key> + <string>EGNOS Message Server (EMS) file</string> + <key>CFBundleTypeRole</key> + <string>Viewer</string> + </dict> <!-- XXX - This dictionary needs a lot more entries --> </array> <key>CFBundleInfoDictionaryVersion</key> @@ -245,7 +263,7 @@ <key>CFBundleVersion</key> <string>@PROJECT_VERSION@</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 1998-2024 Wireshark Developers, GNU General Public License.</string> + <string>Copyright 1998-2024 the Wireshark developer community</string> <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHighResolutionCapable</key> |