--- rpms/smeserver-fail2ban/contribs10/smeserver-fail2ban.spec	2021/09/12 21:16:33	1.8
+++ rpms/smeserver-fail2ban/contribs10/smeserver-fail2ban.spec	2021/12/09 05:40:57	1.13
@@ -1,5 +1,5 @@
 %define version 0.1.18
-%define release 17
+%define release 23
 %define name smeserver-fail2ban
 
 Summary: fail2ban integration on SME Server
@@ -10,7 +10,7 @@ Epoch: 9
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0:smeserver-fail2ban-0.1.18.bz10767-adminpanel.patch
+Patch0: smeserver-fail2ban-0.1.18.bz10767-adminpanel.patch
 Patch1: smeserver-fail2ban-0.1.18.bz9709-wordpress.patch
 Patch2: smeserver-fail2ban-0.1.18.bz10775-sfail2ban.patch
 Patch3: smeserver-fail2ban-0.1.18-locale-2019-05-15.patch
@@ -26,6 +26,10 @@ Patch12: smeserver-fail2ban-0.1.18-bz116
 Patch13: smeserver-fail2ban-0.1.18-locale-2021-08-22.patch
 Patch14: smeserver-fail2ban-0.1.18-locale-2021-09-08.patch
 Patch15: smeserver-fail2ban-0.1.18-bz11586-redofailtostart.patch
+Patch16: smeserver-fail2ban-0.1.18-bz11650.patch 
+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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -33,6 +37,7 @@ BuildRequires: e-smith-devtools
 
 Requires: e-smith-base >= 5.2.0
 Requires: fail2ban-server, fail2ban-sendmail
+Requires: perl-Data-Validate-IP
 Obsoletes: fail2ban-firewalld, firewalld
 AutoReqProv: no
 
@@ -40,6 +45,27 @@ AutoReqProv: no
 Configure fail2ban on SME Server
 
 %changelog
+* Thu Dec 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-23.sme
+- fix adding removing whitelisted hosts [SME: 10819]
+  moved config options to dedicated page
+- removed apache-badbots.local, lot of false positives [SME: 10857]
+
+* Wed Dec 08 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-22.sme
+- fix apache-badbots logfile definition [SME: 10857]
+  add updated badbot list.
+
+* Wed Dec 08 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-21.sme
+- update wordpress filters [SME: 11651]
+
+* Wed Dec 08 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.18-20.sme
+- allow baning subnet [SME: 11650]
+
+* Wed Oct 27 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1.18-19.sme
+- Fix my versioning
+
+* Wed Oct 27 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1.18-18.sme
+- Add Requires for perl-Data-Validate-IP [SME: 11720]
+
 * Sun Sep 12 2021 Terry Fage <terry.fage@gmail.com> 0.1.18-17.sme
 - redo fix for typo qpsmtpd status [SME: 11636]
 
@@ -176,6 +202,10 @@ Configure fail2ban on SME Server
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 %{__mkdir_p} root/var/log/fail2ban
@@ -190,6 +220,7 @@ 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