--- rpms/smeserver-xt_geoip/contribs10/smeserver-xt_geoip.spec 2021/01/06 14:35:31 1.2 +++ rpms/smeserver-xt_geoip/contribs10/smeserver-xt_geoip.spec 2021/08/25 02:01:25 1.8 @@ -1,6 +1,6 @@ %define name smeserver-xt_geoip %define version 1.3.1 -%define release 02 +%define release 08 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. Name: %{name} @@ -11,6 +11,10 @@ URL: http://wiki.contribs.org/Main_Page Group: SMEserver/addon Source: %{name}-%{version}.tar.xz Patch0: %{name}-%{version}-comp_e-smith-manager.patch +Patch1: %{name}-%{version}-update_base.patch +Patch2: smeserver-xt_geoip-1.3.1-update-event-oldManager.patch +Patch3: %{name}-%{version}-logfiles_changes.patch +Patch4: smeserver-xt_geoip-1.3.1-locale-2021-08-25.patch BuildArchitectures: noarch BuildRoot: /var/tmp/%{name}-%{version} @@ -18,7 +22,7 @@ BuildRequires: e-smith-devtools Requires: e-smith-release >= 10.0 Requires: server-manager >= 0.1.0-23 Requires: xtables-addons = 2.14 -Requires: GeoIP = 1.5.0 +Requires: GeoIP >= 1.5.0 Requires: libmaxminddb >= 1.1.1 Requires: libmaxminddb-devel >= 1.1.1 Requires: geolite2-country @@ -28,20 +32,14 @@ AutoReqProv: no %description smserver rpm to setup database, update and configuration for xt_geoip module with a panel. -%changelog -* Wed Jan 06 2021 Michel Begue 1.3.1-02.sme -- Back to compatibility with e-smith-manager -- (s)qpsmtpd replace (s)smtpd (services) - -* Fri Jul 31 2020 Michel Begue 1.3.1-01.sme -- initial release for smeserver-manager (sme10) -- [1.0.1-26 sme9] -- xtables-addons v2.14 %prep - %setup %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build perl createlinks @@ -52,7 +50,14 @@ rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) rm -f %{name}-%{version}-filelist -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT | egrep -v "usr/share/xt_geoip/geoip_" \ +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --file /usr/share/xt_geoip/geoip_countries_list.txt 'attr(0755, root, root)'\ + --file /usr/share/xt_geoip/geoip_exstat 'attr(0755, root, root)'\ + --file /usr/share/xt_geoip/geoip_listat 'attr(0755, root, root)'\ + --file /usr/share/xt_geoip/geoip_look 'attr(0755, root, root)'\ + --file /usr/share/xt_geoip/geoip_stats 'attr(0755, root, root)'\ + --file /usr/share/xt_geoip/xt_geoip_dl 'attr(0750, root, root)'\ + --file /usr/share/xt_geoip/update_base 'attr(0750, root, root)'\ > %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist @@ -70,7 +75,119 @@ rm -rf %{name}-%{version} %files -f %{name}-%{version}-filelist %defattr(-,root,root) -%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 + + +%changelog +* Wed Aug 25 2021 Terry Fage 1.3.1-08.sme +- apply locale 2021-08-25 patch + +* Tue Mar 16 2021 Michel Begue 1.3.1-07.sme +- Fix script as logfiles change (sshd - iptables) + +* Sun Mar 14 2021 Jean-Philippe Pialasse 1.3.1-06.sme +- change Geoip requirement to >= 1.5 + +* Sat Mar 13 2021 Jean-Philippe Pialasse 1.3.1-05.sme +- readded changelog from contribs9 +- moved changelog to the end of spec +- TODO review the two section of %files +- added link to wrapper for e-smith-manager + +* Wed Jan 06 2021 Michel Begue 1.3.1-03.sme +- Back to compatibility with e-smith-manager +- (s)qpsmtpd replace (s)smtpd (services) +- remove 'update_base' script template + +* Fri Jul 31 2020 Michel Begue 1.3.1-01.sme +- initial release for smeserver-manager (sme10) +- [1.0.1-26 sme9] +- xtables-addons v2.14 + +* Mon Feb 24 2020 Michel Begue 1.0.1-26.sme +- add localhost to whitelist [SME: 10881] + +* 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] + +* Wed Mar 06 2019 Michel Begue 1.0.1-7.sme +- add stats of geoip blocked countries [SME: 10745] +- add stats of ssh attacks not geoip blocked [SME: 10744] +- expand /etc/crontab on update + +* Mon Feb 18 2019 Jean-Philipe Pialasse 1.0.1-6.sme +- fix unable to load iptables rules [SME: 10739] + fix warning localtime + fix warning "enabled" isn't numeric in numeric eq (==) + +* Wed Feb 06 2019 Jean-Philipe Pialasse 1.0.1-5.sme +- first import to SME buildsys + +* Sun Oct 29 2017 Michel Begue +- bug in crontab update job, +- [1.0.1-4] + +* Mon Oct 16 2017 Michel Begue +- new message : inactive GeoIP, +- value of country code added in message "country not found", +- [1.0.1-3] + +* Sat Oct 07 2017 Michel Begue +- test kernel module presence in "/lib/modules/weak-updates" directory +- [1.0.1-2] + +* Wed Sep 20 2017 Michel Begue +- panel added in server manager +- [1.0.1-1] + +* Tue Sep 12 2017 Michel Begue +- initial release +- [1.0.0-1] +