From 8ce8cd87f31826300e62b4cfd075774f3c518bf4 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Sun, 24 Sep 2023 22:44:35 +0300 Subject: [PATCH] Update minimum supported macOS version WE2-823 Signed-off-by: Raul Metsma --- install/English.lproj/Localizable.strings | 3 +- install/cs.lproj/Localizable.strings | 3 +- install/distribution.xml | 24 ++-------- install/et.lproj/Localizable.strings | 3 +- install/macos-chrome-policy.plist | 57 ----------------------- install/macos-postinstall-chrome-policy | 3 -- install/ru.lproj/Localizable.strings | 3 +- install/sk.lproj/Localizable.strings | 3 +- src/app/CMakeLists.txt | 14 +----- 9 files changed, 9 insertions(+), 104 deletions(-) delete mode 100644 install/macos-chrome-policy.plist delete mode 100755 install/macos-postinstall-chrome-policy diff --git a/install/English.lproj/Localizable.strings b/install/English.lproj/Localizable.strings index 3b88bf38..3a486517 100644 --- a/install/English.lproj/Localizable.strings +++ b/install/English.lproj/Localizable.strings @@ -1,7 +1,6 @@ "SU_TITLE" = "Web eID Software"; "SU_ERROR" = "Error"; -"SU_1013" = "macOS version needs to be 10.13 or newer."; +"SU_11" = "macOS version needs to be 11.0 or newer."; "SU_BASE" = "Base components"; "SU_FIREFOX" = "Firefox authentication and signing support"; "SU_CHROME" = "Chrome authentication and signing support"; -"SU_CHROME_POLICY" = "Chrome extension will be activated automatically"; diff --git a/install/cs.lproj/Localizable.strings b/install/cs.lproj/Localizable.strings index b570cfab..0f40b2e1 100644 --- a/install/cs.lproj/Localizable.strings +++ b/install/cs.lproj/Localizable.strings @@ -1,7 +1,6 @@ "SU_TITLE" = "Web eID Software"; "SU_ERROR" = "Chyba"; -"SU_1013" = "verze macOS musí být 10.13 nebo novější."; +"SU_11" = "verze macOS musí být 11.0 nebo novější."; "SU_BASE" = "Základní komponenty"; "SU_FIREFOX" = "Podpora ověřování a podepisování Firefoxu"; "SU_CHROME" = "Podpora ověřování a podepisování Chrome"; -"SU_CHROME_POLICY" = "Rozšíření pro Chrome bude aktivováno automaticky"; diff --git a/install/distribution.xml b/install/distribution.xml index 8d3bf7ec..844b8766 100644 --- a/install/distribution.xml +++ b/install/distribution.xml @@ -8,7 +8,7 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I - + @@ -17,9 +17,9 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I - web-eid-native.pkg @@ -61,12 +51,4 @@ function pm_chrome_policy_selected() { web-eid-chrome.pkg - - web-eid-chrome-policy.pkg - diff --git a/install/et.lproj/Localizable.strings b/install/et.lproj/Localizable.strings index 791a1042..d288fe29 100644 --- a/install/et.lproj/Localizable.strings +++ b/install/et.lproj/Localizable.strings @@ -1,7 +1,6 @@ "SU_TITLE" = "Web eID tarkvara"; "SU_ERROR" = "Viga"; -"SU_1013" = "macOS'i versioon peab olema 10.13 või uuem."; +"SU_11" = "macOS'i versioon peab olema 11.0 või uuem."; "SU_BASE" = "Baaskomponendid"; "SU_FIREFOX" = "Firefoxi autentimise ja allkirjastamise tugi"; "SU_CHROME" = "Chrome'i autentimise ja allkirjastamise tugi"; -"SU_CHROME_POLICY" = "Chrome laiendus aktiveeritakse automaatselt"; diff --git a/install/macos-chrome-policy.plist b/install/macos-chrome-policy.plist deleted file mode 100644 index fea80530..00000000 --- a/install/macos-chrome-policy.plist +++ /dev/null @@ -1,57 +0,0 @@ - - - - - PayloadContent - - - PayloadContent - - com.google.Chrome - - Forced - - - mcx_preference_settings - - ExtensionInstallForcelist - - ncibgoaomkmdpilpocfeponihegamlic;https://clients2.google.com/service/update2/crx - - - - - - - PayloadEnabled - - PayloadIdentifier - 56790 - PayloadType - com.apple.ManagedClient.preferences - PayloadUUID - com.google.Chrome: 56790 - PayloadVersion - 1 - - - PayloadDescription - Google Chrome Forced Install Extension - PayloadDisplayName - Google Chrome Forced Install Extension - PayloadIdentifier - eu.web-eid.web-eid - PayloadOrganization - web-eid.eu - PayloadRemovalDisallowed - - PayloadScope - System - PayloadType - Configuration - PayloadUUID - 56790 - PayloadVersion - 1 - - diff --git a/install/macos-postinstall-chrome-policy b/install/macos-postinstall-chrome-policy deleted file mode 100755 index 486e0426..00000000 --- a/install/macos-postinstall-chrome-policy +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -sudo profiles -IF $PWD/chrome-policy.plist diff --git a/install/ru.lproj/Localizable.strings b/install/ru.lproj/Localizable.strings index b8eeb23a..6dd25006 100644 --- a/install/ru.lproj/Localizable.strings +++ b/install/ru.lproj/Localizable.strings @@ -1,7 +1,6 @@ "SU_TITLE" = "Web eID Software"; "SU_ERROR" = "Error"; -"SU_1013" = "macOS version needs to be 10.13 or newer."; +"SU_11" = "macOS version needs to be 11.0 or newer."; "SU_BASE" = "Base components"; "SU_FIREFOX" = "Поддержка аутентиф. и подпис. в Firefox"; "SU_CHROME" = "Поддержка аутентиф. и подпис. в Chrome"; -"SU_CHROME_POLICY" = "Плагин для Chrome активируется автоматически"; diff --git a/install/sk.lproj/Localizable.strings b/install/sk.lproj/Localizable.strings index 7cf93157..e73618d8 100644 --- a/install/sk.lproj/Localizable.strings +++ b/install/sk.lproj/Localizable.strings @@ -1,7 +1,6 @@ "SU_TITLE" = "Web eID Software"; "SU_ERROR" = "Chyba"; -"SU_1013" = "verzia macOS musí byť 10.13 alebo novšia."; +"SU_11" = "verzia macOS musí byť 11.0 alebo novšia."; "SU_BASE" = "Základné komponenty"; "SU_FIREFOX" = "Podpora overovania a podpisovania Firefoxu"; "SU_CHROME" = "Podpora overovania a podpisovania Chrome"; -"SU_CHROME_POLICY" = "Rozšírenie pre Chrome bude aktivované automaticky"; diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 84f33e72..73926f5e 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -118,22 +118,10 @@ elseif(APPLE) --version "${PROJECT_VERSION}" $-chrome_${PROJECT_VERSION}.pkg COMMAND_EXPAND_LISTS ) - add_custom_target(installer-chrome-policy - COMMAND rm -rf root_chrome_policy root_chrome_policy_scripts - COMMAND mkdir -p root_chrome_policy root_chrome_policy_scripts - COMMAND cp ${CMAKE_SOURCE_DIR}/install/macos-chrome-policy.plist root_chrome_policy_scripts/chrome-policy.plist - COMMAND cp ${CMAKE_SOURCE_DIR}/install/macos-postinstall-chrome-policy root_chrome_policy_scripts/postinstall - COMMAND /bin/sh -c "\"$<$:security;cms;-S;-N;Developer ID Application: ${SIGNCERT};-i;${CMAKE_SOURCE_DIR}/install/macos-chrome-policy.plist;-o;root_chrome_policy_scripts/chrome-policy.plist>\"" - COMMAND pkgbuild --root root_chrome_policy --scripts root_chrome_policy_scripts --identifier "eu.web-eid.$-chrome-policy" - "$<$:--sign;${SIGNCERT}>" - --version "${PROJECT_VERSION}" $-chrome-policy_${PROJECT_VERSION}.pkg - COMMAND_EXPAND_LISTS - ) - add_custom_target(installer DEPENDS installer-chrome installer-chrome-policy installer-firefox + add_custom_target(installer DEPENDS installer-chrome installer-firefox COMMAND mkdir -p packages COMMAND cp web-eid-native_*.pkg packages/web-eid-native.pkg COMMAND cp web-eid-chrome_*.pkg packages/web-eid-chrome.pkg - COMMAND cp web-eid-chrome-policy_*.pkg packages/web-eid-chrome-policy.pkg COMMAND cp web-eid-firefox_*.pkg packages/web-eid-firefox.pkg COMMAND productbuild --distribution ${CMAKE_SOURCE_DIR}/install/distribution.xml "$<$:--sign;Developer ID Installer: ${SIGNCERT}>" --resources ${CMAKE_SOURCE_DIR}/install/