Hello community, here is the log from the commit of package avfs for openSUSE:Factory checked in at 2015-11-12 19:41:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avfs (Old) and /work/SRC/openSUSE:Factory/.avfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avfs" Changes: -------- --- /work/SRC/openSUSE:Factory/avfs/avfs.changes 2015-06-10 09:16:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avfs.new/avfs.changes 2015-11-12 19:41:37.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 11 19:00:21 UTC 2015 - [email protected] + +- Update to version 1.0.3 + * fixed zlib assert triggered for some Huffman encodings + * added rar v5 in extfs urar (which is also renamed to uextrar to avoid + collision with internal rar module) + * some configure script improvements have been done for fuse and liblzma + dependencies + +------------------------------------------------------------------- Old: ---- avfs-1.0.2.tar.bz2 avfs-1.0.2.tar.bz2.asc New: ---- avfs-1.0.3.tar.bz2 avfs-1.0.3.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avfs.spec ++++++ --- /var/tmp/diff_new_pack.bMuQt0/_old 2015-11-12 19:41:38.000000000 +0100 +++ /var/tmp/diff_new_pack.bMuQt0/_new 2015-11-12 19:41:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: avfs -Version: 1.0.2 +Version: 1.0.3 Release: 0 Summary: AVFS - an archive look-inside filesystem License: GPL-2.0+ and LGPL-2.1+ @@ -87,9 +87,8 @@ %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -pushd %{buildroot}/%{_libdir}/avfs/extfs/ +pushd %{buildroot}%{_libdir}/%{name}/extfs/ mv uzip ext-uzip - mv urar ext-urar popd mkdir -p %{buildroot}/%{_mandir}/man1/ pushd %{buildroot}/%{_mandir}/man1/ @@ -121,7 +120,7 @@ %dir %{_libdir}/avfs %dir %{_libdir}/avfs/extfs %{_libdir}/avfs/extfs/* -%doc /%{_mandir}/man1/avfsd.1* +%{_mandir}/man1/avfsd.1* %files devel %defattr(-,root,root,0755) ++++++ avfs-1.0.2.tar.bz2 -> avfs-1.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/ChangeLog new/avfs-1.0.3/ChangeLog --- old/avfs-1.0.2/ChangeLog 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/ChangeLog 2015-06-13 15:00:06.000000000 +0200 @@ -1,3 +1,26 @@ +2015-06-13 Ralf Hoffmann <[email protected]> + + * bumped version to 1.0.3 + +2015-05-10 Ralf Hoffmann <[email protected]> + + * added rar v5 support in extfs urar module. + * renamed extfs urar module to uextrar so internal urar and + external module can be used simultaneously. + +2015-03-08 Ralf Hoffmann <[email protected]> + + * fixed zlib state saving/restoring when a Huffman tree is not a + dynamic one. This fixes an assertion triggered by some rare cases + when accessing zip'ed content. Triggering the assertion did also + depend on the block size when reading content. + +2015-02-04 Ralf Hoffmann <[email protected]> + + * changed info.h dependency for out-of-src builds + * changed configure to allow forcing to build with fuse and/or + liblzma support + 2014-06-19 Ralf Hoffmann <[email protected]> * uzip: added support for zip64 format. Allows more than 64k files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/NEWS new/avfs-1.0.3/NEWS --- old/avfs-1.0.2/NEWS 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/NEWS 2015-06-13 15:00:06.000000000 +0200 @@ -1,3 +1,10 @@ +Changes from 1.0.2 to 1.0.3 (2015-06-13) + - fixed zlib assert triggered for some Huffman encodings + - added rar v5 in extfs urar (which is also renamed to uextrar to avoid + collision with internal rar module) + - some configure script improvements have been done for fuse and liblzma + dependencies + Changes from 1.0.1 to 1.0.2 (2014-06-29) - fixed access to files which are larger than 4GB in modules based on archive, state, and utar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/aclocal.m4 new/avfs-1.0.3/aclocal.m4 --- old/avfs-1.0.2/aclocal.m4 2014-06-28 22:39:08.000000000 +0200 +++ new/avfs-1.0.3/aclocal.m4 2015-06-13 15:00:13.000000000 +0200 @@ -1326,7 +1326,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1340,7 +1340,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1359,7 +1362,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/configure new/avfs-1.0.3/configure --- old/avfs-1.0.2/configure 2014-06-28 22:39:12.000000000 +0200 +++ new/avfs-1.0.3/configure 2015-06-13 15:00:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for avfs 1.0.2. +# Generated by GNU Autoconf 2.69 for avfs 1.0.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='avfs' PACKAGE_TARNAME='avfs' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='avfs 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='avfs 1.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -659,7 +659,6 @@ FUSELIBS LIBFUSE_LIBS LIBFUSE_CFLAGS -PKG_CONFIG profiledir stop_prio start_prio @@ -697,6 +696,7 @@ NEON_BUILD_BUNDLED LIBOBJS ZLIB_CFLAGS +PKG_CONFIG OTOOL64 OTOOL LIPO @@ -1402,7 +1402,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 avfs 1.0.2 to adapt to many kinds of systems. +\`configure' configures avfs 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1472,7 +1472,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of avfs 1.0.2:";; + short | recursive ) echo "Configuration of avfs 1.0.3:";; esac cat <<\_ACEOF @@ -1517,7 +1517,7 @@ --with-ssl=DIR enable OpenSSL support --with-expat=DIR specify Expat location --with-kernel Specify location of kernel source - --with-xz use xz (default is YES) + --with-xz use xz (default is YES, force to always enable) Some influential environment variables: CC C compiler command @@ -1604,7 +1604,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -avfs configure 1.0.2 +avfs configure 1.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1969,7 +1969,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by avfs $as_me 1.0.2, which was +It was created by avfs $as_me 1.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2833,7 +2833,7 @@ # Define the identity of the package. PACKAGE='avfs' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -2982,10 +2982,10 @@ as_fn_error $? "type 'make realclean' before running configure" "$LINENO" 5 fi -VERSION=1.0.2 +VERSION=1.0.3 -NUMVERSION=102 +NUMVERSION=103 os=`uname -s` @@ -6611,7 +6611,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6629,7 +6629,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6648,7 +6651,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -11643,6 +11649,123 @@ + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi + +fi + if test ! "$preload_build" = "yes"; then # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : @@ -14062,123 +14185,7 @@ if test $fuse_build = yes; then fuse_pkg_found=no - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi - -fi -if test -n "$PKG_CONFIG" && \ + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5 ($PKG_CONFIG --exists --print-errors "fuse") 2>&5 ac_status=$? @@ -14274,7 +14281,7 @@ fi - if test "$fuse_pkg_found" = "yes"; then + if test "$fuse_pkg_found" = "yes" -o "$run_fuse_test" = "no"; then $as_echo "#define HAVE_LIBFUSE 1" >>confdefs.h @@ -14301,7 +14308,7 @@ ac_cv_use_xz=yes fi -if test "$ac_cv_use_xz" = "yes"; then +if test "$ac_cv_use_xz" = "yes" -o "$ac_cv_use_xz" = "force"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblzma\""; } >&5 ($PKG_CONFIG --exists --print-errors "liblzma") 2>&5 @@ -14398,7 +14405,7 @@ fi - if test "$have_liblzma" = "yes"; then + if test "$have_liblzma" = "yes" -o "$ac_cv_use_xz" = "force"; then $as_echo "#define HAVE_LIBLZMA 1" >>confdefs.h @@ -14513,7 +14520,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile modules/Makefile zlib/Makefile bzlib/Makefile lib/Makefile include/Makefile avfscoda/Makefile avfscoda/redir/Makefile preload/Makefile libneon/Makefile extfs/Makefile scripts/Makefile scripts/init/Makefile test/Makefile spec/Makefile macros/Makefile patch/Makefile doc/Makefile fuse/Makefile scripts/avfs-config extfs/a extfs/apt extfs/audio extfs/deb extfs/deba extfs/debd extfs/dpkg extfs/hp48 extfs/iso9660 extfs/lslR extfs/mailfs extfs/patchfs extfs/rpms extfs/u7z extfs/uace extfs/uar extfs/uarj extfs/uc1541 extfs/uha extfs/ulha extfs/upp extfs/urar extfs/uxdms extfs/uxpk extfs/uzip extfs/uzoo include/version.h" +ac_config_files="$ac_config_files Makefile src/Makefile modules/Makefile zlib/Makefile bzlib/Makefile lib/Makefile include/Makefile avfscoda/Makefile avfscoda/redir/Makefile preload/Makefile libneon/Makefile extfs/Makefile scripts/Makefile scripts/init/Makefile test/Makefile spec/Makefile macros/Makefile patch/Makefile doc/Makefile fuse/Makefile scripts/avfs-config extfs/a extfs/apt extfs/audio extfs/deb extfs/deba extfs/debd extfs/dpkg extfs/hp48 extfs/iso9660 extfs/lslR extfs/mailfs extfs/patchfs extfs/rpms extfs/u7z extfs/uace extfs/uar extfs/uarj extfs/uc1541 extfs/uha extfs/ulha extfs/upp extfs/uextrar extfs/uxdms extfs/uxpk extfs/uzip extfs/uzoo include/version.h" ac_config_commands="$ac_config_commands default" @@ -15104,7 +15111,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by avfs $as_me 1.0.2, which was +This file was extended by avfs $as_me 1.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15170,7 +15177,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -avfs config.status 1.0.2 +avfs config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15621,7 +15628,7 @@ "extfs/uha") CONFIG_FILES="$CONFIG_FILES extfs/uha" ;; "extfs/ulha") CONFIG_FILES="$CONFIG_FILES extfs/ulha" ;; "extfs/upp") CONFIG_FILES="$CONFIG_FILES extfs/upp" ;; - "extfs/urar") CONFIG_FILES="$CONFIG_FILES extfs/urar" ;; + "extfs/uextrar") CONFIG_FILES="$CONFIG_FILES extfs/uextrar" ;; "extfs/uxdms") CONFIG_FILES="$CONFIG_FILES extfs/uxdms" ;; "extfs/uxpk") CONFIG_FILES="$CONFIG_FILES extfs/uxpk" ;; "extfs/uzip") CONFIG_FILES="$CONFIG_FILES extfs/uzip" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/configure.ac new/avfs-1.0.3/configure.ac --- old/avfs-1.0.2/configure.ac 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/configure.ac 2015-06-13 15:00:06.000000000 +0200 @@ -2,7 +2,7 @@ define(AVFS_MAJOR,[1]) define(AVFS_MINOR,[0]) -define(AVFS_PATCH,[2]) +define(AVFS_PATCH,[3]) define(AVFS_COMMENT,[]) define(AVFS_VERSION,AVFS_MAJOR[.]AVFS_MINOR[.]AVFS_PATCH[]AVFS_COMMENT) @@ -167,6 +167,8 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL +PKG_PROG_PKG_CONFIG + if test ! "$preload_build" = "yes"; then AC_SYS_LARGEFILE fi @@ -483,7 +485,7 @@ [fuse_pkg_found=yes]) ]) - if test "$fuse_pkg_found" = "yes"; then + if test "$fuse_pkg_found" = "yes" -o "$run_fuse_test" = "no"; then AC_DEFINE(HAVE_LIBFUSE, 1, [Define to 1 if your system has libfuse installed]) CPPFLAGS="$CPPFLAGS $LIBFUSE_CFLAGS" FUSELIBS="$LIBFUSE_LIBS" @@ -512,16 +514,16 @@ have_liblzma=no use_liblzma=no -AC_ARG_WITH(xz,AC_HELP_STRING([--with-xz],[use xz (default is YES)]), +AC_ARG_WITH(xz,AC_HELP_STRING([--with-xz],[use xz (default is YES, force to always enable)]), ac_cv_use_xz=$withval, ac_cv_use_xz=yes) -if test "$ac_cv_use_xz" = "yes"; then +if test "$ac_cv_use_xz" = "yes" -o "$ac_cv_use_xz" = "force"; then PKG_CHECK_EXISTS([liblzma],[ PKG_CHECK_MODULES([LIBLZMA],[liblzma], [have_liblzma=yes]) ]) dnl AC_MSG_CHECKING(for liblzma) - if test "$have_liblzma" = "yes"; then + if test "$have_liblzma" = "yes" -o "$ac_cv_use_xz" = "force"; then AC_DEFINE(HAVE_LIBLZMA, 1, [Define to 1 if your system has liblzma installed]) CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS" LIBS="$LIBS $LIBLZMA_LIBS" @@ -602,7 +604,7 @@ extfs/uha extfs/ulha extfs/upp -extfs/urar +extfs/uextrar extfs/uxdms extfs/uxpk extfs/uzip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/extfs/Makefile.am new/avfs-1.0.3/extfs/Makefile.am --- old/avfs-1.0.2/extfs/Makefile.am 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/extfs/Makefile.am 2015-06-13 15:00:06.000000000 +0200 @@ -32,7 +32,7 @@ uha \ ulha \ upp \ - urar \ + uextrar \ uxdms \ uxpk \ uzip \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/extfs/Makefile.in new/avfs-1.0.3/extfs/Makefile.in --- old/avfs-1.0.2/extfs/Makefile.in 2014-06-28 22:39:11.000000000 +0200 +++ new/avfs-1.0.3/extfs/Makefile.in 2015-06-13 15:00:15.000000000 +0200 @@ -88,7 +88,7 @@ $(srcdir)/rpms.in $(srcdir)/u7z.in $(srcdir)/uace.in \ $(srcdir)/uar.in $(srcdir)/uarj.in $(srcdir)/uc1541.in \ $(srcdir)/uha.in $(srcdir)/ulha.in $(srcdir)/upp.in \ - $(srcdir)/urar.in $(srcdir)/uxdms.in $(srcdir)/uxpk.in \ + $(srcdir)/uextrar.in $(srcdir)/uxdms.in $(srcdir)/uxpk.in \ $(srcdir)/uzip.in $(srcdir)/uzoo.in README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/extfs.m4 \ @@ -102,8 +102,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = a apt audio deb deba debd dpkg hp48 iso9660 lslR \ - mailfs patchfs rpms u7z uace uar uarj uc1541 uha ulha upp urar \ - uxdms uxpk uzip uzoo + mailfs patchfs rpms u7z uace uar uarj uc1541 uha ulha upp \ + uextrar uxdms uxpk uzip uzoo CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -349,7 +349,7 @@ uha \ ulha \ upp \ - urar \ + uextrar \ uxdms \ uxpk \ uzip \ @@ -435,7 +435,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ upp: $(top_builddir)/config.status $(srcdir)/upp.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -urar: $(top_builddir)/config.status $(srcdir)/urar.in +uextrar: $(top_builddir)/config.status $(srcdir)/uextrar.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uxdms: $(top_builddir)/config.status $(srcdir)/uxdms.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/extfs/extfs.ini new/avfs-1.0.3/extfs/extfs.ini --- old/avfs-1.0.2/extfs/extfs.ini 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/extfs/extfs.ini 2015-06-13 15:00:06.000000000 +0200 @@ -6,7 +6,7 @@ # uzip .zip .jar uzoo .zoo ulha .lha .lhz -# urar .rar +uextrar uha # For arj usage you need special patch to unarj uarj .arj diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/extfs/uextrar.in new/avfs-1.0.3/extfs/uextrar.in --- old/avfs-1.0.2/extfs/uextrar.in 1970-01-01 01:00:00.000000000 +0100 +++ new/avfs-1.0.3/extfs/uextrar.in 2015-06-13 15:00:06.000000000 +0200 @@ -0,0 +1,130 @@ +#! /bin/sh +# +# Written by andrey joukov +# (C) 1996 2:5020/[email protected] +# Updated by [email protected] 1999 +# Andrew V. Samoilov <[email protected]> 2000 +# Updated by [email protected] 2015 +# beta version 2.0 +# +# rar and unrar can be found on http://www.rarlabs.com/ + +RAR=rar +UNRAR=$RAR + +# Prefer unrar (freeware). Try to find unrar in $PATH. +save_IFS="$IFS"; IFS=: +for dir in $PATH; do + IFS="$save_IFS" + test -z "$dir" && dir=. + if test -x "$dir/unrar" -a -f "$dir/unrar"; then + UNRAR="$dir/unrar" + break + fi +done + +mcrarfs_list () +{ + $UNRAR v -c- "$1" | @AWK@ -v uid=$(id -ru) ' +BEGIN { flag=0; date="JanFebMarAprMayJunJulAugSepOctNovDec"; rarv5=0; } +/^RAR 5/ { if (flag == 0) { rarv5 = 1; } } +/^UNRAR 5/ { if (flag == 0) { rarv5 = 1; } } +/^-------/ { flag++; if (flag > 1) exit 0; next } +{ +if (flag == 0) next +if ( rarv5 == 1 ) { + split($5, a, "-") + if (a[3] < 50) + a[3] = 2000 + a[3] + else + a[3] = 1900 + a[3] + + if (match($0,"[0-9][0-9]:[0-9][0-9] *[0-9A-F]{8} ")) { + str = substr($0, RSTART + RLENGTH); + str = substr(str, 0, length(str) - 1); + } else str = ""; + + printf "%s 1 %-8d %-8d %8d %3s %2d %4d %s %s\n", $1, uid, 0, $2, substr(date, (a[2]-1)*3+1, 3), a[1], a[3], $6, str +} else { + if ( !/ [0-9][0-9]:[0-9][0-9] /) str = $0 # there is no time spec in this line + else { + if (str ~ /^\^/) + str=substr(str, 2) + split($4, a, "-") + if (a[3] < 50) + a[3] = 2000 + a[3] + else + a[3] = 1900 + a[3] + if (index($6, "D") != 0) + $6="drwxr-xr-x" + else + if (index($6, ".") != 0) + $6="-rw-r--r--" + printf "%s 1 %-8d %-8d %8d %3s %2d %4d %s %s\n", $6, uid, 0, $1, substr(date, (a[2]-1)*3+1, 3), a[1], a[3], $5, str + } +} +}' +} + +mcrarfs_copyin () +{ +# copyin by [email protected] +# preserve pwd. It is clean, but is it necessary? + pwd=`pwd` +# Create a directory and copy in it the tmp file with the good name + mkdir "$3.dir" || exit 1 + cd "$3.dir" + di="${2%/*}" +# if file is to be written upper in the archive tree, make fake dir + if test x"$di" != x"${2##*/}" ; then + mkdir -p "$di" || exit 1 + fi + cp -fp "$3" "$3.dir/$2" + $RAR a "$1" "$2" >/dev/null + cd "$pwd" + rm -rf "$3.dir" +} + +mcrarfs_copyout () +{ + $UNRAR p -c- -inul "$1" "$2" > "$3" +} + +mcrarfs_mkdir () +{ +# preserve pwd. It is clean, but is it necessary? + pwd=`pwd` +# Create a directory and create in it a tmp directory with the good name + dir=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-urar.XXXXXX"` || exit 1 + cd "$dir" + mkdir -p "$2" || exit 1 +# rar cannot create an empty directory + touch "$2"/.rarfs + $RAR a -r "$1" "$2" >/dev/null + $RAR d "$1" "$2/.rarfs" >/dev/null + cd "$pwd" + rm -rf "$dir" +} + +mcrarfs_rm () +{ + $RAR d "$1" "$2" >/dev/null +} + +umask 077 + +cmd="$1" +shift + +case "$cmd" in + list) mcrarfs_list "$@" | sort -k 10 ;; # rar lists directories + # after files, so sort names + # to prevent duplication + rm) mcrarfs_rm "$@" ;; + rmdir) mcrarfs_rm "$@" ;; + mkdir) mcrarfs_mkdir "$@" ;; + copyin) mcrarfs_copyin "$@" ;; + copyout) mcrarfs_copyout "$@" ;; + *) exit 1 ;; +esac +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/extfs/urar.in new/avfs-1.0.3/extfs/urar.in --- old/avfs-1.0.2/extfs/urar.in 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/extfs/urar.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,112 +0,0 @@ -#! /bin/sh -# -# Written by andrey joukov -# (C) 1996 2:5020/[email protected] -# Updated by [email protected] 1999 -# Andrew V. Samoilov <[email protected]> 2000 -# beta version 2.0 -# -# rar and unrar can be found on http://www.rarlabs.com/ - -RAR=rar -UNRAR=$RAR - -# Prefer unrar (freeware). Try to find unrar in $PATH. -save_IFS="$IFS"; IFS=: -for dir in $PATH; do - IFS="$save_IFS" - test -z "$dir" && dir=. - if test -x "$dir/unrar" -a -f "$dir/unrar"; then - UNRAR="$dir/unrar" - break - fi -done - -mcrarfs_list () -{ - $UNRAR v -c- "$1" | @AWK@ -v uid=$(id -ru) ' -BEGIN { flag=0; date="JanFebMarAprMayJunJulAugSepOctNovDec" } -/^-------/ { flag++; if (flag > 1) exit 0; next } -{ -if (flag == 0) next -if ( !/ [0-9][0-9]:[0-9][0-9] /) str = $0 # there is no time spec in this line -else { - if (str ~ /^\^/) - str=substr(str, 2) - split($4, a, "-") - if (a[3] < 50) - a[3] = 2000 + a[3] - else - a[3] = 1900 + a[3] - if (index($6, "D") != 0) - $6="drwxr-xr-x" - else - if (index($6, ".") != 0) - $6="-rw-r--r--" - printf "%s 1 %-8d %-8d %8d %3s %2d %4d %s %s\n", $6, uid, 0, $1, substr(date, (a[2]-1)*3+1, 3), a[1], a[3], $5, str -} -}' -} - -mcrarfs_copyin () -{ -# copyin by [email protected] -# preserve pwd. It is clean, but is it necessary? - pwd=`pwd` -# Create a directory and copy in it the tmp file with the good name - mkdir "$3.dir" || exit 1 - cd "$3.dir" - di="${2%/*}" -# if file is to be written upper in the archive tree, make fake dir - if test x"$di" != x"${2##*/}" ; then - mkdir -p "$di" || exit 1 - fi - cp -fp "$3" "$3.dir/$2" - $RAR a "$1" "$2" >/dev/null - cd "$pwd" - rm -rf "$3.dir" -} - -mcrarfs_copyout () -{ - $UNRAR p -c- -inul "$1" "$2" > "$3" -} - -mcrarfs_mkdir () -{ -# preserve pwd. It is clean, but is it necessary? - pwd=`pwd` -# Create a directory and create in it a tmp directory with the good name - dir=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-urar.XXXXXX"` || exit 1 - cd "$dir" - mkdir -p "$2" || exit 1 -# rar cannot create an empty directory - touch "$2"/.rarfs - $RAR a -r "$1" "$2" >/dev/null - $RAR d "$1" "$2/.rarfs" >/dev/null - cd "$pwd" - rm -rf "$dir" -} - -mcrarfs_rm () -{ - $RAR d "$1" "$2" >/dev/null -} - -umask 077 - -cmd="$1" -shift - -case "$cmd" in - list) mcrarfs_list "$@" | sort -k 10 ;; # rar lists directories - # after files, so sort names - # to prevent duplication - rm) mcrarfs_rm "$@" ;; - rmdir) mcrarfs_rm "$@" ;; - mkdir) mcrarfs_mkdir "$@" ;; - copyin) mcrarfs_copyin "$@" ;; - copyout) mcrarfs_copyout "$@" ;; - *) exit 1 ;; -esac -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/src/Makefile.am new/avfs-1.0.3/src/Makefile.am --- old/avfs-1.0.2/src/Makefile.am 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/src/Makefile.am 2015-06-13 15:00:06.000000000 +0200 @@ -48,7 +48,8 @@ local.h \ mod_static.h -$(srcdir)/utils.c: info.h +nodist_libavfscore_la_SOURCES = info.h +BUILT_SOURCES = info.h info.h: rm -f info.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/src/Makefile.in new/avfs-1.0.3/src/Makefile.in --- old/avfs-1.0.2/src/Makefile.in 2014-06-28 22:39:11.000000000 +0200 +++ new/avfs-1.0.3/src/Makefile.in 2015-06-13 15:00:16.000000000 +0200 @@ -112,7 +112,9 @@ state.lo serialfile.lo filtprog.lo filter.lo filecache.lo \ socket.lo passwords.lo zread.lo exit.lo realfile.lo bzread.lo \ $(am__objects_1) -libavfscore_la_OBJECTS = $(am_libavfscore_la_OBJECTS) +nodist_libavfscore_la_OBJECTS = +libavfscore_la_OBJECTS = $(am_libavfscore_la_OBJECTS) \ + $(nodist_libavfscore_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -155,7 +157,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libavfscore_la_SOURCES) +SOURCES = $(libavfscore_la_SOURCES) $(nodist_libavfscore_la_SOURCES) DIST_SOURCES = $(am__libavfscore_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -358,8 +360,11 @@ local.h \ mod_static.h +nodist_libavfscore_la_SOURCES = info.h +BUILT_SOURCES = info.h CLEANFILES = info.h -all: all-am +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -558,10 +563,12 @@ fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -592,6 +599,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ @@ -663,7 +671,7 @@ uninstall-am: -.MAKE: install-am install-strip +.MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ @@ -680,8 +688,6 @@ tags tags-am uninstall uninstall-am -$(srcdir)/utils.c: info.h - info.h: rm -f info.h $(srcdir)/make_info $(moduledir) > info.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/test/Makefile.am new/avfs-1.0.3/test/Makefile.am --- old/avfs-1.0.2/test/Makefile.am 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/test/Makefile.am 2015-06-13 15:00:06.000000000 +0200 @@ -1,7 +1,11 @@ -noinst_PROGRAMS = runtest +noinst_PROGRAMS = runtest testread AM_CFLAGS = -I$(top_srcdir)/include @CFLAGS@ @CPPFLAGS@ runtest_LDFLAGS = @LDFLAGS@ @LIBS@ runtest_LDADD = ../lib/libavfs_static.la runtest_SOURCES = runtest.c + +testread_LDFLAGS = @LDFLAGS@ @LIBS@ +testread_LDADD = ../lib/libavfs_static.la +testread_SOURCES = testread.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/test/Makefile.in new/avfs-1.0.3/test/Makefile.in --- old/avfs-1.0.2/test/Makefile.in 2014-06-28 22:39:11.000000000 +0200 +++ new/avfs-1.0.3/test/Makefile.in 2015-06-13 15:00:16.000000000 +0200 @@ -78,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = runtest$(EXEEXT) +noinst_PROGRAMS = runtest$(EXEEXT) testread$(EXEEXT) subdir = test DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -106,6 +106,12 @@ runtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(runtest_LDFLAGS) $(LDFLAGS) -o $@ +am_testread_OBJECTS = testread.$(OBJEXT) +testread_OBJECTS = $(am_testread_OBJECTS) +testread_DEPENDENCIES = ../lib/libavfs_static.la +testread_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(testread_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -140,8 +146,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(runtest_SOURCES) -DIST_SOURCES = $(runtest_SOURCES) +SOURCES = $(runtest_SOURCES) $(testread_SOURCES) +DIST_SOURCES = $(runtest_SOURCES) $(testread_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -329,6 +335,9 @@ runtest_LDFLAGS = @LDFLAGS@ @LIBS@ runtest_LDADD = ../lib/libavfs_static.la runtest_SOURCES = runtest.c +testread_LDFLAGS = @LDFLAGS@ @LIBS@ +testread_LDADD = ../lib/libavfs_static.la +testread_SOURCES = testread.c all: all-am .SUFFIXES: @@ -377,6 +386,10 @@ @rm -f runtest$(EXEEXT) $(AM_V_CCLD)$(runtest_LINK) $(runtest_OBJECTS) $(runtest_LDADD) $(LIBS) +testread$(EXEEXT): $(testread_OBJECTS) $(testread_DEPENDENCIES) $(EXTRA_testread_DEPENDENCIES) + @rm -f testread$(EXEEXT) + $(AM_V_CCLD)$(testread_LINK) $(testread_OBJECTS) $(testread_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -384,6 +397,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testread.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/test/testread.c new/avfs-1.0.3/test/testread.c --- old/avfs-1.0.2/test/testread.c 1970-01-01 01:00:00.000000000 +0100 +++ new/avfs-1.0.3/test/testread.c 2015-06-13 15:00:06.000000000 +0200 @@ -0,0 +1,52 @@ +/* this is a very simple test tool for reading any file in an archive, just give the name as argument. + * This tool is not meant to be correct or a good example, it is pretty much only useful for debugging + * avfs. + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <stdio.h> +#include <virtual.h> + +int main( int argc, char **argv ) +{ + int fd; + ssize_t len; + char buf[128*1024]; + + if ( argc < 2 ) { + return 0; + } + + fd = virt_open( argv[1], O_RDONLY, 0 ); + if ( fd >= 0 ) { + ssize_t total_len; + + for (;;) { + len = virt_read( fd, buf, sizeof( buf ) ); + total_len += len; + + printf( "Bytes read: %lu\n", len ); + + if ( len == 0 ) break; + } + + if ( total_len >= sizeof( buf ) ) { + for (;;) { + total_len -= sizeof( buf ); + + virt_lseek( fd, total_len, 0 ); + len = virt_read( fd, buf, sizeof( buf ) ); + + printf( "Bytes read by seeking to %lu: %lu\n", total_len, len ); + + if ( total_len < sizeof( buf ) ) break; + } + } + + virt_close( fd ); + } + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/avfs-1.0.2/zlib/infcodes.c new/avfs-1.0.3/zlib/infcodes.c --- old/avfs-1.0.2/zlib/infcodes.c 2014-06-28 22:38:57.000000000 +0200 +++ new/avfs-1.0.3/zlib/infcodes.c 2015-06-13 15:00:06.000000000 +0200 @@ -261,11 +261,20 @@ char *buf = *bufp; inflate_codes_statef *c = s->sub.decode.codes; struct inflate_codes_state ccpy = *c; - char fixed_tree = 0; + char fixed_tree = 0; /* this is a flag for the restore code to + indicate that a tree pointer points to a + fixed table instead of dynamic one. Bit 0 + is for the c->ltree/dtree, bit 1 for + c->sub.code.tree + */ if(c->mode == LEN || c->mode == DIST) { - assert(c->sub.code.tree >= s->hufts && c->sub.code.tree < s->hufts + MANY); - ccpy.sub.code.tree = (inflate_huft *) ((long) c->sub.code.tree - (long) s->hufts); + if(c->sub.code.tree >= s->hufts && c->sub.code.tree < s->hufts + MANY) { + ccpy.sub.code.tree = (inflate_huft *) ((long) c->sub.code.tree - (long) s->hufts); + } else { + /* this is an assumption, it will be checked in restore */ + fixed_tree |= 2; + } } if(c->ltree >= s->hufts && c->ltree < s->hufts + MANY) { @@ -275,7 +284,7 @@ ccpy.dtree = (inflate_huft *) ((long) c->dtree - (long) s->hufts); } else { /* this is an assumption, it will be checked in restore */ - fixed_tree = 1; + fixed_tree |= 1; } *bufp = buf = realloc(buf, at + sizeof(struct inflate_codes_state) + 1); @@ -307,10 +316,10 @@ fixed_tree = buf[sizeof(struct inflate_codes_state)]; - if(fixed_tree == 0) { + if( (fixed_tree & 1) == 0) { c->ltree = (inflate_huft *) ((long) s->hufts + (long) c->ltree); c->dtree = (inflate_huft *) ((long) s->hufts + (long) c->dtree); - } else if(fixed_tree == 1) { + } else if( (fixed_tree & 1) == 1) { Byte old_lbits = c->lbits; Byte old_dbits = c->dbits; inflate_huft *old_ltree = c->ltree; @@ -340,8 +349,32 @@ *bufp = buf; - if(c->mode == LEN || c->mode == DIST) - c->sub.code.tree = (inflate_huft *) ((long) s->hufts + (long) c->sub.code.tree); + if(c->mode == LEN || c->mode == DIST) { + if (fixed_tree & 2) { + /* c->sub.code.tree is probably also a fixed tree */ + Byte old_lbits = c->lbits; + inflate_huft *old_ltree = c->ltree; + inflate_huft *temp_dtree; + uInt bl, bd; + + if(inflate_trees_fixed(&bl, &bd, &c->sub.code.tree, &temp_dtree, z) != Z_OK) { + ZFREE(z, c); + return Z_NULL; + } + + c->sub.code.need = (Byte)bl; + + /* it was an assumption that fixed trees are used + if one of the following conditions is false we were wrong */ + if (c->sub.code.tree != old_ltree || + c->sub.code.need != old_lbits) { + ZFREE(z, c); + return Z_NULL; + } + } else { + c->sub.code.tree = (inflate_huft *) ((long) s->hufts + (long) c->sub.code.tree); + } + } return c; }
