[open62541] update to 1.3.5 (#29887)

* update open62541 * run x-add-version * adds patch to qtopcua to support open62541 v1.3 * x-add-version * Update ports/open62541/vcpkg.json Co-authored-by: Lily Wang <[email protected]> * x-add-version * remove explicit set of version variable * x-add-version * Add a warning when the user tries to turn on both encryption options, as requested by @LilyWangLL. --------- Co-authored-by: Julian Zimmermann <[email protected]> Co-authored-by: Lily Wang <[email protected]> Co-authored-by: Billy Robert O'Neal III <[email protected]>
microsoft · Apr 14, 2023 · 50494bb · 50494bb
1 parent 02e902e
commit 50494bb
Show file tree

Hide file tree

Showing 9 changed files with 392 additions and 35 deletions.
diff --git a/ports/open62541/openssl.patch b/ports/open62541/openssl.patch
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
@@ -1,24 +1,29 @@
-set(VERSION v1.2.3)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open62541/open62541
-    REF "${VERSION}"
-    SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2
+    REF "v${VERSION}"
+    SHA512 bb45d288a097b461d2a7106153c7f4b4c38c73cf767fe15c6c9c2213a6e3fcaf9b436fb70c1e7c6dcbc8ef45f232a5bd2f140285fab486358cb5a3a17da96d6e
     HEAD_REF master
-    PATCHES
-        openssl.patch
 )
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        openssl UA_ENABLE_ENCRYPTION_OPENSSL
-        mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS
         amalgamation UA_ENABLE_AMALGAMATION
         historizing UA_ENABLE_HISTORIZING
 )
 
+if("openssl" IN_LIST FEATURES)
+    set(OPEN62541_ENCRYPTION_OPTIONS -DUA_ENABLE_ENCRYPTION=OPENSSL)
+    if("mbedtls" IN_LIST FEATURES)
+        message(WARNING "Only one encryption method can be used. When both [openssl] and [mbedtls] "
+            "are on, openssl is used. To use [mbedtls], don't enable [openssl]. To suppress this "
+            "message, don't enable [mbedtls]")
+    endif()
+elseif("mbedtls" IN_LIST FEATURES)
+    set(OPEN62541_ENCRYPTION_OPTIONS -DUA_ENABLE_ENCRYPTION=MBEDTLS)
+endif()
+
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
@@ -27,6 +32,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        ${OPEN62541_ENCRYPTION_OPTIONS}
         -DOPEN62541_VERSION=${VERSION}
     OPTIONS_DEBUG
         -DCMAKE_DEBUG_POSTFIX=d

diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "open62541",
-  "version": "1.2.3",
-  "port-version": 1,
+  "version": "1.3.5",
   "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.",
   "homepage": "https://open62541.org",
   "license": "MPL-2.0",

diff --git a/ports/qtopcua/open62541_v1.3_support.patch b/ports/qtopcua/open62541_v1.3_support.patch
diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake
@@ -1,6 +1,8 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
+set(${PORT}_PATCHES open62541_v1.3_support.patch)
+
 # General features:
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 FEATURES

diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtopcua",
   "version": "6.4.3",
+  "port-version": 1,
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5733,8 +5733,8 @@
       "port-version": 0
     },
     "open62541": {
-      "baseline": "1.2.3",
-      "port-version": 1
+      "baseline": "1.3.5",
+      "port-version": 0
     },
     "openal-soft": {
       "baseline": "1.23.0",
@@ -6674,7 +6674,7 @@
     },
     "qtopcua": {
       "baseline": "6.4.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qtpositioning": {
       "baseline": "6.4.3",

diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e7412d5c63f5b77eb06f485b7fb89bb718b2f712",
+      "version": "1.3.5",
+      "port-version": 0
+    },
     {
       "git-tree": "78181e46126a93ba6bbea749a985ba675fb53c03",
       "version": "1.2.3",

diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9adaecfcef9783e8df0e92acbd817a4051b11ffb",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "2271b5bd852c0d9afdcee54b6f335667e7883501",
       "version": "6.4.3",