summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@corsac.net>2017-11-23 13:37:38 +0100
committerYves-Alexis Perez <corsac@corsac.net>2017-11-23 20:51:39 +0100
commite89f35cc01d439b9307e6d87dae3f9b918c370a1 (patch)
treec4e348315f130ea4602fd34e889cc830892d2250
parent5bd78829f39e33cb8ace52c135dfa729944bd37a (diff)
downloadvyos-strongswan-e89f35cc01d439b9307e6d87dae3f9b918c370a1.tar.gz
vyos-strongswan-e89f35cc01d439b9307e6d87dae3f9b918c370a1.zip
move counters plugin from -starter to -libcharon. closes: #882431
-rw-r--r--debian/control7
-rw-r--r--debian/strongswan-libcharon.install6
-rw-r--r--debian/strongswan-starter.install4
3 files changed, 12 insertions, 5 deletions
diff --git a/debian/control b/debian/control
index a351836ad..7c9847bfa 100644
--- a/debian/control
+++ b/debian/control
@@ -214,13 +214,18 @@ Architecture: any
Depends: libstrongswan (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+Breaks: strongswan-starter (<= 5.6.1-1)
+Replaces: strongswan-starter (<= 5.6.1-1)
Suggests: libcharon-extra-plugins
Description: strongSwan charon library
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
.
This package contains the charon library, used by IKE client like
- strongswan-charon, strongswan-charon-cmd or strongswan-nm
+ strongswan-charon, strongswan-charon-cmd or strongswan-nm as well as standard
+ plugins:
+ - socket-default
+ - counters
Package: strongswan-charon
Architecture: any
diff --git a/debian/strongswan-libcharon.install b/debian/strongswan-libcharon.install
index 15d63eddc..922794561 100644
--- a/debian/strongswan-libcharon.install
+++ b/debian/strongswan-libcharon.install
@@ -1,4 +1,10 @@
usr/lib/ipsec/libcharon*
+## libcharon plugins
+# socket-default
usr/lib/ipsec/plugins/libstrongswan-socket-default.so
usr/share/strongswan/templates/config/plugins/socket-default.conf
etc/strongswan.d/charon/socket-default.conf
+# counters
+usr/lib/ipsec/plugins/libstrongswan-counters.so
+usr/share/strongswan/templates/config/plugins/counters.conf
+etc/strongswan.d/charon/counters.conf
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index 7eebe6be5..7b02b0a8e 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -21,7 +21,3 @@ usr/lib/ipsec/plugins/libstrongswan-stroke.so
usr/share/strongswan/templates/config/plugins/stroke.conf
etc/strongswan.d/charon/stroke.conf
debian/usr.lib.ipsec.stroke /etc/apparmor.d/
-#counters
-usr/lib/ipsec/plugins/libstrongswan-counters.so
-usr/share/strongswan/templates/config/plugins/counters.conf
-etc/strongswan.d/charon/counters.conf