Update Copyright year and cleanup scripts

.github/workflows/build.yml

@@ -19,6 +19,8 @@ jobs:
       with:
         submodules: recursive
     - name: Install dependencies
+      env:
+        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: YES
       run: |
         brew update
         brew install doxygen boost xsd || brew link --overwrite xsd
@@ -160,7 +162,7 @@ jobs:
     env:
       MAKEFLAGS: ""
       VER_SUFFIX: .VS${{ matrix.toolset }}
-      VERSION: 3.14.12.${{ github.run_number }}
+      VERSION: 3.15.0.${{ github.run_number }}
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/patches/vcpkg-triplets
       VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/patches/vcpkg-ports
     steps:

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(libdigidocpp VERSION 3.14.12)
+project(libdigidocpp VERSION 3.15.0)
 if(POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW)
 endif()
@@ -47,7 +47,7 @@ endif()
 find_package(Doxygen)
 find_package(OpenSSL 1.1.1 REQUIRED)
 find_package(PKCS11)
-find_package(PoDoFo)
+#find_package(PoDoFo)
 find_package(Threads)
 find_package(XmlSecurityC REQUIRED)
 find_package(XSD 4.0 REQUIRED)

build.ps1

@@ -4,7 +4,7 @@ param(
   [string]$vcpkg = "vcpkg\vcpkg.exe",
   [string]$vcpkg_dir = (split-path -parent $vcpkg),
   [string]$buildver = "0",
-  [string]$msiversion = "3.14.12.$buildver",
+  [string]$msiversion = "3.15.0.$buildver",
   [string]$msi_name = "libdigidocpp-$msiversion$env:VER_SUFFIX.msi",
   [string]$cmake = "cmake.exe",
   [string]$generator = "NMake Makefiles",

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Contact: info@ria.ee
 Source: https://github.com/open-eid/libdigidocpp
 
 Files: *
-Copyright: 2012-2022 Estonian Information System's Authority
+Copyright: 2012-2023 Estonian Information System's Authority
 License: LGPL-2.1
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

examples/java/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 group 'ee.ria'
 sourceCompatibility = 8
-sourceSets.main.java.srcDirs += ['/Library/libdigidocpp/include']
+sourceSets.main.java.srcDirs += ['/Library/libdigidocpp/include', '/usr/include']
 
 repositories {
     mavenCentral()
@@ -17,6 +17,6 @@ dependencies {
 jar {
     archivesBaseName = 'libdigidocpp'
     manifest {
-        attributes 'Main-Class': 'ee.ria.libdigidocpp'
+        attributes 'Main-Class': 'ee.ria.libdigidocpp.libdigidocpp'
     }
-}
+}

prepare_osx_build_environment.sh

@@ -259,12 +259,9 @@ function openssl {
     tar xf ${OPENSSL_DIR}.tar.gz
     cd ${OPENSSL_DIR}
 
-    sed -ie 's!, "apps"!!' Configure
-    sed -ie 's!, "fuzz"!!' Configure
-    sed -ie 's!, "test"!!' Configure
     case "${ARGS}" in
     *android*)
-        ./Configure android-${ARCH} -D__ANDROID_API__=${ABI} --prefix=${TARGET_PATH} --openssldir=${TARGET_PATH}/ssl no-hw no-engine no-tests no-shared
+        ./Configure android-${ARCH} -D__ANDROID_API__=${ABI} --prefix=${TARGET_PATH} --openssldir=${TARGET_PATH}/ssl no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio
         make -s
         sudo make install_sw
         ;;
@@ -274,14 +271,14 @@ function openssl {
             case "${ARCH}" in
             *x86_64*)
                 case "${ARGS}" in
-                *simulator*) CC="" CFLAGS="" ./Configure iossimulator-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-asm no-engine ;;
-                *catalyst*) CC="" CFLAGS="-target x86_64-apple-ios-macabi" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} no-shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128 ;;
+                *simulator*) CC="" CFLAGS="" ./Configure iossimulator-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio;;
+                *catalyst*) CC="" CFLAGS="-target x86_64-apple-ios-macabi" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio enable-ec_nistp_64_gcc_128 ;;
                 *) CC="" CFLAGS="" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128
                 esac
                 ;;
             *arm64*)
                 case "${ARGS}" in
-                *ios*) CC="" CFLAGS="" ./Configure ios64-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-asm no-engine ;;
+                *ios*) CC="" CFLAGS="" ./Configure ios64-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio;;
                 *) CC="" CFLAGS="" MACHINE=arm64 KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128
                 esac
                 ;;

src/CMakeLists.txt

