X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-geoip.git;a=blobdiff_plain;f=xtables-geoip.spec;h=0b9a9039edbf9aaaaacdd773c4a2f7aa216c1a75;hp=a6dcfee6c9c91980cea4be0d35c751cf565ec079;hb=7e7c6a035d7d9030b17be7d71f2e1c7192820daf;hpb=074704b2fd909f72d4bd4bd961dd42fdd92d4611

diff --git a/xtables-geoip.spec b/xtables-geoip.spec
index a6dcfee..0b9a903 100644
--- a/xtables-geoip.spec
+++ b/xtables-geoip.spec
@@ -1,19 +1,17 @@
 Summary:	GeoIP database files for xt_geoip
 Summary(pl.UTF-8):	Pliki baz danych GeoIP dla xt_geoip
 Name:		xtables-geoip
-Version:	20161206
-Release:	1
+Version:	20181030
+Release:	2
 License:	GPL, Open Data License
 Group:		Networking/Admin
-Source0:	http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
-# Source0-md5:	86fa9d22dc1f3ab321d7b361153f43ce
-Source1:	http://geolite.maxmind.com/download/geoip/database/GeoIPv6.csv.gz
-# Source1-md5:	896ee482e2e40479ca3bf5122498c57b
-Source2:	http://geolite.maxmind.com/download/geoip/database/LICENSE.txt
-# Source2-md5:	a1381bd1aa0a0c91dc31b3f1e847cf4a
-Source3:	http://sourceforge.net/p/xtables-addons/xtables-addons/ci/master/tree/geoip/xt_geoip_build?format=raw&/xt_geoip_build
-# Source3-md5:	4dcd62c8b2c8b90cc88e961613118be3
-URL:		http://www.maxmind.com/
+Source0:	https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip
+# Source0-md5:	8527b411dfd72d39ff0556c703ca7f80
+Source1:	https://geolite.maxmind.com/download/geoip/database/LICENSE.txt
+# Source1-md5:	a1381bd1aa0a0c91dc31b3f1e847cf4a
+Source2:	https://sourceforge.net/p/xtables-addons/xtables-addons/ci/master/tree/geoip/xt_geoip_build?format=raw&/xt_geoip_build
+# Source2-md5:	462ca00be38471d19dc6e0f32c098275
+URL:		https://www.maxmind.com/
 BuildRequires:	perl-Text-CSV_XS >= 0.69
 BuildRequires:	perl-base
 BuildRequires:	rpm >= 4.4.9-56
@@ -25,12 +23,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # no debuginfo to package
 %define		_enable_debug_packages	0
 
-%ifarch ppc ppc64 s390 s390x sparc sparc64 sparcv9
-%define		byteorder	BE
-%else
-%define		byteorder	LE
-%endif
-
 %description
 The package contains the GeoIP definition files (which IP addresses
 belong to which country) that are needed for Xtables-addons's xt_geoip
@@ -43,64 +35,28 @@ xtables-addons.
 
 %prep
 %setup -qc
-gunzip -c %{SOURCE1} > GeoIPv6.csv
-touch -r %{SOURCE1} GeoIPv6.csv
 
-ver4=$(TZ=GMT stat -c '%y' GeoIPCountryWhois.csv | awk '{print $1}' | tr -d -)
-ver6=$(TZ=GMT stat -c '%y' GeoIPv6.csv | awk '{print $1}' | tr -d -)
-if [ "$ver4" -gt "$ver6" ]; then
-	ver=$ver4
-else
-	ver=$ver6
-fi
+ver=$(echo GeoLite2-Country-CSV_*)
+ver=${ver#GeoLite2-Country-CSV_}
 if [ "$ver" != %{version} ]; then
 	exit 1
 fi
 
-cp -p %{SOURCE2} .
+cp -p %{SOURCE1} .
 
 %build
-%{__perl} %{SOURCE3} GeoIPCountryWhois.csv GeoIPv6.csv | tee ranges.txt
+%{__mkdir} out
+%{__perl} %{SOURCE2} -S GeoLite2-Country-CSV_%{version} -D out > ranges.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{dbdir}
-cp -a %{byteorder} $RPM_BUILD_ROOT%{dbdir}
-
-%if "%{pld_release}" == "ac"
-# handle older xtables in ac:
-# kernel-net-xtables-addons-1.18-15@2.6.27.53_1.amd64
-# still having old .iv0 names requirement
-# http://xtables-addons.git.sourceforge.net/git/gitweb.cgi?p=xtables-addons/xtables-addons;a=commitdiff;h=25bf680ead80e505d5073308f151b4007cb5683f
-# create hardlink, to be most compatible
-for a in $RPM_BUILD_ROOT%{dbdir}/%{byteorder}/*.iv4; do
-	ln $a ${a%.iv4}.iv0
-done
-# kernel-net-xtables-addons-1.18-8@2.6.27.45_1.i686  searches from /var/lib:
-# Could not open /var/lib/geoip/LE/EE.iv0: No such file or directory
-install -d $RPM_BUILD_ROOT/var/lib
-ln -s %{_datadir}/xt_geoip $RPM_BUILD_ROOT/var/lib/geoip
-%endif
+cp -a out/* $RPM_BUILD_ROOT%{dbdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if "%{pld_release}" == "ac"
-%pretrans
-# this needs to be a symlink
-if [ -d /var/lib/geoip -a ! -L /var/lib/geoip ]; then
-	mv -f /var/lib/geoip{,.rpmsave}
-	install -d %{dbdir}
-	ln -s %{dbdir} /var/lib/geoip
-fi
-%endif
-
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt ranges.txt
-%dir %{dbdir}
-%{dbdir}/%{byteorder}
-
-%if "%{pld_release}" == "ac"
-/var/lib/geoip
-%endif
+%{dbdir}