--- rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec 2019/05/01 20:43:26 1.9 +++ rpms/smeserver-xt_geoip/contribs9/smeserver-xt_geoip.spec 2019/07/28 04:21:26 1.14 @@ -1,6 +1,6 @@ %define name smeserver-xt_geoip %define version 1.0.1 -%define release 12 +%define release 17 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. Name: %{name} Version: %{version} @@ -16,6 +16,10 @@ Patch3: smeserver-xt_geoip-1.0.1-bz10739 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 + BuildArchitectures: noarch BuildRoot: /var/tmp/%{name}-%{version} BuildRequires: e-smith-devtools @@ -28,8 +32,26 @@ AutoReqProv: no smserver rpm to setup database, update and configuration for xt_geoip module with a panel. %changelog +* 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] @@ -73,6 +95,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 +104,9 @@ smserver rpm to setup database, update a %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build perl createlinks