--- rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec	2019/04/25 17:53:12	1.7
+++ rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec	2019/12/07 04:06:00	1.18
@@ -1,6 +1,6 @@
 %define name smeserver-xt_geoip
 %define version 1.0.1
-%define release 10
+%define release 21
 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 Name: %{name}
 Version: %{version}
@@ -15,7 +15,17 @@ Patch2: smeserver-xt_geoip-1.0.1-4-cront
 Patch3: smeserver-xt_geoip-1.0.1-bz10739.patch
 Patch4: smeserver-xt_geoip-1.0.1-stats.patch
 Patch5: smeserver-xt_geoip-1.0.1-stats_panel.patch
-Patch6: smeserver-xt_geoip-1.0.1-per_service.patch
+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
+Patch12: smeserver-xt_geoip-1.0.1-bz10791-country_panel_ssh.patch
+Patch13: smeserver-xt_geoip-1.0.1-bz10792-add_services.patch
+Patch14: smeserver-xt_geoip-1.0.1-locale-2019-12-07.patch
+
+
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools
@@ -28,8 +38,42 @@ AutoReqProv: no
 smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 
 %changelog
-* Wed Apr 24 2019 Michel Begue <mab974@gmail.com> 1.0.1-10.sme
+* Sat Dec 07 2019 SME Translation Server <translations@contribs.org> 1.0.1-21.sme
+- apply locale 2019-12-07 patch
+
+* Wed Oct 16 2019 Michel Begue <mab974@gmail.com> 1.0.1-20.sme
+- panel to add services  [SME: 10792]
+- french translation
+
+* Mon Sep 30 2019 Michel Begue <mab974@gmail.com> 1.0.1-19.sme
+- add country code list [SME: 10791]
+- fix stats SSH errors [SME: 10807]
+- improved panel [SME: 10788]
+
+* 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]
+
+* Sun Jul 21 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-13.sme
+- fix network lock out on adjust [SME: 10760] 
+  this arised on initial install with a simple masq adjust
+  or if XT_geoip is disbaled on any masq restart or adjust
+
+* Wed Apr 24 2019 Michel Begue <mab974@gmail.com> 1.0.1-12.sme
 - add per service management of GeoIP bans [SME: 10760]
+- move panel to Security [SME: 10773]
 
 * Wed Apr 17 2019 Michel Begue <mab974@gmail.com> 1.0.1-9.sme
 - add stats access in the panel [SME: 10745]
@@ -57,7 +101,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]
 
@@ -73,6 +117,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
@@ -80,6 +126,14 @@ smserver rpm to setup database, update a
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 perl createlinks