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-05-10 15:36:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmaxminddb (Old) and /work/SRC/openSUSE:Factory/.libmaxminddb.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmaxminddb" Mon May 10 15:36:07 2021 rev:8 rq:889725 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libmaxminddb/libmaxminddb.changes 2021-03-11 20:08:14.220268777 +0100 +++ /work/SRC/openSUSE:Factory/.libmaxminddb.new.2988/libmaxminddb.changes 2021-05-10 15:38:06.073871405 +0200 @@ -1,0 +2,6 @@ +Fri Apr 30 09:15:18 UTC 2021 - Andreas Stieger <[email protected]> + +- libmaxminddb 1.6.0: + * CMake build system fixes, not in use in this package + +------------------------------------------------------------------- Old: ---- libmaxminddb-1.5.2.tar.gz New: ---- libmaxminddb-1.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmaxminddb.spec ++++++ --- /var/tmp/diff_new_pack.vSwjSb/_old 2021-05-10 15:38:06.473869822 +0200 +++ /var/tmp/diff_new_pack.vSwjSb/_new 2021-05-10 15:38:06.477869806 +0200 @@ -18,7 +18,7 @@ %define lname libmaxminddb0 Name: libmaxminddb -Version: 1.5.2 +Version: 1.6.0 Release: 0 Summary: C library for the MaxMind DB file format License: Apache-2.0 @@ -76,10 +76,10 @@ %build %configure --disable-static -make %{?_smp_mflags} +%make_build %check -make %{?_smp_mflags} check +%make_build check %install %make_install @@ -94,6 +94,7 @@ %{_libdir}/%{name}.so.* %files -n mmdblookup +%license LICENSE %doc doc/mmdblookup.md %{_bindir}/mmdblookup %{_mandir}/man1/mmdblookup.* ++++++ libmaxminddb-1.5.2.tar.gz -> libmaxminddb-1.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/CMakeLists.txt new/libmaxminddb-1.6.0/CMakeLists.txt --- old/libmaxminddb-1.5.2/CMakeLists.txt 2021-02-18 18:04:22.000000000 +0100 +++ new/libmaxminddb-1.6.0/CMakeLists.txt 2021-04-29 19:10:31.000000000 +0200 @@ -1,9 +1,11 @@ cmake_minimum_required (VERSION 3.9) project(maxminddb LANGUAGES C - VERSION 1.5.2 + VERSION 1.6.0 ) set(MAXMINDDB_SOVERSION 0.0.7) +set(CMAKE_C_STANDARD 99) +set(CMAKE_C_EXTENSIONS OFF) option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) option(BUILD_TESTING "Build test programs" ON) @@ -52,18 +54,14 @@ if(WIN32) target_link_libraries(maxminddb ws2_32) + if(BUILD_SHARED_LIBS) + set_target_properties(maxminddb PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) + endif() 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}> + $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> + $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include> ) @@ -74,10 +72,7 @@ set_target_properties(maxminddb PROPERTIES PUBLIC_HEADER "${MAXMINDB_HEADERS}") install(TARGETS maxminddb - EXPORT maxminddb - ARCHIVE DESTINATION lib - PUBLIC_HEADER DESTINATION include/ -) + EXPORT maxminddb) # This is required to work with FetchContent install(EXPORT maxminddb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/Changes.md new/libmaxminddb-1.6.0/Changes.md --- old/libmaxminddb-1.5.2/Changes.md 2021-02-18 18:03:50.000000000 +0100 +++ new/libmaxminddb-1.6.0/Changes.md 2021-04-29 18:57:56.000000000 +0200 @@ -1,3 +1,20 @@ +## 1.6.0 - 2021-04-29 + +* This release includes several improvements to the CMake build. In + particular: + * C99 support is now properly enabled, fixing builds on older `gcc` + versions. Pull request by Jan V??el??k. GitHub #257. + * `CMAKE_SHARED_LIBRARY_PREFIX` and `CMAKE_STATIC_LIBRARY_PREFIX` are + no longer explicitly set and now use the default values for the platform. + Pull request by Jan V??el??k. GitHub #258. + * `target_include_directories` now works as expected. Pull request by Jan + V??el??k. GitHub #259. + * DLLs are now installed on Windows when `libmaxminddb` is built as a + shared library. Pull request by Jan V??el??k. GitHub #261. + * When built as a dynamic library on Windows, all symbols are now exported. + Pull request by Jan V??el??k. GitHub #262. + + ## 1.5.2 - 2021-02-18 * With `libmaxminddb` on Windows and `mmdblookup` generally, there were @@ -5,6 +22,7 @@ lead to issues in low memory situations or when resource limits had been set. Reported by cve-reporting. GitHub #252. + ## 1.5.1 - 2021-02-18 * The formatting of the manpages has been improved and the script that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/Makefile.in new/libmaxminddb-1.6.0/Makefile.in --- old/libmaxminddb-1.5.2/Makefile.in 2021-02-18 18:04:37.000000000 +0100 +++ new/libmaxminddb-1.6.0/Makefile.in 2021-04-29 19:10:41.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -239,6 +239,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -821,7 +823,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/NOTICE new/libmaxminddb-1.6.0/NOTICE --- old/libmaxminddb-1.5.2/NOTICE 2020-08-13 18:49:04.000000000 +0200 +++ new/libmaxminddb-1.6.0/NOTICE 2021-04-29 18:57:56.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright 2013-2014 MaxMind, Inc. +Copyright 2013-2021 MaxMind, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -10,4 +10,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/README.md new/libmaxminddb-1.6.0/README.md --- old/libmaxminddb-1.5.2/README.md 2021-01-05 23:58:01.000000000 +0100 +++ new/libmaxminddb-1.6.0/README.md 2021-04-29 18:57:56.000000000 +0200 @@ -120,6 +120,8 @@ # Copyright and License +Copyright 2013-2021 MaxMind, Inc. + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/aclocal.m4 new/libmaxminddb-1.6.0/aclocal.m4 --- old/libmaxminddb-1.5.2/aclocal.m4 2021-02-18 18:04:35.000000000 +0100 +++ new/libmaxminddb-1.6.0/aclocal.m4 2021-04-29 19:10:39.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- # Copyright (C) 1996-2020 Free Software Foundation, Inc. @@ -1085,11 +1085,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -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.2], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9381,7 +9381,7 @@ # 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.2])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -10033,12 +10033,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/bin/Makefile.in new/libmaxminddb-1.6.0/bin/Makefile.in --- old/libmaxminddb-1.5.2/bin/Makefile.in 2021-02-18 18:04:37.000000000 +0100 +++ new/libmaxminddb-1.6.0/bin/Makefile.in 2021-04-29 19:10:41.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/configure new/libmaxminddb-1.6.0/configure --- old/libmaxminddb-1.5.2/configure 2021-02-18 18:04:36.000000000 +0100 +++ new/libmaxminddb-1.6.0/configure 2021-04-29 19:10:40.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libmaxminddb 1.5.2. +# Generated by GNU Autoconf 2.69 for libmaxminddb 1.6.0. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libmaxminddb' PACKAGE_TARNAME='libmaxminddb' -PACKAGE_VERSION='1.5.2' -PACKAGE_STRING='libmaxminddb 1.5.2' +PACKAGE_VERSION='1.6.0' +PACKAGE_STRING='libmaxminddb 1.6.0' PACKAGE_BUGREPORT='[email protected]' 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.5.2 to adapt to many kinds of systems. +\`configure' configures libmaxminddb 1.6.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.5.2:";; + short | recursive ) echo "Configuration of libmaxminddb 1.6.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.5.2 +libmaxminddb configure 1.6.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.5.2, which was +It was created by libmaxminddb $as_me 1.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6853,11 +6853,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + 10.0,*86*-darwin8*|10.0,*-darwin[912]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[012][,.]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -11684,12 +11684,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -12015,7 +12010,7 @@ # Define the identity of the package. PACKAGE='libmaxminddb' - VERSION='1.5.2' + VERSION='1.6.0' cat >>confdefs.h <<_ACEOF @@ -13866,7 +13861,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.5.2, which was +This file was extended by libmaxminddb $as_me 1.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13932,7 +13927,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.5.2 +libmaxminddb config.status 1.6.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/configure.ac new/libmaxminddb-1.6.0/configure.ac --- old/libmaxminddb-1.5.2/configure.ac 2021-02-18 18:04:22.000000000 +0100 +++ new/libmaxminddb-1.6.0/configure.ac 2021-04-29 19:10:31.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([libmaxminddb], [1.5.2], [[email protected]]) +AC_INIT([libmaxminddb], [1.6.0], [[email protected]]) 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.5.2/include/maxminddb.h new/libmaxminddb-1.6.0/include/maxminddb.h --- old/libmaxminddb-1.5.2/include/maxminddb.h 2021-02-18 18:04:22.000000000 +0100 +++ new/libmaxminddb-1.6.0/include/maxminddb.h 2021-04-29 19:10:31.000000000 +0200 @@ -28,7 +28,7 @@ #include <winsock2.h> #include <ws2tcpip.h> /* libmaxminddb package version from configure */ -#define PACKAGE_VERSION "1.5.2" +#define PACKAGE_VERSION "1.6.0" typedef ADDRESS_FAMILY sa_family_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/install-sh new/libmaxminddb-1.6.0/install-sh --- old/libmaxminddb-1.5.2/install-sh 2021-02-18 18:04:37.000000000 +0100 +++ new/libmaxminddb-1.6.0/install-sh 2021-04-29 19:10:41.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to [email protected]. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -488,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -502,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/ltmain.sh new/libmaxminddb-1.6.0/ltmain.sh --- old/libmaxminddb-1.5.2/ltmain.sh 2021-02-18 18:04:34.000000000 +0100 +++ new/libmaxminddb-1.6.0/ltmain.sh 2021-04-29 19:10:39.000000000 +0200 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-14" +VERSION="2.4.6 Debian-2.4.6-15" package_revision=2.4.6 @@ -2141,7 +2141,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-14 + version: $progname $scriptversion Debian-2.4.6-15 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/src/Makefile.in new/libmaxminddb-1.6.0/src/Makefile.in --- old/libmaxminddb-1.5.2/src/Makefile.in 2021-02-18 18:04:37.000000000 +0100 +++ new/libmaxminddb-1.6.0/src/Makefile.in 2021-04-29 19:10:41.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmaxminddb-1.5.2/t/Makefile.in new/libmaxminddb-1.6.0/t/Makefile.in --- old/libmaxminddb-1.5.2/t/Makefile.in 2021-02-18 18:04:37.000000000 +0100 +++ new/libmaxminddb-1.6.0/t/Makefile.in 2021-04-29 19:10:41.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
