diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2022-08-03 09:23:49 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-08-06 09:40:09 -0700 |
commit | 42f8c22fcfde9200899492f45807efc3423f0083 (patch) | |
tree | 18102367f7423d7198dfffe3b7b1d35d81d90f40 /meta-networking/recipes-support | |
parent | 5abd81567d5ed091ed870abf24e51f260747d593 (diff) | |
download | meta-openembedded-42f8c22fcfde9200899492f45807efc3423f0083.tar.gz |
strongswan: upgrade 5.9.6 -> 5.9.7
ChangeLog:
https://github.com/strongswan/strongswan/releases/tag/5.9.7
* Drop backport patch 0001-enum-Fix-compiler-warning.patch.
* Update RDEPENDS to fix strongswan startup failures:
plugin 'mgf1': failed to load - mgf1_plugin_create not found and no plugin file available
plugin 'fips-prf': failed to load - fips_prf_plugin_create not found and no plugin file available
plugin 'kdf': failed to load - kdf_plugin_create not found and no plugin file available
plugin 'drbg': failed to load - drbg_plugin_create not found and no plugin file available
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support')
-rw-r--r-- | meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch | 31 | ||||
-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 e730fe1cd0..0000000000 --- a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner <tobias@strongswan.org> -Date: Mon, 2 May 2022 09:31:49 +0200 -Subject: [PATCH] enum: Fix compiler warning - -Closes strongswan/strongswan#1025 - -Upstream-Status: Backport -[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/libstrongswan/utils/enum.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c -index 79da450f0c..1e77489f6f 100644 ---- a/src/libstrongswan/utils/enum.c -+++ b/src/libstrongswan/utils/enum.c -@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len) - return buf; - } - -- if (snprintf(buf, len, e->names[0]) >= len) -+ if (snprintf(buf, len, "%s", e->names[0]) >= len) - { - return NULL; - } --- -2.25.1 - 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 1b82dceac2..71ffb7ba44 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" DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ - file://0001-enum-Fix-compiler-warning.patch \ " -SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7" +SRC_URI[sha256sum] = "9e64a2ba62efeac81abff1d962522404ebc6ed6c0d352a23ab7c0b2c639e3fcf" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" @@ -147,9 +146,13 @@ RDEPENDS:${PN} += "\ ${PN}-plugin-constraints \ ${PN}-plugin-des \ ${PN}-plugin-dnskey \ + ${PN}-plugin-drbg \ + ${PN}-plugin-fips-prf \ ${PN}-plugin-hmac \ + ${PN}-plugin-kdf \ ${PN}-plugin-kernel-netlink \ ${PN}-plugin-md5 \ + ${PN}-plugin-mgf1 \ ${PN}-plugin-nonce \ ${PN}-plugin-pem \ ${PN}-plugin-pgp \ |