Add dmvpn termination patch

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,2 @@
-/strongswan-5.6.3.tar.bz2
+/strongswan-5.7.1.tar.bz2
+/strongswan-5.7.2.tar.bz2

0001-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch

@@ -1,7 +1,7 @@
-From 9d85d221f1bf330d31fa334d1bb7760fee90317e Mon Sep 17 00:00:00 2001
+From 4904344754c2884e36b40532a8b65229c3355ff6 Mon Sep 17 00:00:00 2001
 From: Tobias Brunner <tobias@strongswan.org>
 Date: Fri, 17 Jul 2015 11:53:58 +0200
-Subject: [PATCH 1/6] ike: Adhere to IKE_SA limit when checking out by config
+Subject: [PATCH 1/7] ike: Adhere to IKE_SA limit when checking out by config
 
 This prevents new SAs from getting created if we hit the global IKE_SA
 limit (we still allow checkout_new(), which is used for rekeying).
@@ -10,7 +10,7 @@ limit (we still allow checkout_new(), which is used for rekeying).
  1 file changed, 37 insertions(+), 34 deletions(-)
 
 diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index 2a499db40..74f2a933c 100644
+index 3bac4b109..8a3178674 100644
 --- a/src/libcharon/sa/ike_sa_manager.c
 +++ b/src/libcharon/sa/ike_sa_manager.c
 @@ -1419,48 +1419,51 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,

0002-charon-add-optional-source-and-remote-overrides-for-.patch

@@ -1,7 +1,7 @@
-From bf75041bd4a2c0f18b1db80f5cf9124a4b0538a0 Mon Sep 17 00:00:00 2001
+From bc5cee05ee42b7566ed3539546757c3183aa7053 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/6] charon: add optional source and remote overrides for
+Subject: [PATCH 2/7] charon: add optional source and remote overrides for
  initiate
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -44,7 +44,7 @@ index 1cf431ff2..ae406393f 100644
  		terminate(pid);
  	}
 diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
-index a12f008a7..59e053318 100644
+index fb9044d29..b47a0c7f5 100644
 --- a/src/charon-nm/nm/nm_service.c
 +++ b/src/charon-nm/nm/nm_service.c
 @@ -622,7 +622,7 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
