d/p/05_charon-nm-Fix-building-list-of-DNS-MDNS-servers-with removed

included upstream

6 files changed, 5 insertions, 38 deletions

diff --git a/conf/plugins/bypass-lan.conf b/conf/plugins/bypass-lan.conf
index ad496db67..e470ce68e 100644
--- a/conf/plugins/bypass-lan.conf
+++ b/conf/plugins/bypass-lan.conf
@@ -11,7 +11,7 @@ bypass-lan {
 
     # Whether to load the plugin. Can also be an integer to increase the
     # priority of this plugin.
-    load = yes
+    load = no
 
 }
 
diff --git a/debian/patches/05_charon-nm-Fix-building-list-of-DNS-MDNS-servers-with.patch b/debian/patches/05_charon-nm-Fix-building-list-of-DNS-MDNS-servers-with.patch
deleted file mode 100644
index fc2c991f5..000000000
--- a/debian/patches/05_charon-nm-Fix-building-list-of-DNS-MDNS-servers-with.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ee8c25516a97a2c880a8033e1663628b6b05646a Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Wed, 21 Feb 2018 11:53:55 +0100
-Subject: [PATCH] charon-nm: Fix building list of DNS/MDNS servers with libnm
-
-g_variant_builder_add() creates a new GVariant using g_variant_new() and
-then adds it to the builder.  Passing a GVariant probably adds the
-pointer to the array, not the value.  I think an alternative fix would
-be to use "@u" as type string for the g_variant_builder_add() call, then
-the already allocated GVariant is adopted.
-
-Fixes: 9a71b7219ca3 ("charon-nm: Port to libnm")
----
- src/charon-nm/nm/nm_service.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
-index 9beac392a..c42733181 100644
---- a/src/charon-nm/nm/nm_service.c
-+++ b/src/charon-nm/nm/nm_service.c
-@@ -65,8 +65,7 @@ static GVariant* handler_to_variant(nm_handler_t *handler,
- 	enumerator = handler->create_enumerator(handler, type);
- 	while (enumerator->enumerate(enumerator, &chunk))
- 	{
--		g_variant_builder_add (&builder, "u",
--							   g_variant_new_uint32 (*(uint32_t*)chunk.ptr));
-+		g_variant_builder_add (&builder, "u", *(uint32_t*)chunk.ptr);
- 	}
- 	enumerator->destroy(enumerator);
- 
--- 
-2.16.1
-
diff --git a/debian/patches/series b/debian/patches/series
index ecc62570b..fde45f535 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_disable-bypass-lan.patch
 03_systemd-service.patch
 04_disable-libtls-tests.patch
-05_charon-nm-Fix-building-list-of-DNS-MDNS-servers-with.patch
diff --git a/init/systemd/strongswan.service.in b/init/systemd/strongswan.service.in
index 474284a19..8060d1ea2 100644
--- a/init/systemd/strongswan.service.in
+++ b/init/systemd/strongswan.service.in
@@ -1,9 +1,10 @@
 [Unit]
 Description=strongSwan IPsec IKEv1/IKEv2 daemon using ipsec.conf
-After=syslog.target network-online.target
+After=network-online.target
 
 [Service]
 ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
+ExecReload=@SBINDIR@/@IPSEC_SCRIPT@ reload
 StandardOutput=syslog
 Restart=on-abnormal
 
diff --git a/src/libtls/Makefile.am b/src/libtls/Makefile.am
index b6496363c..635be3845 100644
--- a/src/libtls/Makefile.am
+++ b/src/libtls/Makefile.am
@@ -26,4 +26,4 @@ nobase_tls_include_HEADERS = \
 	tls_server.h tls_handshake.h tls_application.h tls_aead.h tls.h
 endif
 
-SUBDIRS = . tests
+SUBDIRS = .
diff --git a/src/scepclient/scepclient.8 b/src/scepclient/scepclient.8
index 78ce5c628..126736485 100644
--- a/src/scepclient/scepclient.8
+++ b/src/scepclient/scepclient.8
@@ -1,7 +1,7 @@
 .\"
 .TH "IPSEC_SCEPCLIENT" "8" "2012-05-11" "strongSwan" ""
 .SH "NAME"
-ipsec scepclient \- Client for the SCEP protocol
+ipsec_scepclient \- Client for the SCEP protocol
 .SH "SYNOPSIS"
 .B ipsec scepclient [argument ...]
 .sp