@@ -4,6 +4,9 @@ if(NOT MINIZIP_FOUND)
     target_compile_options(minizip PRIVATE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unused-parameter -Wno-unused-value>)
     set_target_properties(minizip PROPERTIES COMPILE_DEFINITIONS "NOUNCRYPT;NOCRYPT" POSITION_INDEPENDENT_CODE YES)
     target_link_libraries(minizip ZLIB::ZLIB)
+    if(ANDROID)
+        set_property(SOURCE minizip/ioapi.c APPEND PROPERTY COMPILE_DEFINITIONS IOAPI_NO_64)
+    endif()
 else()
     add_library(minizip INTERFACE)
     target_link_libraries(minizip INTERFACE PkgConfig::MINIZIP)
@@ -269,15 +272,20 @@ if(SWIG_FOUND)
         set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/java)
         swig_add_library(digidoc_java TYPE SHARED LANGUAGE java SOURCES ../libdigidocpp.i)
         target_include_directories(digidoc_java PRIVATE ${JAVA_INCLUDE_PATH} $<$<BOOL:${JAVA_INCLUDE_PATH2}>:${JAVA_INCLUDE_PATH2}>)
-        swig_link_libraries(digidoc_java digidocpp digidocpp_util)
+        target_link_libraries(digidoc_java digidocpp digidocpp_util)
         if(APPLE)
+            set_target_properties(digidoc_java PROPERTIES MACOSX_RPATH YES INSTALL_RPATH /Library/Frameworks)
             install(TARGETS digidoc_java DESTINATION /Library/Java/Extensions)
         else()
             install(TARGETS digidoc_java DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
         install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ee/ria/libdigidocpp FILES_MATCHING PATTERN "*.java")
         if(WIN32)
             install(FILES $<TARGET_PDB_FILE:digidoc_java> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
+        elseif(ANDROID)
+            # Xerces-C requires iconv
+            find_package(Iconv)
+            target_link_libraries(digidoc_java Iconv::Iconv)
         endif()
     endif()
     if(TARGET PythonModule)
@@ -305,7 +313,7 @@ if(SWIG_FOUND)
         set(CMAKE_SWIG_FLAGS -dllimport digidoc_csharp -namespace digidoc)
         set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/csharp)
         swig_add_library(digidoc_csharp TYPE SHARED LANGUAGE csharp SOURCES ../libdigidocpp.i)
-        swig_link_libraries(digidoc_csharp digidocpp digidocpp_util)
+        target_link_libraries(digidoc_csharp digidocpp digidocpp_util)
         install(TARGETS digidoc_csharp DESTINATION ${CMAKE_INSTALL_BINDIR})
         install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/csharp/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/digidocpp_csharp FILES_MATCHING PATTERN "*.cs")
         install(FILES $<TARGET_PDB_FILE:digidoc_csharp> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
@@ -343,10 +351,6 @@ if(WIN32)
     endif()
 elseif(APPLE)
     target_link_libraries(digidocpp PUBLIC "-framework CoreFoundation")
-elseif(ANDROID)
-    find_package(Iconv)
-    target_link_libraries(digidocpp PRIVATE Iconv::Iconv)
-    set_property(SOURCE minizip/ioapi.c APPEND PROPERTY COMPILE_DEFINITIONS IOAPI_NO_64)
 endif()
 
 source_group( "Resources" FILES "${CMAKE_CURRENT_BINARY_DIR}/digidocpp.conf;${CMAKE_SOURCE_DIR}/etc/798.p12" )

src/digidoc-tool.rc

@@ -24,7 +24,7 @@ BEGIN
 			VALUE "FileDescription", "digidoc-tool"
 			VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
 			VALUE "InternalName", "digidoc-tool"
-			VALUE "LegalCopyright", "(C) 2009-2022 Estonian Information System Authority"
+			VALUE "LegalCopyright", "(C) 2009-2023 Estonian Information System Authority"
 			VALUE "OriginalFilename", "digidoc-tool.exe"
 			VALUE "ProductName", "digidoc-tool"
 			VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)

src/libdigidocpp.rc

@@ -24,7 +24,7 @@ BEGIN
 			VALUE "FileDescription", "digidocpp"
 			VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
 			VALUE "InternalName", "digidocpp"
-			VALUE "LegalCopyright", "(C) 2009-2022 Estonian Information System Authority"
+			VALUE "LegalCopyright", "(C) 2009-2023 Estonian Information System Authority"
 			VALUE "OriginalFilename", "digidocpp.dll"
 			VALUE "ProductName", "digidocpp"
 			VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)