add new package strongswan-swanctl and charon-systemd

- strongswan-swanctl includes vici plugin and swanctl files
- charon-systemd includes a new charon daemon, started by systemd and
  configured through swanctl.

4 files changed, 20 insertions, 3 deletions

diff --git a/debian/charon-systemd.install b/debian/charon-systemd.install
new file mode 100644
index 000000000..3b62aade9
--- /dev/null
+++ b/debian/charon-systemd.install
@@ -0,0 +1,2 @@
+lib/systemd/system/strongswan-swanctl.service
+usr/sbin/charon-systemd
diff --git a/debian/charon-systemd.lintian-overrides b/debian/charon-systemd.lintian-overrides
new file mode 100644
index 000000000..e6d0b55a1
--- /dev/null
+++ b/debian/charon-systemd.lintian-overrides
@@ -0,0 +1,4 @@
+# strongswan libraries are installed in /usr/lib/ipsec because they are private
+# to the strongSwan project. We still want to split multiple binaries from the
+# lib
+charon-systemd: binary-or-shlib-defines-rpath usr/sbin/charon-systemd /usr/lib/ipsec
diff --git a/debian/control b/debian/control
index 1eeb883ac..f5da534aa 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.2), libtool, libgmp3-dev,
   libxml2-dev, libsqlite3-dev, network-manager-dev (>= 0.7) [linux-any], 
   libnm-glib-vpn-dev (>= 0.7) [linux-any], libnm-util-dev (>= 0.7) [linux-any], 
   gperf, libcap-dev [linux-any], dh-autoreconf, pkg-config,
-  systemd [linux-any], dh-systemd (>= 1.5), iptables-dev
+  libsystemd-dev [linux-any], dh-systemd (>= 1.5), iptables-dev
 Homepage: http://www.strongswan.org
 
 Package: strongswan
@@ -270,7 +270,7 @@ Description: standalone IPsec client
  This package contains the charon-cmd command, which can be used as a client to
  connect to a remote IKE daemon.
 
-Package: charon-swanctl
+Package: strongswan-swanctl
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
 Description: strongSwan IPsec client, swanctl command
@@ -282,7 +282,8 @@ Description: strongSwan IPsec client, swanctl command
 
 Package: charon-systemd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
+  libstrongswan (= ${binary:Version}), strongswan-swanctl
 Description: strongSwan IPsec client, systemd support
  The strongSwan VPN suite uses the native IPsec stack in the standard
  Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
diff --git a/debian/strongswan-swanctl.install b/debian/strongswan-swanctl.install
new file mode 100644
index 000000000..483b03852
--- /dev/null
+++ b/debian/strongswan-swanctl.install
@@ -0,0 +1,10 @@
+etc/strongswan.d/swanctl.conf
+etc/strongswan.d/charon/vici.conf
+etc/swanctl/swanctl.conf
+usr/share/strongswan/templates/config/plugins/vici.conf
+usr/share/strongswan/templates/config/strongswan.d/swanctl.conf
+usr/share/man/man5/swanctl.conf.5
+usr/share/man/man8/swanctl.8
+usr/sbin/swanctl
+usr/lib/ipsec/libvici.so*
+usr/lib/ipsec/plugins/libstrongswan-vici.so