--- rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec	2019/07/23 01:29:45	1.11
+++ rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec	2019/09/21 19:37:59	1.15
@@ -1,6 +1,6 @@
 %define name smeserver-xt_geoip
 %define version 1.0.1
-%define release 14
+%define release 18
 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 Name: %{name}
 Version: %{version}
@@ -18,6 +18,9 @@ Patch5: smeserver-xt_geoip-1.0.1-stats_p
 Patch6: smeserver-xt_geoip-1.0.1-per_serv.patch
 Patch7: smeserver-xt_geoip-1.0.1-bz10760-safe-reload.patch
 Patch8: smeserver-xt_geoip-1.0.1-bz10760-per_serv2.patch
+Patch9: smeserver-xt_geoip-1.0.1-bz10794-masq-template.patch
+Patch10: smeserver-xt_geoip-1.0.1-bz10789-more_services.patch
+Patch11: smeserver-xt_geoip-1.0.1-bz10797-no_emails.patch
 
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
@@ -31,7 +34,19 @@ AutoReqProv: no
 smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 
 %changelog
-* Tue Jul 23 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-14.sme
+* Sat Sep 21 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-18.sme
+- add more service [SME: 10789]
+- no email from log analysis by default [SME: 10797]
+
+* Sun Jul 28 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-17.sme
+- fix empty global filter disable all geoip iptables rules [SME: 10794]
+- tidy masq templates for xt geoip [SME: 10794]
+
+* Wed Jul 24 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-16.sme
+- add missing file to patch [SME: 10760]
+- workaround link issue in source [SME: 10790]
+
+* Tue Jul 23 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-15.sme
 - improved per service filtering [SME: 10760]
 - remove A1 forced as default and allow empty filter [SME: 10785]
 
@@ -70,7 +85,7 @@ smserver rpm to setup database, update a
 - value of country code added in message "country not found", 
 - [1.0.1-3]
 
-* Sat Oct 08 2017 Michel Begue <mab974@gmail.com>
+* Sat Oct 07 2017 Michel Begue <mab974@gmail.com>
 - test kernel module presence in "/lib/modules/weak-updates" directory
 - [1.0.1-2]
 
@@ -86,6 +101,8 @@ smserver rpm to setup database, update a
 %prep
 
 %setup
+# tmp fix before creating a new source archive 1.0.1-16
+unlink root/etc/e-smith/web/panels/manager/cgi-bin/xt_geoip
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -95,6 +112,9 @@ smserver rpm to setup database, update a
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks