Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libmaxminddb for openSUSE:Factory
checked in at 2021-01-15 19:44:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmaxminddb (Old)
and /work/SRC/openSUSE:Factory/.libmaxminddb.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmaxminddb"
Fri Jan 15 19:44:23 2021 rev:6 rq:862280 version:1.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmaxminddb/libmaxminddb.changes
2020-08-12 10:56:29.120742997 +0200
+++ /work/SRC/openSUSE:Factory/.libmaxminddb.new.28504/libmaxminddb.changes
2021-01-15 19:44:40.965883766 +0100
@@ -1,0 +2,6 @@
+Thu Jan 7 12:46:45 UTC 2021 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- libmaxminddb 1.5.0:
+ * build system changes for other platforms only
+
+-------------------------------------------------------------------
Old:
----
libmaxminddb-1.4.3.tar.gz
New:
----
libmaxminddb-1.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmaxminddb.spec ++++++
--- /var/tmp/diff_new_pack.K1N5Pn/_old 2021-01-15 19:44:41.477884528 +0100
+++ /var/tmp/diff_new_pack.K1N5Pn/_new 2021-01-15 19:44:41.481884534 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libmaxminddb
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define lname libmaxminddb0
Name: libmaxminddb
-Version: 1.4.3
+Version: 1.5.0
Release: 0
Summary: C library for the MaxMind DB file format
License: Apache-2.0
++++++ libmaxminddb-1.4.3.tar.gz -> libmaxminddb-1.5.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/CMakeLists.txt
new/libmaxminddb-1.5.0/CMakeLists.txt
--- old/libmaxminddb-1.4.3/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/libmaxminddb-1.5.0/CMakeLists.txt 2021-01-05 23:55:01.000000000
+0100
@@ -0,0 +1,95 @@
+cmake_minimum_required (VERSION 3.9)
+project(maxminddb
+ LANGUAGES C
+ VERSION 1.5.0
+)
+set(MAXMINDDB_SOVERSION 0.0.7)
+
+option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static
ones (.lib/.a)" OFF)
+option(BUILD_TESTING "Build test programs" ON)
+
+include(CheckTypeSize)
+check_type_size("unsigned __int128" UINT128)
+check_type_size("unsigned int __attribute__((mode(TI)))" UINT128_USING_MODE)
+if(HAVE_UINT128)
+ set(MMDB_UINT128_USING_MODE 0)
+ set(MMDB_UINT128_IS_BYTE_ARRAY 0)
+elseif(HAVE_UINT128_USING_MODE)
+ set(MMDB_UINT128_USING_MODE 1)
+ set(MMDB_UINT128_IS_BYTE_ARRAY 0)
+else()
+ set(MMDB_UINT128_USING_MODE 0)
+ set(MMDB_UINT128_IS_BYTE_ARRAY 1)
+endif()
+
+include (TestBigEndian)
+TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
+
+configure_file(${PROJECT_SOURCE_DIR}/include/maxminddb_config.h.cmake.in
+ ${PROJECT_SOURCE_DIR}/include/maxminddb_config.h)
+
+add_library(maxminddb
+ src/maxminddb.c
+ src/data-pool.c
+)
+add_library(maxminddb::maxminddb ALIAS maxminddb)
+
+set_target_properties(maxminddb PROPERTIES VERSION ${MAXMINDDB_SOVERSION})
+
+target_compile_definitions(maxminddb PUBLIC
PACKAGE_VERSION="${PROJECT_VERSION}")
+
+if(NOT IS_BIG_ENDIAN)
+ target_compile_definitions(maxminddb PRIVATE MMDB_LITTLE_ENDIAN=1)
+endif()
+
+if(MSVC)
+ target_compile_definitions(maxminddb PRIVATE _CRT_SECURE_NO_WARNINGS)
+endif()
+
+if(WIN32)
+ target_link_libraries(maxminddb ws2_32)
+endif()
+
+set(CMAKE_SHARED_LIBRARY_PREFIX lib)
+set(CMAKE_STATIC_LIBRARY_PREFIX lib)
+
+set(MAXMINDB_INCLUDE_DIR
+ .
+ include
+)
+
+target_include_directories(maxminddb PUBLIC
+ $<BUILD_INTERFACE:${MAXMINDB_INCLUDE_DIR}>
+ $<INSTALL_INTERFACE:include>
+)
+
+set(MAXMINDB_HEADERS
+ include/maxminddb.h
+ include/maxminddb_config.h
+)
+set_target_properties(maxminddb PROPERTIES PUBLIC_HEADER "${MAXMINDB_HEADERS}")
+
+install(TARGETS maxminddb
+ EXPORT maxminddb
+ ARCHIVE DESTINATION lib
+ PUBLIC_HEADER DESTINATION include/
+)
+
+# This is required to work with FetchContent
+install(EXPORT maxminddb
+ FILE maxminddb-config.cmake
+ NAMESPACE maxminddb::
+ DESTINATION lib/cmake/maxminddb)
+
+# We always want to build mmdblookup
+add_subdirectory(bin)
+
+if (BUILD_TESTING)
+ enable_testing()
+ add_subdirectory(t)
+endif()
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/Changes.md
new/libmaxminddb-1.5.0/Changes.md
--- old/libmaxminddb-1.4.3/Changes.md 2020-08-06 18:27:59.000000000 +0200
+++ new/libmaxminddb-1.5.0/Changes.md 2021-01-05 23:53:50.000000000 +0100
@@ -1,11 +1,19 @@
+## 1.5.0 - 2021-01-05
+
+* A CMake build script has been added for Windows builds. The Visual
+ Studio project files in `projects` are now considered deprecated and will
+ be removed in a future release.
+
+
## 1.4.3 - 2020-08-06
* On Windows, always call `CreateFileW` instead of `CreateFile`.
`CreateFile` could be mapped to `CreateFileA` and not work as expected.
Pull request by Sandu Liviu Catalin. GitHub #228.
* Fixed use of uninitialized memory in `dump_entry_data_list()` that could
- cause a heap buffer flow in `mmdblookup`. As part of this fix, most uses
- of `malloc` were replaced with `calloc`. Reported by azhou. GitHub #236.
+ cause a heap buffer overflow in `mmdblookup`. As part of this fix, most
+ uses of `malloc` were replaced with `calloc`. Reported by azhou. GitHub
+ #236.
## 1.4.2 - 2019-11-02
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/Makefile.am
new/libmaxminddb-1.5.0/Makefile.am
--- old/libmaxminddb-1.4.3/Makefile.am 2019-11-02 03:23:36.000000000 +0100
+++ new/libmaxminddb-1.5.0/Makefile.am 2021-01-05 23:49:16.000000000 +0100
@@ -16,7 +16,10 @@
t
endif
-EXTRA_DIST = doc Changes.md LICENSE NOTICE README.md projects/VS12
projects/VS12-tests
+EXTRA_DIST = doc Changes.md LICENSE NOTICE README.md projects/VS12
projects/VS12-tests \
+ CMakeLists.txt t/CMakeLists.txt bin/CMakeLists.txt \
+ include/maxminddb_config.h.cmake.in
+
dist-hook:
dev-bin/make-man-pages.pl $(distdir)
find $(distdir) -name '.git*' | xargs rm -fr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/Makefile.in
new/libmaxminddb-1.5.0/Makefile.in
--- old/libmaxminddb-1.4.3/Makefile.in 2020-08-06 18:28:15.000000000 +0200
+++ new/libmaxminddb-1.5.0/Makefile.in 2021-01-05 23:55:12.000000000 +0100
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -176,8 +176,8 @@
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+ config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -366,7 +366,10 @@
include_HEADERS = include/maxminddb.h
nodist_include_HEADERS = include/maxminddb_config.h
SUBDIRS = src $(am__append_1) $(am__append_2)
-EXTRA_DIST = doc Changes.md LICENSE NOTICE README.md projects/VS12
projects/VS12-tests
+EXTRA_DIST = doc Changes.md LICENSE NOTICE README.md projects/VS12
projects/VS12-tests \
+ CMakeLists.txt t/CMakeLists.txt bin/CMakeLists.txt \
+ include/maxminddb_config.h.cmake.in
+
man1_MANS = man/man1/*.1
man3_MANS = man/man3/*.3
all: config.h
@@ -755,6 +758,10 @@
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c
>$(distdir).tar.xz
$(am__post_remove_distdir)
+dist-zstd: distdir
+ tardir=$(distdir) && $(am__tar) | zstd -c
$${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+ $(am__post_remove_distdir)
+
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@@ -797,6 +804,8 @@
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
+ *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -981,7 +990,7 @@
am--refresh check check-am clean clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
+ dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
@@ -999,6 +1008,7 @@
.PRECIOUS: Makefile
+
dist-hook:
dev-bin/make-man-pages.pl $(distdir)
find $(distdir) -name '.git*' | xargs rm -fr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/README.md
new/libmaxminddb-1.5.0/README.md
--- old/libmaxminddb-1.4.3/README.md 2019-11-02 03:23:36.000000000 +0100
+++ new/libmaxminddb-1.5.0/README.md 2020-11-05 23:38:03.000000000 +0100
@@ -70,11 +70,15 @@
After cloning, run `./bootstrap` from the `libmaxminddb` directory and then
follow the instructions for installing from a named release tarball as
described above.
-## On Windows via Visual Studio 2013+
+## Using CMake
-We provide a Visual Studio solution in `projects\VS12`. This can be used to
-build both the the library and the tests. Please see the `README.md` file in
-the same directory for more information.
+We provide a CMake build script. This is primarily targeted at Windows users,
+but it can be used in other circumstances where the Autotools script does not
+work.
+
+ $ cmake --build .
+ $ ctest -V .
+ $ cmake --build . --target install
## On Ubuntu via PPA
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/aclocal.m4
new/libmaxminddb-1.5.0/aclocal.m4
--- old/libmaxminddb-1.4.3/aclocal.m4 2020-08-06 18:28:14.000000000 +0200
+++ new/libmaxminddb-1.5.0/aclocal.m4 2021-01-05 23:55:11.000000000 +0100
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9074,9 +9074,9 @@
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
dnl Copyright ?? 2004 Scott James Remnant <sc...@netsplit.com>.
dnl Copyright ?? 2012-2015 Dan Nicholson <dbn.li...@gmail.com>
dnl
@@ -9117,7 +9117,7 @@
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but
]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -9218,7 +9218,7 @@
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -9228,11 +9228,11 @@
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -9249,7 +9249,7 @@
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -9350,7 +9350,7 @@
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9365,7 +9365,7 @@
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.1], [],
+m4_if([$1], [1.16.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -9381,14 +9381,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9440,7 +9440,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9471,7 +9471,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9662,7 +9662,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9701,7 +9701,9 @@
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE="gmake" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
@@ -9728,7 +9730,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9925,7 +9927,7 @@
done
echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9946,7 +9948,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9967,7 +9969,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10010,7 +10012,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10049,7 +10051,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10078,7 +10080,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10125,7 +10127,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10144,7 +10146,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10225,7 +10227,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10285,7 +10287,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10313,7 +10315,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10332,7 +10334,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/bin/CMakeLists.txt
new/libmaxminddb-1.5.0/bin/CMakeLists.txt
--- old/libmaxminddb-1.4.3/bin/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/libmaxminddb-1.5.0/bin/CMakeLists.txt 2021-01-05 23:49:16.000000000
+0100
@@ -0,0 +1,13 @@
+# getopt is required by mmdblookup which is not available by default on Windows
+if(NOT WIN32)
+ add_executable(mmdblookup
+ mmdblookup.c
+ )
+
+ target_link_libraries(mmdblookup maxminddb pthread)
+
+ install(
+ TARGETS mmdblookup
+ RUNTIME DESTINATION bin
+ )
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/bin/Makefile.in
new/libmaxminddb-1.5.0/bin/Makefile.in
--- old/libmaxminddb-1.4.3/bin/Makefile.in 2020-08-06 18:28:15.000000000
+0200
+++ new/libmaxminddb-1.5.0/bin/Makefile.in 2021-01-05 23:55:13.000000000
+0100
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/compile
new/libmaxminddb-1.5.0/compile
--- old/libmaxminddb-1.4.3/compile 2020-08-06 18:28:15.000000000 +0200
+++ new/libmaxminddb-1.5.0/compile 2021-01-05 23:55:12.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/configure
new/libmaxminddb-1.5.0/configure
--- old/libmaxminddb-1.4.3/configure 2020-08-06 18:28:15.000000000 +0200
+++ new/libmaxminddb-1.5.0/configure 2021-01-05 23:55:12.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libmaxminddb 1.4.3.
+# Generated by GNU Autoconf 2.69 for libmaxminddb 1.5.0.
#
# Report bugs to <supp...@maxmind.com>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libmaxminddb'
PACKAGE_TARNAME='libmaxminddb'
-PACKAGE_VERSION='1.4.3'
-PACKAGE_STRING='libmaxminddb 1.4.3'
+PACKAGE_VERSION='1.5.0'
+PACKAGE_STRING='libmaxminddb 1.5.0'
PACKAGE_BUGREPORT='supp...@maxmind.com'
PACKAGE_URL=''
@@ -1344,7 +1344,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libmaxminddb 1.4.3 to adapt to many kinds of systems.
+\`configure' configures libmaxminddb 1.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1415,7 +1415,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libmaxminddb 1.4.3:";;
+ short | recursive ) echo "Configuration of libmaxminddb 1.5.0:";;
esac
cat <<\_ACEOF
@@ -1535,7 +1535,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libmaxminddb configure 1.4.3
+libmaxminddb configure 1.5.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2012,7 +2012,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libmaxminddb $as_me 1.4.3, which was
+It was created by libmaxminddb $as_me 1.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -12015,7 +12015,7 @@
# Define the identity of the package.
PACKAGE='libmaxminddb'
- VERSION='1.4.3'
+ VERSION='1.5.0'
cat >>confdefs.h <<_ACEOF
@@ -13866,7 +13866,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libmaxminddb $as_me 1.4.3, which was
+This file was extended by libmaxminddb $as_me 1.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13932,7 +13932,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libmaxminddb config.status 1.4.3
+libmaxminddb config.status 1.5.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -15572,7 +15572,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/configure.ac
new/libmaxminddb-1.5.0/configure.ac
--- old/libmaxminddb-1.4.3/configure.ac 2020-08-06 18:28:11.000000000 +0200
+++ new/libmaxminddb-1.5.0/configure.ac 2021-01-05 23:55:01.000000000 +0100
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
-AC_INIT([libmaxminddb], [1.4.3], [supp...@maxmind.com])
+AC_INIT([libmaxminddb], [1.5.0], [supp...@maxmind.com])
AC_CONFIG_SRCDIR([include/maxminddb.h])
AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/depcomp
new/libmaxminddb-1.5.0/depcomp
--- old/libmaxminddb-1.4.3/depcomp 2020-08-06 18:28:15.000000000 +0200
+++ new/libmaxminddb-1.5.0/depcomp 2021-01-05 23:55:13.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/include/maxminddb.h
new/libmaxminddb-1.5.0/include/maxminddb.h
--- old/libmaxminddb-1.4.3/include/maxminddb.h 2020-08-06 18:28:11.000000000
+0200
+++ new/libmaxminddb-1.5.0/include/maxminddb.h 2021-01-05 23:55:01.000000000
+0100
@@ -28,7 +28,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
/* libmaxminddb package version from configure */
-#define PACKAGE_VERSION "1.4.3"
+#define PACKAGE_VERSION "1.5.0"
typedef ADDRESS_FAMILY sa_family_t;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libmaxminddb-1.4.3/include/maxminddb_config.h.cmake.in
new/libmaxminddb-1.5.0/include/maxminddb_config.h.cmake.in
--- old/libmaxminddb-1.4.3/include/maxminddb_config.h.cmake.in 1970-01-01
01:00:00.000000000 +0100
+++ new/libmaxminddb-1.5.0/include/maxminddb_config.h.cmake.in 2020-11-05
23:38:03.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef MAXMINDDB_CONFIG_H
+#define MAXMINDDB_CONFIG_H
+
+#ifndef MMDB_UINT128_USING_MODE
+/* Define as 1 if we use unsigned int __atribute__ ((__mode__(TI))) for
uint128 values */
+#cmakedefine MMDB_UINT128_USING_MODE @MMDB_UINT128_USING_MODE@
+#endif
+
+#ifndef MMDB_UINT128_IS_BYTE_ARRAY
+/* Define as 1 if we don't have an unsigned __int128 type */
+#cmakedefine MMDB_UINT128_IS_BYTE_ARRAY @MMDB_UINT128_IS_BYTE_ARRAY@
+#endif
+
+#endif /* MAXMINDDB_CONFIG_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/include/maxminddb_config.h.in
new/libmaxminddb-1.5.0/include/maxminddb_config.h.in
--- old/libmaxminddb-1.4.3/include/maxminddb_config.h.in 2019-01-25
00:58:00.000000000 +0100
+++ new/libmaxminddb-1.5.0/include/maxminddb_config.h.in 2020-11-05
23:38:03.000000000 +0100
@@ -2,7 +2,7 @@
#define MAXMINDDB_CONFIG_H
#ifndef MMDB_UINT128_USING_MODE
-/* Define as 1 if we we use unsigned int __atribute__ ((__mode__(TI))) for
uint128 values */
+/* Define as 1 if we use unsigned int __atribute__ ((__mode__(TI))) for
uint128 values */
#define MMDB_UINT128_USING_MODE 0
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/install-sh
new/libmaxminddb-1.5.0/install-sh
--- old/libmaxminddb-1.4.3/install-sh 2020-08-06 18:28:15.000000000 +0200
+++ new/libmaxminddb-1.5.0/install-sh 2021-01-05 23:55:12.000000000 +0100
@@ -451,7 +451,18 @@
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask &&
+ { test -z "$stripcmd" || {
+ # Create $dsttmp read-write so that cp doesn't create it read-only,
+ # which would cause strip to fail.
+ if test -z "$doit"; then
+ : >"$dsttmp" # No need to fork-exec 'touch'.
+ else
+ $doit touch "$dsttmp"
+ fi
+ }
+ } &&
+ $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/man/man1/mmdblookup.1
new/libmaxminddb-1.5.0/man/man1/mmdblookup.1
--- old/libmaxminddb-1.4.3/man/man1/mmdblookup.1 2020-08-06
18:28:27.000000000 +0200
+++ new/libmaxminddb-1.5.0/man/man1/mmdblookup.1 2021-01-05
23:55:26.000000000 +0100
@@ -1,10 +1,10 @@
-.\" Automatically generated by Pandoc 2.5
+.\" Automatically generated by Pandoc 2.9.2.1
.\"
.TH "mmdblookup" "1" "" "" ""
.hy
.SH NAME
.PP
-mmdblookup \- a utility to look up an IP address in a MaxMind DB file
+mmdblookup - a utility to look up an IP address in a MaxMind DB file
.SH SYNOPSIS
.PP
mmdblookup \[en]file [FILE PATH] \[en]ip [IP ADDRESS] [DATA PATH]
@@ -12,8 +12,8 @@
.PP
\f[C]mmdblookup\f[R] looks up an IP address in the specified MaxMind DB
file.
-The record for the IP address is displayed in a JSON\-like structure
-with type annotations.
+The record for the IP address is displayed in a JSON-like structure with
+type annotations.
.PP
If an IP\[cq]s data entry resolves to a map or array, you can provide a
lookup path to only show part of that data.
@@ -37,7 +37,7 @@
.IP "" 4
.nf
\f[C]
-mmdblookup \-\-file ... \-\-ip ... names en
+mmdblookup --file ... --ip ... names en
\f[R]
.fi
.PP
@@ -45,7 +45,7 @@
.IP "" 4
.nf
\f[C]
-mmdblookup \-\-file ... \-\-ip ... cities 1
+mmdblookup --file ... --ip ... cities 1
\f[R]
.fi
.PP
@@ -57,23 +57,23 @@
.PP
This application accepts the following options:
.TP
-.B \-f, \[en]file
+-f, \[en]file
The path to the MMDB file.
Required.
.TP
-.B \-i, \[en]ip
+-i, \[en]ip
The IP address to look up.
Required.
.TP
-.B \-v, \[en]verbose
+-v, \[en]verbose
Turns on verbose output.
Specifically, this causes this application to output the database
metadata.
.TP
-.B \[en]version
+\[en]version
Print the program\[cq]s version number and exit.
.TP
-.B \-h, \-?, \[en]help
+-h, -?, \[en]help
Show usage information.
.SH BUG REPORTS AND PULL REQUESTS
.PP
@@ -87,7 +87,7 @@
Dave Rolsky (drolsky\[at]maxmind.com).
.SH COPYRIGHT AND LICENSE
.PP
-Copyright 2013\-2014 MaxMind, Inc.
+Copyright 2013-2014 MaxMind, Inc.
.PP
Licensed under the Apache License, Version 2.0 (the \[lq]License\[rq]);
you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@
.IP "" 4
.nf
\f[C]
-http://www.apache.org/licenses/LICENSE\-2.0
+http://www.apache.org/licenses/LICENSE-2.0
\f[R]
.fi
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/man/man3/libmaxminddb.3
new/libmaxminddb-1.5.0/man/man3/libmaxminddb.3
--- old/libmaxminddb-1.4.3/man/man3/libmaxminddb.3 2020-08-06
18:28:27.000000000 +0200
+++ new/libmaxminddb-1.5.0/man/man3/libmaxminddb.3 2021-01-05
23:55:26.000000000 +0100
@@ -1,10 +1,10 @@
-.\" Automatically generated by Pandoc 2.5
+.\" Automatically generated by Pandoc 2.9.2.1
.\"
.TH "libmaxminddb" "3" "" "" ""
.hy
.SH NAME
.PP
-libmaxminddb \- a library for working with MaxMind DB files
+libmaxminddb - a library for working with MaxMind DB files
.SH SYNOPSIS
.IP "" 4
.nf
@@ -98,7 +98,7 @@
.PP
The libmaxminddb library provides functions for working MaxMind DB
files.
-See http://maxmind.github.io/MaxMind\-DB/ for the MaxMind DB format
+See http://maxmind.github.io/MaxMind-DB/ for the MaxMind DB format
specification.
The database and results are all represented by different data
structures.
@@ -147,13 +147,13 @@
\f[R]
.fi
.IP \[bu] 2
-\f[C]uint32_t flags\f[R] \- the flags this database was opened with.
+\f[C]uint32_t flags\f[R] - the flags this database was opened with.
See the \f[C]MMDB_open()\f[R] documentation for more details.
.IP \[bu] 2
-\f[C]const char *filename\f[R] \- the name of the file which was opened,
+\f[C]const char *filename\f[R] - the name of the file which was opened,
as passed to \f[C]MMDB_open()\f[R].
.IP \[bu] 2
-\f[C]MMDB_metadata_s metadata\f[R] \- the metadata for the database.
+\f[C]MMDB_metadata_s metadata\f[R] - the metadata for the database.
.SS \f[C]MMDB_metadata_s\f[R] and \f[C]MMDB_description_s\f[R]
.PP
This structure can be retrieved from the \f[C]MMDB_s\f[R] structure.
@@ -188,7 +188,7 @@
\f[R]
.fi
.PP
-These structures should be mostly self\-explanatory.
+These structures should be mostly self-explanatory.
.PP
The \f[C]ip_version\f[R] member should always be \f[C]4\f[R] or
\f[C]6\f[R].
@@ -226,7 +226,7 @@
part of the \f[C]1.1.0.0/16\f[R] subnet.
.PP
If the database is an IPv6 database, the returned netmask is always an
-IPv6 prefix length (from 0\-128), even if that database \f[I]also\f[R]
+IPv6 prefix length (from 0-128), even if that database \f[I]also\f[R]
contains IPv4 networks.
If you look up an IPv4 address and would like to turn the netmask into
an IPv4 netmask value, you can simply subtract \f[C]96\f[R] from the
@@ -288,10 +288,10 @@
.PP
The \f[C]type\f[R] member can be compared to one of the
\f[C]MMDB_DATA_TYPE_*\f[R] macros.
-.SS 128\-bit Integers
+.SS 128-bit Integers
.PP
The handling of \f[C]uint128\f[R] data depends on how your platform
-supports 128\-bit integers, if it does so at all.
+supports 128-bit integers, if it does so at all.
With GCC 4.4 and 4.5 we can write
\f[C]unsigned int __attribute__ ((__mode__ (TI)))\f[R].
With newer versions of GCC (4.6+) and clang (3.2+) we can simply write
@@ -404,18 +404,18 @@
.PP
The two record types will take one of the following values:
.IP \[bu] 2
-\f[C]MMDB_RECORD_TYPE_SEARCH_NODE\f[R] \- The record points to the next
+\f[C]MMDB_RECORD_TYPE_SEARCH_NODE\f[R] - The record points to the next
search node.
.IP \[bu] 2
-\f[C]MMDB_RECORD_TYPE_EMPTY\f[R] \- The record is a placeholder that
+\f[C]MMDB_RECORD_TYPE_EMPTY\f[R] - The record is a placeholder that
indicates there is no data for the IP address.
The search should end here.
.IP \[bu] 2
-\f[C]MMDB_RECORD_TYPE_DATA\f[R] \- The record is for data in the data
+\f[C]MMDB_RECORD_TYPE_DATA\f[R] - The record is for data in the data
section of the database.
Use the entry for the record when looking up the data for the record.
.IP \[bu] 2
-\f[C]MMDB_RECORD_TYPE_INVALID\f[R] \- The record is invalid.
+\f[C]MMDB_RECORD_TYPE_INVALID\f[R] - The record is invalid.
Either an invalid node was looked up or the database is corrupt.
.PP
The \f[C]MMDB_entry_s\f[R] for the record is only valid if the type is
@@ -427,43 +427,43 @@
This library returns (or populates) status codes for many functions.
These status codes are:
.IP \[bu] 2
-\f[C]MMDB_SUCCESS\f[R] \- everything worked
+\f[C]MMDB_SUCCESS\f[R] - everything worked
.IP \[bu] 2
-\f[C]MMDB_FILE_OPEN_ERROR\f[R] \- there was an error trying to open the
+\f[C]MMDB_FILE_OPEN_ERROR\f[R] - there was an error trying to open the
MaxMind DB file.
.IP \[bu] 2
-\f[C]MMDB_IO_ERROR\f[R] \- an IO operation failed.
+\f[C]MMDB_IO_ERROR\f[R] - an IO operation failed.
Check \f[C]errno\f[R] for more details.
.IP \[bu] 2
-\f[C]MMDB_CORRUPT_SEARCH_TREE_ERROR\f[R] \- looking up an IP address in
+\f[C]MMDB_CORRUPT_SEARCH_TREE_ERROR\f[R] - looking up an IP address in
the search tree gave us an impossible result.
The database is damaged or was generated incorrectly or there is a bug
in the libmaxminddb code.
.IP \[bu] 2
-\f[C]MMDB_INVALID_METADATA_ERROR\f[R] \- something in the database is
+\f[C]MMDB_INVALID_METADATA_ERROR\f[R] - something in the database is
wrong.
This includes missing metadata keys as well as impossible values (like
an \f[C]ip_version\f[R] of 7).
.IP \[bu] 2
-\f[C]MMDB_UNKNOWN_DATABASE_FORMAT_ERROR\f[R] \- The database metadata
+\f[C]MMDB_UNKNOWN_DATABASE_FORMAT_ERROR\f[R] - The database metadata
indicates that it\[cq]s major version is not 2.
This library can only handle major version 2.
.IP \[bu] 2
-\f[C]MMDB_OUT_OF_MEMORY_ERROR\f[R] \- a memory allocation call
+\f[C]MMDB_OUT_OF_MEMORY_ERROR\f[R] - a memory allocation call
(\f[C]malloc\f[R], etc.) failed.
.IP \[bu] 2
-\f[C]MMDB_INVALID_DATA_ERROR\f[R] \- an entry in the data section
+\f[C]MMDB_INVALID_DATA_ERROR\f[R] - an entry in the data section
contains invalid data.
For example, a \f[C]uint16\f[R] field is claiming to be more than 2
bytes long.
The database is probably damaged or was generated incorrectly.
.IP \[bu] 2
-\f[C]MMDB_INVALID_LOOKUP_PATH_ERROR\f[R] \- The lookup path passed to
+\f[C]MMDB_INVALID_LOOKUP_PATH_ERROR\f[R] - The lookup path passed to
\f[C]MMDB_get_value\f[R], \f[C]MMDB_vget_value\f[R], or
\f[C]MMDB_aget_value\f[R] contains an array offset that is larger than
LONG_MAX or smaller than LONG_MIN.
.IP \[bu] 2
-\f[C]MMDB_LOOKUP_PATH_DOES_NOT_MATCH_DATA_ERROR\f[R] \- The lookup path
+\f[C]MMDB_LOOKUP_PATH_DOES_NOT_MATCH_DATA_ERROR\f[R] - The lookup path
passed to \f[C]MMDB_get_value\f[R],\f[C]MMDB_vget_value\f[R], or
\f[C]MMDB_aget_value\f[R] does not match the data structure for the
entry.
@@ -514,22 +514,22 @@
\f[R]
.fi
.PP
-\f[C]filename\f[R] must be encoded as UTF\-8 on Windows.
+\f[C]filename\f[R] must be encoded as UTF-8 on Windows.
.PP
The \f[C]MMDB_s\f[R] structure you pass in can be on the stack or
allocated from the heap.
-However, if the open is successful it will contain heap\-allocated data,
+However, if the open is successful it will contain heap-allocated data,
so you need to close it with \f[C]MMDB_close()\f[R].
If the status returned is not \f[C]MMDB_SUCCESS\f[R] then this library
makes sure that all allocated memory is freed before returning.
.PP
The flags currently provided are:
.IP \[bu] 2
-\f[C]MMDB_MODE_MMAP\f[R] \- open the database with \f[C]mmap()\f[R].
+\f[C]MMDB_MODE_MMAP\f[R] - open the database with \f[C]mmap()\f[R].
.PP
Passing in other values for \f[C]flags\f[R] may yield unpredictable
results.
-In the future we may add additional flags that you can bitwise\-or
+In the future we may add additional flags that you can bitwise-or
together with the mode, as well as additional modes.
.PP
You can also pass \f[C]0\f[R] as the \f[C]flags\f[R] value in which case
@@ -562,7 +562,7 @@
.fi
.PP
This function looks up an IP address that is passed in as a
-null\-terminated string.
+null-terminated string.
Internally it calls \f[C]getaddrinfo()\f[R] to resolve the address into
a binary form.
It then calls \f[C]MMDB_lookup_sockaddr()\f[R] to look the address up in
@@ -598,7 +598,7 @@
contains data for both IPv4 and IPv6 addresses.
The IPv4 address will be looked up as `::xxx.xxx.xxx.xxx' rather than
being remapped to the \f[C]::ffff:xxx.xxx.xxx.xxx\f[R] block allocated
-for IPv4\-mapped IPv6 addresses.
+for IPv4-mapped IPv6 addresses.
.PP
If you pass an IPv6 address to a database with only IPv4 data then the
\f[C]found_entry\f[R] member will be false, but the \f[C]mmdb_error\f[R]
@@ -624,7 +624,7 @@
\f[C]
int mmdb_error;
MMDB_lookup_result_s result =
- MMDB_lookup_sockaddr(&mmdb, address\->ai_addr, &mmdb_error);
+ MMDB_lookup_sockaddr(&mmdb, address->ai_addr, &mmdb_error);
if (MMDB_SUCCESS != mmdb_error) { ... }
if (result.found_entry) { ... }
@@ -672,11 +672,11 @@
The final parameter is a lookup path.
The path consists of a set of strings representing either map keys (e.g,
\[lq]city\[rq]) or array indexes (e.g., \[lq]0\[rq], \[lq]1\[rq],
-\[lq]\-1\[rq]) to use in the lookup.
+\[lq]-1\[rq]) to use in the lookup.
.PP
Negative array indexes will be treated as an offset from the end of the
array.
-For instance, \[lq]\-1\[rq] refers to the last element of the array.
+For instance, \[lq]-1\[rq] refers to the last element of the array.
.PP
The lookup path allows you to navigate a complex data structure.
For example, given this data:
@@ -698,7 +698,7 @@
.nf
\f[C]
MMDB_lookup_result_s result =
- MMDB_lookup_sockaddr(&mmdb, address\->ai_addr, &mmdb_error);
+ MMDB_lookup_sockaddr(&mmdb, address->ai_addr, &mmdb_error);
MMDB_entry_data_s entry_data;
int status =
MMDB_get_value(&result.entry, &entry_data,
@@ -751,7 +751,7 @@
.nf
\f[C]
MMDB_lookup_result_s result =
- MMDB_lookup_sockaddr(&mmdb, address\->ai_addr, &mmdb_error);
+ MMDB_lookup_sockaddr(&mmdb, address->ai_addr, &mmdb_error);
MMDB_entry_data_list_s *entry_data_list, *first;
int status =
MMDB_get_entry_data_list(&result.entry, &entry_data_list);
@@ -760,12 +760,12 @@
first = entry_data_list;
while (1) {
- MMDB_entry_data_list_s *next = entry_data_list = entry_data_list\->next;
+ MMDB_entry_data_list_s *next = entry_data_list = entry_data_list->next;
if (NULL == next) {
break;
}
- switch (next\->entry_data.type) {
+ switch (next->entry_data.type) {
case MMDB_DATA_TYPE_MAP: { ... }
case MMDB_DATA_TYPE_UTF8_STRING: { ... }
...
@@ -779,7 +779,7 @@
.PP
It\[cq]s up to you to interpret the \f[C]entry_data_list\f[R] data
structure.
-The list is linked in a depth\-first traversal.
+The list is linked in a depth-first traversal.
Let\[cq]s use this structure as an example:
.IP "" 4
.nf
@@ -796,27 +796,27 @@
.PP
The list will consist of the following items:
.IP " 1." 4
-MAP \- top level map
+MAP - top level map
.IP " 2." 4
-UTF8_STRING \- \[lq]names\[rq] key
+UTF8_STRING - \[lq]names\[rq] key
.IP " 3." 4
-MAP \- map for \[lq]names\[rq] key
+MAP - map for \[lq]names\[rq] key
.IP " 4." 4
-UTF8_STRING \- \[lq]en\[rq] key
+UTF8_STRING - \[lq]en\[rq] key
.IP " 5." 4
-UTF8_STRING \- value for \[lq]en\[rq] key
+UTF8_STRING - value for \[lq]en\[rq] key
.IP " 6." 4
-UTF8_STRING \- \[lq]de\[rq] key
+UTF8_STRING - \[lq]de\[rq] key
.IP " 7." 4
-UTF8_STRING \- value for \[lq]de\[rq] key
+UTF8_STRING - value for \[lq]de\[rq] key
.IP " 8." 4
-UTF8_STRING \- \[lq]cities\[rq] key
+UTF8_STRING - \[lq]cities\[rq] key
.IP " 9." 4
-ARRAY \- value for \[lq]cities\[rq] key
+ARRAY - value for \[lq]cities\[rq] key
.IP "10." 4
-UTF8_STRING \- array[0]
+UTF8_STRING - array[0]
.IP "11." 4
-UTF8_STRING \- array[1]
+UTF8_STRING - array[1]
.PP
The return value of the function is a status code as defined above.
.SS \f[C]MMDB_free_entry_data_list()\f[R]
@@ -883,7 +883,7 @@
\f[C]open_memstream()\f[R] you can use that to capture the output as a
string.
.PP
-The output is formatted in a JSON\-ish fashion, but values are marked
+The output is formatted in a JSON-ish fashion, but values are marked
with their data type (except for maps and arrays which are shown with
\[lq]{}\[rq] and \[lq][]\[rq] respectively).
.PP
@@ -948,7 +948,7 @@
int status = MMDB_open(filename, MMDB_MODE_MMAP, &mmdb);
if (MMDB_SUCCESS != status) {
- fprintf(stderr, \[dq]\[rs]n Can\[aq]t open %s \- %s\[rs]n\[dq],
+ fprintf(stderr, \[dq]\[rs]n Can\[aq]t open %s - %s\[rs]n\[dq],
filename, MMDB_strerror(status));
if (MMDB_IO_ERROR == status) {
@@ -963,7 +963,7 @@
if (0 != gai_error) {
fprintf(stderr,
- \[dq]\[rs]n Error from getaddrinfo for %s \-
%s\[rs]n\[rs]n\[dq],
+ \[dq]\[rs]n Error from getaddrinfo for %s -
%s\[rs]n\[rs]n\[dq],
ip_address, gai_strerror(gai_error));
exit(2);
}
@@ -985,7 +985,7 @@
if (MMDB_SUCCESS != status) {
fprintf(
stderr,
- \[dq]Got an error looking up the entry data \- %s\[rs]n\[dq],
+ \[dq]Got an error looking up the entry data - %s\[rs]n\[dq],
MMDB_strerror(status));
exit_code = 4;
goto end;
@@ -1011,7 +1011,7 @@
.fi
.SH THREAD SAFETY
.PP
-This library is thread safe when compiled and linked with a thread\-safe
+This library is thread safe when compiled and linked with a thread-safe
\f[C]malloc\f[R] and \f[C]free\f[R] implementation.
.SH INSTALLATION AND SOURCE
.PP
@@ -1033,7 +1033,7 @@
Dave Rolsky (drolsky\[at]maxmind.com).
.SH COPYRIGHT AND LICENSE
.PP
-Copyright 2013\-2014 MaxMind, Inc.
+Copyright 2013-2014 MaxMind, Inc.
.PP
Licensed under the Apache License, Version 2.0 (the \[lq]License\[rq]);
you may not use this file except in compliance with the License.
@@ -1041,7 +1041,7 @@
.IP "" 4
.nf
\f[C]
-http://www.apache.org/licenses/LICENSE\-2.0
+http://www.apache.org/licenses/LICENSE-2.0
\f[R]
.fi
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/missing
new/libmaxminddb-1.5.0/missing
--- old/libmaxminddb-1.4.3/missing 2020-08-06 18:28:15.000000000 +0200
+++ new/libmaxminddb-1.5.0/missing 2021-01-05 23:55:12.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/projects/VS12/README.md
new/libmaxminddb-1.5.0/projects/VS12/README.md
--- old/libmaxminddb-1.4.3/projects/VS12/README.md 2019-01-25
00:58:00.000000000 +0100
+++ new/libmaxminddb-1.5.0/projects/VS12/README.md 2020-11-05
23:38:03.000000000 +0100
@@ -1,3 +1,8 @@
+# Deprecated
+
+*These files are deprecated and will be removed in a future release.
+Please use CMake instead.*
+
# Project Notes
DO NOT modify project settings for each configuration and/or platform
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/src/Makefile.in
new/libmaxminddb-1.5.0/src/Makefile.in
--- old/libmaxminddb-1.4.3/src/Makefile.in 2020-08-06 18:28:15.000000000
+0200
+++ new/libmaxminddb-1.5.0/src/Makefile.in 2021-01-05 23:55:13.000000000
+0100
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/t/CMakeLists.txt
new/libmaxminddb-1.5.0/t/CMakeLists.txt
--- old/libmaxminddb-1.4.3/t/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/libmaxminddb-1.5.0/t/CMakeLists.txt 2021-01-05 23:49:16.000000000
+0100
@@ -0,0 +1,46 @@
+add_library(tap
+ libtap/tap.c
+)
+
+# test programs
+set(TEST_TARGET_NAMES
+ bad_pointers_t
+ basic_lookup_t
+ data_entry_list_t
+ data-pool-t
+ data_types_t
+ dump_t
+ get_value_pointer_bug_t
+ get_value_t
+ ipv4_start_cache_t
+ ipv6_lookup_in_ipv4_t
+ metadata_pointers_t
+ metadata_t
+ no_map_get_value_t
+ read_node_t
+ version_t
+)
+
+if(UNIX) # or if (NOT WIN32)
+ list(APPEND TEST_TARGET_NAMES
+ bad_databases_t
+ threads_t
+ )
+ find_package(Threads)
+endif()
+
+foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
+ add_executable(${TEST_TARGET_NAME} ${TEST_TARGET_NAME}.c
maxminddb_test_helper.c)
+ target_include_directories(${TEST_TARGET_NAME} PRIVATE ../src)
+ target_link_libraries(${TEST_TARGET_NAME} maxminddb tap)
+
+ if(UNIX)
+ target_link_libraries(${TEST_TARGET_NAME} m)
+ endif()
+
+ if (UNIX)
+ target_link_libraries(${TEST_TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
+ endif()
+
+ add_test(${TEST_TARGET_NAME} ${TEST_TARGET_NAME})
+endforeach()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/t/Makefile.in
new/libmaxminddb-1.5.0/t/Makefile.in
--- old/libmaxminddb-1.4.3/t/Makefile.in 2020-08-06 18:28:15.000000000
+0200
+++ new/libmaxminddb-1.5.0/t/Makefile.in 2021-01-05 23:55:13.000000000
+0100
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/t/bad_databases_t.c
new/libmaxminddb-1.5.0/t/bad_databases_t.c
--- old/libmaxminddb-1.4.3/t/bad_databases_t.c 2019-01-25 00:58:00.000000000
+0100
+++ new/libmaxminddb-1.5.0/t/bad_databases_t.c 2020-11-05 23:38:03.000000000
+0100
@@ -48,7 +48,7 @@
{
char *test_db_dir;
#ifdef _WIN32
- test_db_dir = "./t/maxmind-db/bad-data";
+ test_db_dir = "../t/maxmind-db/bad-data";
#else
char cwd[500];
char *UNUSED(tmp) = getcwd(cwd, 500);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmaxminddb-1.4.3/t/maxminddb_test_helper.c
new/libmaxminddb-1.5.0/t/maxminddb_test_helper.c
--- old/libmaxminddb-1.4.3/t/maxminddb_test_helper.c 2020-08-06
18:26:30.000000000 +0200
+++ new/libmaxminddb-1.5.0/t/maxminddb_test_helper.c 2020-11-05
23:38:03.000000000 +0100
@@ -42,13 +42,13 @@
const char *test_database_path(const char *filename)
{
- char cwd[500];
- char *UNUSED(tmp) = getcwd(cwd, 500);
-
char *test_db_dir;
#ifdef _WIN32
- test_db_dir = "./t/maxmind-db/test-data";
+ test_db_dir = "../t/maxmind-db/test-data";
#else
+ char cwd[500];
+ char *UNUSED(tmp) = getcwd(cwd, 500);
+
if (strcmp(basename(cwd), "t") == 0) {
test_db_dir = "./maxmind-db/test-data";
} else {
