From df6b1294cf11b2038e306366c651a6801f6ca999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=A4ge?= Date: Mon, 6 May 2024 10:01:45 +0200 Subject: [PATCH 1/3] Updated versions - Removed open62541 v1.3.8 - Added open62541 v1.4.0 --- recipes/open62541/all/conandata.yml | 10 +++++----- recipes/open62541/all/submoduledata.yml | 4 ++-- recipes/open62541/config.yml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes/open62541/all/conandata.yml b/recipes/open62541/all/conandata.yml index 8fd6ed73c8578..d17284430ad55 100644 --- a/recipes/open62541/all/conandata.yml +++ b/recipes/open62541/all/conandata.yml @@ -1,10 +1,10 @@ sources: + "1.4.0": + url: "https://github.com/open62541/open62541/archive/v1.4.0.tar.gz" + sha256: "22a7a1f821b26f541feb96cc5879e0c76cb3b968e508209b5bf98f2869b11a89" "1.3.9": url: "https://github.com/open62541/open62541/archive/v1.3.9.tar.gz" sha256: "71764d4a060cfa07eae7aaabd176da38b155ef01c63103513339699fd8026e2f" - "1.3.8": - url: "https://github.com/open62541/open62541/archive/v1.3.8.tar.gz" - sha256: "b6943b564787c4953b77ca8d7f987c4b896b3f3e91f45d9f13e9056b6148bc1d" "1.2.6": url: "https://github.com/open62541/open62541/archive/v1.2.6.tar.gz" sha256: "7470c1e2f97d0e7dad9632ced7b62f0add66a3c689532204ef85b0556d129106" @@ -15,11 +15,11 @@ sources: url: "https://github.com/open62541/open62541/archive/v1.0.6.tar.gz" sha256: "299940025c14929533064abe0044d5805ea50d52b32d05ad9bc0e6996569c2a6" patches: - "1.3.9": + "1.4.0": - patch_file: "patches/0001-disable-sanitizers-1_3_x.patch" patch_description: "Disable static code analysis" patch_type: "conan" - "1.3.8": + "1.3.9": - patch_file: "patches/0001-disable-sanitizers-1_3_x.patch" patch_description: "Disable static code analysis" patch_type: "conan" diff --git a/recipes/open62541/all/submoduledata.yml b/recipes/open62541/all/submoduledata.yml index f60651d6c51ea..ef9566891b394 100644 --- a/recipes/open62541/all/submoduledata.yml +++ b/recipes/open62541/all/submoduledata.yml @@ -14,12 +14,12 @@ submodules: sha256: a2bcc1cda0154091ecbed25b8c40436c5b75d11bb38df28b35a2ceedb331d562 url: https://github.com/OPCFoundation/UA-Nodeset/archive/Errata-1.04.5.zip archive_pattern: "UA-Nodeset-{version}" - "1.3.8": + "1.3.9": deps/ua-nodeset: sha256: 032c93e3f7c335bbb2d2d699804a804c9cdce2a2ecc3fe7cde552f2130982c26 url: https://github.com/OPCFoundation/UA-Nodeset/archive/Glass=1.0.0-2022-01-01.zip archive_pattern: "UA-Nodeset-{version}" - "1.3.9": + "1.4.0": deps/ua-nodeset: sha256: 032c93e3f7c335bbb2d2d699804a804c9cdce2a2ecc3fe7cde552f2130982c26 url: https://github.com/OPCFoundation/UA-Nodeset/archive/Glass=1.0.0-2022-01-01.zip diff --git a/recipes/open62541/config.yml b/recipes/open62541/config.yml index 02f8b3e330035..b3474501c3b53 100644 --- a/recipes/open62541/config.yml +++ b/recipes/open62541/config.yml @@ -1,7 +1,7 @@ versions: - "1.3.9": + "1.4.0": folder: all - "1.3.8": + "1.3.9": folder: all "1.2.6": folder: all From ad6ea2921682a37ec92062734aca3f33cc936e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=A4ge?= Date: Mon, 6 May 2024 10:10:54 +0200 Subject: [PATCH 2/3] Added extra patch to disable static code analysis in v1.4.x --- recipes/open62541/all/conandata.yml | 2 +- .../0001-disable-sanitizers-1_4_x.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 recipes/open62541/all/patches/0001-disable-sanitizers-1_4_x.patch diff --git a/recipes/open62541/all/conandata.yml b/recipes/open62541/all/conandata.yml index d17284430ad55..92ba75ca7cb87 100644 --- a/recipes/open62541/all/conandata.yml +++ b/recipes/open62541/all/conandata.yml @@ -16,7 +16,7 @@ sources: sha256: "299940025c14929533064abe0044d5805ea50d52b32d05ad9bc0e6996569c2a6" patches: "1.4.0": - - patch_file: "patches/0001-disable-sanitizers-1_3_x.patch" + - patch_file: "patches/0001-disable-sanitizers-1_4_x.patch" patch_description: "Disable static code analysis" patch_type: "conan" "1.3.9": diff --git a/recipes/open62541/all/patches/0001-disable-sanitizers-1_4_x.patch b/recipes/open62541/all/patches/0001-disable-sanitizers-1_4_x.patch new file mode 100644 index 0000000000000..1bceea30c1d68 --- /dev/null +++ b/recipes/open62541/all/patches/0001-disable-sanitizers-1_4_x.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b3c2cebc..c03cbe8f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -650,20 +650,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") + # Linker + set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # cmake sets -rdynamic by default + +- # Debug +- if(UA_ENABLE_DEBUG_SANITIZER AND BUILD_TYPE_LOWER_CASE STREQUAL "debug" AND UNIX AND NOT UA_BUILD_OSS_FUZZ AND +- CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK) +- # Add default sanitizer settings when using clang and Debug build. +- # This allows e.g. CLion to find memory locations for SegFaults +- message(STATUS "Sanitizer enabled") +- set(SANITIZER_FLAGS "-g -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=leak -fsanitize=undefined") +- if(CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) +- set(SANITIZER_FLAGS "${SANITIZER_FLAGS} -fsanitize-coverage=trace-pc-guard") +- endif() +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}") +- endif() +- + if(NOT MINGW AND UA_ENABLE_HARDENING AND ((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))) + check_add_cc_flag("-D_FORTIFY_SOURCE=2") # run-time buffer overflow detection (needs at least -O1) + endif() From d92a80563488bcd4edc82df96401cfa424ec6e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=A4ge?= Date: Mon, 3 Jun 2024 16:22:09 +0200 Subject: [PATCH 3/3] Switched to v1.4.1 --- recipes/open62541/all/conandata.yml | 8 ++++---- recipes/open62541/all/submoduledata.yml | 2 +- recipes/open62541/config.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/open62541/all/conandata.yml b/recipes/open62541/all/conandata.yml index 92ba75ca7cb87..6de33ef200a13 100644 --- a/recipes/open62541/all/conandata.yml +++ b/recipes/open62541/all/conandata.yml @@ -1,7 +1,7 @@ sources: - "1.4.0": - url: "https://github.com/open62541/open62541/archive/v1.4.0.tar.gz" - sha256: "22a7a1f821b26f541feb96cc5879e0c76cb3b968e508209b5bf98f2869b11a89" + "1.4.1": + url: "https://github.com/open62541/open62541/archive/v1.4.1.tar.gz" + sha256: "4f45f33e4ebd5241142817c4c61a94f2b1353304c8adf9091562bafab6ddb3da" "1.3.9": url: "https://github.com/open62541/open62541/archive/v1.3.9.tar.gz" sha256: "71764d4a060cfa07eae7aaabd176da38b155ef01c63103513339699fd8026e2f" @@ -15,7 +15,7 @@ sources: url: "https://github.com/open62541/open62541/archive/v1.0.6.tar.gz" sha256: "299940025c14929533064abe0044d5805ea50d52b32d05ad9bc0e6996569c2a6" patches: - "1.4.0": + "1.4.1": - patch_file: "patches/0001-disable-sanitizers-1_4_x.patch" patch_description: "Disable static code analysis" patch_type: "conan" diff --git a/recipes/open62541/all/submoduledata.yml b/recipes/open62541/all/submoduledata.yml index ef9566891b394..8770bc864572a 100644 --- a/recipes/open62541/all/submoduledata.yml +++ b/recipes/open62541/all/submoduledata.yml @@ -19,7 +19,7 @@ submodules: sha256: 032c93e3f7c335bbb2d2d699804a804c9cdce2a2ecc3fe7cde552f2130982c26 url: https://github.com/OPCFoundation/UA-Nodeset/archive/Glass=1.0.0-2022-01-01.zip archive_pattern: "UA-Nodeset-{version}" - "1.4.0": + "1.4.1": deps/ua-nodeset: sha256: 032c93e3f7c335bbb2d2d699804a804c9cdce2a2ecc3fe7cde552f2130982c26 url: https://github.com/OPCFoundation/UA-Nodeset/archive/Glass=1.0.0-2022-01-01.zip diff --git a/recipes/open62541/config.yml b/recipes/open62541/config.yml index b3474501c3b53..7c518789e003f 100644 --- a/recipes/open62541/config.yml +++ b/recipes/open62541/config.yml @@ -1,5 +1,5 @@ versions: - "1.4.0": + "1.4.1": folder: all "1.3.9": folder: all