smecontribs/smeserver-affa
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: smecontribs:master
Branches Tags
smecontribs:master
smecontribs:4_0-7_el8_sme
smecontribs:4_0-6_el8_sme
smecontribs:4_0-5_el8_sme
smecontribs:4_0-4_el8_sme
smecontribs:4.0-3
..
compare: smecontribs:4_0-5_el8_sme
Branches Tags
smecontribs:master
smecontribs:4_0-7_el8_sme
smecontribs:4_0-6_el8_sme
smecontribs:4_0-5_el8_sme
smecontribs:4_0-4_el8_sme
smecontribs:4.0-3

No commits in common. "master" and "4_0-5_el8_sme" have entirely different histories.
master ... 4_0-5_el8_

2 changed files with 4 additions and 11 deletions
Show Stats Expand all files Collapse all files

5
root/sbin/affa
View File

@ -1837,9 +1837,8 @@ sub getSourceDirs($) {
# Remove duplicates # Remove duplicates
# This is done in the calling sub getSourceDirs but we need to do it before # 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 # Write @SrcDirList to file
open my $fd, '>', open my $fd, '>',

10
smeserver-affa.spec
View File

@ -2,7 +2,7 @@ Summary: A rsync-based backup program for linux, adapted to Koozali SME server 1
%define name smeserver-affa %define name smeserver-affa
Name: %{name} Name: %{name}
%define version 4.0 %define version 4.0
%define release 7 %define release 5
Version: %{version} Version: %{version}
Release: %{release}%{?dist} 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> Vendor: Michael Weinberger <mweinber AT users DOT sourceforge DOT net> //// adaptation to sme-server Arnaud Guillaume <smeserver-affa AT guedel DOT eu>
@ -78,7 +78,7 @@ rm -f $RPM_BUILD_ROOT/sbin/affa.tmp
--ignoredir "/etc/profile.d" \ --ignoredir "/etc/profile.d" \
--file "/etc/profile.d/affa.sh" "attr(0555,root,root)" \ --file "/etc/profile.d/affa.sh" "attr(0555,root,root)" \
--file "/etc/sudoers.d/affa" "attr(0440,root,root)" \ --file "/etc/sudoers.d/affa" "attr(0440,root,root)" \
--file "/sbin/affa" "attr(0744,root,root)" \ --file "/usr/sbin/affa" "attr(0744,root,root)" \
> %{name}-%{version}-filelist > %{name}-%{version}-filelist
# We could use this for docs I guess - we should standardise this sort of thing # We could use this for docs I guess - we should standardise this sort of thing
@ -105,12 +105,6 @@ exit 0
exit 0 exit 0
%changelog %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 * Thu Feb 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0-5.sme
- Set affa permissions [SME:12922] - Set affa permissions [SME:12922]