Merge remote-tracking branch 'origin/unstable' into testing

diff --cc argeo-freed.spec
index 0000000000000000000000000000000000000000,11b3ec9bafebcb3c22296a92bbf67bed7e2c60b9..87b68e58c34a7e6aa0d24abdb0e312858cdb9de8
mode 000000,100644..100644
--- /dev/null
--- 2/argeo-freed.spec
+++ b/argeo-freed.spec
@@@ -1,0 -1,78 +1,78 @@@
 -Version:        2.3.0
+ Name:           argeo-freed
++Version:        2.1.0
+ Release:        1%{?dist}
+ Summary:        Enrollment into a FREEd compatible domain
+ 
+ License:        GPL
+ URL:            http://www.argeo.org
+ Source0:        %{name}-%{version}.tar.gz
+ 
+ BuildArch:      noarch
+ 
+ # Required for the %{_unitdir} and %{_sysusersdir} macros
+ BuildRequires: systemd
+ BuildRequires: systemd-rpm-macros
+ 
+ %description
+ 
+ %package libreswan
+ Summary:        FREEd extensions to libreswan
+ Requires:       libreswan
+ 
+ %description libreswan
+ 
+ %package roaming-client
+ Summary:        FREEd roaming client
+ Requires:       argeo-freed-libreswan unbound
+ 
+ %description roaming-client
+ 
+ %package roaming-host
+ Summary:        FREEd roaming host
+ Requires:       argeo-freed-libreswan
+ 
+ %description roaming-host
+ 
+ %prep
+ %setup -q
+ 
+ %build
+ 
+ %install
+ mkdir -p %{buildroot}%{_sysconfdir}
+ cp -a ./etc/ipsec.d %{buildroot}%{_sysconfdir}
+ 
+ mkdir -p %{buildroot}%{_unitdir}
+ cp -a ./usr/lib/systemd/system/* %{buildroot}%{_unitdir}
+ 
+ mkdir -p %{buildroot}%{_libexecdir}
+ cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir}
+ 
+ %files libreswan
+ %attr(755, root, root) %{_libexecdir}/ipsec
+ 
+ %files roaming-client
+ %{_sysconfdir}/ipsec.d/roaming.conf
+ 
+ %{_unitdir}/freed-ipsec-roaming@.service
+ %{_unitdir}/freed-onresume.service
+ %{_unitdir}/freed-onsuspend.service
+ 
+ %post roaming-client
+ %systemd_post freed-ipsec-roaming@.service
+ %systemd_post freed-onresume.service
+ %systemd_post freed-onsuspend.service
+ 
+ %preun roaming-client
+ %systemd_preun freed-ipsec-roaming@.service
+ %systemd_preun freed-onresume.service
+ %systemd_preun freed-onsuspend.service
+ 
+ %postun roaming-client
+ %systemd_postun freed-ipsec-roaming@.service
+ %systemd_postun freed-onresume.service
+ %systemd_postun freed-onsuspend.service
+ 
+ %files roaming-host
+ %{_sysconfdir}/ipsec.d/roaming-host.conf
+ %{_sysconfdir}/ipsec.d/roaming-host-domain.conf.template

diff --cc debian/changelog
index 0000000000000000000000000000000000000000,e1e7fd236163a78ab48986884e4dec53488db6cc..c06a49e137010f452b962e482c86c56522b4d9ba
mode 000000,100644..100644
--- /dev/null
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,0 -1,5 +1,5 @@@
 -argeo-freed (2.3.1) unstable; urgency=medium
++argeo-freed (2.1.0) unstable; urgency=medium
+ 
+   * Initial release
+ 
 - -- Mathieu Baudier <mbaudier@argeo.org>  Thu, 09 Mar 2023 06:33:35 +0100
++ -- Mathieu Baudier <mbaudier@argeo.org>  Thu, 09 Mar 2023 09:33:35 +0100