contrib: Windows: update gmp, gnutls, nettle

- Update gmp to 6.2.1-4
- Update gnutls to 3.8.3
- Update nettle to 3.10.0

Gitlab: #1108
Change-Id: Ia7686a94eeaef7242b6570a186700f6d301ffe6c
This commit is contained in:
Andreas Traczyk
2025-02-24 16:24:28 -05:00
committed by Adrien Béraud
parent bd63d69bb0
commit cbba52ef01
5 changed files with 16 additions and 74 deletions

View File

@ -1,14 +0,0 @@
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -202,7 +202,7 @@
/* #undef HAVE_NATIVE_mpn_add_n_sub_n */
#define HAVE_NATIVE_mpn_add_nc 1
#if defined(__x86_64) || defined(_M_X64)
-#define HAVE_NATIVE_mpn_addaddmul_1msb0 1
+#define HAVE_NATIVE_mpn_addaddmul_1msb0 0
#define HAVE_NATIVE_mpn_addlsh1_n 1
#define HAVE_NATIVE_mpn_addlsh2_n 1
#define HAVE_NATIVE_mpn_addlsh_n 1
--
2.8.1.windows.1

View File

@ -1,18 +1,9 @@
{
"name": "gmp",
"version": "eb35fdadc072ecae2b262fd6e6709c308cadc07a",
"cpe": "cpe:2.3:a:gmplib:gmp:6.3.0:*:*:*:*:*:*:*",
"url": "https://github.com/ShiftMediaProject/gmp/archive/__VERSION__.tar.gz",
"deps": [],
"patches": [],
"win_patches": ["gmp_addaddmul_1msb0.patch"],
"version": "6.2.1-4",
"cpe": "cpe:2.3:a:gmplib:gmp:6.2.1:*:*:*:*:*:*:*",
"url": "https://github.com/ShiftMediaProject/gmp/archive/refs/tags/__VERSION__.tar.gz",
"project_paths": [
"SMP/libgmp.vcxproj"
],
"with_env" : "",
"custom_scripts": {
"pre_build": [],
"build": [],
"post_build": []
}
]
}

View File

@ -1,22 +0,0 @@
diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c
index 1b92583..3c0dd8d 100644
--- a/lib/verify-tofu.c
+++ b/lib/verify-tofu.c
@@ -493,7 +493,7 @@ int gnutls_store_pubkey(const char *db_name, gnutls_tdb_t tdb, const char *host,
return gnutls_assert_val(ret);
_gnutls_debug_log("Configuration path: %s\n", local_file);
- mkdir(local_file, 0700);
+ mkdir(local_file);
ret = find_config_file(local_file, sizeof(local_file));
if (ret < 0)
@@ -594,7 +594,7 @@ int gnutls_store_commitment(const char *db_name, gnutls_tdb_t tdb,
return gnutls_assert_val(ret);
_gnutls_debug_log("Configuration path: %s\n", local_file);
- mkdir(local_file, 0700);
+ mkdir(local_file);
ret = find_config_file(local_file, sizeof(local_file));
if (ret < 0)

View File

@ -1,28 +1,23 @@
{
"name": "gnutls",
"version": "3.6.7",
"cpe": "cpe:2.3:a:gnu:gnutls:3.6.7:*:*:*:*:*:*:*",
"url": "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-__VERSION__.tar.xz",
"version": "3.8.3",
"cpe": "cpe:2.3:a:gnu:gnutls:3.8.3:*:*:*:*:*:*:*",
"url": "https://github.com/ShiftMediaProject/gnutls/archive/refs/tags/__VERSION__.tar.gz",
"deps": [
"iconv",
"nettle",
"zlib",
"gmp"
],
"patches": [
"gnutls-3.6.7-win32-compat.patch",
"gnutls-3.6.7-win32-vs-support.patch",
"read-file-limits.h.patch",
"mkdir_permissions.patch"
],
"win_patches": [],
"project_paths": [
"SMP/libgnutls.vcxproj"
],
"with_env" : "",
"custom_scripts": {
"pre_build": [],
"build": [],
"post_build": []
"pre_build": [
"git init",
"git remote add origin https://github.com/ShiftMediaProject/gnutls.git || true",
"git fetch origin --depth=1 --tags && git reset --hard 3.8.3",
"git submodule update --init --recursive --depth=1 gnulib devel/libtasn1"
]
}
}

View File

@ -1,19 +1,11 @@
{
"name": "nettle",
"version": "c180b4d7afbda4049ad265d1366567f62a7a4a3a",
"cpe": "cpe:2.3:a:nettle_project:nettle:3.9.1:*:*:*:*:*:*:*",
"version": "0ba2d5c6a73d7c95327ed52e7326d49e3fb6d283",
"cpe": "cpe:2.3:a:nettle_project:nettle:3.10.0:*:*:*:*:*:*:*",
"url": "https://github.com/ShiftMediaProject/nettle/archive/__VERSION__.tar.gz",
"deps": ["gmp"],
"patches": [],
"win_patches": [],
"project_paths": [
"SMP/libnettle.vcxproj",
"SMP/libhogweed.vcxproj"
],
"with_env" : "",
"custom_scripts": {
"pre_build": [],
"build": [],
"post_build": []
}
]
}