gnutls: update 3.7.8 -> 3.8.0

Refresh patches.

guile option removed upstream.

License-update: formatting, urls
a39e528897

(From OE-Core rev: 016025f1c77b9ffc00213e6056c5134f353ff541)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-02-19 20:30:31 +01:00
committed by Richard Purdie
parent 78bb2eca6b
commit 25f6d2bf18
4 changed files with 23 additions and 27 deletions

View File

@@ -1,4 +1,4 @@
From b729a356538d499fe25e82bfc78ea663bdaca0a8 Mon Sep 17 00:00:00 2001
From 21a8295bac3805e4490ba2b5f136e7f4c121061b Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@fujitsu.com>
Date: Mon, 23 May 2022 10:44:43 +0900
Subject: [PATCH] Creating .hmac file should be excuted in target environment,
@@ -6,23 +6,22 @@ Subject: [PATCH] Creating .hmac file should be excuted in target environment,
Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373]
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
lib/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0b43ef9..cf263f0 100644
index 6d4e8d2..24ef108 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -206,8 +206,7 @@ hmac_files = .libs/.gnutls.hmac
all-local: $(hmac_files)
-.libs/.gnutls.hmac: libgnutls.la fipshmac
@@ -206,8 +206,7 @@ hmac_file = .libs/.$(gnutls_so).hmac
all-local: $(hmac_file)
-$(hmac_file): libgnutls.la fipshmac
- $(AM_V_GEN) $(builddir)/fipshmac > $@-t && mv $@-t $@
+.libs/.gnutls.hmac:
CLEANFILES = $(hmac_files)
CLEANFILES = $(hmac_file)
endif
--
2.25.1

View File

@@ -1,10 +1,11 @@
From 74080376904713a8e6cceefbc25c81512796bf0c Mon Sep 17 00:00:00 2001
From 81861f7ba690956c064ebe8dce6c313951fa2a9f Mon Sep 17 00:00:00 2001
From: Ravineet Singh <ravineet.a.singh@est.tech>
Date: Tue, 10 Jan 2023 16:11:10 +0100
Subject: [PATCH] gnutls: add ptest support
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech>
---
Makefile.am | 3 +++
configure.ac | 2 ++
@@ -12,7 +13,7 @@ Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech>
3 files changed, 11 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 843193f9f..816b09fec 100644
index 843193f..816b09f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,6 +191,9 @@ dist-hook:
@@ -26,7 +27,7 @@ index 843193f9f..816b09fec 100644
include $(top_srcdir)/cligen/cligen.mk
diff --git a/configure.ac b/configure.ac
index baff1c007..f9f596abf 100644
index b25ba14..860ddef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
@@ -39,10 +40,10 @@ index baff1c007..f9f596abf 100644
hw_features=
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 573e911a0..e8a26f8b9 100644
index d530ad0..71c592f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -644,6 +644,12 @@ SH_LOG_COMPILER = $(SHELL)
@@ -648,6 +648,12 @@ SH_LOG_COMPILER = $(SHELL)
AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind
LOG_COMPILER = $(LOG_VALGRIND)
@@ -55,6 +56,3 @@ index 573e911a0..e8a26f8b9 100644
distclean-local:
rm -rf softhsm-*.db softhsm-*.config *.tmp tmp-* x509-crt-list-import-url.config.db port.lock.d
--
2.31.1

View File

@@ -1,4 +1,4 @@
From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001
From 911213d9f72ddce468322d22d223127b93964409 Mon Sep 17 00:00:00 2001
From: Joe Slater <jslater@windriver.com>
Date: Wed, 25 Jan 2017 13:52:59 -0800
Subject: [PATCH] gnutls: account for ARM_EABI
@@ -15,10 +15,10 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/tests/seccomp.c b/tests/seccomp.c
index ed14d00..3c5b726 100644
index a3148fe..443bc5f 100644
--- a/tests/seccomp.c
+++ b/tests/seccomp.c
@@ -53,7 +53,9 @@ int disable_system_calls(void)
@@ -52,7 +52,9 @@ int disable_system_calls(void)
ADD_SYSCALL(nanosleep, 0);
ADD_SYSCALL(clock_nanosleep, 0);
@@ -27,4 +27,4 @@ index ed14d00..3c5b726 100644
+#endif
ADD_SYSCALL(getpid, 0);
ADD_SYSCALL(gettimeofday, 0);
#if defined(HAVE_CLOCK_GETTIME)
# if defined(HAVE_CLOCK_GETTIME)

View File

@@ -11,8 +11,8 @@ LICENSE:${PN}-bin = "GPL-3.0-or-later"
LICENSE:${PN}-openssl = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \
file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
file://doc/COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "nettle gmp virtual/libiconv libunistring"
DEPENDS:append:libc-musl = " argp-standalone"
@@ -26,7 +26,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
file://Add-ptest-support.patch \
"
SRC_URI[sha256sum] = "c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114"
SRC_URI[sha256sum] = "0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5"
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest
@@ -44,7 +44,6 @@ PACKAGECONFIG[fips] = "--enable-fips140-mode --with-libdl-prefix=${STAGING_BASEL
EXTRA_OECONF = " \
--enable-doc \
--disable-libdane \
--disable-guile \
--disable-rpath \
--enable-openssl-compatibility \
--with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \