Include patch to inherit charon settings in charon-systemd

* debian/patches
  - 0001-charon-systemd-Inherit-all-settings-from-the-charon added, inherit
    charon configuration settings for charon-systemd.

3 files changed, 36 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index f1f830ac0..d96cc5c28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ strongswan (5.3.5-2) UNRELEASED; urgency=medium
   * debian/strongswan-scepclient.install:
     - install scepclient files
   * move strongswan.conf manpage to libstrongswan package
+  * debian/patches
+    - 0001-charon-systemd-Inherit-all-settings-from-the-charon added, inherit
+      charon configuration settings for charon-systemd.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 11 Jan 2016 14:50:14 +0100
 
diff --git a/debian/patches/0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch b/debian/patches/0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch
new file mode 100644
index 000000000..043f4d27a
--- /dev/null
+++ b/debian/patches/0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch
@@ -0,0 +1,32 @@
+From 6727f41be66904c8a38dcabf93a0933e35aaf253 Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Mon, 8 Feb 2016 17:19:20 +0100
+Subject: [PATCH] charon-systemd: Inherit all settings from the charon section
+
+Our default config files are very charon specific.  So to avoid
+confusion when only charon-systemd is installed we just default to all
+settings defined for charon.  Since charon-systemd probably won't be used
+together with charon this should not cause conflicts (settings may still
+be overridden via the charon-systemd section).
+
+ #1300
+---
+ src/charon-systemd/charon-systemd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/charon-systemd/charon-systemd.c b/src/charon-systemd/charon-systemd.c
+index 4286cde..c6559ce 100644
+--- a/src/charon-systemd/charon-systemd.c
++++ b/src/charon-systemd/charon-systemd.c
+@@ -349,6 +349,8 @@ int main(int argc, char *argv[])
+ 		sd_notifyf(0, "STATUS=libstrongswan initialization failed");
+ 		return SS_RC_INITIALIZATION_FAILED;
+ 	}
++	/* inherit settings from charon */
++	lib->settings->add_fallback(lib->settings, lib->ns, "charon");
+ 	if (lib->integrity &&
+ 		!lib->integrity->check_file(lib->integrity, "charon-systemd", argv[0]))
+ 	{
+-- 
+2.7.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 0f31135d3..3403d503a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03_systemd-service.patch
 04_disable-libtls-tests.patch
 0001-configure-Support-systemd-209.patch
+0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch