[Launch-darkly-server] update to 2.9.3 (#41780)

This commit is contained in:
blavallee 2024-10-29 03:12:03 -04:00 committed by GitHub
parent 996739d8cd
commit 3de07eb09f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 47 deletions

View File

@ -1,26 +0,0 @@
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);

View File

@ -1,13 +0,0 @@
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(

View File

@ -1,14 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO launchdarkly/c-server-sdk
REF a79f743bda933af3c45ab6ca5c6448df4b815667 # 2.8.6
SHA512 5f5982def5d2e9272751f35cbc0891ef967ae189d56da996e00410205ab0d57c196b66f7be0ba918ee6f82a584e5d75257e77f03c9b644c3174c35ea015802f7
REF 66c24c874d623338636083f81ed258bc5101f504 # 2.9.3
SHA512 38dd411da0cae016f781efc467a9c230236160e3db737550809f5c7b799c2946deec191d6abcf2f677d6452ad0c273c864e9a78674f6c547d1fd8a88d9d73bcc
HEAD_REF master
PATCHES
findPCRE.patch
FixStrictPrototypes.patch # required with clang-15
removeWarningAsError.patch
fix-depend-clib.patch
)
@ -39,7 +38,7 @@ vcpkg_from_github(
SHA512 fd7dfbed4ac10e2c482da1cd460dabf0a53965e6fa17fab97156becb8214e435ee3605b2748705141380e254de7c32ab42da5e42cd6e4494f7ecaafb3b9e19f0
HEAD_REF master
PATCHES
fix-confilct-with-openssl.patch
${SOURCE_PATH}/patches/sha1.patch
)
vcpkg_from_github(

View File

@ -1,7 +1,6 @@
{
"name": "launch-darkly-server",
"version": "2.8.6",
"port-version": 2,
"version": "2.9.3",
"description": "LaunchDarkly server-side SDK for C/C++",
"homepage": "https://github.com/launchdarkly/c-server-sdk",
"license": "Apache-2.0",

View File

@ -4181,8 +4181,8 @@
"port-version": 0
},
"launch-darkly-server": {
"baseline": "2.8.6",
"port-version": 2
"baseline": "2.9.3",
"port-version": 0
},
"lazy-importer": {
"baseline": "2023-08-03",

View File

@ -1,5 +1,9 @@
{
"versions": [
{
"git-tree": "f1cc29ee2a449604e38c80c1c864a3683b675e6c",
"version": "2.9.3"
},
{
"git-tree": "cf4d27e890d7becddd87f89a3a0622199892ebd2",
"version": "2.8.6",