From ecbfda08c42b5d64cbb432846da22f52277ef8d4 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 8 Feb 2023 16:21:56 -0800 Subject: [PATCH] macOS: Update our extra package versions. Track our extra package versions using CMake variables and bump each version. --- CMakeLists.txt | 18 ++++++++++-------- .../macosx/ChmodBPF/install-distribution.xml | 2 +- .../macosx/ChmodBPF/uninstall-distribution.xml | 2 +- .../path_helper/install-distribution.xml | 2 +- .../path_helper/uninstall-distribution.xml | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87f9be9638..cdbab5f4be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3246,6 +3246,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) # --preserve-xattr is undocumented but ensures that we install # a signed ChmodBPF script. + set (_chmodbpf_version 1.2) set (install_chmodbpf_component_pkg "${CMAKE_BINARY_DIR}/install.ChmodBPF.pkg") add_custom_command(OUTPUT "${install_chmodbpf_component_pkg}" COMMAND find @@ -3259,7 +3260,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) COMMAND "${CMAKE_SOURCE_DIR}/packaging/macosx/osx-extras.sh" COMMAND pkgbuild --identifier org.wireshark.ChmodBPF.pkg - --version 1.1 + --version ${_chmodbpf_version} --preserve-xattr --root "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/root" --scripts "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/install-scripts" @@ -3273,7 +3274,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) add_custom_command(OUTPUT "${install_chmodbpf_pkg}" COMMAND productbuild --identifier org.wireshark.install.ChmodBPF.product - --version 1.1 + --version ${_chmodbpf_version} --distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/install-distribution.xml" --package-path "${CMAKE_BINARY_DIR}" ${install_chmodbpf_pkg} @@ -3286,7 +3287,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) add_custom_command(OUTPUT "${uninstall_chmodbpf_component_pkg}" COMMAND pkgbuild --identifier org.wireshark.uninstall.ChmodBPF.pkg - --version 1.1 + --version ${_chmodbpf_version} --nopayload --scripts "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/uninstall-scripts" ${uninstall_chmodbpf_component_pkg} @@ -3297,7 +3298,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) add_custom_command(OUTPUT "${uninstall_chmodbpf_pkg}" COMMAND productbuild --identifier org.wireshark.uninstall.ChmodBPF.product - --version 1.1 + --version ${_chmodbpf_version} --distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/uninstall-distribution.xml" --package-path "${CMAKE_BINARY_DIR}" ${uninstall_chmodbpf_pkg} @@ -3308,6 +3309,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) add_custom_target(chmodbpf DEPENDS ${install_chmodbpf_pkg} ${uninstall_chmodbpf_pkg}) + set (_path_helper_version 1.1) set (install_path_helper_component_pkg "${CMAKE_BINARY_DIR}/install.path_helper.pkg") add_custom_command(OUTPUT "${install_path_helper_component_pkg}" COMMAND find @@ -3320,7 +3322,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) -exec chmod 644 "{}" + COMMAND pkgbuild --identifier org.wireshark.path_helper.pkg - --version 1.0 + --version ${_path_helper_version} --root "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/root/etc" --install-location /private/etc ${install_path_helper_component_pkg} @@ -3332,7 +3334,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) add_custom_command(OUTPUT "${install_path_helper_pkg}" COMMAND productbuild --identifier org.wireshark.install.path_helper.product - --version 1.0 + --version ${_path_helper_version} --distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/install-distribution.xml" --package-path "${CMAKE_BINARY_DIR}" ${install_path_helper_pkg} @@ -3345,7 +3347,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) add_custom_command(OUTPUT "${uninstall_path_helper_component_pkg}" COMMAND pkgbuild --identifier org.wireshark.uninstall.path_helper.pkg - --version 1.0 + --version ${_path_helper_version} --nopayload --scripts "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/uninstall-scripts" ${uninstall_path_helper_component_pkg} @@ -3356,7 +3358,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark) add_custom_command(OUTPUT "${uninstall_path_helper_pkg}" COMMAND productbuild --identifier org.wireshark.uninstall.path_helper.product - --version 1.0 + --version ${_path_helper_version} --distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/uninstall-distribution.xml" --package-path "${CMAKE_BINARY_DIR}" ${uninstall_path_helper_pkg} diff --git a/packaging/macosx/ChmodBPF/install-distribution.xml b/packaging/macosx/ChmodBPF/install-distribution.xml index 1b3e067d3a..fbd6fd916b 100644 --- a/packaging/macosx/ChmodBPF/install-distribution.xml +++ b/packaging/macosx/ChmodBPF/install-distribution.xml @@ -21,5 +21,5 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I - install.ChmodBPF.pkg + install.ChmodBPF.pkg diff --git a/packaging/macosx/ChmodBPF/uninstall-distribution.xml b/packaging/macosx/ChmodBPF/uninstall-distribution.xml index bd3b33486c..001f6e1454 100644 --- a/packaging/macosx/ChmodBPF/uninstall-distribution.xml +++ b/packaging/macosx/ChmodBPF/uninstall-distribution.xml @@ -21,5 +21,5 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I - uninstall.ChmodBPF.pkg + uninstall.ChmodBPF.pkg diff --git a/packaging/macosx/path_helper/install-distribution.xml b/packaging/macosx/path_helper/install-distribution.xml index be7cbcdf14..245f076543 100644 --- a/packaging/macosx/path_helper/install-distribution.xml +++ b/packaging/macosx/path_helper/install-distribution.xml @@ -20,5 +20,5 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I - install.path_helper.pkg + install.path_helper.pkg diff --git a/packaging/macosx/path_helper/uninstall-distribution.xml b/packaging/macosx/path_helper/uninstall-distribution.xml index 7949475ece..d44538cd44 100644 --- a/packaging/macosx/path_helper/uninstall-distribution.xml +++ b/packaging/macosx/path_helper/uninstall-distribution.xml @@ -20,5 +20,5 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I - uninstall.path_helper.pkg + uninstall.path_helper.pkg