summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-09-06 18:56:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-07 14:36:30 +0100
commitebb1b629d20bec1a73d6dd0a79f7cbc3f0808537 (patch)
tree7762a068af8354abfcc80b119a5104950e5a7b3b
parenta469cdcd34ba870b866922c1255a6a1c50167fe3 (diff)
downloadpoky-ebb1b629d20bec1a73d6dd0a79f7cbc3f0808537.tar.gz
gnutls: update 3.8.0 -> 3.8.1
(From OE-Core rev: 5f08d833669e96df5236773ae5a70bfb22f90b6b) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/gnutls/arm_eabi.patch12
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.8.1.bb (renamed from meta/recipes-support/gnutls/gnutls_3.8.0.bb)2
2 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
index 2b61a703cb..fe3f031fdc 100644
--- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
+++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
@@ -1,4 +1,4 @@
1From 911213d9f72ddce468322d22d223127b93964409 Mon Sep 17 00:00:00 2001 1From 5810d97281bb30edb786de9946e5c13186eff6a2 Mon Sep 17 00:00:00 2001
2From: Joe Slater <jslater@windriver.com> 2From: Joe Slater <jslater@windriver.com>
3Date: Wed, 25 Jan 2017 13:52:59 -0800 3Date: Wed, 25 Jan 2017 13:52:59 -0800
4Subject: [PATCH] gnutls: account for ARM_EABI 4Subject: [PATCH] gnutls: account for ARM_EABI
@@ -9,16 +9,15 @@ reference to them.
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Joe Slater <jslater@windriver.com> 11Signed-off-by: Joe Slater <jslater@windriver.com>
12
13--- 12---
14 tests/seccomp.c | 2 ++ 13 tests/seccomp.c | 2 ++
15 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
16 15
17diff --git a/tests/seccomp.c b/tests/seccomp.c 16diff --git a/tests/seccomp.c b/tests/seccomp.c
18index a3148fe..443bc5f 100644 17index 86442a5..03a5aa8 100644
19--- a/tests/seccomp.c 18--- a/tests/seccomp.c
20+++ b/tests/seccomp.c 19+++ b/tests/seccomp.c
21@@ -52,7 +52,9 @@ int disable_system_calls(void) 20@@ -55,7 +55,9 @@ int disable_system_calls(void)
22 21
23 ADD_SYSCALL(nanosleep, 0); 22 ADD_SYSCALL(nanosleep, 0);
24 ADD_SYSCALL(clock_nanosleep, 0); 23 ADD_SYSCALL(clock_nanosleep, 0);
@@ -27,4 +26,7 @@ index a3148fe..443bc5f 100644
27+#endif 26+#endif
28 ADD_SYSCALL(getpid, 0); 27 ADD_SYSCALL(getpid, 0);
29 ADD_SYSCALL(gettimeofday, 0); 28 ADD_SYSCALL(gettimeofday, 0);
30 # if defined(HAVE_CLOCK_GETTIME) 29 #if defined(HAVE_CLOCK_GETTIME)
30--
312.30.2
32
diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb b/meta/recipes-support/gnutls/gnutls_3.8.1.bb
index 1e3f34b6c5..455031dd47 100644
--- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.8.1.bb
@@ -25,7 +25,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
25 file://Add-ptest-support.patch \ 25 file://Add-ptest-support.patch \
26 " 26 "
27 27
28SRC_URI[sha256sum] = "0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5" 28SRC_URI[sha256sum] = "ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c"
29 29
30inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest 30inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest
31 31