summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch31
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb (renamed from meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb)7
2 files changed, 5 insertions, 33 deletions
diff --git a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch b/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
deleted file mode 100644
index e730fe1cd..000000000
--- a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001
2From: Tobias Brunner <tobias@strongswan.org>
3Date: Mon, 2 May 2022 09:31:49 +0200
4Subject: [PATCH] enum: Fix compiler warning
5
6Closes strongswan/strongswan#1025
7
8Upstream-Status: Backport
9[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960]
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 src/libstrongswan/utils/enum.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
17index 79da450f0c..1e77489f6f 100644
18--- a/src/libstrongswan/utils/enum.c
19+++ b/src/libstrongswan/utils/enum.c
20@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len)
21 return buf;
22 }
23
24- if (snprintf(buf, len, e->names[0]) >= len)
25+ if (snprintf(buf, len, "%s", e->names[0]) >= len)
26 {
27 return NULL;
28 }
29--
302.25.1
31
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
index 1b82dceac..71ffb7ba4 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
@@ -9,10 +9,9 @@ DEPENDS = "flex-native flex bison-native"
9DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" 9DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}"
10 10
11SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ 11SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
12 file://0001-enum-Fix-compiler-warning.patch \
13 " 12 "
14 13
15SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7" 14SRC_URI[sha256sum] = "9e64a2ba62efeac81abff1d962522404ebc6ed6c0d352a23ab7c0b2c639e3fcf"
16 15
17UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" 16UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"
18 17
@@ -147,9 +146,13 @@ RDEPENDS:${PN} += "\
147 ${PN}-plugin-constraints \ 146 ${PN}-plugin-constraints \
148 ${PN}-plugin-des \ 147 ${PN}-plugin-des \
149 ${PN}-plugin-dnskey \ 148 ${PN}-plugin-dnskey \
149 ${PN}-plugin-drbg \
150 ${PN}-plugin-fips-prf \
150 ${PN}-plugin-hmac \ 151 ${PN}-plugin-hmac \
152 ${PN}-plugin-kdf \
151 ${PN}-plugin-kernel-netlink \ 153 ${PN}-plugin-kernel-netlink \
152 ${PN}-plugin-md5 \ 154 ${PN}-plugin-md5 \
155 ${PN}-plugin-mgf1 \
153 ${PN}-plugin-nonce \ 156 ${PN}-plugin-nonce \
154 ${PN}-plugin-pem \ 157 ${PN}-plugin-pem \
155 ${PN}-plugin-pgp \ 158 ${PN}-plugin-pgp \