--- rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec	2019/07/28 04:21:26	1.14
+++ rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec	2020/02/24 19:28:34	1.23
@@ -1,6 +1,6 @@
 %define name smeserver-xt_geoip
 %define version 1.0.1
-%define release 17
+%define release 26
 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 Name: %{name}
 Version: %{version}
@@ -19,6 +19,14 @@ Patch6: smeserver-xt_geoip-1.0.1-per_ser
 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
+Patch15: smeserver-xt_geoip-1.0.1-bz10860-license_key.patch
+Patch16: smeserver-xt_geoip-1.0.1-bz10860-download_mmdblookup.patch
+Patch17: smeserver-xt_geoip-1.0.1-bz10881_whitelist_localhost.patch
 
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
@@ -26,12 +34,45 @@ BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 9.0
 Requires: xtables-addons = 1.47.1
 Requires: GeoIP = 1.6.5
+Requires: libmaxminddb >= 1.1.1
+Requires: libmaxminddb-devel >= 1.1.1
+Requires: geolite2-country
+Requires: geolite2-city
 AutoReqProv: no
 
 %description
 smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 
 %changelog
+* Mon Feb 24 2020 Michel Begue <mab974@gmail.com> 1.0.1-26.sme
+- add localhost to whitelist [SME: 10881]
+
+* Tue Jan 21 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.1-25.sme
+- add requirement for mmdb provided by rpm to allow accounting [SME: 10860]
+
+* Sat Jan 18 2020 Michel Begue <mab974@gmail.com> 1.0.1-24.sme
+- new download script adapted to SME (from xtables-addons) [SME: 10860]
+- change geoiplookup to mmdblookup
+
+* Sat Jan 11 2020 Michel Begue <mab974@gmail.com> 1.0.1-23.sme
+- add license_key in config db and test in panel [SME: 10860]
+
+* 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]
@@ -79,7 +120,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]
 
@@ -107,6 +148,14 @@ unlink root/etc/e-smith/web/panels/manag
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 perl createlinks
@@ -137,3 +186,5 @@ rm -rf %{name}-%{version}
 
 %files
 %attr(0755, root, root) /usr/share/xt_geoip/geoip_*
+%attr(0750, root, root) /usr/share/xt_geoip/xt_geoip_dl
+%attr(0750, root, root) /usr/share/xt_geoip/update_base