From 91e38949864ea16aca20449cebac43aadf911209 Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Tue, 12 Nov 2024 09:34:59 +0200
Subject: [PATCH] [curl] wolfssl and openssl features can install alongside
 (#42104)

---
 ports/curl/portfile.cmake                   | 8 --------
 ports/curl/vcpkg.json                       | 1 +
 scripts/test_ports/vcpkg-ci-curl/vcpkg.json | 3 ++-
 versions/baseline.json                      | 2 +-
 versions/c-/curl.json                       | 5 +++++
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index a3641e3894..841bd7e0f0 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -44,14 +44,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         websockets  CURL_DISABLE_WEBSOCKETS
 )
 
-# Add warning on build failuer when using wolfssl and openssl features togther.
-if("openssl" IN_LIST FEATURES AND "wolfssl" IN_LIST FEATURES)
-    message(WARNING "Adding OpenSSL and WolfSSL simultaneously will result in a build failure. \
-                     Please remove one of these features from your build process.\
-                     If you are using OpenSSL version 1.1, you may disregard this warning."
-    )
-endif()
-
 set(OPTIONS "")
 
 if("sectransp" IN_LIST FEATURES)
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
index 95e3371c1a..5fa5e1cf4d 100644
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "curl",
   "version": "8.11.0",
+  "port-version": 1,
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": "curl AND ISC AND BSD-3-Clause",
diff --git a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
index 5a734b8e80..c13f6a371e 100644
--- a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json
@@ -33,7 +33,8 @@
         "gsasl",
         "mbedtls",
         "openssl",
-        "psl"
+        "psl",
+        "wolfssl"
       ],
       "platform": "!uwp"
     },
diff --git a/versions/baseline.json b/versions/baseline.json
index db7f611b66..e6d5f49478 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2142,7 +2142,7 @@
     },
     "curl": {
       "baseline": "8.11.0",
-      "port-version": 0
+      "port-version": 1
     },
     "curlcpp": {
       "baseline": "3.1",
diff --git a/versions/c-/curl.json b/versions/c-/curl.json
index ae6a63c997..32e752294f 100644
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ef1763f3cbe570d6378632c9b5793479c37fb07",
+      "version": "8.11.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c7272ca5021fc2b6a404911e1c0055fa08992463",
       "version": "8.11.0",