From c734bbeba1c70af1dc292b7defae945de6d4c737 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 13 Aug 2024 14:52:30 +0300
Subject: [PATCH] Update minimum libdigidocpp version and codesigning timestamp
 server URL

IB-7900

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 CMakeLists.txt                    |  2 +-
 RELEASE-NOTES.md                  | 12 ++++++++++++
 client/CMakeLists.txt             |  2 +-
 cmake                             |  2 +-
 extensions/windows/CMakeLists.txt |  4 ++--
 qdigidoc4.wxs                     |  2 --
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d50f9ff..3e4c63b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ include( GNUInstallDirs )
 include( VersionInfo )
 
 find_package( PKCS11 )
-find_package(LibDigiDocpp 3.17.0 REQUIRED)
+find_package(LibDigiDocpp 4.0.0 REQUIRED)
 find_package( LDAP REQUIRED )
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.12.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 9bdeade4..b121d315 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,15 @@
+DigiDoc4 version [4.6.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.6.0) release notes
+--------------------------------------
+- Code, Text and translation improvements and updates
+
+[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.5.0...v4.6.0)
+
+DigiDoc4 version [4.5.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.5.0) release notes
+--------------------------------------
+- Code, Text and translation improvements and updates
+
+[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.4.0...v4.5.0)
+
 DigiDoc4 version [4.4.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.4.0) release notes
 --------------------------------------
 - Code, Text and translation improvements and updates
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index ec4551b7..acf874b4 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -247,7 +247,7 @@ elseif(WIN32)
 	)
 	if(SIGNCERT)
 		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
diff --git a/cmake b/cmake
index 32c52b02..8ce75e60 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 32c52b028eefce322fc5380dca2c834ce5a98d0c
+Subproject commit 8ce75e6057067ca51d7c619d34d88422bad201e5
diff --git a/extensions/windows/CMakeLists.txt b/extensions/windows/CMakeLists.txt
index 49daab56..04d943ba 100644
--- a/extensions/windows/CMakeLists.txt
+++ b/extensions/windows/CMakeLists.txt
@@ -74,12 +74,12 @@ if(SIGNCERT)
     add_custom_command(TARGET EsteidShellExtension POST_BUILD
         COMMAND signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256 /du http://installer.id.ee
             "$<$<BOOL:${CROSSSIGNCERT}>:/ph;/ac;${CROSSSIGNCERT}>"
-            /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 $<TARGET_FILE:EsteidShellExtension>
+            /tr http://timestamp.digicert.com /td SHA256 $<TARGET_FILE:EsteidShellExtension>
         COMMAND_EXPAND_LISTS
     )
     add_custom_command(TARGET msishellext POST_BUILD
         COMMAND 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
+            /tr http://timestamp.digicert.com /td SHA256
             "${CMAKE_BINARY_DIR}/Digidoc_ShellExt-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}.msi"
     )
 endif()
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
index d669a008..54ce5ead 100644
--- a/qdigidoc4.wxs
+++ b/qdigidoc4.wxs
@@ -109,8 +109,6 @@
         <File Name="libcrypto-3$(var.OpenSSLSuffix).dll" />
         <File Name="libssl-3$(var.OpenSSLSuffix).dll" />
         <File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
-        <File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
-        <File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
         <File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
 <?if $(sys.BUILDARCH) != x86 ?>
         <File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />