From 642692b7b7443ab891ee7c8682bbcf61c2bcec0a Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 5 Sep 2023 07:20:25 +0200
Subject: [PATCH 1/2] [xmlsec,libffi] Fix exported targets

---
 ports/libffi/libffiConfig.cmake  | 4 +++-
 ports/libffi/vcpkg.json          | 2 +-
 ports/xmlsec/vcpkg.json          | 1 +
 ports/xmlsec/xmlsec-config.cmake | 8 ++++++--
 versions/baseline.json           | 4 ++--
 versions/l-/libffi.json          | 5 +++++
 versions/x-/xmlsec.json          | 5 +++++
 7 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ports/libffi/libffiConfig.cmake b/ports/libffi/libffiConfig.cmake
index 37481bb771d11a..a510862e10dcc2 100644
--- a/ports/libffi/libffiConfig.cmake
+++ b/ports/libffi/libffiConfig.cmake
@@ -2,4 +2,6 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
 message(WARNING "find_package(libffi) is deprecated.\n${usage}")
 include(CMakeFindDependencyMacro)
 find_dependency(unofficial-libffi CONFIG REQUIRED)
-add_library(libffi ALIAS unofficial::libffi::libffi)
+if(NOT TARGET libffi)
+    add_library(libffi ALIAS unofficial::libffi::libffi)
+endif()
diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json
index 5e1ef7cef89768..ba0a6bdca2e03b 100644
--- a/ports/libffi/vcpkg.json
+++ b/ports/libffi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libffi",
   "version": "3.4.4",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Portable, high level programming interface to various calling conventions",
   "homepage": "https://github.com/libffi/libffi",
   "license": "MIT",
diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json
index 984f424acb95a8..19c7f7d57cd8c2 100644
--- a/ports/xmlsec/vcpkg.json
+++ b/ports/xmlsec/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "xmlsec",
   "version": "1.3.1",
+  "port-version": 1,
   "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.",
   "homepage": "https://www.aleksey.com/xmlsec/",
   "license": "X11 AND MPL-1.1",
diff --git a/ports/xmlsec/xmlsec-config.cmake b/ports/xmlsec/xmlsec-config.cmake
index d93c36aed1fe5c..5c8b6f34b3dc58 100644
--- a/ports/xmlsec/xmlsec-config.cmake
+++ b/ports/xmlsec/xmlsec-config.cmake
@@ -2,5 +2,9 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
 message(WARNING "find_package(xmlsec) is deprecated.\n${usage}")
 include(CMakeFindDependencyMacro)
 find_dependency(unofficial-xmlsec CONFIG REQUIRED)
-add_library(xmlsec1 ALIAS unofficial::xmlsec::xmlsec1)
-add_library(xmlsec1-openssl ALIAS unofficial::xmlsec::xmlsec1-openssl)
+if(NOT TARGET xmlsec1)
+    add_library(xmlsec1 ALIAS unofficial::xmlsec::xmlsec1)
+endif()
+if(NOT TARGET xmlsec1-openssl)
+    add_library(xmlsec1-openssl ALIAS unofficial::xmlsec::xmlsec1-openssl)
+endif()
diff --git a/versions/baseline.json b/versions/baseline.json
index 77aa6f526399c0..816b874b893e1d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4094,7 +4094,7 @@
     },
     "libffi": {
       "baseline": "3.4.4",
-      "port-version": 4
+      "port-version": 5
     },
     "libfido2": {
       "baseline": "1.13.0",
@@ -8942,7 +8942,7 @@
     },
     "xmlsec": {
       "baseline": "1.3.1",
-      "port-version": 0
+      "port-version": 1
     },
     "xnnpack": {
       "baseline": "2022-02-17",
diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json
index 9d1ea77778286b..e675172fcb9dbb 100644
--- a/versions/l-/libffi.json
+++ b/versions/l-/libffi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "db85488447cfda7bcc5e08452d8581ac0295b4c9",
+      "version": "3.4.4",
+      "port-version": 5
+    },
     {
       "git-tree": "d189744d6e4f29ab0a2f88f3c75f01d0c3719618",
       "version": "3.4.4",
diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json
index aeea03981e9e17..6d32e4da36abfc 100644
--- a/versions/x-/xmlsec.json
+++ b/versions/x-/xmlsec.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9152aec5099de6e629c31adc81bd07fc6f87607e",
+      "version": "1.3.1",
+      "port-version": 1
+    },
     {
       "git-tree": "3ca82fa3b389ead91f8abe51fb628fc1959cf29b",
       "version": "1.3.1",

From 3d479b63d33271fa1588133437e50b87441c723a Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Wed, 6 Sep 2023 09:26:44 +0200
Subject: [PATCH 2/2] CI