main/strongswan: upgrade to 5.5.2

1 files changed, 28 insertions, 29 deletions

diff --git a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch b/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch
index 0dcf001244..823a8e16b7 100644
--- a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch
+++ b/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch
@@ -1,8 +1,7 @@
-From a3e5318ef98f47761ec2c2fc6d106ec9f5dc294b Mon Sep 17 00:00:00 2001
+From 460e0f52d88433071b27603e47995517514ef8b9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Mon, 21 Sep 2015 13:41:58 +0300
-Subject: [PATCH 2/5] charon: add optional source and remote overrides for
- initiate
+Subject: [PATCH] charon: add optional source and remote overrides for initiate
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -28,10 +27,10 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
  src/libcharon/sa/ike_sa_manager.h                |  8 ++-
  src/libcharon/sa/trap_manager.c                  | 45 +++++++----------
  src/swanctl/commands/initiate.c                  | 40 ++++++++++++++-
- 13 files changed, 219 insertions(+), 49 deletions(-)
+ 12 files changed, 218 insertions(+), 48 deletions(-)
 
 diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
-index 71df92f..13b31de 100644
+index 71df92f7e..13b31de8a 100644
 --- a/src/charon-cmd/cmd/cmd_connection.c
 +++ b/src/charon-cmd/cmd/cmd_connection.c
 @@ -436,7 +436,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this)
@@ -44,10 +43,10 @@ index 71df92f..13b31de 100644
  		terminate(pid);
  	}
 diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
-index 5991c24..2d37942 100644
+index 571c0edba..e7922cf4d 100644
 --- a/src/charon-nm/nm/nm_service.c
 +++ b/src/charon-nm/nm/nm_service.c
-@@ -579,7 +579,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
+@@ -580,7 +580,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
  	 * Prepare IKE_SA
  	 */
  	ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
@@ -57,7 +56,7 @@ index 5991c24..2d37942 100644
  	{
  		peer_cfg->destroy(peer_cfg);
 diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
-index 93ff70b..49ef998 100644
+index 8e7816b39..7d7b3bcbc 100644
 --- a/src/libcharon/control/controller.c
 +++ b/src/libcharon/control/controller.c
 @@ -15,6 +15,28 @@
@@ -148,7 +147,7 @@ index 93ff70b..49ef998 100644
  			.limits = limits,
  		},
 diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h
-index 9524f53..7c51ba4 100644
+index 9524f53b9..7c51ba4ca 100644
 --- a/src/libcharon/control/controller.h
 +++ b/src/libcharon/control/controller.h
 @@ -79,6 +79,8 @@ struct controller_t {
@@ -169,7 +168,7 @@ index 9524f53..7c51ba4 100644
  						 bool limits);
  
 diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c
-index fb60d39..83f8ae5 100644
+index ee8306772..0736a6427 100644
 --- a/src/libcharon/plugins/stroke/stroke_control.c
 +++ b/src/libcharon/plugins/stroke/stroke_control.c
 @@ -108,7 +108,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
