From 0a6002ef2591045826d29ea9ffe8f22149813645 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Tue, 17 May 2022 23:56:02 -0700
Subject: [PATCH] [curl] Don't try to include OpenSSL headers when OpenSSL
 backends aren't selected. (#24766)

Fixes regression introduced in https://github.com/microsoft/vcpkg/pull/24348
---
 ports/curl/vcpkg.json         | 2 +-
 ports/curl/wolfssl-ntlm.patch | 2 +-
 versions/baseline.json        | 2 +-
 versions/c-/curl.json         | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
index ad8b1b91c0..0352d403fd 100644
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "curl",
   "version": "7.83.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": null,
diff --git a/ports/curl/wolfssl-ntlm.patch b/ports/curl/wolfssl-ntlm.patch
index a86ab800b4..40e2dd67fb 100644
--- a/ports/curl/wolfssl-ntlm.patch
+++ b/ports/curl/wolfssl-ntlm.patch
@@ -32,7 +32,7 @@ diff -ur a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h
  #  include <wolfssl/options.h>
 -#endif
 +#  include <wolfssl/openssl/ssl.h>
-+#else
++#elif defined(USE_OPENSSL)
  #  include <openssl/ssl.h>
  #endif
  
diff --git a/versions/baseline.json b/versions/baseline.json
index 99108ceb17..f1238b3606 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1746,7 +1746,7 @@
     },
     "curl": {
       "baseline": "7.83.1",
-      "port-version": 1
+      "port-version": 2
     },
     "curlpp": {
       "baseline": "2018-06-15",
diff --git a/versions/c-/curl.json b/versions/c-/curl.json
index 36970ab962..551cecf0e4 100644
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "09dee7c9ae276d954fc8017b6a81002e43f81bb0",
+      "version": "7.83.1",
+      "port-version": 2
+    },
     {
       "git-tree": "69e1aaae731455f5ed18b7eea4da75ee10bd073a",
       "version": "7.83.1",