Skip to content

Commit 32e89dc

Browse files
authored
Update minimum libdigidocpp version and codesigning timestamp server URL (#1282)
IB-7900 Signed-off-by: Raul Metsma <[email protected]>
1 parent 5212d87 commit 32e89dc

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include( GNUInstallDirs )
1212
include( VersionInfo )
1313

1414
find_package( PKCS11 )
15-
find_package(LibDigiDocpp 3.17.0 REQUIRED)
15+
find_package(LibDigiDocpp 4.0.0 REQUIRED)
1616
find_package( LDAP REQUIRED )
1717
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
1818
find_package(Qt${QT_VERSION_MAJOR} 5.12.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools)

RELEASE-NOTES.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
DigiDoc4 version [4.6.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.6.0) release notes
2+
--------------------------------------
3+
- Code, Text and translation improvements and updates
4+
5+
[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.5.0...v4.6.0)
6+
7+
DigiDoc4 version [4.5.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.5.0) release notes
8+
--------------------------------------
9+
- Code, Text and translation improvements and updates
10+
11+
[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.4.0...v4.5.0)
12+
113
DigiDoc4 version [4.4.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.4.0) release notes
214
--------------------------------------
315
- Code, Text and translation improvements and updates

client/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,13 @@ elseif(WIN32)
247247
)
248248
if(SIGNCERT)
249249
list(APPEND SIGNCMD signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256
250-
/du http://installer.id.ee /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256)
250+
/du http://installer.id.ee /tr http://timestamp.digicert.com /td SHA256)
251251
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
252252
COMMAND ${SIGNCMD} "$<$<BOOL:${CROSSSIGNCERT}>:/ph;/ac;${CROSSSIGNCERT}>" $<TARGET_FILE:${PROJECT_NAME}>
253253
COMMAND_EXPAND_LISTS
254254
)
255255
add_custom_command(TARGET msi POST_BUILD
256-
COMMAND ${SIGNCMD} "${MSI_FILE}.msi"
256+
COMMAND ${SIGNCMD} "${MSI_FILE}.msi" "${MSI_FILE}.qt.msi"
257257
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
258258
)
259259
endif()

extensions/windows/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ if(SIGNCERT)
7474
add_custom_command(TARGET EsteidShellExtension POST_BUILD
7575
COMMAND signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256 /du http://installer.id.ee
7676
"$<$<BOOL:${CROSSSIGNCERT}>:/ph;/ac;${CROSSSIGNCERT}>"
77-
/tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 $<TARGET_FILE:EsteidShellExtension>
77+
/tr http://timestamp.digicert.com /td SHA256 $<TARGET_FILE:EsteidShellExtension>
7878
COMMAND_EXPAND_LISTS
7979
)
8080
add_custom_command(TARGET msishellext POST_BUILD
8181
COMMAND signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256 /du http://installer.id.ee
82-
/tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256
82+
/tr http://timestamp.digicert.com /td SHA256
8383
"${CMAKE_BINARY_DIR}/Digidoc_ShellExt-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}.msi"
8484
)
8585
endif()

qdigidoc4.wxs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@
109109
<File Name="libcrypto-3$(var.OpenSSLSuffix).dll" />
110110
<File Name="libssl-3$(var.OpenSSLSuffix).dll" />
111111
<File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
112-
<File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
113-
<File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
114112
<File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
115113
<?if $(sys.BUILDARCH) != x86 ?>
116114
<File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />

0 commit comments

Comments
 (0)