Increase Qt version (#855)

IB-6722

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

.travis.yml

@@ -1,7 +1,7 @@
 language: c++
 sudo: false
-dist: bionic
-osx_image: xcode11.6
+dist: focal
+osx_image: xcode12.2
 services:
 - docker
 matrix:

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 if(POLICY CMP0074)
 	cmake_policy(SET CMP0074 NEW)
 endif()
-project(qdigidoc4 VERSION 4.2.7)
+project(qdigidoc4 VERSION 4.2.8)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

README.md

@@ -72,7 +72,7 @@
 
         mkdir build
         cd build
-        cmake -DQt5_DIR="~/cmake_builds/Qt-5.12.9-OpenSSL/lib/cmake/Qt5" -DCMAKE_EXE_LINKER_FLAGS="-F/Library/Frameworks" ..
+        cmake -DQt5_DIR="~/cmake_builds/Qt-5.12.10-OpenSSL/lib/cmake/Qt5" -DCMAKE_EXE_LINKER_FLAGS="-F/Library/Frameworks" ..
 
 4. Build
 
@@ -103,7 +103,7 @@
 
         mkdir build
         cd build
-        cmake -G"NMAKE Makefiles" -DQt5_DIR="C:\Qt\5.12.9\msvc2017\lib\cmake\Qt5" ..
+        cmake -G"NMAKE Makefiles" -DQt5_DIR="C:\Qt\5.12.10\msvc2017\lib\cmake\Qt5" ..
 
 4. Build
 

RELEASE-NOTES.md

@@ -1,3 +1,21 @@
+DigiDoc4 version [4.2.7](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.7) release notes
+--------------------------------------
+- Fix Mobile-ID signing with Russian translations
+
+[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.6...v4.2.7)
+
+DigiDoc4 version [4.2.6](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.6) release notes
+--------------------------------------
+- Code, Text and translation improvements and updates
+
+[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.5...v4.2.6)
+
+DigiDoc4 version [4.2.5](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.5) release notes
+--------------------------------------
+- Code, Text and translation improvements and updates
+
+[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.4...v4.2.5)
+
 DigiDoc4 version [4.2.4](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.4) release notes
 --------------------------------------
 - Workaround Fin driver issues (#569)

openldap.patch

@@ -0,0 +1,12 @@
+--- openldap-2.4.56/libraries/libldap/tls2.c.orig	2020-11-11 12:15:02.000000000 +0200
++++ openldap-2.4.56/libraries/libldap/tls2.c	2020-11-11 12:15:47.000000000 +0200
+@@ -33,6 +33,9 @@
+
+ #include "ldap-int.h"
+
++int
++ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in );
++
+ #ifdef HAVE_TLS
+
+ #include "ldap-tls.h"

prepare_osx_build_environment.sh

@@ -4,8 +4,8 @@
 set -e
 
 ######### Versions of libraries/frameworks to be compiled
-QT_VER="5.12.9"
-OPENLDAP_VER="2.4.50"
+QT_VER="5.12.10"
+OPENLDAP_VER="2.4.56"
 REBUILD=false
 BUILD_PATH=~/cmake_builds
 OPENSSL_PATH="/usr/local/opt/openssl"
@@ -94,10 +94,12 @@ else
 fi
 
 if [[ "$REBUILD" = true || ! -d ${OPENLDAP_PATH} ]] ; then
+    SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
     echo -e "\n${ORANGE}##### Building OpenLDAP ${OPENLDAP_VER} ${OPENLDAP_PATH} #####${RESET}\n"
     curl -O -L http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-${OPENLDAP_VER}.tgz
     tar xf openldap-${OPENLDAP_VER}.tgz
     cd openldap-${OPENLDAP_VER}
+    patch -Np1 -i ${SCRIPTPATH}/openldap.patch
     LDFLAGS="-L${OPENSSL_PATH}/lib" CPPFLAGS="-I${OPENSSL_PATH}/include" ./configure -prefix ${OPENLDAP_PATH} \
         --enable-static --disable-shared --disable-syslog --disable-proctitle --disable-local --disable-slapd \
         --without-threads --without-cyrus-sasl --with-tls=openssl