summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2024-11-13 19:27:45 +0100
committerØrjan Malde <red@foxi.me>2024-11-13 19:27:45 +0100
commit570f525c4bbb80df8f5ec7912780c628e0f761ad (patch)
tree3492302001fc218784c82913babd7bf9cacbdddb /patches
parentc72558fe2fec0b87da1be75eab32bc307fd8045b (diff)
downloadmidipix_build-570f525c4bbb80df8f5ec7912780c628e0f761ad.tar.bz2
midipix_build-570f525c4bbb80df8f5ec7912780c628e0f761ad.tar.xz
groups.d/241.native_packages_inet.d/gnutls.package: bump to v3.8.8
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat (limited to 'patches')
-rw-r--r--patches/gnutls-3.8.5.local.patch12
-rw-r--r--patches/gnutls-3.8.8.local.patch30
-rw-r--r--patches/gnutls-3.8.8_pre.local.patch (renamed from patches/gnutls-3.8.5_pre.local.patch)0
3 files changed, 30 insertions, 12 deletions
diff --git a/patches/gnutls-3.8.5.local.patch b/patches/gnutls-3.8.5.local.patch
deleted file mode 100644
index 968143cf..00000000
--- a/patches/gnutls-3.8.5.local.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru gnutls-3.6.14.orig/lib/system/sockets.c gnutls-3.6.14/lib/system/sockets.c
---- gnutls-3.6.14.orig/lib/system/sockets.c 2020-06-01 11:48:13.000000000 +0200
-+++ gnutls-3.6.14/lib/system/sockets.c 2020-06-28 22:12:02.485455741 +0200
-@@ -117,7 +117,7 @@
- system_writev(gnutls_transport_ptr_t ptr, const giovec_t * iovec,
- int iovec_cnt)
- {
-- return _system_writev(ptr, iovec, iovec_cnt, 0);
-+ return writev(GNUTLS_POINTER_TO_INT(ptr), (struct iovec *) iovec, iovec_cnt);
- }
-
- #endif
diff --git a/patches/gnutls-3.8.8.local.patch b/patches/gnutls-3.8.8.local.patch
new file mode 100644
index 00000000..85b6b8f7
--- /dev/null
+++ b/patches/gnutls-3.8.8.local.patch
@@ -0,0 +1,30 @@
+diff -ru gnutls-3.8.8.orig/lib/algorithms/groups.c gnutls-3.8.8/lib/algorithms/groups.c
+--- gnutls-3.8.8.orig/lib/algorithms/groups.c 2024-10-30 05:41:21.000000000 +0100
++++ gnutls-3.8.8/lib/algorithms/groups.c 2024-11-13 19:12:22.032377871 +0100
+@@ -90,7 +90,13 @@
+ .tls_id = 25,
+ .pk = GNUTLS_PK_ECDSA,
+ },
+- group_x25519,
++ {
++ .name = "X25519",
++ .id = GNUTLS_GROUP_X25519,
++ .curve = GNUTLS_ECC_CURVE_X25519,
++ .tls_id = 29,
++ .pk = GNUTLS_PK_ECDH_X25519,
++ },
+ #ifdef ENABLE_GOST
+ /* draft-smyshlyaev-tls12-gost-suites-06, Section 6 */
+ {
+diff -ru gnutls-3.8.8.orig/lib/system/sockets.c gnutls-3.8.8/lib/system/sockets.c
+--- gnutls-3.8.8.orig/lib/system/sockets.c 2024-06-03 01:16:18.000000000 +0200
++++ gnutls-3.8.8/lib/system/sockets.c 2024-11-13 19:02:28.738122921 +0100
+@@ -161,7 +161,7 @@
+ ssize_t system_writev(gnutls_transport_ptr_t ptr, const giovec_t *iovec,
+ int iovec_cnt)
+ {
+- return _system_writev(ptr, iovec, iovec_cnt, 0);
++ return writev(GNUTLS_POINTER_TO_INT(ptr), (struct iovec *) iovec, iovec_cnt);
+ }
+
+ #endif
diff --git a/patches/gnutls-3.8.5_pre.local.patch b/patches/gnutls-3.8.8_pre.local.patch
index b214ccc0..b214ccc0 100644
--- a/patches/gnutls-3.8.5_pre.local.patch
+++ b/patches/gnutls-3.8.8_pre.local.patch