haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnutls, bump to 3.8.9 (#12524)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-06-28 16:58:20 +02:00
committed by GitHub
parent 8b8b51ae62
commit 433b185137
2 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net-libs/gnutls/gnutls-3.7.8.recipe → net-libs/gnutls/gnutls-3.8.9.recipe
View File

@@ -12,7 +12,7 @@ COPYRIGHT="2000-2018 Free Software Fundation Inc.
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
CHECKSUM_SHA256="c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114"
CHECKSUM_SHA256="69e113d802d1670c4d5ac1b99040b1f2d5c7c05daec5003813c049b5184820ed"
SOURCE_DIR="gnutls-$portVersion"
PATCHES="gnutls-$portVersion.patchset"
@@ -27,7 +27,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
fi
libgnutls_opensslVersion="27.0.2"
libgnutlsVersion="30.34.2"
libgnutlsVersion="30.40.3"
libgnutlsxxVersion="30.0.0"
libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}"
@@ -70,7 +70,6 @@ PROVIDES_bin="
cmd:ocsptool
cmd:p11tool
cmd:psktool
cmd:srptool
"
REQUIRES_bin="
gnutls$secondaryArchSuffix == $portVersion base
@@ -140,7 +139,7 @@ BUILD_PREREQUIRES="
cmd:autoconf
cmd:autoheader
cmd:automake
cmd:autopoint
cmd:autopoint$secondaryArchSuffix
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
@@ -149,6 +148,7 @@ BUILD_PREREQUIRES="
cmd:makeinfo
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:python3.10
"
TEST_REQUIRES="
@@ -169,7 +169,6 @@ debugList+=(
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/gnutls-serv
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/ocsptool
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/psktool
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/srptool
)
fi
defineDebugInfoPackage gnutls$secondaryArchSuffix "${debugList[@]}"
@@ -182,6 +181,7 @@ BUILD()
--disable-hardware-acceleration \
--disable-nls \
--with-default-trust-store-file=/system/data/ssl/CARootCertificates.pem
make $jobArgs AUTOCONF=: AUTOMAKE=: AUTOHEADER=: ACLOCAL=:
}
@@ -216,5 +216,6 @@ INSTALL()
TEST()
{
# 3 tests fail out of 201
make check LIBS="-lgnu"
}

50
net-libs/gnutls/patches/gnutls-3.7.8.patchset → net-libs/gnutls/patches/gnutls-3.8.9.patchset
View File

