Update version number and packages

IB-8447, IB-8528, IB-8527, IB-8433, IB-8306, IB-8529

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

.github/workflows/build.yml

@@ -85,14 +85,14 @@ jobs:
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 5ee5eee0d3e9c6098b24d263e9099edcdcef6631
+        vcpkgGitCommitId: 031ad89ce6c575df35a8e58707ad2c898446c63e
         vcpkgJsonGlob: ./vcpkg.json
         runVcpkgInstall: true
       env:
         VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
     - name: Build
       run: |
-        cmake --preset ${{ matrix.target }} "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=libdigidocpp.${{ matrix.target }}
+        cmake --preset ${{ matrix.target }} "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo
         cmake --build --preset ${{ matrix.target }}
         cmake --build --preset ${{ matrix.target }} --target install/strip
         zip -q -r libdigidocpp.${{ matrix.target }}.zip libdigidocpp.${{ matrix.target }}
@@ -161,15 +161,12 @@ jobs:
         path: libdigidocpp*.*
   windows:
     name: Build on Windows
-    runs-on: ${{ matrix.image }}
+    runs-on: windows-2025
     strategy:
       matrix:
         toolset: [143]
         platform: [x86, x64, arm64]
         include:
-        - toolset: 143
-          image: windows-2022
-          vcvars: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         - platform: x86
           setenv: amd64_x86
         - platform: x64
@@ -185,18 +182,15 @@ jobs:
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 5ee5eee0d3e9c6098b24d263e9099edcdcef6631
+        vcpkgGitCommitId: 031ad89ce6c575df35a8e58707ad2c898446c63e
         vcpkgJsonGlob: ./vcpkg.json
         runVcpkgInstall: true
         runVcpkgFormatString: "[`install`, `--recurse`, `--clean-after-build`, `--x-install-root`, `$[env.VCPKG_INSTALLED_DIR]`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`, `--x-feature`, `tests`]"
       env:
         VCPKG_DEFAULT_TRIPLET: ${{ matrix.platform }}-windows
         VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed_${{ matrix.platform }}
     - name: Install dependencies
-      run: |
-        choco install doxygen.install -y > $null
-        Invoke-WebRequest -UserAgent "Wget" "https://sourceforge.net/projects/swig/files/swigwin/swigwin-4.2.1/swigwin-4.2.1.zip/download" -OutFile swig.zip
-        tar xf swig.zip
+      run: winget install --silent --accept-source-agreements --accept-package-agreements swig doxygen
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
@@ -208,8 +202,9 @@ jobs:
         architecture: ${{ matrix.platform }}
     - name: Build
       run: |
-        & "${{ matrix.vcvars }}" ${{ matrix.setenv }} "&&" pwsh build.ps1 `
-          -swig ${{ github.workspace }}/swigwin-4.2.1/swig.exe `
+        $swig = (Get-Item "$env:LOCALAPPDATA\Microsoft\WinGet\Links\swig.exe").Target
+        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" ${{ matrix.setenv }} "&&" pwsh build.ps1 `
+          -swig $swig `
           -doxygen "C:/Program files/doxygen/bin/doxygen.exe" `
           -boost
     - name: Archive artifacts

CMakeLists.txt

@@ -5,7 +5,7 @@ endif()
 if(POLICY CMP0177)
     cmake_policy(SET CMP0177 NEW)
 endif()
-project(libdigidocpp VERSION 4.2.0)
+project(libdigidocpp VERSION 4.2.1)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
 

CMakePresets.json

@@ -11,36 +11,32 @@
         "CMAKE_BUILD_TYPE": "Debug"
       }
     },
-    {
-      "name": "base",
-      "displayName": "Base build config",
-      "hidden": true,
-      "inherits": "default",
-      "environment": {
-        "DEST": "/Library/libdigidocpp$env{DEST_SUFFIX}"
-      },
-      "installDir": "$env{DEST}"
-    },
     {
       "name": "macos",
       "description": "This macos build is only available on macOS",
-      "inherits": "base",
+      "inherits": "default",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Darwin"
       },
