Hello community, here is the log from the commit of package libraw for openSUSE:Factory checked in at 2018-05-06 14:56:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libraw (Old) and /work/SRC/openSUSE:Factory/.libraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libraw" Sun May 6 14:56:15 2018 rev:48 rq:602481 version:0.18.9 Changes: -------- --- /work/SRC/openSUSE:Factory/libraw/libraw.changes 2018-03-12 12:03:12.089776454 +0100 +++ /work/SRC/openSUSE:Factory/.libraw.new/libraw.changes 2018-05-06 14:56:16.852448164 +0200 @@ -1,0 +2,19 @@ +Mon Apr 30 09:18:00 UTC 2018 - [email protected] + +- security update + * CVE-2018-10528 [bsc#1091345] + + libraw-CVE-2018-10528.patch + * CVE-2018-10529 [bsc#1091346] + + libraw-CVE-2018-10529.patch + +------------------------------------------------------------------- +Mon Apr 30 08:59:33 UTC 2018 - [email protected] + +- Updated to version 0.18.9: + * samsung_load_raw: possible buffer overrun + * rollei_load_raw: possible buffer overrun + * nikon_coolscan_load_raw: possible buffer overrun, possible NULL pointer + * find_green: possible stack overrun + * parse_exif: possible stack overrun + +------------------------------------------------------------------- Old: ---- LibRaw-0.18.8.tar.gz New: ---- LibRaw-0.18.9.tar.gz libraw-CVE-2018-10528.patch libraw-CVE-2018-10529.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw.spec ++++++ --- /var/tmp/diff_new_pack.jeDdki/_old 2018-05-06 14:56:17.388428498 +0200 +++ /var/tmp/diff_new_pack.jeDdki/_new 2018-05-06 14:56:17.392428351 +0200 @@ -20,14 +20,16 @@ %define lver 16 %define lname libraw%{lver} Name: libraw -Version: 0.18.8 +Version: 0.18.9 Release: 0 Summary: Library for reading RAW files obtained from digital photo cameras -License: CDDL-1.0 OR LGPL-2.1 +License: CDDL-1.0 OR LGPL-2.1-only Group: Development/Libraries/C and C++ Url: https://www.libraw.org/ #Git-Clone: git://github.com/LibRaw/LibRaw Source: https://www.libraw.org/data/%tar_name-%version.tar.gz +Patch0: libraw-CVE-2018-10528.patch +Patch1: libraw-CVE-2018-10529.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjasper-devel @@ -95,6 +97,8 @@ %prep %setup -qn %tar_name-%version +%patch0 -p1 +%patch1 -p1 %build export CXXFLAGS="%optflags -fPIC -DUSE_ZLIB" ++++++ LibRaw-0.18.8.tar.gz -> LibRaw-0.18.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.18.8/Changelog.txt new/LibRaw-0.18.9/Changelog.txt --- old/LibRaw-0.18.8/Changelog.txt 2018-02-24 10:47:43.000000000 +0100 +++ new/LibRaw-0.18.9/Changelog.txt 2018-04-24 16:23:24.000000000 +0200 @@ -1,3 +1,13 @@ +2018-04-24 Alex Tutubalin <[email protected]> +Secunia #81800: +Credit: Laurent Delosieres, Secunia Research at Flexera + * samsung_load_raw: possible buffer overrun + * rollei_load_raw: possible buffer overrun + * nikon_coolscan_load_raw: possible buffer overrun, possible NULL pointer + * find_green: possible stack overrun + * parse_exif: possible stack overrun + * LibRaw 0.18.9 + 2018-02-23 Alex Tutubalin <[email protected]> Secunia #81000: Credit: Laurent Delosieres, Secunia Research at Flexera diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.18.8/autom4te.cache/output.0 new/LibRaw-0.18.9/autom4te.cache/output.0 --- old/LibRaw-0.18.8/autom4te.cache/output.0 2018-02-24 12:10:41.000000000 +0100 +++ new/LibRaw-0.18.9/autom4te.cache/output.0 2018-04-24 16:32:57.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.18.8. +@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.18.9. @%:@ @%:@ Report bugs to <[email protected]>. @%:@ @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.18.8' -PACKAGE_STRING='LibRaw 0.18.8' +PACKAGE_VERSION='0.18.9' +PACKAGE_STRING='LibRaw 0.18.9' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://www.libraw.org' @@ -1352,7 +1352,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 LibRaw 0.18.8 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.18.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1422,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.18.8:";; + short | recursive ) echo "Configuration of LibRaw 0.18.9:";; esac cat <<\_ACEOF @@ -1553,7 +1553,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.18.8 +LibRaw configure 0.18.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2043,7 +2043,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.18.8, which was +It was created by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2906,7 +2906,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.18.8' + VERSION='0.18.9' # Some tools Automake needs. @@ -16906,7 +16906,7 @@ LIBRAW_SHLIB_VERSION=16:0:0 -LIBRAW_RELEASE_VERSION=0.18.8 +LIBRAW_RELEASE_VERSION=0.18.9 cat >confcache <<\_ACEOF @@ -17483,7 +17483,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.18.8, which was +This file was extended by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17541,7 +17541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.18.8 +LibRaw config.status 0.18.9 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/LibRaw-0.18.8/autom4te.cache/output.1 new/LibRaw-0.18.9/autom4te.cache/output.1 --- old/LibRaw-0.18.8/autom4te.cache/output.1 2018-02-24 12:10:44.000000000 +0100 +++ new/LibRaw-0.18.9/autom4te.cache/output.1 2018-04-24 16:33:01.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.18.8. +@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.18.9. @%:@ @%:@ Report bugs to <[email protected]>. @%:@ @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.18.8' -PACKAGE_STRING='LibRaw 0.18.8' +PACKAGE_VERSION='0.18.9' +PACKAGE_STRING='LibRaw 0.18.9' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://www.libraw.org' @@ -1352,7 +1352,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 LibRaw 0.18.8 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.18.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1422,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.18.8:";; + short | recursive ) echo "Configuration of LibRaw 0.18.9:";; esac cat <<\_ACEOF @@ -1553,7 +1553,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.18.8 +LibRaw configure 0.18.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2043,7 +2043,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.18.8, which was +It was created by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2906,7 +2906,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.18.8' + VERSION='0.18.9' # Some tools Automake needs. @@ -16906,7 +16906,7 @@ LIBRAW_SHLIB_VERSION=16:0:0 -LIBRAW_RELEASE_VERSION=0.18.8 +LIBRAW_RELEASE_VERSION=0.18.9 cat >confcache <<\_ACEOF @@ -17483,7 +17483,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.18.8, which was +This file was extended by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17541,7 +17541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.18.8 +LibRaw config.status 0.18.9 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/LibRaw-0.18.8/autom4te.cache/output.2 new/LibRaw-0.18.9/autom4te.cache/output.2 --- old/LibRaw-0.18.8/autom4te.cache/output.2 2018-02-24 12:10:43.000000000 +0100 +++ new/LibRaw-0.18.9/autom4te.cache/output.2 2018-04-24 16:33:00.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.18.8. +@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.18.9. @%:@ @%:@ Report bugs to <[email protected]>. @%:@ @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.18.8' -PACKAGE_STRING='LibRaw 0.18.8' +PACKAGE_VERSION='0.18.9' +PACKAGE_STRING='LibRaw 0.18.9' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://www.libraw.org' @@ -1352,7 +1352,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 LibRaw 0.18.8 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.18.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1422,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.18.8:";; + short | recursive ) echo "Configuration of LibRaw 0.18.9:";; esac cat <<\_ACEOF @@ -1553,7 +1553,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.18.8 +LibRaw configure 0.18.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2043,7 +2043,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.18.8, which was +It was created by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2906,7 +2906,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.18.8' + VERSION='0.18.9' # Some tools Automake needs. @@ -16906,7 +16906,7 @@ LIBRAW_SHLIB_VERSION=16:0:0 -LIBRAW_RELEASE_VERSION=0.18.8 +LIBRAW_RELEASE_VERSION=0.18.9 cat >confcache <<\_ACEOF @@ -17483,7 +17483,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.18.8, which was +This file was extended by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17541,7 +17541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.18.8 +LibRaw config.status 0.18.9 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/LibRaw-0.18.8/autom4te.cache/requests new/LibRaw-0.18.9/autom4te.cache/requests --- old/LibRaw-0.18.8/autom4te.cache/requests 2018-02-24 12:10:44.000000000 +0100 +++ new/LibRaw-0.18.9/autom4te.cache/requests 2018-04-24 16:33:01.000000000 +0200 @@ -43,196 +43,196 @@ 'configure.ac' ], { - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_PROG_LD_GNU' => 1, - 'LTOPTIONS_VERSION' => 1, - 'AC_WITH_LTDL' => 1, - '_LT_WITH_SYSROOT' => 1, + 'AC_DISABLE_STATIC' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_LTDL_PREOPEN' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'AC_LTDL_SHLIBPATH' => 1, + '_AM_SET_OPTION' => 1, + 'PKG_WITH_MODULES' => 1, + 'LT_LIB_DLLOAD' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, + 'AM_MISSING_PROG' => 1, + 'AC_DEFUN' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + '_LT_LINKER_OPTION' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + '_AM_DEPENDENCIES' => 1, + 'LT_LANG' => 1, 'AC_CONFIG_MACRO_DIR' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_AC_SYS_COMPILER' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'LT_PATH_LD' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, '_LT_COMPILER_OPTION' => 1, - 'AM_PROG_LD' => 1, - 'AM_DISABLE_STATIC' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, - 'AC_DEFUN' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AX_OPENMP' => 1, - 'LT_AC_PROG_EGREP' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'AC_DISABLE_SHARED' => 1, + 'LT_SYS_MODULE_PATH' => 1, 'PKG_CHECK_VAR' => 1, - 'LT_OUTPUT' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - 'm4_include' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - '_LT_LINKER_OPTION' => 1, + 'AM_RUN_LOG' => 1, + '_LT_PROG_CXX' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_LT_AC_SYS_COMPILER' => 1, '_AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'LT_AC_PROG_RC' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + '_LT_PROG_LTMAIN' => 1, + 'AM_PROG_NM' => 1, 'AM_PROG_INSTALL_SH' => 1, - 'AM_DISABLE_SHARED' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AM_DEP_TRACK' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'LTOBSOLETE_VERSION' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'LT_PATH_NM' => 1, 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'LT_SYS_MODULE_EXT' => 1, - 'LT_PATH_LD' => 1, - 'LT_LIB_M' => 1, - 'LT_INIT' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - '_LT_LIBOBJ' => 1, - 'LTDL_CONVENIENCE' => 1, - 'AM_AUX_DIR_EXPAND' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + '_LT_AC_SHELL_INIT' => 1, + '_AM_SET_OPTIONS' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LIBTOOL_F77' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + '_AM_IF_OPTION' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_ENABLE_SHARED' => 1, 'AC_LIBTOOL_PICMODE' => 1, - 'LT_CMD_MAX_LEN' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AM_CONDITIONAL' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'PKG_NOARCH_INSTALLDIR' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_ENABLE_STATIC' => 1, + 'AM_DISABLE_SHARED' => 1, + 'PKG_HAVE_WITH_MODULES' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, 'AC_ENABLE_SHARED' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AM_SET_LEADING_DOT' => 1, + 'm4_include' => 1, + 'LT_PROG_RC' => 1, + 'AC_PATH_MAGIC' => 1, + 'LTDL_CONVENIENCE' => 1, + 'LTOPTIONS_VERSION' => 1, 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AM_DEP_TRACK' => 1, - 'LT_LANG' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - '_AM_AUTOCONF_VERSION' => 1, - '_LT_PROG_F77' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_LTDL_SYSSEARCHPATH' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'AC_LTDL_DLLIB' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AM_ENABLE_SHARED' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AM_SILENT_RULES' => 1, 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'LT_LIB_DLLOAD' => 1, - 'AC_PROG_LD' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'LTDL_INSTALLABLE' => 1, - '_LTDL_SETUP' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIB_LTDL' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, '_LT_AC_LOCK' => 1, + 'PKG_CHECK_EXISTS' => 1, + '_LT_AC_LANG_F77' => 1, + 'LT_PROG_GCJ' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AM_MISSING_HAS_RUN' => 1, + 'PKG_NOARCH_INSTALLDIR' => 1, + 'AM_SANITY_CHECK' => 1, + 'LT_AC_PROG_SED' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_PROG_EGREP' => 1, + 'AC_PROG_LD' => 1, + 'AC_LTDL_SHLIBEXT' => 1, 'PKG_INSTALLDIR' => 1, - '_LT_PROG_CXX' => 1, - 'm4_pattern_forbid' => 1, + 'LT_SYS_MODULE_EXT' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'LT_AC_PROG_RC' => 1, + '_LT_AC_TAGVAR' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'AC_WITH_LTDL' => 1, + 'AC_LIBTOOL_RC' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + '_LT_CC_BASENAME' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + '_AM_PROG_TAR' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AM_SET_DEPDIR' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + 'AC_CHECK_LIBM' => 1, + 'AU_DEFUN' => 1, + '_LTDL_SETUP' => 1, + 'LTSUGAR_VERSION' => 1, + 'AC_PROG_NM' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, 'PKG_CHECK_MODULES' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'LT_PROG_GO' => 1, + '_LT_PROG_F77' => 1, + 'LTDL_INSTALLABLE' => 1, '_LT_AC_PROG_CXXCPP' => 1, - 'AC_PROG_NM' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AC_PATH_MAGIC' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'include' => 1, + 'LTVERSION_VERSION' => 1, + 'LT_WITH_LTDL' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'LT_INIT' => 1, + 'AM_SUBST_NOTMAKE' => 1, '_LT_COMPILER_BOILERPLATE' => 1, - 'AM_ENABLE_STATIC' => 1, - 'AC_LTDL_OBJDIR' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'PKG_WITH_MODULES' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, + 'LT_FUNC_ARGZ' => 1, + 'm4_pattern_forbid' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AX_OPENMP' => 1, + '_PKG_SHORT_ERRORS_SUPPORTED' => 1, + '_LT_AC_LANG_GCJ' => 1, + '_AM_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'LT_LIB_M' => 1, + '_LT_LIBOBJ' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_LIBTOOL_SETUP' => 1, 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'PKG_HAVE_WITH_MODULES' => 1, - 'AM_SILENT_RULES' => 1, - '_AM_SET_OPTIONS' => 1, - '_AM_PROG_TAR' => 1, - 'AU_DEFUN' => 1, - 'AC_PROG_EGREP' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + '_LT_DLL_DEF_P' => 1, + 'AC_LIBTOOL_FC' => 1, + 'AM_AUTOMAKE_VERSION' => 1, 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'LTDL_INIT' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'AC_LTDL_SHLIBPATH' => 1, - 'AC_LIBTOOL_RC' => 1, - '_LT_AC_TAGVAR' => 1, - 'AC_LIB_LTDL' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + '_m4_warn' => 1, + '_LT_PROG_FC' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'LT_SYS_DLSEARCH_PATH' => 1, + '_AM_SUBST_NOTMAKE' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AM_ENABLE_STATIC' => 1, '_LT_AC_LANG_CXX' => 1, - '_LT_DLL_DEF_P' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'LTDL_INIT' => 1, + 'PKG_HAVE_DEFINE_WITH_MODULES' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'm4_pattern_allow' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_LTDL_SHLIBEXT' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'LT_SYS_MODULE_PATH' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'LT_PROG_GO' => 1, - '_LT_AC_SHELL_INIT' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'LT_WITH_LTDL' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_PROG_GCJ' => 1, - 'AC_CHECK_LIBM' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_LT_PROG_LTMAIN' => 1, - '_AM_IF_OPTION' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'PKG_CHECK_EXISTS' => 1, + 'AM_CONDITIONAL' => 1, '_LT_PATH_TOOL_PREFIX' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'LT_SYS_DLSEARCH_PATH' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'AM_PROG_NM' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'LT_PROG_RC' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'AM_RUN_LOG' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - '_m4_warn' => 1, - 'LT_AC_PROG_SED' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'AC_LTDL_DLSYM_USCORE' => 1, - 'm4_pattern_allow' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, - 'AC_LIBTOOL_F77' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - '_PKG_SHORT_ERRORS_SUPPORTED' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - '_LT_CC_BASENAME' => 1, - 'LT_SYS_SYMBOL_USCORE' => 1, - 'AM_MISSING_PROG' => 1, - '_AM_SET_OPTION' => 1, - 'AM_SET_DEPDIR' => 1, - 'LT_FUNC_ARGZ' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'PKG_HAVE_DEFINE_WITH_MODULES' => 1, - 'LTSUGAR_VERSION' => 1, - 'LTVERSION_VERSION' => 1, 'AM_PROG_CC_C_O' => 1, - '_AM_DEPENDENCIES' => 1, - 'LT_PATH_NM' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_DEFUN_ONCE' => 1, - '_LT_PROG_FC' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + 'AM_DISABLE_STATIC' => 1, '_AM_MANGLE_OPTION' => 1, - 'AM_SANITY_CHECK' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'include' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'LT_AC_PROG_GCJ' => 1 + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AM_PROG_LD' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AC_LTDL_DLLIB' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'LT_OUTPUT' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -247,65 +247,65 @@ 'configure.ac' ], { - 'AH_OUTPUT' => 1, - 'AM_PATH_GUILE' => 1, - '_m4_warn' => 1, - 'm4_include' => 1, - 'AM_NLS' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_CONFIG_FILES' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AC_FC_FREEFORM' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'm4_pattern_allow' => 1, - 'AC_SUBST_TRACE' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AC_INIT' => 1, 'AM_MAINTAINER_MODE' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_PROG_AR' => 1, - 'AC_SUBST' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AC_CANONICAL_HOST' => 1, - 'include' => 1, + 'LT_INIT' => 1, + 'm4_pattern_forbid' => 1, + 'AC_FC_FREEFORM' => 1, + '_AM_COND_ENDIF' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AC_CONFIG_AUX_DIR' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AC_LIBSOURCE' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_CONFIG_FILES' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'sinclude' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'm4_include' => 1, + 'AH_OUTPUT' => 1, 'AC_CANONICAL_SYSTEM' => 1, '_AM_COND_ELSE' => 1, - 'AC_FC_SRCEXT' => 1, - 'AM_CONDITIONAL' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - '_AM_COND_IF' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_SILENT_RULES' => 1, + 'include' => 1, + 'AM_GNU_GETTEXT' => 1, + 'm4_pattern_allow' => 1, 'm4_sinclude' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AC_SUBST' => 1, + 'AM_PROG_MOC' => 1, + 'AM_PROG_AR' => 1, + 'AC_CANONICAL_HOST' => 1, + '_m4_warn' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AC_LIBSOURCE' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, 'AC_CONFIG_SUBDIRS' => 1, - 'LT_INIT' => 1, - 'sinclude' => 1, - 'm4_pattern_forbid' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AC_INIT' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AM_PATH_GUILE' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_COND_ENDIF' => 1, 'AM_ENABLE_MULTILIB' => 1, - 'AM_PROG_MOC' => 1 + 'AM_PROG_FC_C_O' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_POT_TOOLS' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AM_NLS' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_SUBST_TRACE' => 1, + '_AM_COND_IF' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -348,196 +348,196 @@ 'configure.ac' ], { - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - '_LT_LINKER_OPTION' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - 'm4_include' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'LT_AC_PROG_EGREP' => 1, - 'LTOBSOLETE_VERSION' => 1, - 'LT_OUTPUT' => 1, - 'PKG_CHECK_VAR' => 1, - 'AC_DEFUN' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AX_OPENMP' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - '_LT_COMPILER_OPTION' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_SYS_COMPILER' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, + '_AM_PROG_TAR' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + '_LT_CC_BASENAME' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_RC' => 1, 'AC_WITH_LTDL' => 1, - 'AC_PROG_LD_GNU' => 1, - 'LTOPTIONS_VERSION' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_WITH_SYSROOT' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_ENABLE_SHARED' => 1, - 'PKG_NOARCH_INSTALLDIR' => 1, - '_AM_PROG_CC_C_O' => 1, + 'LT_AC_PROG_EGREP' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, - 'AM_CONDITIONAL' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'LTDL_CONVENIENCE' => 1, - '_LT_LIBOBJ' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'LT_INIT' => 1, - 'LT_LIB_M' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'LT_PATH_LD' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AM_DISABLE_SHARED' => 1, - 'LT_SYS_MODULE_EXT' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, 'LT_AC_PROG_RC' => 1, + '_LT_AC_TAGVAR' => 1, + 'LT_SYS_MODULE_EXT' => 1, + 'PKG_INSTALLDIR' => 1, + 'AC_LTDL_SHLIBEXT' => 1, 'AC_PROG_LD' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'LT_LIB_DLLOAD' => 1, + 'AC_PROG_EGREP' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AU_DEFUN' => 1, + 'AC_CHECK_LIBM' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'AM_SET_DEPDIR' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + 'LTVERSION_VERSION' => 1, + 'include' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_PROG_F77' => 1, 'LTDL_INSTALLABLE' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'AM_ENABLE_SHARED' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AC_LTDL_DLLIB' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'AC_LTDL_SYSSEARCHPATH' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'LT_PROG_GO' => 1, '_AM_AUTOCONF_VERSION' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_LT_PROG_F77' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, - 'LT_LANG' => 1, - 'AM_DEP_TRACK' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'AM_ENABLE_STATIC' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'PKG_WITH_MODULES' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_DISABLE_SHARED' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'PKG_CHECK_MODULES' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'LTSUGAR_VERSION' => 1, 'AC_PROG_NM' => 1, - 'PKG_INSTALLDIR' => 1, - 'm4_pattern_forbid' => 1, - '_LT_PROG_CXX' => 1, - '_LT_AC_LOCK' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, '_LTDL_SETUP' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AC_LTDL_SHLIBPATH' => 1, - 'AM_MAKE_INCLUDE' => 1, + 'm4_pattern_forbid' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'LT_FUNC_ARGZ' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'LT_INIT' => 1, 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'LTDL_INIT' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AC_PROG_EGREP' => 1, - '_AM_SET_OPTIONS' => 1, - 'AM_SILENT_RULES' => 1, - 'AU_DEFUN' => 1, - '_AM_PROG_TAR' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'PKG_HAVE_WITH_MODULES' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'PKG_CHECK_EXISTS' => 1, - '_LT_PROG_LTMAIN' => 1, - '_AM_IF_OPTION' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_WITH_LTDL' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_CHECK_LIBM' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'LT_PROG_GCJ' => 1, - '_LT_AC_SHELL_INIT' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AC_LTDL_SHLIBEXT' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'LT_PROG_GO' => 1, - 'LT_SYS_MODULE_PATH' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIB_LTDL' => 1, - '_LT_AC_TAGVAR' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - '_LT_DLL_DEF_P' => 1, - '_LT_AC_LANG_CXX' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AC_LIBTOOL_SETUP' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + '_LT_LIBOBJ' => 1, + 'LT_LIB_M' => 1, + 'LT_CMD_MAX_LEN' => 1, + '_AM_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + '_LT_AC_LANG_GCJ' => 1, '_PKG_SHORT_ERRORS_SUPPORTED' => 1, - 'm4_pattern_allow' => 1, - 'AC_LTDL_DLSYM_USCORE' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, - 'AC_LIBTOOL_F77' => 1, + 'AX_OPENMP' => 1, 'AC_LTDL_SYMBOL_USCORE' => 1, - 'LT_AC_PROG_SED' => 1, - '_m4_warn' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'AM_RUN_LOG' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'AM_PROG_NM' => 1, 'AC_LIBTOOL_CXX' => 1, - 'LT_PROG_RC' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, + '_m4_warn' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_LIBTOOL_FC' => 1, + '_LT_DLL_DEF_P' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'm4_pattern_allow' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'PKG_HAVE_DEFINE_WITH_MODULES' => 1, + 'LTDL_INIT' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_GCJ' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_PROG_LIBTOOL' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, + '_LT_PROG_FC' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1, + 'LT_OUTPUT' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LTDL_DLLIB' => 1, + 'AM_PROG_LD' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AM_PROG_CC_C_O' => 1, '_LT_PATH_TOOL_PREFIX' => 1, + 'AM_CONDITIONAL' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + '_AM_SET_OPTION' => 1, + 'AC_LTDL_SHLIBPATH' => 1, '_LT_AC_LANG_CXX_CONFIG' => 1, - 'include' => 1, - 'AM_AUTOMAKE_VERSION' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_DISABLE_STATIC' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'LT_LANG' => 1, + '_AM_DEPENDENCIES' => 1, 'LT_CONFIG_LTDL_DIR' => 1, + '_LT_LINKER_OPTION' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'AC_DEFUN' => 1, + 'AM_MISSING_PROG' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'LT_LIB_DLLOAD' => 1, + 'PKG_WITH_MODULES' => 1, + 'AC_DEFUN_ONCE' => 1, + '_LT_PROG_CXX' => 1, + '_LT_AC_SYS_COMPILER' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AM_RUN_LOG' => 1, + 'PKG_CHECK_VAR' => 1, + 'LT_SYS_MODULE_PATH' => 1, + 'AC_DISABLE_SHARED' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'LT_AC_PROG_GCJ' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AM_SANITY_CHECK' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - '_LT_AC_TAGCONFIG' => 1, 'LT_SUPPORTED_TAG' => 1, - '_LT_PROG_FC' => 1, - 'AC_DEFUN_ONCE' => 1, + '_LT_COMPILER_OPTION' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'LT_PATH_LD' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, 'LT_PATH_NM' => 1, - 'AM_PROG_CC_C_O' => 1, - 'LTVERSION_VERSION' => 1, - '_AM_DEPENDENCIES' => 1, - 'LTSUGAR_VERSION' => 1, - 'PKG_HAVE_DEFINE_WITH_MODULES' => 1, - 'LT_FUNC_ARGZ' => 1, - '_AM_SET_OPTION' => 1, - 'AM_SET_DEPDIR' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'AM_MISSING_PROG' => 1, - '_LT_CC_BASENAME' => 1, - 'LT_SYS_SYMBOL_USCORE' => 1 + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AM_DEP_TRACK' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AM_PROG_INSTALL_SH' => 1, + 'AM_PROG_NM' => 1, + '_LT_PROG_LTMAIN' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + '_AM_IF_OPTION' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_F77' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + '_AM_SET_OPTIONS' => 1, + '_LT_AC_SHELL_INIT' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'PKG_HAVE_WITH_MODULES' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AM_DISABLE_SHARED' => 1, + 'AC_ENABLE_STATIC' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'AM_ENABLE_SHARED' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'LT_PROG_GCJ' => 1, + '_LT_AC_LANG_F77' => 1, + 'PKG_CHECK_EXISTS' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, + '_LT_AC_LOCK' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + 'AC_LIB_LTDL' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'LTOPTIONS_VERSION' => 1, + 'LTDL_CONVENIENCE' => 1, + 'AC_PATH_MAGIC' => 1, + 'LT_PROG_RC' => 1, + 'AC_ENABLE_SHARED' => 1, + 'm4_include' => 1, + 'LT_AC_PROG_SED' => 1, + 'AM_SANITY_CHECK' => 1, + 'PKG_NOARCH_INSTALLDIR' => 1, + 'AM_MISSING_HAS_RUN' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1 } ], 'Autom4te::Request' ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.18.8/autom4te.cache/traces.1 new/LibRaw-0.18.9/autom4te.cache/traces.1 --- old/LibRaw-0.18.8/autom4te.cache/traces.1 2018-02-24 12:10:44.000000000 +0100 +++ new/LibRaw-0.18.9/autom4te.cache/traces.1 2018-04-24 16:33:01.000000000 +0200 @@ -4,7 +4,7 @@ m4trace:aclocal.m4:1444: -1- m4_include([m4/ltsugar.m4]) m4trace:aclocal.m4:1445: -1- m4_include([m4/ltversion.m4]) m4trace:aclocal.m4:1446: -1- m4_include([m4/lt~obsolete.m4]) -m4trace:configure.ac:2: -1- AC_INIT([LibRaw], [0.18.8], [[email protected]], [], [http://www.libraw.org]) +m4trace:configure.ac:2: -1- AC_INIT([LibRaw], [0.18.9], [[email protected]], [], [http://www.libraw.org]) m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -618,7 +618,7 @@ m4trace:configure.ac:211: -1- AC_SUBST([LIBRAW_SHLIB_VERSION], [16:0:0]) m4trace:configure.ac:211: -1- AC_SUBST_TRACE([LIBRAW_SHLIB_VERSION]) m4trace:configure.ac:211: -1- m4_pattern_allow([^LIBRAW_SHLIB_VERSION$]) -m4trace:configure.ac:212: -1- AC_SUBST([LIBRAW_RELEASE_VERSION], [0.18.8]) +m4trace:configure.ac:212: -1- AC_SUBST([LIBRAW_RELEASE_VERSION], [0.18.9]) m4trace:configure.ac:212: -1- AC_SUBST_TRACE([LIBRAW_RELEASE_VERSION]) m4trace:configure.ac:212: -1- m4_pattern_allow([^LIBRAW_RELEASE_VERSION$]) m4trace:configure.ac:214: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.18.8/configure new/LibRaw-0.18.9/configure --- old/LibRaw-0.18.8/configure 2018-02-24 12:10:44.000000000 +0100 +++ new/LibRaw-0.18.9/configure 2018-04-24 16:33:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LibRaw 0.18.8. +# Generated by GNU Autoconf 2.69 for LibRaw 0.18.9. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.18.8' -PACKAGE_STRING='LibRaw 0.18.8' +PACKAGE_VERSION='0.18.9' +PACKAGE_STRING='LibRaw 0.18.9' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://www.libraw.org' @@ -1352,7 +1352,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 LibRaw 0.18.8 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.18.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1422,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.18.8:";; + short | recursive ) echo "Configuration of LibRaw 0.18.9:";; esac cat <<\_ACEOF @@ -1553,7 +1553,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.18.8 +LibRaw configure 0.18.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2043,7 +2043,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.18.8, which was +It was created by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2906,7 +2906,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.18.8' + VERSION='0.18.9' # Some tools Automake needs. @@ -16906,7 +16906,7 @@ LIBRAW_SHLIB_VERSION=16:0:0 -LIBRAW_RELEASE_VERSION=0.18.8 +LIBRAW_RELEASE_VERSION=0.18.9 cat >confcache <<\_ACEOF @@ -17483,7 +17483,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.18.8, which was +This file was extended by LibRaw $as_me 0.18.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17541,7 +17541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.18.8 +LibRaw config.status 0.18.9 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/LibRaw-0.18.8/internal/dcraw_common.cpp new/LibRaw-0.18.9/internal/dcraw_common.cpp --- old/LibRaw-0.18.8/internal/dcraw_common.cpp 2018-02-24 12:10:39.000000000 +0100 +++ new/LibRaw-0.18.9/internal/dcraw_common.cpp 2018-04-24 16:32:54.000000000 +0200 @@ -1228,9 +1228,14 @@ void CLASS nikon_coolscan_load_raw() { - int bufsize = width*3*tiff_bps/8; - if(tiff_bps <= 8) - gamma_curve(1.0/imgdata.params.coolscan_nef_gamma,0.,1,255); + if(!image) + throw LIBRAW_EXCEPTION_IO_CORRUPT; + + int bypp = tiff_bps <= 8 ? 1 : 2; + int bufsize = width * 3 * bypp; + + if (tiff_bps <= 8) + gamma_curve(1.0 / imgdata.params.coolscan_nef_gamma, 0., 1, 255); else gamma_curve(1.0/imgdata.params.coolscan_nef_gamma,0.,1,65535); fseek (ifp, data_offset, SEEK_SET); @@ -1506,7 +1511,12 @@ void CLASS rollei_load_raw() { uchar pixel[10]; - unsigned iten=0, isix, i, buffer=0, todo[16]; + unsigned iten = 0, isix, i, buffer = 0, todo[16]; +#ifdef LIBRAW_LIBRARY_BUILD + if(raw_width > 32767 || raw_height > 32767) + throw LIBRAW_EXCEPTION_IO_BADFILE; +#endif + unsigned maxpixel = raw_width*(raw_height+7); isix = raw_width * raw_height * 5 / 8; while (fread (pixel, 1, 10, ifp) == 10) { @@ -1522,8 +1532,11 @@ todo[i] = isix++; todo[i+1] = buffer >> (14-i)*5; } - for (i=0; i < 16; i+=2) - raw_image[todo[i]] = (todo[i+1] & 0x3ff); + for (i = 0; i < 16; i += 2) + if(todo[i] < maxpixel) + raw_image[todo[i]] = (todo[i + 1] & 0x3ff); + else + derror(); } maximum = 0x3ff; } @@ -3569,6 +3582,11 @@ void CLASS samsung_load_raw() { int row, col, c, i, dir, op[4], len[4]; +#ifdef LIBRAW_LIBRARY_BUILD + if(raw_width> 32768 || raw_height > 32768) // definitely too much for old samsung + throw LIBRAW_EXCEPTION_IO_BADFILE; +#endif + unsigned maxpixels = raw_width*(raw_height+7); order = 0x4949; for (row=0; row < raw_height; row++) { @@ -3587,11 +3605,17 @@ case 2: len[c]--; break; case 1: len[c]++; } - for (c=0; c < 16; c+=2) { - i = len[((c & 1) << 1) | (c >> 3)]; - RAW(row,col+c) = ((signed) ph1_bits(i) << (32-i) >> (32-i)) + - (dir ? RAW(row+(~c | -2),col+c) : col ? RAW(row,col+(c | -2)) : 128); - if (c == 14) c = -1; + for (c = 0; c < 16; c += 2) + { + i = len[((c & 1) << 1) | (c >> 3)]; + unsigned idest = RAWINDEX(row, col + c); + unsigned isrc = (dir ? RAWINDEX(row + (~c | -2), col + c) : col ? RAWINDEX(row, col + (c | -2)) : 0); + if(idest < maxpixels && isrc < maxpixels) // less than zero is handled by unsigned conversion + RAW(row, col + c) = ((signed)ph1_bits(i) << (32 - i) >> (32 - i)) + (dir ? RAW(row + (~c | -2), col + c) : col ? RAW(row, col + (c | -2)) : 128); + else + derror(); + if (c == 14) + c = -1; } } } @@ -9890,37 +9914,68 @@ if (((make[0] == '\0') && (!strncmp(model, "ov5647",6))) || ((!strncmp(make, "RaspberryPi",11)) && (!strncmp(model, "RP_OV5647",9))) || ((!strncmp(make, "RaspberryPi",11)) && (!strncmp(model, "RP_imx219",9)))) { - char mn_text[512]; - char* pos; - char ccms[512]; - ushort l; - float num; - - fgets(mn_text, len, ifp); - pos = strstr(mn_text, "gain_r="); - if (pos) cam_mul[0] = atof(pos+7); - pos = strstr(mn_text, "gain_b="); - if (pos) cam_mul[2] = atof(pos+7); - if ((cam_mul[0] > 0.001f) && (cam_mul[2] > 0.001f)) cam_mul[1] = cam_mul[3] = 1.0f; - else cam_mul[0] = cam_mul[2] = 0.0f; - - pos = strstr(mn_text, "ccm=") + 4; - l = strstr(pos, " ") - pos; - memcpy (ccms, pos, l); - ccms[l] = '\0'; - - pos = strtok (ccms, ","); - for (l=0; l<4; l++) { - num = 0.0; - for (c=0; c<3; c++) { - imgdata.color.ccm[l][c] = (float)atoi(pos); - num += imgdata.color.ccm[l][c]; - pos = strtok (NULL, ","); - } - if (num > 0.01) FORC3 imgdata.color.ccm[l][c] = imgdata.color.ccm[l][c] / num; - } + char mn_text[512]; + char *pos; + char ccms[512]; + ushort l; + float num; + + fgets(mn_text, MIN(len,511), ifp); + mn_text[511] = 0; + + pos = strstr(mn_text, "gain_r="); + if (pos) + cam_mul[0] = atof(pos + 7); + pos = strstr(mn_text, "gain_b="); + if (pos) + cam_mul[2] = atof(pos + 7); + if ((cam_mul[0] > 0.001f) && (cam_mul[2] > 0.001f)) + cam_mul[1] = cam_mul[3] = 1.0f; + else + cam_mul[0] = cam_mul[2] = 0.0f; + + pos = strstr(mn_text, "ccm="); + if(pos) + { + pos +=4; + char *pos2 = strstr(pos, " "); + if(pos2) + { + l = pos2 - pos; + memcpy(ccms, pos, l); + ccms[l] = '\0'; +#if defined WIN32 || defined(__MINGW32__) + // Win32 strtok is already thread-safe + pos = strtok(ccms, ","); +#else + char *last=0; + pos = strtok_r(ccms, ",",&last); +#endif + if(pos) + { + for (l = 0; l < 4; l++) + { + num = 0.0; + for (c = 0; c < 3; c++) + { + imgdata.color.ccm[l][c] = (float)atoi(pos); + num += imgdata.color.ccm[l][c]; +#if defined WIN32 || defined(__MINGW32__) + pos = strtok(NULL, ","); +#else + pos = strtok_r(NULL, ",",&last); +#endif + if(!pos) goto end; // broken + } + if (num > 0.01) + FORC3 imgdata.color.ccm[l][c] = imgdata.color.ccm[l][c] / num; + } + } + } } - else + end:; + } + else #endif parse_makernote (base, 0); break; @@ -13739,7 +13794,8 @@ UINT64 bitbuf=0; int vbits, col, i, c; ushort img[2][2064]; - double sum[]={0,0}; + double sum[] = {0, 0}; + if(width > 2064) return 0.f; // too wide FORC(2) { fseek (ifp, c ? off1:off0, SEEK_SET); @@ -13762,14 +13818,16 @@ #ifdef LIBRAW_LIBRARY_BUILD static void remove_trailing_spaces(char *string, size_t len) { - if(len<1) return; // not needed, b/c sizeof of make/model is 64 - string[len-1]=0; - if(len<3) return; // also not needed - len = strnlen(string,len-1); - for(int i=len-1; i>=0; i--) + if (len < 1) + return; // not needed, b/c sizeof of make/model is 64 + string[len - 1] = 0; + if (len < 3) + return; // also not needed + len = strnlen(string, len - 1); + for (int i = len - 1; i >= 0; i--) { - if(isspace(string[i])) - string[i]=0; + if (isspace((unsigned char)string[i])) + string[i] = 0; else break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.18.8/internal/defines.h new/LibRaw-0.18.9/internal/defines.h --- old/LibRaw-0.18.8/internal/defines.h 2018-02-24 12:10:39.000000000 +0100 +++ new/LibRaw-0.18.9/internal/defines.h 2018-04-24 16:32:54.000000000 +0200 @@ -153,6 +153,7 @@ 3 G R G R G R 3 B G B G B G 3 R G R G R G 3 G B G B G B */ +#define RAWINDEX(row, col) ((row)*raw_width + (col)) #define RAW(row,col) \ raw_image[(row)*raw_width+(col)] #define BAYER(row,col) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.18.8/libraw/libraw_version.h new/LibRaw-0.18.9/libraw/libraw_version.h --- old/LibRaw-0.18.8/libraw/libraw_version.h 2018-02-24 10:47:43.000000000 +0100 +++ new/LibRaw-0.18.9/libraw/libraw_version.h 2018-04-24 16:23:24.000000000 +0200 @@ -22,7 +22,7 @@ #define LIBRAW_MAJOR_VERSION 0 #define LIBRAW_MINOR_VERSION 18 -#define LIBRAW_PATCH_VERSION 8 +#define LIBRAW_PATCH_VERSION 9 #define LIBRAW_VERSION_TAIL Release #define LIBRAW_SHLIB_CURRENT 16 ++++++ libraw-CVE-2018-10528.patch ++++++ Index: LibRaw-0.18.9/src/libraw_cxx.cpp =================================================================== --- LibRaw-0.18.9.orig/src/libraw_cxx.cpp 2018-04-30 11:13:15.126021499 +0200 +++ LibRaw-0.18.9/src/libraw_cxx.cpp 2018-04-30 11:16:43.677077398 +0200 @@ -5484,17 +5484,18 @@ void x3f_clear(void *p) x3f_delete((x3f_t*)p); } -static char *utf2char(utf16_t *str, char *buffer) +void utf2char(utf16_t *str, char *buffer, unsigned bufsz) { + if(bufsz<1) return; + buffer[bufsz-1] = 0; char *b = buffer; - while (*str != 0x00) { + while (*str != 0x00 && --bufsz>0) { char *chr = (char *)str; *b++ = *chr; str++; } *b = 0; - return buffer; } static void *lr_memmem(const void *l, size_t l_len, const void *s, size_t s_len) @@ -5555,8 +5556,8 @@ void LibRaw::parse_x3f() x3f_property_t *P = PL->property_table.element; for (i=0; i<PL->num_properties; i++) { char name[100], value[100]; - utf2char(P[i].name,name); - utf2char(P[i].value,value); + utf2char(P[i].name,name,sizeof(name)); + utf2char(P[i].value,value,sizeof(value)); if (!strcmp (name, "ISO")) imgdata.other.iso_speed = atoi(value); if (!strcmp (name, "CAMMANUF")) ++++++ libraw-CVE-2018-10529.patch ++++++ Index: LibRaw-0.18.9/internal/libraw_x3f.cpp =================================================================== --- LibRaw-0.18.9.orig/internal/libraw_x3f.cpp 2018-04-24 16:23:24.000000000 +0200 +++ LibRaw-0.18.9/internal/libraw_x3f.cpp 2018-04-30 11:35:17.477351409 +0200 @@ -121,8 +121,6 @@ typedef struct x3f_property_s { /* Computed */ utf16_t *name; /* 0x0000 terminated UTF 16 */ utf16_t *value; /* 0x0000 terminated UTF 16 */ - char *name_utf8; /* converted to UTF 8 */ - char *value_utf8; /* converted to UTF 8 */ } x3f_property_t; typedef struct x3f_property_table_s { @@ -516,7 +514,6 @@ unsigned x3f_get4(LibRaw_abstract_datast int _cur = _file->_func(_buffer,1,_left); \ if (_cur == 0) { \ throw LIBRAW_EXCEPTION_IO_CORRUPT; \ - exit(1); \ } \ _left -= _cur; \ } \ @@ -912,11 +909,6 @@ static void free_camf_entry(camf_entry_t if (PL) { int i; - - for (i = 0; i < PL->property_table.size; i++) { - FREE(PL->property_table.element[i].name_utf8); - FREE(PL->property_table.element[i].value_utf8); - } } FREE(PL->property_table.element); FREE(PL->data); @@ -1624,14 +1616,14 @@ static void x3f_load_property_list(x3f_i if (!PL->data_size) PL->data_size = read_data_block(&PL->data, I, DE, 0); + uint32_t maxoffset = PL->data_size/sizeof(utf16_t)-2; // at least 2 chars, value + terminating 0x0000 for (i=0; i<PL->num_properties; i++) { x3f_property_t *P = &PL->property_table.element[i]; - + if(P->name_offset > maxoffset || P->value_offset > maxoffset) + throw LIBRAW_EXCEPTION_IO_CORRUPT; P->name = ((utf16_t *)PL->data + P->name_offset); P->value = ((utf16_t *)PL->data + P->value_offset); - P->name_utf8 = 0;// utf16le_to_utf8(P->name); - P->value_utf8 = 0;//utf16le_to_utf8(P->value); } } Index: LibRaw-0.18.9/src/libraw_cxx.cpp =================================================================== --- LibRaw-0.18.9.orig/src/libraw_cxx.cpp 2018-04-30 11:35:17.477351409 +0200 +++ LibRaw-0.18.9/src/libraw_cxx.cpp 2018-04-30 11:38:21.568048079 +0200 @@ -5551,13 +5551,21 @@ void LibRaw::parse_x3f() // Parse property list DEH = &DE->header; x3f_property_list_t *PL = &DEH->data_subsection.property_list; + utf16_t *datap = (utf16_t*) PL->data; + uint32_t maxitems = PL->data_size/sizeof(utf16_t); if (PL->property_table.size != 0) { int i; x3f_property_t *P = PL->property_table.element; for (i=0; i<PL->num_properties; i++) { char name[100], value[100]; - utf2char(P[i].name,name,sizeof(name)); - utf2char(P[i].value,value,sizeof(value)); + int noffset = (P[i].name - datap); + int voffset = (P[i].value - datap); + if(noffset < 0 || noffset>maxitems || voffset<0 || voffset>maxitems) + throw LIBRAW_EXCEPTION_IO_CORRUPT; + int maxnsize = maxitems - (P[i].name - datap); + int maxvsize = maxitems - (P[i].value - datap); + utf2char(P[i].name, name,MIN(maxnsize,sizeof(name))); + utf2char(P[i].value, value,MIN(maxvsize,sizeof(value))); if (!strcmp (name, "ISO")) imgdata.other.iso_speed = atoi(value); if (!strcmp (name, "CAMMANUF"))