@@ -192,10 +191,10 @@ index fb60d39..83f8ae5 100644
  		switch (status)
  		{
 diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
-index d919e1d..2cac93f 100644
+index 12497ec5e..ba954e5cb 100644
 --- a/src/libcharon/plugins/vici/vici_config.c
 +++ b/src/libcharon/plugins/vici/vici_config.c
-@@ -1691,7 +1691,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
+@@ -1911,7 +1911,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
  			DBG1(DBG_CFG, "initiating '%s'", child_cfg->get_name(child_cfg));
  			charon->controller->initiate(charon->controller,
  					peer_cfg->get_ref(peer_cfg), child_cfg->get_ref(child_cfg),
@@ -205,7 +204,7 @@ index d919e1d..2cac93f 100644
  		case ACTION_ROUTE:
  			DBG1(DBG_CFG, "installing '%s'", child_cfg->get_name(child_cfg));
 diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
-index 4400381..55b8c99 100644
+index afee649f7..94bb2eecb 100644
 --- a/src/libcharon/plugins/vici/vici_control.c
 +++ b/src/libcharon/plugins/vici/vici_control.c
 @@ -16,6 +16,28 @@
@@ -237,7 +236,7 @@ index 4400381..55b8c99 100644
  #include "vici_control.h"
  #include "vici_builder.h"
  
-@@ -167,9 +189,11 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
+@@ -169,9 +191,11 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
  CALLBACK(initiate, vici_message_t*,
  	private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
  {
@@ -250,7 +249,7 @@ index 4400381..55b8c99 100644
  	int timeout;
  	bool limits;
  	controller_cb_t log_cb = NULL;
-@@ -183,6 +207,8 @@ CALLBACK(initiate, vici_message_t*,
+@@ -185,6 +209,8 @@ CALLBACK(initiate, vici_message_t*,
  	timeout = request->get_int(request, 0, "timeout");
  	limits = request->get_bool(request, FALSE, "init-limits");
  	log.level = request->get_int(request, 1, "loglevel");
@@ -259,7 +258,7 @@ index 4400381..55b8c99 100644
  
  	if (!child)
  	{
-@@ -193,28 +219,47 @@ CALLBACK(initiate, vici_message_t*,
+@@ -195,28 +221,47 @@ CALLBACK(initiate, vici_message_t*,
  		log_cb = (controller_cb_t)log_vici;
  	}
  
@@ -316,7 +315,7 @@ index 4400381..55b8c99 100644
  
  CALLBACK(terminate, vici_message_t*,
 diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c
-index 5e88ac2..7043332 100644
+index 654ec6abe..3d5a48cb8 100644
 --- a/src/libcharon/processing/jobs/start_action_job.c
 +++ b/src/libcharon/processing/jobs/start_action_job.c
 @@ -61,7 +61,7 @@ METHOD(job_t, execute, job_requeue_t,
@@ -329,7 +328,7 @@ index 5e88ac2..7043332 100644
  				case ACTION_ROUTE:
  					DBG1(DBG_JOB, "start action: route '%s'", name);
 diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index 37d49da..9593356 100644
+index 3ee233c1f..def2a6f1b 100644
 --- a/src/libcharon/sa/ike_sa_manager.c
 +++ b/src/libcharon/sa/ike_sa_manager.c
 @@ -16,6 +16,28 @@
@@ -419,7 +418,7 @@ index 37d49da..9593356 100644
  	charon->bus->set_sa(charon->bus, ike_sa);
  
 diff --git a/src/libcharon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h
-index 4298c54..47d6e6a 100644
+index 4298c54e2..47d6e6a37 100644
 --- a/src/libcharon/sa/ike_sa_manager.h
 +++ b/src/libcharon/sa/ike_sa_manager.h
 @@ -93,7 +93,8 @@ struct ike_sa_manager_t {
@@ -448,7 +447,7 @@ index 4298c54..47d6e6a 100644
  	/**
  	 * Check for duplicates of the given IKE_SA.
 diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
-index 40a0682..ea79d95 100644
+index 40a0682f2..ea79d95ae 100644
 --- a/src/libcharon/sa/trap_manager.c
 +++ b/src/libcharon/sa/trap_manager.c
 @@ -399,7 +399,7 @@ METHOD(trap_manager_t, acquire, void,
@@ -515,7 +514,7 @@ index 40a0682..ea79d95 100644
  	{
  		if (ike_sa->get_peer_cfg(ike_sa) == NULL)
 diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c
-index eb7b6ad..706fa57 100644
+index 8e452a6f6..b27bb8194 100644
 --- a/src/swanctl/commands/initiate.c
 +++ b/src/swanctl/commands/initiate.c
 @@ -13,6 +13,28 @@
@@ -551,12 +550,12 @@ index eb7b6ad..706fa57 100644
  	vici_req_t *req;
  	vici_res_t *res;
  	command_format_options_t format = COMMAND_FORMAT_NONE;
--	char *arg, *child = NULL;
-+	char *arg, *child = NULL, *my_host = NULL, *other_host = NULL;
+-	char *arg, *child = NULL, *ike = NULL;
++	char *arg, *child = NULL, *ike = NULL, *my_host = NULL, *other_host = NULL;
  	int ret = 0, timeout = 0, level = 1;
  
  	while (TRUE)
-@@ -61,6 +83,12 @@ static int initiate(vici_conn_t *conn)
+@@ -64,6 +86,12 @@ static int initiate(vici_conn_t *conn)
  			case 'l':
  				level = atoi(arg);
  				continue;
@@ -569,9 +568,9 @@ index eb7b6ad..706fa57 100644
  			case EOF:
  				break;
  			default:
-@@ -80,6 +108,14 @@ static int initiate(vici_conn_t *conn)
+@@ -87,6 +115,14 @@ static int initiate(vici_conn_t *conn)
  	{
- 		vici_add_key_valuef(req, "child", "%s", child);
+ 		vici_add_key_valuef(req, "ike", "%s", ike);
  	}
 +	if (my_host)
 +	{
@@ -584,15 +583,15 @@ index eb7b6ad..706fa57 100644
  	if (timeout)
  	{
  		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
-@@ -125,6 +161,8 @@ static void __attribute__ ((constructor))reg()
- 		{
+@@ -133,6 +169,8 @@ static void __attribute__ ((constructor))reg()
  			{"help",		'h', 0, "show usage information"},
  			{"child",		'c', 1, "initate a CHILD_SA configuration"},
+ 			{"ike",			'i', 1, "name of the connection to which the child belongs"},
 +			{"source",		'S', 1, "override source address"},
 +			{"remote",		'R', 1, "override remote address"},
  			{"timeout",		't', 1, "timeout in seconds before detaching"},
  			{"raw",			'r', 0, "dump raw response message"},
  			{"pretty",		'P', 0, "dump raw response message in pretty print"},
 -- 
-2.5.0
+2.12.1