From b88e4cdec52bd755702d293312650cdf5649026f Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Fri, 5 Jan 2024 04:04:24 +0800
Subject: [PATCH] [launch-darkly-server] Fix dependence clib symbol Duplicate
 with openssl (#35901)

---
 .../fix-confilct-with-openssl.patch           | 26 +++++++++++++++++++
 .../fix-depend-clib.patch                     | 13 ++++++++++
 ports/launch-darkly-server/portfile.cmake     |  3 +++
 ports/launch-darkly-server/vcpkg.json         |  2 +-
 versions/baseline.json                        |  2 +-
 versions/l-/launch-darkly-server.json         |  5 ++++
 6 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 ports/launch-darkly-server/fix-confilct-with-openssl.patch
 create mode 100644 ports/launch-darkly-server/fix-depend-clib.patch

diff --git a/ports/launch-darkly-server/fix-confilct-with-openssl.patch b/ports/launch-darkly-server/fix-confilct-with-openssl.patch
new file mode 100644
index 0000000000..871a1540b1
--- /dev/null
+++ b/ports/launch-darkly-server/fix-confilct-with-openssl.patch
@@ -0,0 +1,26 @@
+diff --git a/sha1.c b/sha1.c
+index fe8da83..53ad2c4 100644
+--- a/sha1.c
++++ b/sha1.c
+@@ -279,7 +279,7 @@ void SHA1Final(
+     memset(&finalcount, '\0', sizeof(finalcount));
+ }
+ 
+-void SHA1(
++void SHA1_CLIBS(
+     char *hash_out,
+     const char *str,
+     int len)
+diff --git a/sha1.h b/sha1.h
+index 96bb008..53c4b01 100644
+--- a/sha1.h
++++ b/sha1.h
+@@ -36,7 +36,7 @@ void SHA1Final(
+     SHA1_CTX * context
+     );
+ 
+-void SHA1(
++void SHA1_CLIBS(
+     char *hash_out,
+     const char *str,
+     int len);
diff --git a/ports/launch-darkly-server/fix-depend-clib.patch b/ports/launch-darkly-server/fix-depend-clib.patch
new file mode 100644
index 0000000000..297343b00e
--- /dev/null
+++ b/ports/launch-darkly-server/fix-depend-clib.patch
@@ -0,0 +1,13 @@
+diff --git a/src/evaluate.c b/src/evaluate.c
+index f702419..e80fa6c 100644
+--- a/src/evaluate.c
++++ b/src/evaluate.c
+@@ -1246,7 +1246,7 @@ LDi_bucketUser(
+             char        digest[21], encoded[17];
+             const float longScale = 1152921504606846975.0;
+ 
+-            SHA1(digest, raw, strlen(raw));
++            SHA1_CLIBS(digest, raw, strlen(raw));
+ 
+             /* encodes to hex, and shortens, 16 characters in hex 8 bytes */
+             status = hexify(
diff --git a/ports/launch-darkly-server/portfile.cmake b/ports/launch-darkly-server/portfile.cmake
index e0cf49badb..f05a7889bf 100644
--- a/ports/launch-darkly-server/portfile.cmake
+++ b/ports/launch-darkly-server/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
         findPCRE.patch
         FixStrictPrototypes.patch # required with clang-15
         removeWarningAsError.patch
+        fix-depend-clib.patch
 )
 
 
@@ -37,6 +38,8 @@ vcpkg_from_github(
     REF fa1d96ec293d2968791603548125e3274bd6b472
     SHA512 fd7dfbed4ac10e2c482da1cd460dabf0a53965e6fa17fab97156becb8214e435ee3605b2748705141380e254de7c32ab42da5e42cd6e4494f7ecaafb3b9e19f0
     HEAD_REF master
+    PATCHES
+        fix-confilct-with-openssl.patch
 )
 
 vcpkg_from_github(
diff --git a/ports/launch-darkly-server/vcpkg.json b/ports/launch-darkly-server/vcpkg.json
index fa420d6c3d..3bb4be09eb 100644
--- a/ports/launch-darkly-server/vcpkg.json
+++ b/ports/launch-darkly-server/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "launch-darkly-server",
   "version": "2.8.6",
-  "port-version": 1,
+  "port-version": 2,
   "description": "LaunchDarkly server-side SDK for C/C++",
   "homepage": "https://github.com/launchdarkly/c-server-sdk",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 94219cf4d2..dacfe5a9dc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3994,7 +3994,7 @@
     },
     "launch-darkly-server": {
       "baseline": "2.8.6",
-      "port-version": 1
+      "port-version": 2
     },
     "lazy-importer": {
       "baseline": "2023-08-03",
diff --git a/versions/l-/launch-darkly-server.json b/versions/l-/launch-darkly-server.json
index 5db0081827..ea76effe1e 100644
--- a/versions/l-/launch-darkly-server.json
+++ b/versions/l-/launch-darkly-server.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cf4d27e890d7becddd87f89a3a0622199892ebd2",
+      "version": "2.8.6",
+      "port-version": 2
+    },
     {
       "git-tree": "d2e41e5748cc5b77167205b83be64003e979e637",
       "version": "2.8.6",