.gitignore

@@ -1,4 +1,4 @@
 *.rpm
 *.log
 *spec-20*
-*.tar.xz
+*.tar.gz

README.md

@@ -12,14 +12,7 @@ SMEServer Koozali developed git repo for smeserver-affa smecontribs
 <br />https://wiki.koozali.org/Rsyncd_setup_on_a_windows_computer_for_use_with_Affa_backup
 
 ## Bugzilla
-Show list of outstanding bugs:
+Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-affa&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
-[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&classification=Contribs&component=smeserver-affa&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
-[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&classification=Contribs&component=smeserver-affa&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
-[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&classification=Contribs&component=smeserver-affa&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
-[Need Info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&classification=Contribs&component=smeserver-affa&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
-[In Progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&classification=Contribs&component=smeserver-affa&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
-[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&classification=Contribs&component=smeserver-affa&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
-[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&classification=Contribs&component=smeserver-affa&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
 
 ## Description
 

root/sbin/affa

@@ -1837,9 +1837,8 @@ sub getSourceDirs($) {
 
             # Remove duplicates
             # This is done in the calling sub getSourceDirs but we need to do it before
-            @remoteDirs = sort (keys %{ { map { $_ => 1 } @remoteDirs } });
+            @remoteDirs = sort ( keys { map { $_ => 1 } @remoteDirs } );
-            @localDirs  = sort (keys %{ { map { $_ => 1 } @localDirs } });
+            @localDirs  = sort ( keys { map { $_ => 1 } @localDirs } );
-
 
             # Write @SrcDirList to file
             open my $fd, '>',

smeserver-affa.spec

@@ -2,7 +2,7 @@ Summary: A rsync-based backup program for linux, adapted to Koozali SME server 1
 %define name smeserver-affa
 Name: %{name}
 %define version 4.0
-%define release 7
+%define release 3
 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>
@@ -11,11 +11,11 @@ Group: Applications/Archiving
 Source: %{name}-%{version}.tar.xz
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-BuildRequires: smeserver-devtools
+BuildRequires: e-smith-devtools
 
 AutoReq: no
 
-Requires: smeserver-release >= 10
+Requires: e-smith-release >= 10
 Requires: smeserver-systemd-control
 Requires: openssh-clients
 Requires: perl-Config-IniFiles
@@ -78,7 +78,6 @@ rm -f $RPM_BUILD_ROOT/sbin/affa.tmp
     --ignoredir "/etc/profile.d" \
     --file "/etc/profile.d/affa.sh" "attr(0555,root,root)" \
     --file "/etc/sudoers.d/affa" "attr(0440,root,root)" \
-    --file "/sbin/affa" "attr(0744,root,root)" \
     > %{name}-%{version}-filelist
 
 # We could use this for docs I guess - we should standardise this sort of thing
@@ -105,18 +104,6 @@ exit 0
 exit 0
 
 %changelog
-* Thu Feb 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0-7.sme
-- Fix experimental scalar now forbidded error [SME: 12935]
-
-* Thu Feb 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0-6.sme
-- Set affa permissions again - seems we've been struck by the usr merge [SME:12922]
-
-* Thu Feb 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0-5.sme
-- Set affa permissions [SME:12922]
-
-* Wed Sep 11 2024 Brian Read <brianr@koozali.org> 4.0-4.sme
-- Update requires to use smeserver- packages
-
 * Tue Sep 10 2024 cvs2git.sh aka Brian Read <brianr@koozali.org> 4.0-3.sme
 - Roll up patches and move to git repo [SME: 12338]
 
@@ -124,6 +111,7 @@ exit 0
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
   by assuming the date is correct and changing the weekday.
 
+
 * Mon Sep 09 2024 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0-2.sme
 - Various fixes for rise