@@ -192,10 +192,10 @@ index 8d84b934e..b00d0e62d 100644
  		switch (status)
  		{
 diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
-index f4e9e33ee..56292696b 100644
+index ace7a4528..f0fd8a989 100644
 --- a/src/libcharon/plugins/vici/vici_config.c
 +++ b/src/libcharon/plugins/vici/vici_config.c
-@@ -1978,7 +1978,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
+@@ -2057,7 +2057,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 +205,7 @@ index f4e9e33ee..56292696b 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 ce19608dc..e378ca2e7 100644
+index 16e49fdbc..9c6b86741 100644
 --- a/src/libcharon/plugins/vici/vici_control.c
 +++ b/src/libcharon/plugins/vici/vici_control.c
 @@ -16,6 +16,28 @@
@@ -329,7 +329,7 @@ index 3a0ed879f..e3399007b 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 74f2a933c..93de04d3d 100644
+index 8a3178674..ad338b04c 100644
 --- a/src/libcharon/sa/ike_sa_manager.c
 +++ b/src/libcharon/sa/ike_sa_manager.c
 @@ -17,6 +17,28 @@
@@ -448,7 +448,7 @@ index efad2e4d6..c43edabbb 100644
  	/**
  	 * Reset initiator SPI.
 diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
-index 979f9290a..b727370ed 100644
+index 148df3923..901a8ba10 100644
 --- a/src/libcharon/sa/trap_manager.c
 +++ b/src/libcharon/sa/trap_manager.c
 @@ -421,7 +421,7 @@ METHOD(trap_manager_t, acquire, void,
@@ -515,7 +515,7 @@ index 979f9290a..b727370ed 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 8e452a6f6..b27bb8194 100644
+index bf8d2cd79..29d95d85c 100644
 --- a/src/swanctl/commands/initiate.c
 +++ b/src/swanctl/commands/initiate.c
 @@ -13,6 +13,28 @@
@@ -586,7 +586,7 @@ index 8e452a6f6..b27bb8194 100644
  		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
 @@ -133,6 +169,8 @@ static void __attribute__ ((constructor))reg()
  			{"help",		'h', 0, "show usage information"},
- 			{"child",		'c', 1, "initate a CHILD_SA configuration"},
+ 			{"child",		'c', 1, "initiate 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"},

0003-vici-send-certificates-for-ike-sa-events.patch

@@ -1,7 +1,7 @@
-From b4aa8404810032287a01d599238ec3a0d43bd153 Mon Sep 17 00:00:00 2001
+From 0220ba579f8df26f90a1152f115f2a339a755708 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:42:05 +0300
-Subject: [PATCH 3/6] vici: send certificates for ike-sa events
+Subject: [PATCH 3/7] vici: send certificates for ike-sa events
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
  1 file changed, 41 insertions(+), 7 deletions(-)
 
 diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index 82c3d7855..d3092270d 100644
+index d7b61ca72..f986ef8ab 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
 @@ -337,7 +337,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
@@ -77,7 +77,7 @@ index 82c3d7855..d3092270d 100644
  
  	eap = ike_sa->get_other_eap_id(ike_sa);
  
-@@ -476,7 +510,7 @@ CALLBACK(list_sas, vici_message_t*,
+@@ -477,7 +511,7 @@ CALLBACK(list_sas, vici_message_t*,
  		b = vici_builder_create();
  		b->begin_section(b, ike_sa->get_name(ike_sa));
  
@@ -86,7 +86,7 @@ index 82c3d7855..d3092270d 100644
  
  		b->begin_section(b, "child-sas");
  		csas = ike_sa->create_child_sa_enumerator(ike_sa);
-@@ -1624,7 +1658,7 @@ METHOD(listener_t, ike_updown, bool,
+@@ -1650,7 +1684,7 @@ METHOD(listener_t, ike_updown, bool,
  	}
  
  	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -95,7 +95,7 @@ index 82c3d7855..d3092270d 100644
  	b->end_section(b);
  
  	this->dispatcher->raise_event(this->dispatcher,
-@@ -1649,10 +1683,10 @@ METHOD(listener_t, ike_rekey, bool,
+@@ -1675,10 +1709,10 @@ METHOD(listener_t, ike_rekey, bool,
  	b = vici_builder_create();
  	b->begin_section(b, old->get_name(old));
  	b->begin_section(b, "old");
@@ -108,7 +108,7 @@ index 82c3d7855..d3092270d 100644
  	b->end_section(b);
  	b->end_section(b);
  
-@@ -1682,7 +1716,7 @@ METHOD(listener_t, child_updown, bool,
+@@ -1708,7 +1742,7 @@ METHOD(listener_t, child_updown, bool,
  	}
  
  	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -117,7 +117,7 @@ index 82c3d7855..d3092270d 100644
  	b->begin_section(b, "child-sas");
  
  	b->begin_section(b, child_sa->get_name(child_sa));
-@@ -1714,7 +1748,7 @@ METHOD(listener_t, child_rekey, bool,
+@@ -1740,7 +1774,7 @@ METHOD(listener_t, child_rekey, bool,
  	b = vici_builder_create();
  
  	b->begin_section(b, ike_sa->get_name(ike_sa));

0004-vici-add-support-for-individual-sa-state-changes.patch

@@ -1,7 +1,7 @@
-From a2c2426e64c34e81a81abd6fc6b358384593be96 Mon Sep 17 00:00:00 2001
+From 5ad4fd199b718d8281021a6e31d682872b59a34c 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:42:11 +0300
-Subject: [PATCH 4/6] vici: add support for individual sa state changes
+Subject: [PATCH 4/7] vici: add support for individual sa state changes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
  1 file changed, 105 insertions(+)
 
 diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index d3092270d..8a5231473 100644
+index f986ef8ab..c7b07fca0 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -1624,8 +1624,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
+@@ -1650,8 +1650,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
  	this->dispatcher->manage_event(this->dispatcher, "list-cert", reg);
  	this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
  	this->dispatcher->manage_event(this->dispatcher, "ike-rekey", reg);
@@ -34,7 +34,7 @@ index d3092270d..8a5231473 100644
  	manage_command(this, "list-sas", list_sas, reg);
  	manage_command(this, "list-policies", list_policies, reg);
  	manage_command(this, "list-conns", list_conns, reg);
-@@ -1696,6 +1704,45 @@ METHOD(listener_t, ike_rekey, bool,
+@@ -1722,6 +1730,45 @@ METHOD(listener_t, ike_rekey, bool,
  	return TRUE;
  }
  
@@ -80,7 +80,7 @@ index d3092270d..8a5231473 100644
  METHOD(listener_t, child_updown, bool,
  	private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
  {
-@@ -1771,6 +1818,62 @@ METHOD(listener_t, child_rekey, bool,
+@@ -1797,6 +1844,62 @@ METHOD(listener_t, child_rekey, bool,
  	return TRUE;
  }
  
@@ -143,7 +143,7 @@ index d3092270d..8a5231473 100644
  METHOD(vici_query_t, destroy, void,
  	private_vici_query_t *this)
  {
-@@ -1790,8 +1893,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
+@@ -1816,8 +1919,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
  			.listener = {
  				.ike_updown = _ike_updown,
  				.ike_rekey = _ike_rekey,

0005-vici-add-deprecated-async-parameter.patch

@@ -1,7 +1,7 @@
-From a2ff6e9951a784d192ec7f7abd48a9e3da01e2bd Mon Sep 17 00:00:00 2001
+From b251c17bfba838ee565a4f4af35b249024e35e77 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:42:15 +0300
-Subject: [PATCH 5/6] vici: add (deprecated) async parameter
+Subject: [PATCH 5/7] vici: add (deprecated) async parameter
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
-index e378ca2e7..dcc6c853f 100644
+index 9c6b86741..718d14b3c 100644
 --- a/src/libcharon/plugins/vici/vici_control.c
 +++ b/src/libcharon/plugins/vici/vici_control.c
 @@ -197,7 +197,7 @@ CALLBACK(initiate, vici_message_t*,

0006-support-gre-key-in-ikev1.patch

@@ -1,7 +1,7 @@
-From a88eece36be240bb0240760a0b2a9056a69a3e71 Mon Sep 17 00:00:00 2001
+From b2e130f8ce765d5bd0f12ad16ef2434c820c11b1 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:42:18 +0300
-Subject: [PATCH 6/6] support gre key in ikev1
+Subject: [PATCH 6/7] support gre key in ikev1
 
 this implements gre key negotiation in ikev1 similarly to the
 ipsec-tools patch in alpine.
@@ -205,7 +205,7 @@ index 283780624..fafeca8bc 100644
  
  #endif /** ID_PAYLOAD_H_ @}*/
 diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
-index 4926c3de8..820780f3c 100644
+index 40fff7e05..0743f7a95 100644
 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
 @@ -869,7 +869,18 @@ static struct xfrm_selector ts2selector(traffic_selector_t *src,
@@ -304,10 +304,10 @@ index 8cdb5ef48..a81949c09 100644
  	{
  		svc = getservbyname(port, NULL);
 diff --git a/src/libcharon/plugins/unity/unity_narrow.c b/src/libcharon/plugins/unity/unity_narrow.c
-index 05ae8d504..8545c415d 100644
+index afbd6cc7e..911fe70c6 100644
 --- a/src/libcharon/plugins/unity/unity_narrow.c
 +++ b/src/libcharon/plugins/unity/unity_narrow.c
-@@ -247,7 +247,7 @@ METHOD(listener_t, message, bool,
+@@ -248,7 +248,7 @@ METHOD(listener_t, message, bool,
  			if (!first)
  			{
  				id_payload = (id_payload_t*)payload;
@@ -317,10 +317,10 @@ index 05ae8d504..8545c415d 100644
  			}
  			first = FALSE;
 diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
-index 56292696b..214ed9b52 100644
+index f0fd8a989..9f9dcfa45 100644
 --- a/src/libcharon/plugins/vici/vici_config.c
 +++ b/src/libcharon/plugins/vici/vici_config.c
-@@ -680,8 +680,13 @@ CALLBACK(parse_ts, bool,
+@@ -691,8 +691,13 @@ CALLBACK(parse_ts, bool,
  		}
  		else if (*port && !streq(port, "any"))
  		{
@@ -337,7 +337,7 @@ index 56292696b..214ed9b52 100644
  				from = to = ntohs(svc->s_port);
  			}
 diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
-index 5e5b61e7f..1027e3006 100644
+index b0a42b8bd..4ef4bf324 100644
 --- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
 +++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
 @@ -567,9 +567,9 @@ static void add_ts(private_quick_mode_t *this, message_t *message)
@@ -447,7 +447,7 @@ index cfd2b029d..d01e2ccec 100644
  		(is_opaque(other) && is_any(this)))
  	{
 diff --git a/src/libstrongswan/selectors/traffic_selector.h b/src/libstrongswan/selectors/traffic_selector.h
-index dd9ad7e1b..9ea360d90 100644
+index 03f7a6d8c..b27ca4ad1 100644
 --- a/src/libstrongswan/selectors/traffic_selector.h
 +++ b/src/libstrongswan/selectors/traffic_selector.h
 @@ -120,6 +120,9 @@ struct traffic_selector_t {

0007-vyos-terminate-connections-source-dest.patch

@@ -0,0 +1,124 @@
+From 4e0a88132b5e3e99b250d044f4434702cae2abaa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= <zpericic@netst.org>
+Date: Wed, 22 Jan 2020 13:12:39 +0100
+Subject: [PATCH 7/7] vyos-terminate-connections-source-dest
+
+---
+ src/libcharon/plugins/vici/vici_control.c | 27 ++++++++++++++++++++---
+ src/swanctl/commands/terminate.c          | 18 ++++++++++++++-
+ 2 files changed, 41 insertions(+), 4 deletions(-)
+
+diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
+index 718d14b3c..39da4a10d 100644
+--- a/src/libcharon/plugins/vici/vici_control.c
++++ b/src/libcharon/plugins/vici/vici_control.c
+@@ -269,12 +269,13 @@ CALLBACK(terminate, vici_message_t*,
+ 	private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
+ {
+ 	enumerator_t *enumerator, *isas, *csas;
+-	char *child, *ike, *errmsg = NULL;
++	char *child, *ike, *errmsg = NULL, *my_host_str, *other_host_str;
+ 	u_int child_id, ike_id, current, *del, done = 0;
+ 	bool force;
+ 	int timeout;
+ 	ike_sa_t *ike_sa;
+ 	child_sa_t *child_sa;
++	host_t *my_host = NULL, *other_host = NULL;
+ 	array_t *ids;
+ 	vici_builder_t *builder;
+ 	controller_cb_t log_cb = NULL;
+@@ -290,12 +291,23 @@ CALLBACK(terminate, vici_message_t*,
+ 	force = request->get_bool(request, FALSE, "force");
+ 	timeout = request->get_int(request, 0, "timeout");
+ 	log.level = request->get_int(request, 1, "loglevel");
++	my_host_str = request->get_str(request, NULL, "my-host");
++	other_host_str = request->get_str(request, NULL, "other-host");
+ 
+-	if (!child && !ike && !ike_id && !child_id)
++	if (!child && !ike && !ike_id && !child_id && !my_host_str &&!other_host_str)
+ 	{
+ 		return send_reply(this, "missing terminate selector");
+ 	}
+-
++	if (my_host_str && !other_host_str || other_host_str && !my_host_str)
++	{
++		return send_reply(this, "missing source or remote");
++	}
++	else
++	{
++		my_host = host_create_from_string(my_host_str, 0);
++		other_host = host_create_from_string(other_host_str, 0);
++		DBG1(DBG_CFG, "vici terminate with source me %H and other %H", my_host, other_host);
++	}
+ 	if (ike_id)
+ 	{
+ 		DBG1(DBG_CFG, "vici terminate IKE_SA #%d", ike_id);
+@@ -358,6 +370,15 @@ CALLBACK(terminate, vici_message_t*,
+ 		{
+ 			array_insert(ids, ARRAY_TAIL, &ike_id);
+ 		}
++		else if (my_host && other_host)
++		{
++			if (!my_host->ip_equals(my_host, ike_sa->get_my_host(ike_sa)) || !other_host->ip_equals(other_host, ike_sa->get_other_host(ike_sa)))
++			{
++				continue;
++			}
++			current = ike_sa->get_unique_id(ike_sa);
++			array_insert(ids, ARRAY_TAIL, &current);
++		}
+ 	}
+ 	isas->destroy(isas);
+ 
+diff --git a/src/swanctl/commands/terminate.c b/src/swanctl/commands/terminate.c
+index 2309843b2..37d0bde3f 100644
+--- a/src/swanctl/commands/terminate.c
++++ b/src/swanctl/commands/terminate.c
+@@ -37,7 +37,7 @@ static int terminate(vici_conn_t *conn)
+ 	vici_req_t *req;
+ 	vici_res_t *res;
+ 	command_format_options_t format = COMMAND_FORMAT_NONE;
+-	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, child_id = 0, ike_id = 0;
+ 	bool force = FALSE;
+ 
+@@ -74,6 +74,12 @@ static int terminate(vici_conn_t *conn)
+ 			case 'l':
+ 				level = atoi(arg);
+ 				continue;
++			case 'S':
++				my_host = arg;
++				continue;
++			case 'R':
++				other_host = arg;
++				continue;
+ 			case EOF:
+ 				break;
+ 			default:
+@@ -109,6 +115,14 @@ static int terminate(vici_conn_t *conn)
+ 	{
+ 		vici_add_key_valuef(req, "force", "yes");
+ 	}
++	if (my_host)
++	{
++		vici_add_key_valuef(req, "my-host", "%s", my_host);
++	}
++	if (other_host)
++	{
++		vici_add_key_valuef(req, "other-host", "%s", other_host);
++	}
+ 	if (timeout)
+ 	{
+ 		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
+@@ -155,6 +169,8 @@ static void __attribute__ ((constructor))reg()
+ 		{
+ 			{"help",		'h', 0, "show usage information"},
+ 			{"child",		'c', 1, "terminate by CHILD_SA name"},
++			{"source",		'S', 1, "override source address"},
++			{"remote",		'R', 1, "override remote address"},
+ 			{"ike",			'i', 1, "terminate by IKE_SA name"},
+ 			{"child-id",	'C', 1, "terminate by CHILD_SA reqid"},
+ 			{"ike-id",		'I', 1, "terminate by IKE_SA unique identifier"},
+-- 
+2.24.1
+

sources

@@ -1 +1 @@
-SHA512 (strongswan-5.6.3.tar.bz2) = 080402640952b1a08e95bfe9c7f33c6a7dd01ac401b5e7e2e78257c0f2bf0a4d6078141232ac62abfacef892c493f6824948b3165d54d72b4e436ed564fd2609
+SHA512 (strongswan-5.7.2.tar.bz2) = e2169dbbc0c03737e34af90d7bc07e444408c5e2ac1f81764eeccbac8b142b984ce9ed512a89071075a930e0997632267f6912aa5b352eee2edbd551b5a64e7e

strongswan.spec

@@ -1,10 +1,9 @@
 %global _hardened_build 1
 #%%define prerelease dr1
-Epoch:          1
 
 Name:           strongswan
-Version:        5.6.3
+Version:        5.7.2
-Release:        3%{?dist}
+Release:        3.nhrp.2%{?dist}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 License:        GPLv2+
 URL:            http://www.strongswan.org/
@@ -18,6 +17,7 @@ Patch12:        0003-vici-send-certificates-for-ike-sa-events.patch
 Patch13:        0004-vici-add-support-for-individual-sa-state-changes.patch
 Patch14:        0005-vici-add-deprecated-async-parameter.patch
 Patch15:        0006-support-gre-key-in-ikev1.patch
+Patch16:        0007-vyos-terminate-connections-source-dest.patch
 
 # only needed for pre-release versions
 #BuildRequires:  autoconf automake
@@ -95,6 +95,7 @@ PT-TLS to support TNC over TLS.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 # only for snapshots
@@ -280,6 +281,20 @@ done
 %{_libexecdir}/strongswan/charon-nm
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 09 2019 Paul Wouters <pwouters@redhat.com> - 5.7.2-1
+- Updated to 5.7.2
+
+* Thu Oct 04 2018 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.7.1-1
+- Updated to 5.7.1
+- Resolves rhbz#1635872 CVE-2018-16152
+- Resolves rhbz#1635875 CVE-2018-16151
+
 * Thu Aug 23 2018 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.6.3-3
 - Add plugin bypass-lan, disabled by default
 - Resolves rhbz#1554479 Update to strongswan-charon-nm fails