Re: [meta-networking][PATCH] strongswan: upgrade 5.9.6 -> 5.9.7


Yi Zhao
 

Please ignore this patch as there are some startup failures. I will send v2.


//Yi

On 8/1/22 15:42, Yi Zhao wrote:
ChangeLog:
https://github.com/strongswan/strongswan/releases/tag/5.9.7

Drop backport patch 0001-enum-Fix-compiler-warning.patch.

Signed-off-by: Yi Zhao <yi.zhao@...>
---
.../0001-enum-Fix-compiler-warning.patch | 31 -------------------
...trongswan_5.9.6.bb => strongswan_5.9.7.bb} | 3 +-
2 files changed, 1 insertion(+), 33 deletions(-)
delete mode 100644 meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
rename meta-networking/recipes-support/strongswan/{strongswan_5.9.6.bb => strongswan_5.9.7.bb} (98%)

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 @@
-From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@...>
-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@...>
----
- 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
similarity index 98%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
index 1b82dceac..349538620 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"

Join openembedded-devel@lists.openembedded.org to automatically receive all group messages.