From c44738f742502eaacce8c004a2c992b8c024e343 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Tue, 16 Jun 2020 11:02:23 -0300 Subject: [PATCH 1/7] Improve the charon-systemd long description Mention it works in conjuction with swanctl{,.conf}. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9c0d90988..b7fff00c9 100644 --- a/debian/control +++ b/debian/control @@ -336,4 +336,5 @@ 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. . - This package contains the charon-systemd files. + This package contains the charon-systemd files. It works in conjunction with + swanctl command and swanctl.conf file provided by strongswan-swanctl package. -- GitLab From e06d0a385cef45c28cdd49b364e70f60ea380ad6 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Mon, 15 Jun 2020 16:01:10 -0300 Subject: [PATCH 2/7] Make strongswan runtime depend on charon-systemd instead of strongswan-starter This change will enforce the use of the new systemd service unit file instead of the legacy one in new installations. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b7fff00c9..b2f281978 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Homepage: http://www.strongswan.org Package: strongswan Architecture: all -Depends: strongswan-charon, strongswan-starter, ${misc:Depends} +Depends: strongswan-charon, charon-systemd, ${misc:Depends} Description: IPsec VPN solution metapackage The strongSwan VPN suite uses the native IPsec stack in the standard Linux kernel. It supports both the IKEv1 and IKEv2 protocols. -- GitLab From 43f20bbf0f3e123deb98ed32aa4914bb25274569 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Mon, 15 Jun 2020 16:26:43 -0300 Subject: [PATCH 3/7] Use charon-systemd in daemon DEP-8 test The default now is charon-systemd and not strongswan-starter. --- debian/tests/control | 2 +- debian/tests/daemon | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index 5b1ebf32c..5d0ebd90c 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -3,5 +3,5 @@ Depends: strongswan, strongswan-pki, strongswan-scepclient Restrictions: needs-root isolation-container allow-stderr Tests: daemon plugins -Depends: strongswan-starter, libstrongswan-standard-plugins, libstrongswan-extra-plugins, libcharon-extra-plugins +Depends: charon-systemd, libstrongswan-standard-plugins, libstrongswan-extra-plugins, libcharon-extra-plugins Restrictions: needs-root isolation-machine allow-stderr diff --git a/debian/tests/daemon b/debian/tests/daemon index 2a8b5e688..fe4621141 100755 --- a/debian/tests/daemon +++ b/debian/tests/daemon @@ -2,7 +2,7 @@ #------------------------ # Testing starter, charon #------------------------ -DAEMONS="starter charon" +DAEMONS="charon-systemd" for daemon in $DAEMONS; do if pidof -x $daemon > /dev/null; then -- GitLab From e5525647cf60abec52de3a5bebbd4064e71f9f0f Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Tue, 16 Jun 2020 09:38:31 -0300 Subject: [PATCH 4/7] Depend on strongswan-charon in admin-strongswan-{starter,charon} DEP-8 tests --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/tests/control b/debian/tests/control index 5d0ebd90c..634c4788e 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,5 +1,5 @@ Tests: admin-strongswan-charon admin-strongswan-starter -Depends: strongswan, strongswan-pki, strongswan-scepclient +Depends: strongswan-charon, strongswan-pki, strongswan-scepclient Restrictions: needs-root isolation-container allow-stderr Tests: daemon plugins -- GitLab From 6184b015e1bdfb10e76d40b9c85e405f2712e0e1 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Tue, 16 Jun 2020 09:39:58 -0300 Subject: [PATCH 5/7] Create DEP-8 test to check charon-systemd admin executable file --- debian/tests/admin-strongswan-charon-systemd | 17 +++++++++++++++++ debian/tests/control | 4 ++++ 2 files changed, 21 insertions(+) create mode 100755 debian/tests/admin-strongswan-charon-systemd diff --git a/debian/tests/admin-strongswan-charon-systemd b/debian/tests/admin-strongswan-charon-systemd new file mode 100755 index 000000000..4591f31b0 --- /dev/null +++ b/debian/tests/admin-strongswan-charon-systemd @@ -0,0 +1,17 @@ +#!/bin/sh +#--------------------------- +# Testing charon-systemd +#--------------------------- +CMDS=" +/usr/sbin/swanctl +" + +for cmd in $CMDS; do + $cmd --help > /dev/null 2>&1 + RET=$? + + if [ $RET -ne 0 ]; then + echo "ERROR, failed to run ${cmd}" >&2 + exit $RET + fi +done diff --git a/debian/tests/control b/debian/tests/control index 634c4788e..4fa112376 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,6 +2,10 @@ Tests: admin-strongswan-charon admin-strongswan-starter Depends: strongswan-charon, strongswan-pki, strongswan-scepclient Restrictions: needs-root isolation-container allow-stderr +Tests: admin-strongswan-charon-systemd +Depends: strongswan, strongswan-pki, strongswan-scepclient +Restrictions: needs-root isolation-container allow-stderr + Tests: daemon plugins Depends: charon-systemd, libstrongswan-standard-plugins, libstrongswan-extra-plugins, libcharon-extra-plugins Restrictions: needs-root isolation-machine allow-stderr -- GitLab From 80e04189eda798ea9e488f06d1358f7a1cd328b3 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Thu, 18 Jun 2020 15:39:17 -0300 Subject: [PATCH 6/7] d/NEWS: notify user about the move to charon-systemd in new installations --- debian/NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/NEWS b/debian/NEWS index 31ab58576..e23150863 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,15 @@ +strongswan (5.8.4-2) unstable; urgency=medium + + In version 5.8.4-2, the default systemd service file is changed in new + installations, from strongswan-starter associated with the ipsec(8) command to + strongswan associated with the swanctl(8) command. + . + Administrators are still able to use the strongswan-starter systemd sevice + file in conjuction with ipsec(8). However, the recommendation is to move to + strongswan systemd service file and swanctl(8). + + -- Lucas Kanashiro Mon, 26 Aug 2019 16:29:57 +0200 + strongswan (5.8.0-1) unstable; urgency=medium With 5.8.0, systemd service files for strongSwan have been renamed. -- GitLab From 9b6e50e6d20ab7e8223e18b70b1b1a91e5a2b8c4 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Wed, 17 Jun 2020 15:51:18 -0300 Subject: [PATCH 7/7] Update changelog --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4153bfd23..4ae3c10d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +strongswan (5.8.4-2) UNRELEASED; urgency=medium + + * Improve the charon-systemd long description + * Make strongswan runtime depend on charon-systemd instead of + strongswan-starter + - Use charon-systemd in daemon DEP-8 test + - Depend on strongswan-charon in admin-strongswan-{starter,charon} + DEP-8 tests + * Create DEP-8 test to check charon-systemd admin executable file + * d/NEWS: notify user about the move to charon-systemd in new installations + + -- Lucas Kanashiro Wed, 17 Jun 2020 15:47:46 -0300 + strongswan (5.8.4-1) unstable; urgency=medium * New upstream version 5.8.4 (Closes: #956446) -- GitLab