Skip to contentSkip to conversation

strongswan: 5.9.4 -> 5.9.5

PATCH New Yi Zhao 1 participant 1 message Mar 31, 2022

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 strongswan: 5.9.4 -> 5.9.5

* Backport a patch to fix the segfault with swanctl:

  $ /usr/sbin/charon-systemd &
  $ /usr/sbin/swanctl --load-all --noprompt
  no files found matching '/etc/swanctl/conf.d/*.conf'
  no authorities found, 0 unloaded
  no pools found, 0 unloaded
  no connections found, 0 unloaded
  Segmentation fault

* Drop fix-funtion-parameter.patch and 0001-memory.h-Include-stdint.h-for-uintptr_t.patch as the issues have been fixed upstream.

---
 ...ory.h-Include-stdint.h-for-uintptr_t.patch | 22 -----
 .../0001-openssl-Don-t-unload-providers.patch | 92 +++++++++++++++++
 .../files/fix-funtion-parameter.patch         | 99 -------------------
 ...trongswan_5.9.4.bb => strongswan_5.9.5.bb} |  5 +-
 4 files changed, 94 insertions(+), 124 deletions(-)
 delete mode 100644 meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch
 create mode 100644 meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch
 delete mode 100644 meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
 rename meta-networking/recipes-support/strongswan/{strongswan_5.9.4.bb => strongswan_5.9.5.bb} (97%)
meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch deleted +0 -22
deleted file mode 100644
index 2d17507b1..000000000
@@ -1,22 +0,0 @@
-From 33a53dc13fd924949a582109b45fedd8d0bed59b Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 27 Jun 2017 07:42:11 -0700
-Subject: [PATCH] memory.h: Include stdint.h for uintptr_t
-
-Signed-off-by: Khem Raj <[email protected]>
-
----
- src/libstrongswan/utils/utils/memory.h | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/src/libstrongswan/utils/utils/memory.h
-+++ b/src/libstrongswan/utils/utils/memory.h
-@@ -26,6 +26,8 @@
- #include <string.h>
- #endif
- 
-+#include <stdint.h>
-+
- /**
-  * Helper function that compares two binary blobs for equality
-  */
meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch new file +92 -0

92 lines not on this page · raw message

meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch deleted +0 -99

99 lines not on this page · raw message

meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb renamed from meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb +2 -3
similarity index 97%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb
index babfe17d2..cfb7b41fa 100644
@@ -9,11 +9,10 @@ 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://fix-funtion-parameter.patch \
-           file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \
+           file://0001-openssl-Don-t-unload-providers.patch \
            "
 
-SRC_URI[sha256sum] = "45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518"
+SRC_URI[sha256sum] = "983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd"
 
 UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"
 
Signature · 1 line
2.25.1