Hello community, here is the log from the commit of package GeoIP for openSUSE:Factory checked in at 2015-02-24 13:02:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/GeoIP (Old) and /work/SRC/openSUSE:Factory/.GeoIP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "GeoIP" Changes: -------- --- /work/SRC/openSUSE:Factory/GeoIP/GeoIP.changes 2013-08-01 17:14:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.GeoIP.new/GeoIP.changes 2015-02-24 13:06:43.000000000 +0100 @@ -1,0 +2,35 @@ +Sat Feb 21 10:33:33 UTC 2015 - mpluskal@suse.com +- Disable checks, they fail with currently provided data file. +- Update to 1.6.4: + + Update Fips code + + Several issues with the MinGW build were fixed. + + Use a constructor in pread.c to ensure the critical section is + always initialized. + + Added missing include of io.h on Windows + + Fixed configure warning that 'missing' script is too old or + missing. + + Previously nmake /f Makefile.vc clean would fail on Windows. This was fixed. + + Obsolete win32 and NetWare make files were removed. + + Numerous documentation updates. +- Changes from 1.6.3: + + Added a GEOIP_SILENCE flag. Include this flag when calling + GeoIP_open to prevent any messages from being written to stderr. + + Mitigate a possible race condition when running nuder threads + in the GeoIP_cleanup function. + + Added some recommendations to the docs on using this library + in a threaded application. + + Fixed some bugs discovered by coverity, including failure to + check some system call return values and making sure all + strings are null-terminated +- Changes from 1.6.2: + + Two files required for building on Win32 were missing from the + 1.6.1 release. These files were added. There are no changes + affecting other platforms. +- Changes from 1.6.1: + + Improve Win32 support. + + Update FIPS codes. +- Changes from 1.6.0: + + The GeoIP Update program was move to its own repo and source + distribution. + +------------------------------------------------------------------- Old: ---- GeoIP-1.5.1.tar.gz New: ---- GeoIP-1.6.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ GeoIP.spec ++++++ --- /var/tmp/diff_new_pack.qKdXu8/_old 2015-02-24 13:06:45.000000000 +0100 +++ /var/tmp/diff_new_pack.qKdXu8/_new 2015-02-24 13:06:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package GeoIP # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,21 @@ Name: GeoIP -%define lname libGeoIP1 -Version: 1.5.1 +Version: 1.6.4 Release: 0 -# Summary: Library to find the country that any IP address originates from -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ and CC-BY-SA-3.0 Group: Development/Libraries/C and C++ -# Url: http://www.maxmind.com/ -Source: http://www.maxmind.com/download/geoip/api/c/%{name}-%{version}.tar.gz +Source0: https://github.com/maxmind/geoip-api-c/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: LICENSE.txt Source2: GPL-2.0.txt Source3: README.SUSE Source4: geoip-fetch Source5: baselibs.conf -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config -BuildRequires: zlib-devel +BuildRequires: pkgconfig(zlib) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Recommends: curl %endif @@ -50,7 +46,7 @@ MaxMind offers a service where you can have your database updated automically each month. -%package -n %lname +%package -n lib%{name}1 Summary: Shared libraries of the GeoIP C API License: LGPL-2.1+ Group: Development/Libraries/C and C++ @@ -59,7 +55,7 @@ Recommends: GeoIP %endif -%description -n %lname +%description -n lib%{name}1 GeoIP is a C library that enables the user to find the country that any IP address or hostname originates from. It uses a file based database. This database simply contains IP blocks as keys, and countries as @@ -71,16 +67,15 @@ This package holds the shared libraries for GeoIP. -%package -n libGeoIP-devel +%package -n lib%{name}-devel Summary: Development Files for GeoIP License: LGPL-2.1+ Group: Development/Libraries/C and C++ -# -Requires: %lname = %{version} +Requires: lib%{name}1 = %{version} Provides: %{name}-devel = %{version}-%{release} Obsoletes: %{name}-devel < %{version} -%description -n libGeoIP-devel +%description -n lib%{name}-devel GeoIP is a C library that enables the user to find the country that any IP address or hostname originates from. It uses a file based database. This database simply contains IP blocks as keys, and countries as @@ -99,60 +94,54 @@ cp %{SOURCE3} . %build -%configure --disable-static --with-pic -sed -i -e '/-DGEOIPDATADIR/s,\$(pkgdatadir),/var/lib/GeoIP,' libGeoIP/Makefile{.am,.in,} -sed -i -e 's,\$(pkgdatadir),/var/lib/GeoIP,' man/Makefile{.am,.in,} +%configure --disable-static \ + --with-pic + +sed -i -e '/-DGEOIPDATADIR/s,\$(pkgdatadir),%{_localstatedir}/lib/GeoIP,' libGeoIP/Makefile{.am,.in,} +sed -i -e 's,\$(pkgdatadir),%{_localstatedir}/lib/GeoIP,' man/Makefile{.am,.in,} + make %{?_smp_mflags} %install -%makeinstall -install -d %{buildroot}/var/lib -mv %{buildroot}%{_datadir}/GeoIP %{buildroot}/var/lib -for i in GeoIPASNum.dat GeoIPCity.dat GeoIPv6.dat; do - touch %buildroot/var/lib/GeoIP/$i -done -# we don't need that, we use %config(noreplace) instead -%{__rm} %{buildroot}%{_sysconfdir}/GeoIP.conf.default -# no need for that -%{__rm} %{buildroot}%{_libdir}/*.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} + +install -d %{buildroot}%{_localstatedir}/lib/GeoIP +install data/* %{buildroot}%{_localstatedir}/lib/GeoIP/ +# do not ship these +rm %{buildroot}%{_libdir}/libGeoIP.la # install fetcher install -D -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}/geoip-fetch -%post -n %lname -p /sbin/ldconfig +%post -n lib%{name}1 -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n lib%{name}1 -p /sbin/ldconfig %files %defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING README TODO LICENSE.txt GPL-2.0.txt README.SUSE -%config(noreplace) %{_sysconfdir}/GeoIP.conf +%doc AUTHORS ChangeLog COPYING README.md LICENSE.txt GPL-2.0.txt README.SUSE %{_bindir}/geoiplookup %{_bindir}/geoiplookup6 -%{_bindir}/geoipupdate %{_mandir}/man1/geoiplookup6.1* %{_mandir}/man1/geoiplookup.1* -%{_mandir}/man1/geoipupdate.1* %{_sbindir}/geoip-fetch -%dir /var/lib/GeoIP -%verify(not md5 size mtime) /var/lib/GeoIP/GeoIP.dat -%ghost %verify(not md5 size mtime) /var/lib/GeoIP/GeoIPASNum.dat -%ghost %verify(not md5 size mtime) /var/lib/GeoIP/GeoIPCity.dat -%ghost %verify(not md5 size mtime) /var/lib/GeoIP/GeoIPv6.dat +%dir %{_localstatedir}/lib/GeoIP +%verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIP.dat +%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIPASNum.dat +%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIPCity.dat +%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/GeoIP/GeoIPv6.dat -%files -n %lname +%files -n lib%{name}1 %defattr(-, root, root, -) +%doc AUTHORS ChangeLog COPYING README.md LICENSE.txt GPL-2.0.txt README.SUSE %{_libdir}/libGeoIP.so.1 %{_libdir}/libGeoIP.so.%{version} -%{_libdir}/libGeoIPUpdate.so.0 -%{_libdir}/libGeoIPUpdate.so.0.0.0 -%files -n libGeoIP-devel +%files -n lib%{name}-devel %defattr(-, root, root, -) +%doc AUTHORS ChangeLog COPYING README.md LICENSE.txt GPL-2.0.txt README.SUSE %{_includedir}/GeoIP.h %{_includedir}/GeoIPCity.h -%{_includedir}/GeoIPUpdate.h %{_libdir}/libGeoIP.so -%{_libdir}/libGeoIPUpdate.so %{_libdir}/pkgconfig/geoip.pc %changelog ++++++ GeoIP-1.5.1.tar.gz -> GeoIP-1.6.4.tar.gz ++++++ ++++ 65607 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org