diff --git a/CMakeLists.txt b/CMakeLists.txt index 3785a0112..1f971ee01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ if(UNIX AND NOT IOS) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Required macOS version") endif() -project(AusweisApp2 VERSION 1.24.3 LANGUAGES ${LANGUAGES}) +project(AusweisApp2 VERSION 1.24.4 LANGUAGES ${LANGUAGES}) # Set TWEAK if not defined in PROJECT_VERSION above to # have a valid tweak version without propagating it diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index bdf8fd54f..7a149513a 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -121,13 +121,13 @@ if(WIN32) endif() elseif(IOS) - configure_file("${CMAKE_DIR}/Bundles.cmake.in" "${CMAKE_BINARY_DIR}/Bundles.cmake" @ONLY) + configure_file("${CMAKE_DIR}/iOS.bundles.cmake.in" "${CMAKE_BINARY_DIR}/iOS.bundles.cmake" @ONLY) if(INTEGRATED_SDK) set(Bundle_Target zip) else() set(Bundle_Target ipa) endif() - add_custom_target(${Bundle_Target} COMMAND ${CMAKE_COMMAND} -DINTEGRATED_SDK=${INTEGRATED_SDK} -DCONFIG=$ -P ${CMAKE_BINARY_DIR}/Bundles.cmake) + add_custom_target(${Bundle_Target} COMMAND ${CMAKE_COMMAND} -DINTEGRATED_SDK=${INTEGRATED_SDK} -DCONFIG=$ -DIOS=${IOS} -P ${CMAKE_BINARY_DIR}/iOS.bundles.cmake) elseif(APPLE) set(CPACK_GENERATOR External DragNDrop) diff --git a/cmake/SignFiles.cmake.in b/cmake/SignFiles.cmake.in index f0dcb944e..a86563949 100644 --- a/cmake/SignFiles.cmake.in +++ b/cmake/SignFiles.cmake.in @@ -77,9 +77,9 @@ else() endif() message(STATUS "Sign in directory: ${CMAKE_BINARY_DIR}") -message(STATUS "Sign extensions: ${FILE_EXTENSIONS}") file(GLOB_RECURSE FILES RELATIVE "${CMAKE_BINARY_DIR}" ${FILE_EXTENSIONS}) if(APPLE) + list(APPEND FILE_EXTENSIONS *.framework) file(GLOB_RECURSE DIRECTORIES LIST_DIRECTORIES true RELATIVE "${CMAKE_BINARY_DIR}" *) foreach(entry ${DIRECTORIES}) if(${entry} MATCHES ".framework$") @@ -87,7 +87,7 @@ if(APPLE) endif() endforeach() endif() - +message(STATUS "Sign extensions: ${FILE_EXTENSIONS}") message(STATUS "Sign: ${FILES}") @@ -123,4 +123,4 @@ if(APPLE AND NOT IOS) file(GLOB_RECURSE APP_BINARY ${CMAKE_BINARY_DIR}/*/@PROJECT_NAME@) message("Signing app bundle: ${APP_BINARY}") execute_process(COMMAND @SIGNTOOL_CMD@ ${BUNDLE_APPLE_CODESIGN_PARAMETER} --entitlements @PACKAGING_DIR@/macos/@PROJECT_NAME@.entitlements -i @BUNDLE_IDENTIFIER@ ${APP_BINARY}) -endif() \ No newline at end of file +endif() diff --git a/cmake/Bundles.cmake.in b/cmake/iOS.bundles.cmake.in similarity index 95% rename from cmake/Bundles.cmake.in rename to cmake/iOS.bundles.cmake.in index eb8beee1c..947166c48 100644 --- a/cmake/Bundles.cmake.in +++ b/cmake/iOS.bundles.cmake.in @@ -39,7 +39,7 @@ function(SELF_GENERATED) execute_process(COMMAND install_name_tool -id @rpath/${filename_stripped} ${f}) endforeach() - execute_process(COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/SignFiles.cmake WORKING_DIRECTORY ${BundleDir} RESULT_VARIABLE _result) + execute_process(COMMAND ${CMAKE_COMMAND} -DIOS=${IOS} -P ${CMAKE_BINARY_DIR}/SignFiles.cmake WORKING_DIRECTORY ${BundleDir} RESULT_VARIABLE _result) if(NOT ${_result} EQUAL 0) message(FATAL_ERROR "Signing failed") endif() diff --git a/docs/releasenotes/1.24.4.rst b/docs/releasenotes/1.24.4.rst new file mode 100644 index 000000000..fa189bd03 --- /dev/null +++ b/docs/releasenotes/1.24.4.rst @@ -0,0 +1,14 @@ +AusweisApp2 1.24.4 +^^^^^^^^^^^^^^^^^^ + +**Releasedatum:** 2. November 2022 + + +Anwender +"""""""" +- Mögliche Abstürze durch OpenSSL (denial of service) behoben. + + +Entwickler +"""""""""" +- Aktualisierung von OpenSSL auf die Version 3.0.7. diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst index e602ce249..257fffe96 100644 --- a/docs/releasenotes/appcast.rst +++ b/docs/releasenotes/appcast.rst @@ -4,6 +4,7 @@ Release Notes .. toctree:: :maxdepth: 1 + 1.24.4 1.24.3 1.24.2 1.24.1 diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst index 6b3f75541..ef67fb502 100644 --- a/docs/releasenotes/versions.rst +++ b/docs/releasenotes/versions.rst @@ -6,6 +6,7 @@ Versionszweig 1.24 .. toctree:: :maxdepth: 1 + 1.24.4 1.24.3 1.24.2 1.24.1 diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index d6ef986b1..c6b811427 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -112,8 +112,8 @@ endif() set(QT 6.3.1) set(QT_HASH 51114e789485fdb6b35d112dfd7c7abb38326325ac51221b6341564a1c3cc726) -set(OPENSSL 3.0.5) -set(OPENSSL_HASH aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a) +set(OPENSSL 3.0.7) +set(OPENSSL_HASH 83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e) ################################## Files set(QT_FILE qt-everywhere-src-${QT}.tar.xz)