From 93a4f41b1759507520f48d56b8eca965dc3ad19070b81f77b24cc44e6436f1e8 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Fri, 18 May 2018 09:01:09 +0000
Subject: [PATCH] Accepting request 610117 from
home:weberho:branches:devel:libraries:c_c++
- Run tests
- Packaged LICENSE
- Update to version 1.3.2
OBS-URL: https://build.opensuse.org/request/show/610117
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmaxminddb?expand=0&rev=11
---
libmaxminddb-1.2.0.tar.gz | 3 ---
libmaxminddb-1.3.2.tar.gz | 3 +++
libmaxminddb.changes | 52 +++++++++++++++++++++++++++++++++++++++
libmaxminddb.spec | 40 +++++++++++++++---------------
4 files changed, 75 insertions(+), 23 deletions(-)
delete mode 100644 libmaxminddb-1.2.0.tar.gz
create mode 100644 libmaxminddb-1.3.2.tar.gz
diff --git a/libmaxminddb-1.2.0.tar.gz b/libmaxminddb-1.2.0.tar.gz
deleted file mode 100644
index ad10f06..0000000
--- a/libmaxminddb-1.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fe859ed714f94fc902a145453f7e1b5cd928718179ba4c4fcb7f6ae0df7ad37
-size 658820
diff --git a/libmaxminddb-1.3.2.tar.gz b/libmaxminddb-1.3.2.tar.gz
new file mode 100644
index 0000000..eddefd3
--- /dev/null
+++ b/libmaxminddb-1.3.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0
+size 619009
diff --git a/libmaxminddb.changes b/libmaxminddb.changes
index bea5026..5529bd4 100644
--- a/libmaxminddb.changes
+++ b/libmaxminddb.changes
@@ -1,3 +1,55 @@
+-------------------------------------------------------------------
+Thu May 17 13:37:24 UTC 2018 - jweberhofer@weberhofer.at
+
+- Run tests
+- Packaged LICENSE
+
+- Update to version 1.3.2
+ * Allocate memory for MMDB_entry_data_list_s structs in separate chunks
+ rather than one large chunk. This simplifies accessing memory in
+ MMDB_get_entry_data_list() and increases performance. It builds on the
+ changes in 1.3.0 and 1.3.1.
+ * We no longer export data_pool_* symbols. These are internal functions
+ but we were previously exporting them. Pull request by Faidon Liambotis.
+ gh#maxmind/libmaxminddb#162.
+ * Build with POSIX.1-2008 by default if the system supports it. This allows
+ use of open() with O_CLOEXEC. We retain support for systems that
+ provide only POSIX.1-2001.
+ Open the database with the O_CLOEXEC flag if the system provides it.
+ * This avoids cases where we could leak fds when called in multi-threaded
+ programs that fork() and exec(). Original report and PR by Brandon L
+ Black.
+ * Added a test to ensure we export only intended symbols (e.g. MMDB_*).
+
+- Update to version 1.3.1
+ * Fix build problems related to rpl_malloc(). Pull request by Rainer
+ Gerhards. gh#maxmind/libmaxminddb
+ * Fix a race to set and read data in a field on the MMDB_s struct
+ (ipv4_start_node). gh#maxmind/libmaxminddb#153.
+ * Fix cases of invalid memory access when using
+ MMDB_get_entry_data_list(). This was introduced in 1.3.0 and occurred
+ when performing large lookups. gh#maxmind/libmaxminddb#153.
+
+- Update to version 1.3.0
+ * Perform fewer memory allocations in MMDB_get_entry_data_list(). This
+ significantly improves its performance. gh#maxmind/libmaxminddb#147.
+ * Fix mmdblookup's build epoch reporting on some systems. Big endian
+ systems with a 32-bit time_t no longer show a database build date of
+ 1970-01-01 00:00:00. Pull request by Rainer Jung. gh#maxmind/libmaxminddb#143.
+
+- Update to version 1.2.1
+ * Use autoconf to check the system's endianness rather than trying to do this
+ with compiler-defined macros like __BYTE_ORDER__. Apparently this didn't
+ work properly on a Sparc system. gh#maxmind/libmaxminddb#120.
+ * Several compiler warnings on Visual C++ were fixed. Pull request by Marcel
+ Raad. gh#maxmind/libmaxminddb#130.
+ * Fix segmentation faults found in MMDB_open() using afl-fuzz. This
+ occurred on corrupt databases that had a data pointer large enough to
+ cause an integer overflow when doing bound checking. Reported by Ryan
+ Whitworth. gh#maxmind/libmaxminddb#140.
+ * Add --disable-tests option to configure. Pull request by Fabrice
+ Fontaine. gh#maxmind/libmaxminddb#136.
+
-------------------------------------------------------------------
Tue Apr 12 13:48:56 UTC 2016 - p.drouand@gmail.com
diff --git a/libmaxminddb.spec b/libmaxminddb.spec
index 21b8fff..63aa778 100644
--- a/libmaxminddb.spec
+++ b/libmaxminddb.spec
@@ -1,7 +1,7 @@
#
# spec file for package libmaxminddb
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -16,19 +16,18 @@
#
-Name: libmaxminddb
%define lname libmaxminddb0
-Version: 1.2.0
+Name: libmaxminddb
+Version: 1.3.2
Release: 0
Summary: C library for the MaxMind DB file format
License: Apache-2.0
Group: Development/Libraries/C and C++
+URL: https://dev.maxmind.com/
Source: https://github.com/maxmind/libmaxminddb/releases/download/%{version}/%{name}-%{version}.tar.gz
-Url: http://dev.maxmind.com/
BuildRequires: fdupes
BuildRequires: gcc-c++
-BuildRequires: pkg-config
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig
%description
The libmaxminddb library provides a C library for reading MaxMind DB
@@ -37,11 +36,11 @@ custom binary format designed to facilitate fast lookups of IP
addresses while allowing for great flexibility in the type of
data associated with an address.
-%package -n %lname
+%package -n %{lname}
Summary: C library for the MaxMind DB file format
Group: System/Libraries
-%description -n %lname
+%description -n %{lname}
The libmaxminddb library provides a C library for reading MaxMind DB
files, including the GeoIP2 databases from MaxMind. This is a
custom binary format designed to facilitate fast lookups of IP
@@ -50,7 +49,7 @@ data associated with an address.
%package -n mmdblookup
Summary: An utility to look up an IP address in a MaxMind DB file
-Group: Productivity/Networking/Other
+Group: Productivity/Networking/Other
%description -n mmdblookup
The libmaxminddb library provides a C library for reading MaxMind DB
@@ -63,8 +62,8 @@ This package contains the mmdblookup binary.
%package devel
Summary: Development files for the MaxMind DB file format library
-Group: Development/Libraries/C and C++
-Requires: %lname = %version
+Group: Development/Libraries/C and C++
+Requires: %{lname} = %{version}
%description devel
The libmaxminddb library provides a C library for reading MaxMind DB
@@ -82,28 +81,29 @@ This package contains the development files for %{name}.
%configure --disable-static
make %{?_smp_mflags}
+%check
+make %{?_smp_mflags} check
+
%install
%make_install
-rm %buildroot/%_libdir/*.la
-%fdupes -s %buildroot/%_prefix
+find %{buildroot} -type f -name "*.la" -delete -print
+%fdupes -s %{buildroot}/%{_prefix}
-%post -n %lname -p /sbin/ldconfig
-%postun -n %lname -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
-%files -n %lname
-%defattr(-,root,root)
-%doc LICENSE
+%files -n %{lname}
+%license LICENSE
%{_libdir}/%{name}.so.*
%files -n mmdblookup
-%defattr(-,root,root)
%doc doc/mmdblookup.md
%{_bindir}/mmdblookup
%{_mandir}/man1/mmdblookup.*
%files devel
-%defattr(-,root,root)
%doc Changes.md NOTICE README.md doc/mmdblookup.md doc/libmaxminddb.md
+%license LICENSE
%{_includedir}/*
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc