From 8ddfaaf60d20ec1bf589a6cdefc422c4202e0ea1 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 23 Aug 2024 16:01:44 +0300
Subject: [PATCH] Update code signature timestamping URL-s

IB-7900

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml |  6 +++---
 CMakeLists.txt              | 23 ++++++++++++++++-------
 cmake                       |  2 +-
 common                      |  2 +-
 idupdater.wxs               |  2 --
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index be2fbf8..987cec4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: 6.7.1
+        version: 6.7.2
         arch: win64_msvc2019_64
     - name: Setup dev env
       uses: ilammy/msvc-dev-cmd@v1
@@ -59,8 +59,8 @@ jobs:
         arch: x64
     - name: Install WiX
       run: |
-        dotnet tool install -g wix --version 5.0.0
-        wix extension -g add WixToolset.UI.wixext/5.0.0
+        dotnet tool install -g wix --version 5.0.1
+        wix extension -g add WixToolset.UI.wixext/5.0.1
     - name: Build
       run: |
         cmake -S . -B build `
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3712cf..851c5b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,10 @@ if( APPLE )
 		XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "ee.ria.${PROJECT_NAME}"
 	)
 	target_link_libraries(${PROJECT_NAME} ${XAR}
-		"-framework Cocoa -framework PreferencePanes -framework CryptoTokenKit -framework Security"
+		"-framework Cocoa"
+		"-framework PreferencePanes"
+		"-framework CryptoTokenKit"
+		"-framework Security"
 	)
 	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 		COMMAND cp $<TARGET_FILE:id-updater-helper> $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Resources )
@@ -131,9 +134,15 @@ else()
 		INTERPROCEDURAL_OPTIMIZATION YES
 		INTERPROCEDURAL_OPTIMIZATION_DEBUG NO
 	)
-	target_compile_definitions(${PROJECT_NAME} PRIVATE WIN32_LEAN_AND_MEAN UNICODE CONFIG_URL="${CONFIG_URL}" COMMON_STATIC NO_CACHE)
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+		WIN32_LEAN_AND_MEAN
+		UNICODE
+		CONFIG_URL="${CONFIG_URL}"
+		COMMON_STATIC
+		NO_CACHE
+	)
 	target_link_libraries(${PROJECT_NAME} Qt6::Widgets Qt6::Network OpenSSL::Crypto
-		msi Mstask Userenv wintrust Crypt32 taskschd comsupp ws2_32 Setupapi winscard Wtsapi32
+		msi wintrust Crypt32 taskschd comsupp Setupapi winscard Wtsapi32
 	)
 
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -151,7 +160,7 @@ else()
 	get_target_property(qtCore_install_prefix Qt6::qmake IMPORTED_LOCATION)
 	get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY)
 	add_custom_target(installer DEPENDS ${PROJECT_NAME}
-		COMMAND "wix.exe" build -nologo
+		COMMAND wix.exe build -nologo
 			-arch ${PLATFORM}
 			-ext WixToolset.UI.wixext
 			-bv WixUIDialogBmp=${CMAKE_SOURCE_DIR}/cmake/modules/dlgbmp.bmp
@@ -165,20 +174,20 @@ else()
 			${CMAKE_SOURCE_DIR}/idupdater.wxs
 			${CMAKE_SOURCE_DIR}/cmake/modules/WelcomeDlg.wxs
 			${CMAKE_SOURCE_DIR}/cmake/modules/WixUI_Minimal.wxs
-			-o "${MSI_FILE}.msi"
+			-o ${MSI_FILE}.msi
 	)
 	if(SIGNCERT)
 		if(CROSSSIGNCERT)
 			target_link_options(${PROJECT_NAME} PRIVATE "/INTEGRITYCHECK")
 		endif()
 		list(APPEND SIGNCMD signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256
-			/du http://installer.id.ee /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256)
+			/du http://installer.id.ee /tr http://timestamp.digicert.com /td SHA256)
 		add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 			COMMAND ${SIGNCMD} "$<$<BOOL:${CROSSSIGNCERT}>:/ph;/ac;${CROSSSIGNCERT}>" $<TARGET_FILE:${PROJECT_NAME}>
 			COMMAND_EXPAND_LISTS
 		)
 		add_custom_command(TARGET installer POST_BUILD
-			COMMAND ${SIGNCMD} "${MSI_FILE}.msi"
+			COMMAND ${SIGNCMD} ${MSI_FILE}.msi
 		)
 	endif()
 endif()
diff --git a/cmake b/cmake
index 32c52b0..8ce75e6 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 32c52b028eefce322fc5380dca2c834ce5a98d0c
+Subproject commit 8ce75e6057067ca51d7c619d34d88422bad201e5
diff --git a/common b/common
index 8cf8b7c..8e4034f 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 8cf8b7c3bc178c29bbaa33f37aad7dfd4970630e
+Subproject commit 8e4034fff04708e305d0bc9df8e445d6c3ffc81f
diff --git a/idupdater.wxs b/idupdater.wxs
index 35be4a3..dc19b9f 100644
--- a/idupdater.wxs
+++ b/idupdater.wxs
@@ -42,8 +42,6 @@
         </Component>
         <File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
         <File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
-        <File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
-        <File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
 <?if $(sys.BUILDARCH) != x86 ?>
         <File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />
 <?endif?>