/[smecontribs]/rpms/smeserver-geoip/contribs10/smeserver-geoip.spec

Diff of /rpms/smeserver-geoip/contribs10/smeserver-geoip.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.1 by brianr,
Tue Oct  6 13:45:14 2020 UTC
+Revision 1.6 by jpp,
Sun Mar 14 05:57:01 2021 UTC
 Line 1
  %define name smeserver-geoip
  %define version 1.2
- %define release 14
+ %define release 16
  Summary: SME Server geoip plugin
  Name: %{name}
 Line 12 
 Source: %{name}-%{version}.tar.gz
  Packager: Doug Kruhm <dakruhm@daknetworks.net>
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArchitectures: noarch
- Requires: GeoIP >= 1.6.5
+ Requires: perl-GeoIP2
+ Requires: libmaxminddb >= 1.1.1
+ Requires: libmaxminddb-devel >= 1.1.1
+ Requires: geoipupdate
+ Requires: geolite2-country
+ Requires: geolite2-city
+ Provides: smeserver-geoip2 >= 1.2-16
  BuildRequires: e-smith-devtools >= 1.13.1-03
  Patch0: smeserver-geoip-conf-typo.patch
  Patch1: smeserver-geoip-fix-city-createlinks.patch
-Line 22 
 Patch4: smeserver-geoip-1.2-bz10820-geoi
+Line 28 
 Patch4: smeserver-geoip-1.2-bz10820-geoi
  Patch5: smeserver-geoip-1.2-bz10815-display-country.patch
  Patch6: smeserver-geoip-1.2-bz10859-bz10740.patch
  Patch7: smeserver-geoip-1.2-fix-product-id.patch
+ Patch8: smeserver-geoip-1.2-sme10-update.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.
-Line 31 
 SIGNAL EVENT: signal-event email-update
+Line 38 
 SIGNAL EVENT: signal-event email-update
  #----------------------------------------------------
- %package        -n smeserver-geoip1
+ %package        -n smeserver-geoip-legacy
  Summary:        SME Server geoip plugin v1
  Group:          Email
  Requires:       perl-Geo-IP
  Requires:       GeoIP >= 1.6.5
+ Requires:       GeoIP-GeoLite-data
+ Requires:       GeoIP-GeoLite-data-extra
+ Requires:       smeserver-geoip >= 1.2-16
  BuildRequires:  e-smith-devtools >= 1.13.1-03
- %description    -n smeserver-geoip1
+ %description    -n smeserver-geoip-legacy
+ Package to use the legacy plugin. DB are not updated since 2018
  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 <countrycode> (i.e. config setprop qpsmtpd BadCountries BR)
- SIGNAL EVENT: signal-event email-update
  #----------------------------------------------------
- %package        -n smeserver-geoip2
+ %changelog
- Summary:        SME Server geoip plugin v2
+ * Sat Mar 13 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-16.sme
- Group:          Email
+ - rebuild for SME10 [SME: 11023]
- Requires:       smeserver-geoip
+   make geoip2 default
- Requires:       perl-GeoIP2
+   create geoip-legacy package with old geoip1 stuffs
- Requires:       GeoIP >= 1.6.5
+   smeserver-geoip(-legacy)-update events
- Requires: libmaxminddb >= 1.1.1
- Requires: libmaxminddb-devel >= 1.1.1
- Requires: geolite2-country
- Requires: geolite2-city
- BuildRequires:  e-smith-devtools >= 1.13.1-03
- %description    -n smeserver-geoip2
+ * Tue Oct 06 2020 Brian Read <brianr@bjsystems.co.uk> 1.2-15.sme
- 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.
+ - Import to SME10 tree [SME: 11023]
- CHANGE THE CONFIG DB: config setprop qpsmtpd BadCountries <countrycode> (i.e. config setprop qpsmtpd BadCountries BR)
- SIGNAL EVENT: signal-event email-update
- #----------------------------------------------------
- %changelog
  * Wed Jan 22 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-14.sme
  - Change template from EditionID to ProductID
  - fix 20databasestore has a trailing tilde
-Line 159 
 SIGNAL EVENT: signal-event email-update
+Line 156 
 SIGNAL EVENT: signal-event email-update
  %patch5 -p1
  %patch6 -p1
  %patch7 -p1
+ rm -rf root/var/
+ %patch8 -p1
+ mkdir -p root/etc/e-smith/events/smeserver-geoip-legacy
  %build
- %{__mkdir_p} root/var/lib/GeoIP
  perl createlinks
  %install
  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 > %{name}-%{version}-filelist
+ /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+   --file /usr/bin/geoiplook 'attr(0755,root,root)' \
+ > %{name}-%{version}-filelist
  cat %{name}-%{version}-filelist \
- |grep -v 'etc/e-smith/templates/etc/GeoIP.conf' \
+ |grep -v 'etc/e-smith/events/smeserver-geoip-legacy' \
- |grep -v 'usr/bin/geocity.pl' \
+ > %{name}-%{version}-filelist-base
- |grep -v 'usr/bin/geocountry.pl'\
+ cat %{name}-%{version}-filelist \
- |grep -v 'smeserver-geopip-download-action' \
+ |grep 'etc/e-smith/events/smeserver-geoip-legacy' \
- |grep -v 'templates2expand/etc/GeoIP.conf' \
+ > %{name}-%{version}-filelist-legacy
- |grep -v '/etc/crontab/91_Update_Geoip_db' \
- |grep -v '/usr/bin/geoiplook' \
+ #diff -u %{name}-%{version}-filelist %{name}-%{version}-filelist-v1 | grep -E "^\-"| sed -E 's/^\-//'|grep -v filelist > %{name}-%{version}-filelist-v2
- |grep -v '/etc/e-smith/db/configuration/defaults/geoip' \
-  > %{name}-%{version}-filelist-v1
- diff -u %{name}-%{version}-filelist %{name}-%{version}-filelist-v1 | grep -E "^\-"| sed -E 's/^\-//'|grep -v filelist > %{name}-%{version}-filelist-v2
  %clean
  rm -rf $RPM_BUILD_ROOT
-Line 189 
 rm -rf $RPM_BUILD_ROOT
+Line 187 
 rm -rf $RPM_BUILD_ROOT
  %postun
- %files -f %{name}-%{version}-filelist-v1
+ %files -f %{name}-%{version}-filelist-base
  %defattr(-,root,root)
- %files -n smeserver-geoip2 -f %{name}-%{version}-filelist-v2
+ %files -n smeserver-geoip-legacy -f %{name}-%{version}-filelist-legacy
- %defattr(-,root,root,-)
- %files -n smeserver-geoip1 -f %{name}-%{version}-filelist-v1
  %defattr(-,root,root,-)

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1