summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@corsac.net>2017-06-30 13:44:16 +0200
committerYves-Alexis Perez <corsac@corsac.net>2017-06-30 13:47:37 +0200
commit784751a50713ae63faeb9aac3b0d77581324e70e (patch)
tree28a406476a1d0f07f2b21dccf546c981ba77872c /debian/patches
parent60d600ad7af636d2177eda3870c9964405a11617 (diff)
downloadvyos-strongswan-784751a50713ae63faeb9aac3b0d77581324e70e.tar.gz
vyos-strongswan-784751a50713ae63faeb9aac3b0d77581324e70e.zip
Install /etc/strongswan.d/charon-systemd.conf with charon-systemd package
* debian/patches: - 02_configure-Install-charon-systemd.conf added, cherry-picked from upstream to install configuration to output logging information to the journal. * debian/charon-systemd.install: - install charon-systemd.conf files, thanks Gerald Tuner. closes: #866325
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/02_configure-Install-charon-systemd.conf.patch25
-rw-r--r--debian/patches/series1
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/02_configure-Install-charon-systemd.conf.patch b/debian/patches/02_configure-Install-charon-systemd.conf.patch
new file mode 100644
index 000000000..80e0d0648
--- /dev/null
+++ b/debian/patches/02_configure-Install-charon-systemd.conf.patch
@@ -0,0 +1,25 @@
+From 45f45fed1edee3fec951e72ba3d5b826ccdc47f2 Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Thu, 29 Jun 2017 08:36:50 +0200
+Subject: [PATCH] configure: Install charon-systemd.conf
+
+Fixes #2370.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index f01631474..21563f7f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1724,6 +1724,7 @@ AM_COND_IF([USE_MEDSRV], [strongswan_options=${strongswan_options}" medsrv"])
+ AM_COND_IF([USE_SCEPCLIENT], [strongswan_options=${strongswan_options}" scepclient"])
+ AM_COND_IF([USE_PKI], [strongswan_options=${strongswan_options}" pki"])
+ AM_COND_IF([USE_SWANCTL], [strongswan_options=${strongswan_options}" swanctl"])
++AM_COND_IF([USE_SYSTEMD], [strongswan_options=${strongswan_options}" charon-systemd"])
+
+ AC_SUBST(strongswan_options)
+
+--
+2.13.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 6d7cc1dfa..6fe6217b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_fix-manpages.patch
+02_configure-Install-charon-systemd.conf.patch
03_systemd-service.patch
04_disable-libtls-tests.patch