--- rpms/smeserver-fail2ban/contribs10/smeserver-fail2ban.spec	2021/12/09 05:40:57	1.13
+++ rpms/smeserver-fail2ban/contribs10/smeserver-fail2ban.spec	2024/03/01 17:30:59	1.21
@@ -1,5 +1,5 @@
 %define version 0.1.18
-%define release 23
+%define release 31
 %define name smeserver-fail2ban
 
 Summary: fail2ban integration on SME Server
@@ -30,6 +30,11 @@ Patch16: smeserver-fail2ban-0.1.18-bz116
 Patch17: smeserver-fail2ban-0.1.18-bz11651-wordpress.patch
 Patch18: smeserver-fail2ban-0.1.18-bz10857.patch
 Patch19: smeserver-fail2ban-0.1.18-bz10819-whitelisthostfix.patch
+Patch20: smeserver-fail2ban-0.1.18-Add-class-to-div-for-AdminLTE.patch
+Patch21: smeserver-fail2ban-0.1.18-locale-2022-07-22.patch
+Patch22: smeserver-fail2ban-0.1.18-bz12008-backup.patch
+Patch23: smeserver-fail2ban-0.1.18-locale-2022-07-30.patch
+Patch24: smeserver-fail2ban-0.1.18-Alter-menu-category-for-new-arrangement.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -45,7 +50,26 @@ AutoReqProv: no
 Configure fail2ban on SME Server
 
 %changelog
-* Thu Dec 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-23.sme
+* Fri Mar 01 2024 Brian Read <brianr@koozali.org> 0.1.18-31.sme
+- Edit SM2 Menu entry to conform to new arrangements [SME: 12493]
+
+* Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-30.sme
+- add to core backup [SME: 12008]
+- add local 2022-07-30 patch
+
+* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-28.sme
+- revert previous patch, wrong package [SME: 12011]
+
+* Fri Jul 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-27.sme
+- add to core backup [SME: 12011]
+
+* Fri Jul 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-26.sme
+- apply locale patch 2022-07-22
+
+* Fri Jan 07 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.18-25.sme
+- Add-class-to-div-for-AdminLTE [SME: 11837]
+
+* Thu Dec 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-24.sme
 - fix adding removing whitelisted hosts [SME: 10819]
   moved config options to dedicated page
 - removed apache-badbots.local, lot of false positives [SME: 10857]
@@ -206,6 +230,11 @@ Configure fail2ban on SME Server
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %build
 %{__mkdir_p} root/var/log/fail2ban
@@ -220,9 +249,9 @@ perl createlinks
    --file /var/log/fail2ban/daemon.log 'config(noreplace) %attr(0600,root,root)' \
    --file /etc/cron.daily/cleanup_fail2ban 'attr(0755,root,root)' \
    --file /etc/fail2ban/filter.d/apache-auth.local 'config(noreplace) %attr(0644,root,root)' \
-   --file /etc/fail2ban/filter.d/apache-badbots.local 'config(noreplace) %attr(0644,root,root)' \
    --file /usr/bin/sfail2ban 'attr(0755,root,root)' \
   > %{name}-%{version}-filelist
+#--file /etc/fail2ban/filter.d/apache-badbots.local 'config(noreplace) %attr(0644,root,root)' \
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
@@ -232,4 +261,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 
+if (systemctl list-unit-files |grep smanager) then
+  echo "Smanager restart in spec file"
+  /sbin/e-smith/signal-event smanager-refresh;
+fi
+
+
 %preun