--- rpms/smeserver-affa/contribs10/smeserver-affa.spec	2021/09/21 15:59:34	1.5
+++ rpms/smeserver-affa/contribs10/smeserver-affa.spec	2022/06/30 21:24:06	1.10
@@ -2,7 +2,7 @@ Summary: A rsync-based backup program fo
 %define name smeserver-affa
 Name: %{name}
 %define version 3.3.1
-%define release 3
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 Vendor: Michael Weinberger <mweinber AT users DOT sourceforge DOT net> //// adaptation to sme-server Arnaud Guillaume <smeserver-affa AT guedel DOT eu>
@@ -28,6 +28,11 @@ Requires: rsync
 
 Patch1: smeserver-affa-add-some-systemd-support.patch
 Patch2: smeserver-affa-change-host-domain.patch
+Patch3: smeserver-affa-change_to_rsa_keys.patch
+Patch4: smeserver-affa-update-ssh-keys-links.patch
+Patch5: smeserver-affa-fix-config-directory-name-spaces.patch
+Patch6: smeserver-affa-fix-reporting-error.patch
+Patch7: smeserver-affa-fix-ssh-knownhosts-error.patch
 
 %description
 Affa is a rsync-based backup program for SMEServer + RPMCheck + Watchdog + rise.  Documentation: http://affa.sf.net 
@@ -38,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{name}-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
 
 %build
 # perl createlinks << if required
@@ -87,6 +98,26 @@ exit 0
 exit 0
 
 %changelog
+* Thu Jun 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-8
+- Fix KnownHosts error [SME: 12081]
+- Thanks to 'gieres' for finding this
+
+* Thu Jun 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-7
+- Fix logging parse errors [SME:12084]
+- Thanks to 'sti' for finding it 
+
+* Thu Jun 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-6
+- Fix error with files with spaces in names - Credit to Trevor Drake-Brockman [SME: 11784]
+- Fix directory search - Credit to Trevor Drake-Brockman [SME: 11784]
+
+* Wed Sep 22 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-5
+- Modify ssh key links [SME: 10783]
+- Untidy the ssh commands so I can see them and tidy them more easily
+
+* Wed Sep 22 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-4
+- Change ssh keys from DSA to RSA 4096 [SME: 10783]
+- Fix missing /var/affa store dir
+
 * Tue Sep 21 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-3.sme
 - Fix some syntax errors. Migrate to using HostName/DomainName