summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch21
-rw-r--r--meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch14
-rw-r--r--meta/recipes-support/gnutls/gnutls/arm_eabi.patch8
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.8.0.bb (renamed from meta/recipes-support/gnutls/gnutls_3.7.8.bb)7
4 files changed, 23 insertions, 27 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 @@
1From b729a356538d499fe25e82bfc78ea663bdaca0a8 Mon Sep 17 00:00:00 2001 1From 21a8295bac3805e4490ba2b5f136e7f4c121061b Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@fujitsu.com> 2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Mon, 23 May 2022 10:44:43 +0900 3Date: Mon, 23 May 2022 10:44:43 +0900
4Subject: [PATCH] Creating .hmac file should be excuted in target environment, 4Subject: [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
7Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] 7Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373]
8Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> 8Signed-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
13diff --git a/lib/Makefile.am b/lib/Makefile.am 14diff --git a/lib/Makefile.am b/lib/Makefile.am
14index 0b43ef9..cf263f0 100644 15index 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--
282.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 @@
1From 74080376904713a8e6cceefbc25c81512796bf0c Mon Sep 17 00:00:00 2001 1From 81861f7ba690956c064ebe8dce6c313951fa2a9f Mon Sep 17 00:00:00 2001
2From: Ravineet Singh <ravineet.a.singh@est.tech> 2From: Ravineet Singh <ravineet.a.singh@est.tech>
3Date: Tue, 10 Jan 2023 16:11:10 +0100 3Date: Tue, 10 Jan 2023 16:11:10 +0100
4Subject: [PATCH] gnutls: add ptest support 4Subject: [PATCH] gnutls: add ptest support
5 5
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> 7Signed-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
14diff --git a/Makefile.am b/Makefile.am 15diff --git a/Makefile.am b/Makefile.am
15index 843193f9f..816b09fec 100644 16index 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
28diff --git a/configure.ac b/configure.ac 29diff --git a/configure.ac b/configure.ac
29index baff1c007..f9f596abf 100644 30index 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=
41diff --git a/tests/Makefile.am b/tests/Makefile.am 42diff --git a/tests/Makefile.am b/tests/Makefile.am
42index 573e911a0..e8a26f8b9 100644 43index 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--
592.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 @@
1From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001 1From 911213d9f72ddce468322d22d223127b93964409 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
@@ -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
17diff --git a/tests/seccomp.c b/tests/seccomp.c 17diff --git a/tests/seccomp.c b/tests/seccomp.c
18index ed14d00..3c5b726 100644 18index 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)
diff --git a/meta/recipes-support/gnutls/gnutls_3.7.8.bb b/meta/recipes-support/gnutls/gnutls_3.8.0.bb
index fee06393bd..835ab122d8 100644
--- a/meta/recipes-support/gnutls/gnutls_3.7.8.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.8.0.bb
@@ -11,8 +11,8 @@ LICENSE:${PN}-bin = "GPL-3.0-or-later"
11LICENSE:${PN}-openssl = "GPL-3.0-or-later" 11LICENSE:${PN}-openssl = "GPL-3.0-or-later"
12 12
13LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ 13LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \
14 file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ 14 file://doc/COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
15 file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" 15 file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
16 16
17DEPENDS = "nettle gmp virtual/libiconv libunistring" 17DEPENDS = "nettle gmp virtual/libiconv libunistring"
18DEPENDS:append:libc-musl = " argp-standalone" 18DEPENDS:append:libc-musl = " argp-standalone"
@@ -26,7 +26,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
26 file://Add-ptest-support.patch \ 26 file://Add-ptest-support.patch \
27 " 27 "
28 28
29SRC_URI[sha256sum] = "c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114" 29SRC_URI[sha256sum] = "0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5"
30 30
31inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest 31inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest
32 32
@@ -44,7 +44,6 @@ PACKAGECONFIG[fips] = "--enable-fips140-mode --with-libdl-prefix=${STAGING_BASEL
44EXTRA_OECONF = " \ 44EXTRA_OECONF = " \
45 --enable-doc \ 45 --enable-doc \
46 --disable-libdane \ 46 --disable-libdane \
47 --disable-guile \
48 --disable-rpath \ 47 --disable-rpath \
49 --enable-openssl-compatibility \ 48 --enable-openssl-compatibility \
50 --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ 49 --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \