mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 01:30:55 +08:00
[shiftmedia-libgnutls, nettle] update shiftmedia-libgnutls to 3.8.7, add symbols in nettle for shiftmedia-libgnutls (#41704)
This commit is contained in:
talregev
GitHub
parent
1b92e9c2cb
commit
4bdc812637
@ -561,3 +561,7 @@ EXPORTS
|
||||
_nettle_aes_decrypt_table
|
||||
nettle_aes_decrypt
|
||||
_nettle_aes_decrypt
|
||||
nettle_sha3_256_shake_output
|
||||
nettle_sha3_128_init
|
||||
nettle_sha3_128_update
|
||||
nettle_sha3_128_shake_output
|
||||
|
||||
@ -585,3 +585,7 @@ EXPORTS
|
||||
_nettle_aes_decrypt_table
|
||||
nettle_aes_decrypt
|
||||
_nettle_aes_decrypt
|
||||
nettle_sha3_256_shake_output
|
||||
nettle_sha3_128_init
|
||||
nettle_sha3_128_update
|
||||
nettle_sha3_128_shake_output
|
||||
|
||||
@ -592,3 +592,7 @@ EXPORTS
|
||||
_nettle_aes_decrypt_table
|
||||
nettle_aes_decrypt
|
||||
_nettle_aes_decrypt
|
||||
nettle_sha3_256_shake_output
|
||||
nettle_sha3_128_init
|
||||
nettle_sha3_128_update
|
||||
nettle_sha3_128_shake_output
|
||||
|
||||
@ -561,3 +561,7 @@ EXPORTS
|
||||
_nettle_aes_decrypt_table
|
||||
nettle_aes_decrypt
|
||||
_nettle_aes_decrypt
|
||||
nettle_sha3_256_shake_output
|
||||
nettle_sha3_128_init
|
||||
nettle_sha3_128_update
|
||||
nettle_sha3_128_shake_output
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "nettle",
|
||||
"version": "3.10",
|
||||
"port-version": 1,
|
||||
"description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.",
|
||||
"homepage": "https://git.lysator.liu.se/nettle/nettle",
|
||||
"license": null,
|
||||
|
||||
@ -1,8 +1,18 @@
|
||||
diff --git a/SMP/libgnutls.vcxproj.filters b/SMP/libgnutls.vcxproj.filters
|
||||
index 0e810b202..5a69f12ec 100644
|
||||
index ef202f4ac..a397e1574 100644
|
||||
--- a/SMP/libgnutls.vcxproj.filters
|
||||
+++ b/SMP/libgnutls.vcxproj.filters
|
||||
@@ -1520,30 +1520,6 @@
|
||||
@@ -103,9 +103,6 @@
|
||||
<Filter Include="Header Files\lib\inih">
|
||||
<UniqueIdentifier>{ae0c3eeb-53df-4c72-a85a-6b46de35e7ba}</UniqueIdentifier>
|
||||
</Filter>
|
||||
- <Filter Include="Source Files\libtasn1">
|
||||
- <UniqueIdentifier>{32be60b7-8c65-486e-9df5-7e529443cf07}</UniqueIdentifier>
|
||||
- </Filter>
|
||||
<Filter Include="Source Files\lib\nettle\gost">
|
||||
<UniqueIdentifier>{1f3549a8-3c3d-475f-8fd6-20451d336464}</UniqueIdentifier>
|
||||
</Filter>
|
||||
@@ -1535,30 +1532,6 @@
|
||||
<ClCompile Include="..\lib\nettle\sysrng-bcrypt.c">
|
||||
<Filter>Source Files\lib\nettle</Filter>
|
||||
</ClCompile>
|
||||
@ -34,31 +44,48 @@ index 0e810b202..5a69f12ec 100644
|
||||
<Filter>Source Files\lib\nettle\gost</Filter>
|
||||
</ClCompile>
|
||||
diff --git a/SMP/libgnutls_files.props b/SMP/libgnutls_files.props
|
||||
index 7fe1f88d5..cbc2d45c1 100644
|
||||
index 55049b70b..2bb76e3b0 100644
|
||||
--- a/SMP/libgnutls_files.props
|
||||
+++ b/SMP/libgnutls_files.props
|
||||
@@ -172,16 +172,6 @@
|
||||
@@ -175,13 +175,6 @@
|
||||
<ItemGroup>
|
||||
<ClCompile Include="lib\gnutls_asn1_tab.c" />
|
||||
<ClCompile Include="lib\pkix_asn1_tab.c" />
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\coding.c" />
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\decoding.c" />
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\element.c" />
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\errors.c">
|
||||
- <ObjectFileName>$(IntDir)\tasn1_$(filename).obj</ObjectFileName>
|
||||
- </ClCompile>
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\gstr.c" />
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\parser_aux.c" />
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\structure.c" />
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\version.c" />
|
||||
<ClCompile Include="..\gnulib\lib\c-strcasecmp.c" />
|
||||
<ClCompile Include="..\gnulib\lib\c-strncasecmp.c" />
|
||||
<ClCompile Include="..\gnulib\lib\gl_linkedhash_list.c" />
|
||||
<ClCompile Include="..\gnulib\lib\cloexec.c" />
|
||||
@@ -545,9 +538,6 @@
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\gnulib\lib\stdio-write.c">
|
||||
<PreprocessorDefinitions>REPLACE_PRINTF_POSIX=1;REPLACE_FPRINTF_POSIX=1;REPLACE_VPRINTF_POSIX=1;REPLACE_VFPRINTF_POSIX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
- </ClCompile>
|
||||
- <ClCompile Include="..\devel\libtasn1\lib\errors.c">
|
||||
- <ObjectFileName>$(IntDir)\tasn1_$(filename).obj</ObjectFileName>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\lib\algorithms\ecc.c">
|
||||
<ObjectFileName>$(IntDir)\alg_%(Filename).obj</ObjectFileName>
|
||||
diff --git a/SMP/libgnutls_winrt.vcxproj.filters b/SMP/libgnutls_winrt.vcxproj.filters
|
||||
index 761877440..cd40b5bb7 100644
|
||||
index f6a355e7e..299749c2a 100644
|
||||
--- a/SMP/libgnutls_winrt.vcxproj.filters
|
||||
+++ b/SMP/libgnutls_winrt.vcxproj.filters
|
||||
@@ -1520,30 +1520,6 @@
|
||||
@@ -103,9 +103,6 @@
|
||||
<Filter Include="Header Files\lib\inih">
|
||||
<UniqueIdentifier>{ae0c3eeb-53df-4c72-a85a-6b46de35e7ba}</UniqueIdentifier>
|
||||
</Filter>
|
||||
- <Filter Include="Source Files\libtasn1">
|
||||
- <UniqueIdentifier>{32be60b7-8c65-486e-9df5-7e529443cf07}</UniqueIdentifier>
|
||||
- </Filter>
|
||||
<Filter Include="Header Files\lib\nettle\gost">
|
||||
<UniqueIdentifier>{4fada990-3138-4089-a6c7-ae722a0e7fe9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
@@ -1535,30 +1532,6 @@
|
||||
<ClCompile Include="..\lib\nettle\sysrng-bcrypt.c">
|
||||
<Filter>Source Files\lib\nettle</Filter>
|
||||
</ClCompile>
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
|
||||
index 9e271476cf..80d8ccc8f5 100644
|
||||
--- a/lib/includes/gnutls/ocsp.h
|
||||
+++ b/lib/includes/gnutls/ocsp.h
|
||||
@@ -224,9 +224,9 @@ int gnutls_ocsp_resp_get_single(gnutls_ocsp_resp_const_t resp, unsigned indx,
|
||||
gnutls_datum_t *issuer_name_hash,
|
||||
gnutls_datum_t *issuer_key_hash,
|
||||
gnutls_datum_t *serial_number,
|
||||
- unsigned int *cert_status, time_t *this_update,
|
||||
+ gnutls_ocsp_cert_status_t *cert_status, time_t *this_update,
|
||||
time_t *next_update, time_t *revocation_time,
|
||||
- unsigned int *revocation_reason);
|
||||
+ gnutls_x509_crl_reason_t *revocation_reason);
|
||||
int gnutls_ocsp_resp_get_extension(gnutls_ocsp_resp_const_t resp, unsigned indx,
|
||||
gnutls_datum_t *oid, unsigned int *critical,
|
||||
gnutls_datum_t *data);
|
||||
diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
|
||||
index 0120129d50..3a46f2d174 100644
|
||||
--- a/lib/x509/ocsp.c
|
||||
+++ b/lib/x509/ocsp.c
|
||||
@@ -1433,9 +1433,9 @@ int gnutls_ocsp_resp_get_single(gnutls_ocsp_resp_const_t resp, unsigned indx,
|
||||
gnutls_datum_t *issuer_name_hash,
|
||||
gnutls_datum_t *issuer_key_hash,
|
||||
gnutls_datum_t *serial_number,
|
||||
- unsigned int *cert_status, time_t *this_update,
|
||||
+ gnutls_ocsp_cert_status_t *cert_status, time_t *this_update,
|
||||
time_t *next_update, time_t *revocation_time,
|
||||
- unsigned int *revocation_reason)
|
||||
+ gnutls_x509_crl_reason_t *revocation_reason)
|
||||
{
|
||||
char name[MAX_NAME_SIZE];
|
||||
int ret, result;
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/SMP/unistd.h b/SMP/unistd.h
|
||||
index b54d4be15..273204e00 100644
|
||||
--- a/SMP/unistd.h
|
||||
+++ b/SMP/unistd.h
|
||||
@@ -32,6 +32,8 @@
|
||||
#include <direct.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
+#define mkdir(path, mode) _mkdir(path)
|
||||
+
|
||||
#define R_OK 4 /* Test for read permission. */
|
||||
#define W_OK 2 /* Test for write permission. */
|
||||
//#define X_OK 1 /* execute permission - unsupported in windows*/
|
||||
@ -4,14 +4,11 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ShiftMediaProject/gnutls
|
||||
REF ${VERSION}
|
||||
SHA512 5bd515da85f9e87b98f09a29472f788e869ccc3355f9583fbb4215d954cc5f97239e017120a0b358d259e58d0bd8e538fd00ea102fdbc1b29363cd92f06d0299
|
||||
SHA512 ff3991012425fb047229b3a72f3ab465981e002f93840df0dc3729b152fb497f88c74cb50022fc6f30aa2f6db3c34ed4e44e5556ec249f8da5b20886bb4116b1
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
external-libtasn1.patch
|
||||
pkgconfig.patch
|
||||
ssize_t_already_define.patch
|
||||
fix-warnings.patch
|
||||
mkdir.patch
|
||||
)
|
||||
|
||||
file(REMOVE_RECURSE "${SOURCE_PATH}/devel/perlasm")
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/SMP/gnutls/gnutls.h b/SMP/gnutls/gnutls.h
|
||||
index af1c296a69..796d838064 100644
|
||||
--- a/SMP/gnutls/gnutls.h
|
||||
+++ b/SMP/gnutls/gnutls.h
|
||||
@@ -39,7 +39,9 @@
|
||||
/* Get ssize_t. */
|
||||
#ifdef _MSC_VER
|
||||
# include <BaseTsd.h>
|
||||
+# ifndef ssize_t
|
||||
typedef SSIZE_T ssize_t;
|
||||
+# endif
|
||||
# include <sys/types.h>
|
||||
#else
|
||||
# include <sys/types.h>
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "shiftmedia-libgnutls",
|
||||
"version": "3.8.4",
|
||||
"port-version": 3,
|
||||
"version": "3.8.7",
|
||||
"description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ",
|
||||
"homepage": "https://github.com/ShiftMediaProject/gnutls",
|
||||
"license": "LGPL-2.1-only",
|
||||
|
||||
@ -6286,7 +6286,7 @@
|
||||
},
|
||||
"nettle": {
|
||||
"baseline": "3.10",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"networkdirect-sdk": {
|
||||
"baseline": "2.0.1",
|
||||
@ -8269,8 +8269,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"shiftmedia-libgnutls": {
|
||||
"baseline": "3.8.4",
|
||||
"port-version": 3
|
||||
"baseline": "3.8.7",
|
||||
"port-version": 0
|
||||
},
|
||||
"shiftmedia-libgpg-error": {
|
||||
"baseline": "1.45",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8e33e188623d99135e4d6db52d98840da86ffc0d",
|
||||
"version": "3.10",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "9326fbe0ac4d6a3e70d622443d40b29d9538a9ff",
|
||||
"version": "3.10",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "86914b66df06648d0bf9cfff13c272a852768df4",
|
||||
"version": "3.8.7",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b18bd4e582995b852d1b9eac4b79805d84aaa656",
|
||||
"version": "3.8.4",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user