Skip to contentSkip to conversation

strongswan: fix error with gcc-15

PATCH New [email protected] 1 participant 1 message Apr 17, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 strongswan: fix error with gcc-15

From: "mark.yang" <[email protected]>

* Backport 3 Patch:
- 0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch
- 0002-callback-job-Replace-return_false-in-constructors-wi.patch
- 0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch

* To fix the error with gcc-15.
- See more details: http://errors.yoctoproject.org/Errors/Details/851801

---
 ...e-of-help-to-match-that-of-a-callbac.patch |  25 ++++
 ...lace-return_false-in-constructors-wi.patch |  90 +++++++++++++
 ...urn_-nop-and-enumerator_create_empty.patch | 118 ++++++++++++++++++
 .../strongswan/strongswan_6.0.1.bb            |   8 +-
 4 files changed, 239 insertions(+), 2 deletions(-)
 create mode 100644 meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch
 create mode 100644 meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch
 create mode 100644 meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch
meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch new file +25 -0
new file mode 100644
index 0000000000..92c848f095
@@ -0,0 +1,25 @@
+From a7b5de569082398a14b7e571498e55d005903aaf Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <[email protected]>
+Date: Fri, 21 Feb 2025 17:18:35 +0100
+Subject: [PATCH] pki: Fix signature of help() to match that of a callback in
+ command_t
+
+Upstream-Status: Backport [a7b5de5 pki: Fix signature of help() to match that of a callback in command_t]
+Signed-off-by: mark.yang <[email protected]>
+---
+ src/pki/command.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pki/command.c b/src/pki/command.c
+index accec5fe5..6e6bf041e 100644
+--- a/src/pki/command.c
++++ b/src/pki/command.c
+@@ -265,7 +265,7 @@ int command_usage(char *error)
+ /**
+  * Show usage information
+  */
+-static int help(int c, char *v[])
++static int help()
+ {
+ 	return command_usage(NULL);
+ }
meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch new file +90 -0

90 lines not on this page · raw message

meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch new file +118 -0

118 lines not on this page · raw message

meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb +6 -2
index 9baf219cea..771470f695 100644
@@ -8,8 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "flex-native flex bison-native"
 DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '  tpm2-tss', '', d)}"
 
-SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \
-          "
+SRC_URI = " \
+    https://download.strongswan.org/strongswan-${PV}.tar.bz2 \
+    file://0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch \
+    file://0002-callback-job-Replace-return_false-in-constructors-wi.patch \
+    file://0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch \
+    "
 
 SRC_URI[sha256sum] = "212368cbc674fed31f3292210303fff06da8b90acad2d1387375ed855e6879c4"