--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec 2017/02/15 14:44:04 1.7 +++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec 2019/01/05 19:53:29 1.12 @@ -1,6 +1,6 @@ %define name smeserver-geoip -%define version 1.1.2 -%define release 7 +%define version 1.2 +%define release 5 Summary: SME Server geoip plugin Name: %{name} @@ -12,13 +12,11 @@ Source: %{name}-%{version}.tar.gz Packager: Doug Kruhm BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch -Requires: perl-Geo-IP Requires: GeoIP >= 1.6.5 BuildRequires: e-smith-devtools >= 1.13.1-03 -Patch0: smeserver-geoip-remove-createlink-add-geoip-download-actions.patch -Patch1: smeserver-geoip-1.1.2.geoip-update-event.patch -Patch2: smeserver-geoip-whitelist_by_IP.patch -Patch3: smeserver-geoip-use-newer-databases.patch +Patch0: smeserver-geoip-conf-typo.patch +Patch1: smeserver-geoip-fix-city-createlinks.patch +Patch2: smeserver-geoip-1.2-check_badcountries.patch %description The GEOIP plugin lets us know which country our mail server is receiving mail from. If we're receiving too much spam from a particular country, this will help track it down and then use that info to reject connections from that country. This ends up taking the load off our servers. @@ -26,7 +24,58 @@ The GEOIP plugin lets us know which coun CHANGE THE CONFIG DB: config setprop qpsmtpd BadCountries (i.e. config setprop qpsmtpd BadCountries BR) SIGNAL EVENT: signal-event email-update +#---------------------------------------------------- + +%package -n smeserver-geoip1 +Summary: SME Server geoip plugin v1 +Group: Email +Requires: perl-Geo-IP +Requires: GeoIP >= 1.6.5 +BuildRequires: e-smith-devtools >= 1.13.1-03 + +%description -n smeserver-geoip1 +The GEOIP plugin lets us know which country our mail server is receiving mail from. If we're receiving too much spam from a particular country, this will help track it down and then use that info to reject connections from that country. This ends up taking the load off our servers. + +CHANGE THE CONFIG DB: config setprop qpsmtpd BadCountries (i.e. config setprop qpsmtpd BadCountries BR) +SIGNAL EVENT: signal-event email-update +#---------------------------------------------------- + +%package -n smeserver-geoip2 +Summary: SME Server geoip plugin v2 +Group: Email +Requires: perl-GeoIP2 +Requires: GeoIP >= 1.6.5 +BuildRequires: e-smith-devtools >= 1.13.1-03 + + +%description -n smeserver-geoip2 +The GEOIP plugin lets us know which country our mail server is receiving mail from. If we're receiving too much spam from a particular country, this will help track it down and then use that info to reject connections from that country. This ends up taking the load off our servers. + +CHANGE THE CONFIG DB: config setprop qpsmtpd BadCountries (i.e. config setprop qpsmtpd BadCountries BR) +SIGNAL EVENT: signal-event email-update +#---------------------------------------------------- + %changelog +* Sat Jan 05 2019 Jean-Philipe Pialasse 1.2-5.sme +- fix wrong loglevel LOGINFO instead of LOGNOTICE needed [SME: 10679] +- try first db v2 and back on v1 if not available [SME: 10691] +- workaround FATAL PLUGIN ERROR when method name_by_addr not existing priori geo-ip 1.39 [SME: 10691] + +* Fri Jan 04 2019 Jean-Philipe Pialasse 1.2-4.sme +- split smeserver-geoip into smeserver-geoip and smeserver-geoip2 for compatibility [SME: 10691] +- TODO: workaround to find for plugin compatibility + +* Mon Oct 29 2018 John Crisp 1.2-3.sme +- Fix Use of uninitialized value $city in string eq +- Fix createlinks geoip-update action + +* Sat Jun 23 2018 John Crisp 1.2-2.sme +- Fix typo in createlinks + +* Tue Jun 12 2018 John Crisp 1.2-1.sme +- Update to latest v2 DBs [SME: 9033] +- add geocity.pl and geocountry.pl test files + * Wed Feb 15 2017 Jean-Philipe Pialasse 1.1.2-7.sme - update requirement for GeoIP 1.6.5 [SME: 9714] @@ -71,7 +120,6 @@ SIGNAL EVENT: signal-event email-update %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %{__mkdir_p} root/var/lib/GeoIP @@ -83,6 +131,14 @@ rm -rf $RPM_BUILD_ROOT rm -f %{name}-%{version}-filelist /sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist +cat %{name}-%{version}-filelist \ +|grep -v 'etc/e-smith/templates/etc/GeoIP.conf' \ +|grep -v 'usr/bin/geocity.pl' \ +|grep -v 'usr/bin/geocountry.pl'\ +|grep -v 'smeserver-geopip-download-action' \ +|grep -v 'templates2expand/etc/GeoIP.conf' \ + > %{name}-%{version}-filelist-v1 + %clean rm -rf $RPM_BUILD_ROOT @@ -90,5 +146,16 @@ rm -rf $RPM_BUILD_ROOT %postun -%files -f %{name}-%{version}-filelist +%files -f %{name}-%{version}-filelist-v1 %defattr(-,root,root) + + + +%files -n smeserver-geoip2 -f %{name}-%{version}-filelist +%defattr(-,root,root,-) + +%files -n smeserver-geoip1 -f %{name}-%{version}-filelist-v1 +%defattr(-,root,root,-) + + +