@@ -1,14 +1,14 @@
From d5308b25f1afb8bf98f4dbab9156069f3574933e Mon Sep 17 00:00:00 2001
From 7bc2d4df1e5f8e39c95d963378d30a184a2e43e3 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Tue, 7 Jun 2016 03:05:44 +0000
Subject: include sys/select.h
diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c
index d48c328..89fec50 100644
index b98b907..708ed43 100644
--- a/tests/mini-dtls-mtu.c
+++ b/tests/mini-dtls-mtu.c
@@ -24,6 +24,9 @@
@@ -23,6 +23,9 @@
#include <stdio.h>
#include <stdlib.h>
@@ -19,10 +19,10 @@ index d48c328..89fec50 100644
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-dtls-record-asym.c b/tests/mini-dtls-record-asym.c
index 59e7467..820bd66 100644
index 7e17ea1..812a9b4 100644
--- a/tests/mini-dtls-record-asym.c
+++ b/tests/mini-dtls-record-asym.c
@@ -26,6 +26,9 @@
@@ -25,6 +25,9 @@
#include <stdio.h>
#include <stdlib.h>
@@ -33,7 +33,7 @@ index 59e7467..820bd66 100644
#include <string.h>
#include <errno.h>
diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
index 5eb2eff..1f179e7 100644
index 3648374..c93e715 100644
--- a/tests/mini-record-failure.c
+++ b/tests/mini-record-failure.c
@@ -27,6 +27,9 @@
@@ -47,17 +47,17 @@ index 5eb2eff..1f179e7 100644
#if defined(_WIN32)
--
2.37.3
2.48.1
From 334834350c2db80b5c7113c287f2920a4bac4aff Mon Sep 17 00:00:00 2001
From 57d17c2d6b38e62bbe8a3404002afb395a337145 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 6 Jul 2016 22:11:20 +0000
Subject: Use /bin/perl instead of /usr/bin/perl.
diff --git a/doc/scripts/split-texi.pl b/doc/scripts/split-texi.pl
index 34978d3..96b1067 100755
index 89dd5df..0628e06 100755
--- a/doc/scripts/split-texi.pl
+++ b/doc/scripts/split-texi.pl
@@ -1,4 +1,4 @@
@@ -67,10 +67,10 @@ index 34978d3..96b1067 100755
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
--
2.37.3
2.48.1
From fddc58ad729d433af8636b4f5e52f5acc9ec5f75 Mon Sep 17 00:00:00 2001
From de462b8a9424de412fb8a7f1e89ba188befbf0e0 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 18 Jul 2018 07:44:23 +0000
Subject: doc/examples/tlsproxy/tlsproxy.c calls strdupa and fails to build
@@ -78,10 +78,10 @@ Subject: doc/examples/tlsproxy/tlsproxy.c calls strdupa and fails to build
so let's just skip it for now.
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index c40bf4f..85c6bd6 100644
index 690c3bb..ac646da 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -74,7 +74,6 @@ if ENABLE_SRP
@@ -76,7 +76,6 @@ if ENABLE_SRP
noinst_PROGRAMS += ex-client-srp ex-serv-srp
endif
@@ -90,20 +90,20 @@ index c40bf4f..85c6bd6 100644
tlsproxy_tlsproxy_SOURCES = tlsproxy/buffer.c tlsproxy/buffer.h tlsproxy/crypto-gnutls.c \
tlsproxy/crypto-gnutls.h tlsproxy/tlsproxy.c
--
2.37.3
2.48.1
From 443ee88bf3c05e38dc0304ef8a5165a8eb8c8807 Mon Sep 17 00:00:00 2001
From 97a02ddc184bb219b6cd2cd68eb6f81b9d73537e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 13 Aug 2022 11:06:09 +1000
Subject: Remove static for _Thread_local variables
diff --git a/lib/fips.c b/lib/fips.c
index 54eb4a3..3ed17bd 100644
index 6330670..0032cbb 100644
--- a/lib/fips.c
+++ b/lib/fips.c
@@ -52,9 +52,9 @@ struct gnutls_fips140_context_st {
@@ -58,9 +58,9 @@ struct gnutls_fips140_context_st {
* can use gnutls_fips140_set_mode() to override a specific
* operation on a thread */
static gnutls_fips_mode_t _global_fips_mode = -1;
@@ -116,20 +116,18 @@ index 54eb4a3..3ed17bd 100644
static int _skip_integrity_checks = 0;
diff --git a/lib/random.c b/lib/random.c
index f1abe74..2219cda 100644
index d6a8a91..dafac5a 100644
--- a/lib/random.c
+++ b/lib/random.c
@@ -36,8 +36,8 @@ extern gnutls_crypto_rnd_st _gnutls_fuzz_rnd_ops;
#endif
@@ -55,7 +55,7 @@ static gl_tls_key_t ctx_key;
/* Per thread context of random generator, and a flag to indicate initialization */
-static _Thread_local void *gnutls_rnd_ctx;
/* Flag to indicate initialization
*/
-static _Thread_local unsigned rnd_initialized = 0;
+_Thread_local void *gnutls_rnd_ctx;
+_Thread_local unsigned rnd_initialized = 0;
struct rnd_ctx_list_st {
void *ctx;
static void free_ctx(const void *ctx)
{
--
2.37.3
2.48.1