--- rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec 2019/04/23 14:44:01 1.6 +++ rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec 2020/01/21 19:49:38 1.22 @@ -1,6 +1,6 @@ %define name smeserver-xt_geoip %define version 1.0.1 -%define release 9 +%define release 25 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. Name: %{name} Version: %{version} @@ -15,18 +15,81 @@ 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_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 +Patch15: smeserver-xt_geoip-1.0.1-bz10860-license_key.patch +Patch16: smeserver-xt_geoip-1.0.1-bz10860-download_mmdblookup.patch + BuildArchitectures: noarch BuildRoot: /var/tmp/%{name}-%{version} 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 +* Tue Jan 21 2020 Jean-Philipe Pialasse 1.0.1-25.sme +- add requirement for mmdb provided by rpm to allow accounting [SME: 10860] + +* Sat Jan 18 2020 Michel Begue 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 1.0.1-23.sme +- add license_key in config db and test in panel [SME: 10860] + +* Sat Dec 07 2019 SME Translation Server 1.0.1-21.sme +- apply locale 2019-12-07 patch + +* Wed Oct 16 2019 Michel Begue 1.0.1-20.sme +- panel to add services [SME: 10792] +- french translation + +* Mon Sep 30 2019 Michel Begue 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 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 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 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 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 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 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 1.0.1-9.sme - add stats access in the panel [SME: 10745] - add control of maximum number of countries [SME: 10749] @@ -53,7 +116,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 +* Sat Oct 07 2017 Michel Begue - test kernel module presence in "/lib/modules/weak-updates" directory - [1.0.1-2] @@ -69,12 +132,25 @@ 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 %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %build perl createlinks @@ -105,3 +181,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