+      "installDir": "$env{DEST}",
+      "environment": {
+        "DEST": "/Library/libdigidocpp$env{DEST_SUFFIX}"
+      },
       "cacheVariables": {
         "CMAKE_OSX_ARCHITECTURES": "arm64;x86_64",
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "12.0",
+        "CMAKE_OSX_DEPLOYMENT_TARGET": "13.0",
         "CMAKE_FIND_ROOT_PATH": "$env{DEST}"
       }
     },
     {
       "name": "mobile",
       "hidden": true,
-      "inherits": "base",
+      "inherits": "default",
+      "installDir": "$env{DEST}",
       "environment": {
+        "DEST": "libdigidocpp$env{DEST_SUFFIX}",
         "DEST_SUFFIX": ".${presetName}"
       },
       "cacheVariables": {
@@ -52,7 +48,7 @@
     {
       "name": "ios",
       "hidden": true,
-      "inherits": ["mobile", "macos"],
+      "inherits": ["macos", "mobile"],
       "cacheVariables": {
         "CMAKE_SYSTEM_NAME": "iOS",
         "CMAKE_OSX_SYSROOT": "${presetName}",

build.ps1

@@ -3,7 +3,7 @@ param(
   [string]$libdigidocpp = $PSScriptRoot,
   [string]$platform = $env:PLATFORM,
   [string]$build_number = $(if ($null -eq $env:BUILD_NUMBER) {"0"} else {$env:BUILD_NUMBER}),
-  [string]$msiversion = "4.2.0.$build_number",
+  [string]$msiversion = "4.2.1.$build_number",
   [string]$msi_name = "libdigidocpp-$msiversion$env:VER_SUFFIX.$platform.msi",
   [string]$git = "git.exe",
   [string]$vcpkg = "vcpkg\vcpkg.exe",
@@ -23,8 +23,8 @@ Try {
   & wix > $null
 }
 Catch {
-  & dotnet tool install -g --version 5.0.2 wix
-  & wix extension add -g WixToolset.UI.wixext/5.0.2
+  & dotnet tool install -g --version 6.0.1 wix
+  & wix extension add -g WixToolset.UI.wixext/6.0.1
 }
 
 if(!(Test-Path -Path $vcpkg)) {

prepare_osx_build_environment.sh

@@ -42,7 +42,7 @@ case "$@" in
   TARGET_PATH=/Library/libdigidocpp
   SYSROOT=$(xcrun -sdk macosx --show-sdk-path)
   : ${ARCHS:="arm64 x86_64"}
-  : ${MACOSX_DEPLOYMENT_TARGET:="12.0"}
+  : ${MACOSX_DEPLOYMENT_TARGET:="13.0"}
   export MACOSX_DEPLOYMENT_TARGET
   export CFLAGS="-arch ${ARCHS// / -arch } "
   ;;
@@ -51,7 +51,8 @@ esac
 function xmlsec {
     echo Building ${XMLSEC_DIR}
     if [ ! -f ${XMLSEC_DIR}.tar.gz ]; then
-        curl -O -L https://www.aleksey.com/xmlsec/download/${XMLSEC_DIR}.tar.gz
+        XMLSEC_VERSION="${XMLSEC_DIR##*-}"
+        curl -O -L https://github.com/lsh123/xmlsec/releases/download/${XMLSEC_VERSION}/${XMLSEC_DIR}.tar.gz
     fi
     rm -rf ${XMLSEC_DIR}
     tar xf ${XMLSEC_DIR}.tar.gz
@@ -126,7 +127,7 @@ case "$@" in
     echo "  tasks: openssl, xmlsec, all, help"
     echo "To control builds set environment variables:"
     echo " minimum deployment target"
-    echo " - MACOSX_DEPLOYMENT_TARGET=12.0"
+    echo " - MACOSX_DEPLOYMENT_TARGET=13.0"
     echo " - IPHONEOS_DEPLOYMENT_TARGET=15.0"
     echo " archs to build on macOS/iOS"
     echo " - ARCHS=\"arm64 x86_64\" (macOS)"

src/CMakeLists.txt

@@ -352,6 +352,7 @@ if( FRAMEWORK )
                 -change '${LIBPATH}/libssl.3.dylib' '@executable_path/../Libraries/libssl.3.dylib'
                 -change '${LIBPATH}/libxmlsec1.1.dylib' '@executable_path/../Libraries/libxmlsec1.1.dylib'
                 -change '${LIBPATH}/libxmlsec1-openssl.1.dylib' '@executable_path/../Libraries/libxmlsec1-openssl.1.dylib'
+                -rpath '${CMAKE_CURRENT_BINARY_DIR}' '@executable_path/../../../..'
                 $<TARGET_FILE_DIR:digidocpp>/Resources/digidoc-tool
             COMMAND touch $<TARGET_FILE:digidoc-tool>
         )
@@ -360,13 +361,15 @@ if( FRAMEWORK )
         add_custom_command(TARGET digidocpp POST_BUILD
             COMMAND /usr/libexec/PlistBuddy -c "Add :MinimumOSVersion string ${CMAKE_OSX_DEPLOYMENT_TARGET}" $<TARGET_FILE_DIR:digidocpp>/Info.plist)
     endif()
-    add_custom_target(codesign DEPENDS digidocpp $<TARGET_NAME_IF_EXISTS:digidoc-tool>
-        COMMAND codesign -f -s "Developer ID Application: ${SIGNCERT}"
-            $<TARGET_FILE_DIR:digidocpp>/Libraries/*
-            $<$<TARGET_EXISTS:digidoc-tool>:$<TARGET_FILE_DIR:digidocpp>/Resources/digidoc-tool>
-            $<TARGET_BUNDLE_DIR:digidocpp>
-        COMMAND touch $<TARGET_FILE:digidocpp> $<$<TARGET_EXISTS:digidoc-tool>:$<TARGET_FILE:digidoc-tool>>
-    )
+    if(SIGNCERT)
+        add_custom_command(TARGET embedlibs POST_BUILD
+            COMMAND codesign -f -s "Developer ID Application: ${SIGNCERT}"
+                $<TARGET_FILE_DIR:digidocpp>/Libraries/*
+                $<$<TARGET_EXISTS:digidoc-tool>:$<TARGET_FILE_DIR:digidocpp>/Resources/digidoc-tool>
+                $<TARGET_BUNDLE_DIR:digidocpp>
+            COMMAND touch $<TARGET_FILE:digidocpp> $<$<TARGET_EXISTS:digidoc-tool>:$<TARGET_FILE:digidoc-tool>>
+        )
+    endif()
     add_custom_target(pkgbuild DEPENDS digidocpp $<TARGET_NAME_IF_EXISTS:digidoc-tool>
         COMMAND DESTDIR=install ${CMAKE_COMMAND} --install .
         COMMAND pkgbuild --root install "$<$<BOOL:${SIGNCERT}>:--sign;${SIGNCERT}>"

src/digidoc-tool.cpp

@@ -928,18 +928,20 @@ static int tslcmd(int /*argc*/, char* /*argv*/[])
 {
     int returnCode = EXIT_SUCCESS;
     string cache = CONF(TSLCache);
+    auto certs = CONF(TSLCerts);
+    for(const X509Cert &cert: certs)
+        cout << "Signer: " << cert << endl;
     TSL t(File::path(cache, File::fileName(CONF(TSLUrl))));
     cout << "TSL: " << t.url() << endl
         << "         Type: " << t.type() << endl
         << "    Territory: " << t.territory() << endl
         << "     Operator: " << t.operatorName() << endl
         << "     Sequence: " << t.sequenceNumber() << endl
         << "       Issued: " << t.issueDate() << endl
-        << "  Next update: " << t.nextUpdate() << endl
-        << "Pointers:" << endl;
+        << "  Next update: " << t.nextUpdate() << endl;
     try {
         cout << "  Signature: ";
-        t.validate(CONF(TSLCerts));
+        t.validate(certs);
         cout << ToolConfig::GREEN << "VALID" << ToolConfig::RESET << endl;
     } catch(const Exception &e) {
         cout << ToolConfig::RED << "INVALID" << ToolConfig::RESET << endl;
@@ -952,6 +954,7 @@ static int tslcmd(int /*argc*/, char* /*argv*/[])
         for(const X509Cert &x: s.certs)
             cout << "    Cert: " << x << endl;
     }
+    cout << "Pointers: " << endl;
     for(const TSL::Pointer &p: t.pointers())
     {
         cout << "    Pointer: " << p.territory << endl