Skip to content
Snippets Groups Projects
Verified Commit 4d99076f authored by Richard Muzik's avatar Richard Muzik
Browse files

patches/packages/strongswan: drop patch

This was merged in upstream:
- https://github.com/openwrt/packages/pull/23493
parent e08f2367
1 merge request!739patches/packages/strongswan: drop patch
Pipeline #127044 passed with stages
in 11 minutes and 14 seconds
From d5a73f26ae146917a6fc0af97e11d7b55f239fa2 Mon Sep 17 00:00:00 2001
From: Philip Prindeville <philipp@redfish-solutions.com>
Date: Tue, 8 Nov 2022 20:07:48 -0700
Subject: [PATCH 1/2] strongswan: Fix PSK's when using multiple connections
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 796443267f797ddd2a219a5699097a9b215680a4)
Signed-off-by: Richard Muzik <richard.muzik@nic.cz>
---
net/strongswan/files/swanctl.init | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/strongswan/files/swanctl.init b/net/strongswan/files/swanctl.init
index 14b56e838c170..9d34b1041db03 100644
--- a/net/strongswan/files/swanctl.init
+++ b/net/strongswan/files/swanctl.init
@@ -544,12 +544,12 @@ config_connection() {
swanctl_xappend0 ""
swanctl_xappend0 "secrets {"
- swanctl_xappend1 "ike {"
+ swanctl_xappend1 "ike-$config_name {"
swanctl_xappend2 "secret = $pre_shared_key"
- if [ -n "$local_id" ]; then
- swanctl_xappend2 "id1 = $local_id"
- if [ -n "$remote_id" ]; then
- swanctl_xappend2 "id2 = $remote_id"
+ if [ -n "$local_identifier" ]; then
+ swanctl_xappend2 "id1 = $local_identifier"
+ if [ -n "$remote_identifier" ]; then
+ swanctl_xappend2 "id2 = $remote_identifier"
fi
fi
swanctl_xappend1 "}"
From ce7b48f05f5e88882772e5df317b809bfd9d5f93 Mon Sep 17 00:00:00 2001
From: Philip Prindeville <philipp@redfish-solutions.com>
Date: Sun, 26 Mar 2023 13:27:02 -0600
Subject: [PATCH 2/2] strongswan: Fix indent for hw_offload, interface,
priority
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 03eab9b63b8e813108b3e7f0db50a3041515472e)
Signed-off-by: Richard Muzik <richard.muzik@nic.cz>
---
net/strongswan/Makefile | 2 +-
net/strongswan/files/swanctl.init | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index e1e9e55c0f420..015a0219014c3 100644
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=strongswan
PKG_VERSION:=5.9.5
-PKG_RELEASE:=13.1
+PKG_RELEASE:=13.2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
diff --git a/net/strongswan/files/swanctl.init b/net/strongswan/files/swanctl.init
index 9d34b1041db03..b7af78446a614 100644
--- a/net/strongswan/files/swanctl.init
+++ b/net/strongswan/files/swanctl.init
@@ -331,10 +331,10 @@ config_child() {
[ -n "$local_subnet" ] && swanctl_xappend4 "local_ts = $local_subnet"
[ -n "$remote_subnet" ] && swanctl_xappend4 "remote_ts = $remote_subnet"
- [ -n "$hw_offload" ] && swanctl_append4 "hw_offload = $hw_offload"
+ [ -n "$hw_offload" ] && swanctl_xappend4 "hw_offload = $hw_offload"
[ $ipcomp -eq 1 ] && swanctl_xappend4 "ipcomp = 1"
- [ -n "$interface" ] && swanctl_append4 "interface = $interface"
- [ -n "$priority" ] && swanctl_append4 "priority = $priority"
+ [ -n "$interface" ] && swanctl_xappend4 "interface = $interface"
+ [ -n "$priority" ] && swanctl_xappend4 "priority = $priority"
[ -n "$if_id" ] && { swanctl_xappend4 "if_id_in = $if_id" ; swanctl_xappend4 "if_id_out = $if_id" ; }
[ -n "$startaction" -a "$startaction" != "none" ] && swanctl_xappend4 "start_action = $startaction"
[ -n "$closeaction" -a "$closeaction" != "none" ] && swanctl_xappend4 "close_action = $closeaction"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment