diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-02-19 20:30:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-20 15:18:30 +0000 |
commit | 25f6d2bf18436755f8989984cac1fbc1d56c01c6 (patch) | |
tree | c26edf20b2eece59ca7efa0217f0bd5e0758ae00 /meta/recipes-support/gnutls/gnutls | |
parent | 78bb2eca6b7843fa2533d5540fdd60ff3380c0b0 (diff) | |
download | poky-25f6d2bf18436755f8989984cac1fbc1d56c01c6.tar.gz |
gnutls: update 3.7.8 -> 3.8.0
Refresh patches.
guile option removed upstream.
License-update: formatting, urls
https://github.com/gnutls/gnutls/commit/a39e528897184c6f6a33d245b82891a8dc8090ce
(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>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls')
3 files changed, 20 insertions, 23 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch index e40b2be362..87ebd8059e 100644 --- a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch +++ b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b729a356538d499fe25e82bfc78ea663bdaca0a8 Mon Sep 17 00:00:00 2001 | 1 | From 21a8295bac3805e4490ba2b5f136e7f4c121061b Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@fujitsu.com> | 2 | From: Lei Maohui <leimaohui@fujitsu.com> |
3 | Date: Mon, 23 May 2022 10:44:43 +0900 | 3 | Date: Mon, 23 May 2022 10:44:43 +0900 |
4 | Subject: [PATCH] Creating .hmac file should be excuted in target environment, | 4 | 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, | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] | 7 | Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] |
8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | 8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> |
9 | |||
9 | --- | 10 | --- |
10 | lib/Makefile.am | 3 +-- | 11 | lib/Makefile.am | 3 +-- |
11 | 1 file changed, 1 insertion(+), 2 deletions(-) | 12 | 1 file changed, 1 insertion(+), 2 deletions(-) |
12 | 13 | ||
13 | diff --git a/lib/Makefile.am b/lib/Makefile.am | 14 | diff --git a/lib/Makefile.am b/lib/Makefile.am |
14 | index 0b43ef9..cf263f0 100644 | 15 | index 6d4e8d2..24ef108 100644 |
15 | --- a/lib/Makefile.am | 16 | --- a/lib/Makefile.am |
16 | +++ b/lib/Makefile.am | 17 | +++ b/lib/Makefile.am |
17 | @@ -206,8 +206,7 @@ hmac_files = .libs/.gnutls.hmac | 18 | @@ -206,8 +206,7 @@ hmac_file = .libs/.$(gnutls_so).hmac |
18 | 19 | ||
19 | all-local: $(hmac_files) | 20 | all-local: $(hmac_file) |
20 | 21 | ||
21 | -.libs/.gnutls.hmac: libgnutls.la fipshmac | 22 | -$(hmac_file): libgnutls.la fipshmac |
22 | - $(AM_V_GEN) $(builddir)/fipshmac > $@-t && mv $@-t $@ | 23 | - $(AM_V_GEN) $(builddir)/fipshmac > $@-t && mv $@-t $@ |
23 | +.libs/.gnutls.hmac: | 24 | +.libs/.gnutls.hmac: |
24 | 25 | ||
25 | CLEANFILES = $(hmac_files) | 26 | CLEANFILES = $(hmac_file) |
26 | endif | 27 | endif |
27 | -- | ||
28 | 2.25.1 | ||
diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch index 8ad6ba5ad5..f87cf536fa 100644 --- a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch +++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch | |||
@@ -1,10 +1,11 @@ | |||
1 | From 74080376904713a8e6cceefbc25c81512796bf0c Mon Sep 17 00:00:00 2001 | 1 | From 81861f7ba690956c064ebe8dce6c313951fa2a9f Mon Sep 17 00:00:00 2001 |
2 | From: Ravineet Singh <ravineet.a.singh@est.tech> | 2 | From: Ravineet Singh <ravineet.a.singh@est.tech> |
3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 | 3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 |
4 | Subject: [PATCH] gnutls: add ptest support | 4 | Subject: [PATCH] gnutls: add ptest support |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [embedded specific] | 6 | Upstream-Status: Inappropriate [embedded specific] |
7 | Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> | 7 | Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> |
8 | |||
8 | --- | 9 | --- |
9 | Makefile.am | 3 +++ | 10 | Makefile.am | 3 +++ |
10 | configure.ac | 2 ++ | 11 | configure.ac | 2 ++ |
@@ -12,7 +13,7 @@ Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> | |||
12 | 3 files changed, 11 insertions(+) | 13 | 3 files changed, 11 insertions(+) |
13 | 14 | ||
14 | diff --git a/Makefile.am b/Makefile.am | 15 | diff --git a/Makefile.am b/Makefile.am |
15 | index 843193f9f..816b09fec 100644 | 16 | index 843193f..816b09f 100644 |
16 | --- a/Makefile.am | 17 | --- a/Makefile.am |
17 | +++ b/Makefile.am | 18 | +++ b/Makefile.am |
18 | @@ -191,6 +191,9 @@ dist-hook: | 19 | @@ -191,6 +191,9 @@ dist-hook: |
@@ -26,7 +27,7 @@ index 843193f9f..816b09fec 100644 | |||
26 | 27 | ||
27 | include $(top_srcdir)/cligen/cligen.mk | 28 | include $(top_srcdir)/cligen/cligen.mk |
28 | diff --git a/configure.ac b/configure.ac | 29 | diff --git a/configure.ac b/configure.ac |
29 | index baff1c007..f9f596abf 100644 | 30 | index b25ba14..860ddef 100644 |
30 | --- a/configure.ac | 31 | --- a/configure.ac |
31 | +++ b/configure.ac | 32 | +++ b/configure.ac |
32 | @@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) | 33 | @@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) |
@@ -39,10 +40,10 @@ index baff1c007..f9f596abf 100644 | |||
39 | 40 | ||
40 | hw_features= | 41 | hw_features= |
41 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 42 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
42 | index 573e911a0..e8a26f8b9 100644 | 43 | index d530ad0..71c592f 100644 |
43 | --- a/tests/Makefile.am | 44 | --- a/tests/Makefile.am |
44 | +++ b/tests/Makefile.am | 45 | +++ b/tests/Makefile.am |
45 | @@ -644,6 +644,12 @@ SH_LOG_COMPILER = $(SHELL) | 46 | @@ -648,6 +648,12 @@ SH_LOG_COMPILER = $(SHELL) |
46 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind | 47 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind |
47 | LOG_COMPILER = $(LOG_VALGRIND) | 48 | LOG_COMPILER = $(LOG_VALGRIND) |
48 | 49 | ||
@@ -55,6 +56,3 @@ index 573e911a0..e8a26f8b9 100644 | |||
55 | distclean-local: | 56 | distclean-local: |
56 | rm -rf softhsm-*.db softhsm-*.config *.tmp tmp-* x509-crt-list-import-url.config.db port.lock.d | 57 | rm -rf softhsm-*.db softhsm-*.config *.tmp tmp-* x509-crt-list-import-url.config.db port.lock.d |
57 | 58 | ||
58 | -- | ||
59 | 2.31.1 | ||
60 | |||
diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index 6eb1edbdb1..2b61a703cb 100644 --- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001 | 1 | From 911213d9f72ddce468322d22d223127b93964409 Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <jslater@windriver.com> | 2 | From: Joe Slater <jslater@windriver.com> |
3 | Date: Wed, 25 Jan 2017 13:52:59 -0800 | 3 | Date: Wed, 25 Jan 2017 13:52:59 -0800 |
4 | Subject: [PATCH] gnutls: account for ARM_EABI | 4 | Subject: [PATCH] gnutls: account for ARM_EABI |
@@ -15,10 +15,10 @@ Signed-off-by: Joe Slater <jslater@windriver.com> | |||
15 | 1 file changed, 2 insertions(+) | 15 | 1 file changed, 2 insertions(+) |
16 | 16 | ||
17 | diff --git a/tests/seccomp.c b/tests/seccomp.c | 17 | diff --git a/tests/seccomp.c b/tests/seccomp.c |
18 | index ed14d00..3c5b726 100644 | 18 | index a3148fe..443bc5f 100644 |
19 | --- a/tests/seccomp.c | 19 | --- a/tests/seccomp.c |
20 | +++ b/tests/seccomp.c | 20 | +++ b/tests/seccomp.c |
21 | @@ -53,7 +53,9 @@ int disable_system_calls(void) | 21 | @@ -52,7 +52,9 @@ int disable_system_calls(void) |
22 | 22 | ||
23 | ADD_SYSCALL(nanosleep, 0); | 23 | ADD_SYSCALL(nanosleep, 0); |
24 | ADD_SYSCALL(clock_nanosleep, 0); | 24 | ADD_SYSCALL(clock_nanosleep, 0); |
@@ -27,4 +27,4 @@ index ed14d00..3c5b726 100644 | |||
27 | +#endif | 27 | +#endif |
28 | ADD_SYSCALL(getpid, 0); | 28 | ADD_SYSCALL(getpid, 0); |
29 | ADD_SYSCALL(gettimeofday, 0); | 29 | ADD_SYSCALL(gettimeofday, 0); |
30 | #if defined(HAVE_CLOCK_GETTIME) | 30 | # if defined(HAVE_CLOCK_GETTIME) |