Hello community, here is the log from the commit of package kyotocabinet for openSUSE:Factory checked in at 2020-03-25 23:42:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kyotocabinet (Old) and /work/SRC/openSUSE:Factory/.kyotocabinet.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kyotocabinet" Wed Mar 25 23:42:04 2020 rev:12 rq:786355 version:1.2.77 Changes: -------- --- /work/SRC/openSUSE:Factory/kyotocabinet/kyotocabinet.changes 2018-01-07 17:21:25.949108725 +0100 +++ /work/SRC/openSUSE:Factory/.kyotocabinet.new.3160/kyotocabinet.changes 2020-03-25 23:42:10.499971593 +0100 @@ -1,0 +2,11 @@ +Thu Mar 12 11:45:45 UTC 2020 - Martin Pluskal <[email protected]> + +- Update to version 1.2.77: + * kcthread.cc (CondVar::wait): a bug on Win32 was fixed. + * kcdbext.h (IndexDB::set, IndexDB::replace): a bug of updating + existing records was fixed. + * kcdb.h (DB::check): new function. +- Drop no longer needed gcc6-fix-errors.patch +- Modernise spec file + +------------------------------------------------------------------- Old: ---- gcc6-fix-errors.patch kyotocabinet-1.2.76.tar.gz New: ---- kyotocabinet-1.2.77.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kyotocabinet.spec ++++++ --- /var/tmp/diff_new_pack.lk76Bu/_old 2020-03-25 23:42:11.131971800 +0100 +++ /var/tmp/diff_new_pack.lk76Bu/_new 2020-03-25 23:42:11.135971801 +0100 @@ -1,7 +1,7 @@ # # spec file for package kyotocabinet # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define soname 16 Name: kyotocabinet -Version: 1.2.76 +Version: 1.2.77 Release: 0 -%define soname 16 Summary: A straightforward implementation of DBM License: SUSE-GPL-3.0-with-FLOSS-exception Group: Productivity/Databases/Tools -Url: http://fallabs.com/kyotocabinet/ -Source: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz +URL: https://fallabs.com/kyotocabinet/ +Source: https://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz Source99: baselibs.conf # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-fix_rpath.patch Patch2: configure-8-byte-atomics.patch -# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6/GCC7. -Patch3: gcc6-fix-errors.patch -# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Do not supress debuginfo Patch4: kyotocabinet-fix-debuginfo.patch BuildRequires: autoconf BuildRequires: automake @@ -40,10 +37,9 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if "%_target_cpu" == "i386" +%if "%{_target_cpu}" == "i386" # kyotocabinet uses __sync_* primitives and requires at least 586 -BuildArch: i586 +ExclusiveArch: i586 %endif %description @@ -109,26 +105,18 @@ Kyoto Cabinet within a proprietary software, the commercial license is required. %prep -%setup -q -%patch1 -p 1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -sed -ie "/ldconfig/d" Makefile.in -sed -ie "/DOCDIR/d" Makefile.in +%autosetup -p1 %build +sed -ie "/ldconfig/d" Makefile.in +sed -ie "/DOCDIR/d" Makefile.in sed -ri 's/-march=native/-O2 -g3/g' configure.in -autoreconf -iv -export CFLAGS="%optflags"; -export CXXFLAGS="%optflags"; -export CFLAGS="${CFLAGS//-march=i386/-march=i586}"; -export CXXFLAGS="${CXXFLAGS//-march=i386/-march=i586}"; +autoreconf -fiv %configure -make %{?_smp_mflags} +%make_build %install -make install DESTDIR="%buildroot" +%make_install rm -rf %{buildroot}%{_datadir}/kyotocabinet rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a @@ -136,26 +124,24 @@ # make check %post -n libkyotocabinet%{soname} -p /sbin/ldconfig - %postun -n libkyotocabinet%{soname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc ChangeLog COPYING +%license COPYING +%doc ChangeLog %doc doc/* %doc *.idl %{_bindir}/* -%doc %{_mandir}/man1/* +%{_mandir}/man1/* %files -n libkyotocabinet-devel -%defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libkyotocabinet.so %{_libdir}/pkgconfig/kyotocabinet.pc %files -n libkyotocabinet%{soname} -%defattr(-,root,root) -%doc ChangeLog COPYING +%license COPYING +%doc ChangeLog %{_libdir}/libkyotocabinet.so.%{soname}* %changelog ++++++ configure-8-byte-atomics.patch ++++++ --- /var/tmp/diff_new_pack.lk76Bu/_old 2020-03-25 23:42:11.155971807 +0100 +++ /var/tmp/diff_new_pack.lk76Bu/_new 2020-03-25 23:42:11.155971807 +0100 @@ -10,11 +10,11 @@ configure.in | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 19 deletions(-) -diff --git a/configure b/configure -index a07063d..bfc6df0 100755 ---- a/configure -+++ b/configure -@@ -4012,25 +4012,22 @@ fi +Index: kyotocabinet-1.2.77/configure +=================================================================== +--- kyotocabinet-1.2.77.orig/configure ++++ kyotocabinet-1.2.77/configure +@@ -4041,25 +4041,22 @@ fi # Atomic operations if test "$enable_atomic" != "no" then @@ -53,11 +53,11 @@ then MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" printf 'yes\n' -diff --git a/configure.in b/configure.in -index 7808806..b5f5ac0 100644 ---- a/configure.in -+++ b/configure.in -@@ -238,9 +238,22 @@ fi +Index: kyotocabinet-1.2.77/configure.in +=================================================================== +--- kyotocabinet-1.2.77.orig/configure.in ++++ kyotocabinet-1.2.77/configure.in +@@ -229,9 +229,22 @@ fi # Atomic operations if test "$enable_atomic" != "no" then @@ -83,5 +83,3 @@ then MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" printf 'yes\n' --- -1.7.9.5 ++++++ kyotocabinet-1.2.76.tar.gz -> kyotocabinet-1.2.77.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/ChangeLog new/kyotocabinet-1.2.77/ChangeLog --- old/kyotocabinet-1.2.76/ChangeLog 2012-05-24 14:44:50.000000000 +0200 +++ new/kyotocabinet-1.2.77/ChangeLog 2018-10-28 18:44:41.000000000 +0100 @@ -1,3 +1,9 @@ +2018-10-29 FAL Labs <[email protected]> + + - Fixed build errors. + + - Release: 1.2.77 + 2012-05-24 FAL Labs <[email protected]> * kcthread.cc (CondVar::wait): a bug on Win32 was fixed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/configure new/kyotocabinet-1.2.77/configure --- old/kyotocabinet-1.2.76/configure 2012-05-24 13:31:45.000000000 +0200 +++ new/kyotocabinet-1.2.77/configure 2018-10-28 18:42:54.000000000 +0100 @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for kyotocabinet 1.2.76. +# Generated by GNU Autoconf 2.69 for kyotocabinet 1.2.77. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -557,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='kyotocabinet' PACKAGE_TARNAME='kyotocabinet' -PACKAGE_VERSION='1.2.76' -PACKAGE_STRING='kyotocabinet 1.2.76' +PACKAGE_VERSION='1.2.77' +PACKAGE_STRING='kyotocabinet 1.2.77' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -651,6 +671,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -735,6 +756,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -987,6 +1009,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1124,7 +1155,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1152,8 +1183,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1239,7 +1268,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 kyotocabinet 1.2.76 to adapt to many kinds of systems. +\`configure' configures kyotocabinet 1.2.77 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1279,6 +1308,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1300,7 +1330,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of kyotocabinet 1.2.76:";; + short | recursive ) echo "Configuration of kyotocabinet 1.2.77:";; esac cat <<\_ACEOF @@ -1398,10 +1428,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -kyotocabinet configure 1.2.76 -generated by GNU Autoconf 2.68 +kyotocabinet configure 1.2.77 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1625,7 +1655,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1734,8 +1764,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by kyotocabinet $as_me 1.2.76, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by kyotocabinet $as_me 1.2.77, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2312,7 +2342,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2352,7 +2382,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2405,7 +2435,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2446,7 +2476,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2504,7 +2534,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2548,7 +2578,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2994,8 +3024,7 @@ /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3108,7 +3137,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3152,7 +3181,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3509,7 +3538,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3575,7 +3604,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5041,16 +5070,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -5110,28 +5139,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -5152,8 +5169,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by kyotocabinet $as_me 1.2.76, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by kyotocabinet $as_me 1.2.77, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5205,11 +5222,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -kyotocabinet config.status 1.2.76 -configured by $0, generated by GNU Autoconf 2.68, +kyotocabinet config.status 1.2.77 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5286,7 +5303,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/configure.in new/kyotocabinet-1.2.77/configure.in --- old/kyotocabinet-1.2.76/configure.in 2012-05-24 13:31:42.000000000 +0200 +++ new/kyotocabinet-1.2.77/configure.in 2018-10-28 18:41:50.000000000 +0100 @@ -7,7 +7,7 @@ #================================================================ # Package name -AC_INIT(kyotocabinet, 1.2.76) +AC_INIT(kyotocabinet, 1.2.77) # Package information MYLIBVER=16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/doc/index.html new/kyotocabinet-1.2.77/doc/index.html --- old/kyotocabinet-1.2.76/doc/index.html 2012-05-24 13:32:01.000000000 +0200 +++ new/kyotocabinet-1.2.77/doc/index.html 2018-10-30 07:12:17.000000000 +0100 @@ -60,7 +60,7 @@ <p>Kyoto Cabinet runs very fast. For example, elapsed time to store one million records is 0.9 seconds for hash database, and 1.1 seconds for B+ tree database. Moreover, the size of database is very small. For example, overhead for a record is 16 bytes for hash database, and 4 bytes for B+ tree database. Furthermore, scalability of Kyoto Cabinet is great. The database size can be up to 8EB (9.22e18 bytes).</p> -<p>Kyoto Cabinet is written in the C++ language, and provided as API of C++, C, Java, Python, Ruby, Perl, and Lua. Kyoto Cabinet is available on platforms which have API conforming to C++03 with the TR1 library extensions. Kyoto Cabinet is a free software licensed under the GNU General Public License. On the other hand, a commercial license is also provided. If you use Kyoto Cabinet within a proprietary software, the commercial license is required.</p> +<p>Kyoto Cabinet is written in the C++ language, and provided as API of C++, C, Java, Python, Ruby, Perl, and Lua. Kyoto Cabinet is available on platforms which have API conforming to C++03 with the TR1 library extensions. Kyoto Cabinet is a free software licensed under the GNU General Public License.</p> <hr /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/doc/index.ja.html new/kyotocabinet-1.2.77/doc/index.ja.html --- old/kyotocabinet-1.2.76/doc/index.ja.html 2012-05-24 13:32:01.000000000 +0200 +++ new/kyotocabinet-1.2.77/doc/index.ja.html 2018-10-30 07:12:34.000000000 +0100 @@ -59,7 +59,7 @@ <p>Kyoto Cabinetは非常に高速に動作します。例えば、ハッシュ表データベースに100万レコードを格納するのに0.9秒かかり、B+木データベースでは1.1秒かかります。さらに、データベースのサイズが非常に小さいです。例えば、ハッシュ表データベースの各レコードにかかるオーバーヘッドは16バイトであり、B+木データベースでは4バイトです。また、Kyoto Cabinetのスケーラビリティは素晴らしいです。データベースのサイズは8EB（9.22e18バイト）までです。</p> -<p>Kyoto CabinetはC++言語で記述され、C++とCとJavaとPythonとRubyとPerlとLuaのAPIとして提供されます。Kyoto cabinetはC++03とTR1ライブラリ拡張に準拠するAPIを備えた環境にて利用できます。Kyoto CabinetはGNU一般公衆利用許諾に基づいて利用許諾されたフリーソフトウェアです。一方で、商用ライセンスも提供されます。もしあなたがプロプライエタリソフトウェアでKyoto Cabinetを利用する場合には、商用ライセンスが必要です。</p> +<p>Kyoto CabinetはC++言語で記述され、C++とCとJavaとPythonとRubyとPerlとLuaのAPIとして提供されます。Kyoto cabinetはC++03とTR1ライブラリ拡張に準拠するAPIを備えた環境にて利用できます。Kyoto CabinetはGNU一般公衆利用許諾に基づいて利用許諾されたフリーソフトウェアです。</p> <hr /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kccachetest.cc new/kyotocabinet-1.2.77/kccachetest.cc --- old/kyotocabinet-1.2.76/kccachetest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kccachetest.cc 2018-10-30 07:13:02.000000000 +0100 @@ -2070,7 +2070,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kcdbext.h new/kyotocabinet-1.2.77/kcdbext.h --- old/kyotocabinet-1.2.76/kcdbext.h 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kcdbext.h 2018-10-30 07:13:02.000000000 +0100 @@ -1278,7 +1278,7 @@ if (omode_ == 0) { set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened"); *sp = 0; - return false; + return NULL; } if (!cache_) return db_.get(kbuf, ksiz, sp); size_t dvsiz = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kcdirtest.cc new/kyotocabinet-1.2.77/kcdirtest.cc --- old/kyotocabinet-1.2.76/kcdirtest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kcdirtest.cc 2018-10-30 07:13:03.000000000 +0100 @@ -2078,7 +2078,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kcforesttest.cc new/kyotocabinet-1.2.77/kcforesttest.cc --- old/kyotocabinet-1.2.76/kcforesttest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kcforesttest.cc 2018-10-30 07:13:03.000000000 +0100 @@ -2227,7 +2227,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kcgrasstest.cc new/kyotocabinet-1.2.77/kcgrasstest.cc --- old/kyotocabinet-1.2.76/kcgrasstest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kcgrasstest.cc 2018-10-30 07:13:03.000000000 +0100 @@ -2083,7 +2083,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kchashtest.cc new/kyotocabinet-1.2.77/kchashtest.cc --- old/kyotocabinet-1.2.76/kchashtest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kchashtest.cc 2018-10-30 07:13:03.000000000 +0100 @@ -2247,7 +2247,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kcprototest.cc new/kyotocabinet-1.2.77/kcprototest.cc --- old/kyotocabinet-1.2.76/kcprototest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kcprototest.cc 2018-10-30 07:13:03.000000000 +0100 @@ -1972,7 +1972,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kcstashtest.cc new/kyotocabinet-1.2.77/kcstashtest.cc --- old/kyotocabinet-1.2.76/kcstashtest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kcstashtest.cc 2018-10-30 07:13:03.000000000 +0100 @@ -1976,7 +1976,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/kctreetest.cc new/kyotocabinet-1.2.77/kctreetest.cc --- old/kyotocabinet-1.2.76/kctreetest.cc 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/kctreetest.cc 2018-10-30 07:13:03.000000000 +0100 @@ -2367,7 +2367,7 @@ std::string key; if (cur->get_key(&key)) { keys.push_back(key); - if (!cur->get_value(&key) && kc::BasicDB::Error::NOREC) { + if (!cur->get_value(&key) && db_->error() != kc::BasicDB::Error::NOREC) { dberrprint(db_, __LINE__, "Cursor::get_value"); err_ = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kyotocabinet-1.2.76/myconf.h new/kyotocabinet-1.2.77/myconf.h --- old/kyotocabinet-1.2.76/myconf.h 2012-05-24 18:27:59.000000000 +0200 +++ new/kyotocabinet-1.2.77/myconf.h 2018-10-30 07:13:03.000000000 +0100 @@ -90,7 +90,7 @@ #endif -#define _KC_VERSION "1.2.76" +#define _KC_VERSION "1.2.77" #define _KC_LIBVER 16 #define _KC_LIBREV 13 #define _KC_FMTVER 5 ++++++ kyotocabinet-fix_rpath.patch ++++++ --- /var/tmp/diff_new_pack.lk76Bu/_old 2020-03-25 23:42:11.335971866 +0100 +++ /var/tmp/diff_new_pack.lk76Bu/_new 2020-03-25 23:42:11.335971866 +0100 @@ -1,7 +1,7 @@ -Index: kyotocabinet-1.2.52/Makefile.in +Index: kyotocabinet-1.2.77/Makefile.in =================================================================== ---- kyotocabinet-1.2.52.orig/Makefile.in -+++ kyotocabinet-1.2.52/Makefile.in +--- kyotocabinet-1.2.77.orig/Makefile.in ++++ kyotocabinet-1.2.77/Makefile.in @@ -56,7 +56,7 @@ LDFLAGS = @MYLDFLAGS@ CMDLDFLAGS = @MYCMDLDFLAGS@ CMDLIBS = @MYCMDLIBS@ @@ -9,15 +9,15 @@ -RUNENV = @MYLDLIBPATHENV@=@MYLDLIBPATH@ +RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) POSTCMD = @MYPOSTCMD@ - - -Index: kyotocabinet-1.2.52/configure.in + + +Index: kyotocabinet-1.2.77/configure.in =================================================================== ---- kyotocabinet-1.2.52.orig/configure.in -+++ kyotocabinet-1.2.52/configure.in +--- kyotocabinet-1.2.77.orig/configure.in ++++ kyotocabinet-1.2.77/configure.in @@ -35,27 +35,18 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C MYPCFILES="kyotocabinet.pc" - + # Building flags -MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2" +MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0" @@ -33,7 +33,7 @@ MYLDLIBPATH="" MYLDLIBPATHENV="LD_LIBRARY_PATH" MYPOSTCMD="true" - + -# Building paths -PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH" -CPATH=".:/usr/local/include:$CPATH" @@ -43,6 +43,6 @@ -export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH - - - + #================================================================ # Options
