Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jan 2017 06:38:56 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r312517 - in stable/11: contrib/xz contrib/xz/src/common contrib/xz/src/liblzma/api/lzma contrib/xz/src/liblzma/check contrib/xz/src/liblzma/common contrib/xz/src/liblzma/delta contrib/...
Message-ID:  <201701200638.v0K6cuu5074850@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Fri Jan 20 06:38:56 2017
New Revision: 312517
URL: https://svnweb.freebsd.org/changeset/base/312517

Log:
  MFC r311504: MFV r311477: xz 5.2.3.

Modified:
  stable/11/contrib/xz/ChangeLog
  stable/11/contrib/xz/THANKS
  stable/11/contrib/xz/src/common/tuklib_cpucores.c
  stable/11/contrib/xz/src/common/tuklib_physmem.c
  stable/11/contrib/xz/src/liblzma/api/lzma/version.h
  stable/11/contrib/xz/src/liblzma/check/check.h
  stable/11/contrib/xz/src/liblzma/common/alone_decoder.c
  stable/11/contrib/xz/src/liblzma/common/alone_encoder.c
  stable/11/contrib/xz/src/liblzma/common/auto_decoder.c
  stable/11/contrib/xz/src/liblzma/common/block_decoder.c
  stable/11/contrib/xz/src/liblzma/common/block_encoder.c
  stable/11/contrib/xz/src/liblzma/common/common.h
  stable/11/contrib/xz/src/liblzma/common/index.c
  stable/11/contrib/xz/src/liblzma/common/index_decoder.c
  stable/11/contrib/xz/src/liblzma/common/index_encoder.c
  stable/11/contrib/xz/src/liblzma/common/stream_decoder.c
  stable/11/contrib/xz/src/liblzma/common/stream_encoder.c
  stable/11/contrib/xz/src/liblzma/common/stream_encoder_mt.c
  stable/11/contrib/xz/src/liblzma/delta/delta_common.c
  stable/11/contrib/xz/src/liblzma/delta/delta_decoder.c
  stable/11/contrib/xz/src/liblzma/delta/delta_encoder.c
  stable/11/contrib/xz/src/liblzma/delta/delta_private.h
  stable/11/contrib/xz/src/liblzma/lz/lz_decoder.c
  stable/11/contrib/xz/src/liblzma/lz/lz_decoder.h
  stable/11/contrib/xz/src/liblzma/lz/lz_encoder.c
  stable/11/contrib/xz/src/liblzma/lz/lz_encoder.h
  stable/11/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_decoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder.h
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
  stable/11/contrib/xz/src/liblzma/simple/arm.c
  stable/11/contrib/xz/src/liblzma/simple/armthumb.c
  stable/11/contrib/xz/src/liblzma/simple/ia64.c
  stable/11/contrib/xz/src/liblzma/simple/powerpc.c
  stable/11/contrib/xz/src/liblzma/simple/simple_coder.c
  stable/11/contrib/xz/src/liblzma/simple/simple_private.h
  stable/11/contrib/xz/src/liblzma/simple/sparc.c
  stable/11/contrib/xz/src/liblzma/simple/x86.c
  stable/11/contrib/xz/src/xz/args.c
  stable/11/contrib/xz/src/xz/coder.c
  stable/11/contrib/xz/src/xz/file_io.c
  stable/11/contrib/xz/src/xz/file_io.h
  stable/11/contrib/xz/src/xz/main.c
  stable/11/contrib/xz/src/xz/private.h
  stable/11/lib/liblzma/config.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/xz/ChangeLog
==============================================================================
--- stable/11/contrib/xz/ChangeLog	Fri Jan 20 06:24:31 2017	(r312516)
+++ stable/11/contrib/xz/ChangeLog	Fri Jan 20 06:38:56 2017	(r312517)
@@ -1,3 +1,563 @@
+commit 3d566cd519017eee1a400e7961ff14058dfaf33c
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-12-30 13:26:36 +0200
+
+    Bump version and soname for 5.2.3.
+
+ src/liblzma/Makefile.am        | 2 +-
+ src/liblzma/api/lzma/version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 053e624fe33795e779ff736f16ce44a129c829b5
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-12-30 13:25:10 +0200
+
+    Update NEWS for 5.2.3.
+
+ NEWS | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+commit cae412b2b77d7fd88d187ed7659331709311f80d
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-04-01 14:45:25 +0300
+
+    xz: Fix the Capsicum rights on user_abort_pipe.
+
+ src/xz/file_io.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 9ccbae41000572193b9a09e7102f9e84dc6d96de
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-12-28 21:05:22 +0200
+
+    Mention potential sandboxing bugs in INSTALL.
+
+ INSTALL | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit e013a337d3de77cce24360dffe956ea2339489b6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-11-21 20:24:50 +0200
+
+    liblzma: Avoid multiple definitions of lzma_coder structures.
+    
+    Only one definition was visible in a translation unit.
+    It avoided a few casts and temp variables but seems that
+    this hack doesn't work with link-time optimizations in compilers
+    as it's not C99/C11 compliant.
+    
+    Fixes:
+    http://www.mail-archive.com/xz-devel@tukaani.org/msg00279.html
+
+ src/liblzma/common/alone_decoder.c             |  44 +++++----
+ src/liblzma/common/alone_encoder.c             |  34 ++++---
+ src/liblzma/common/auto_decoder.c              |  35 ++++---
+ src/liblzma/common/block_decoder.c             |  41 ++++----
+ src/liblzma/common/block_encoder.c             |  40 ++++----
+ src/liblzma/common/common.h                    |  18 ++--
+ src/liblzma/common/index_decoder.c             |  33 ++++---
+ src/liblzma/common/index_encoder.c             |  16 ++--
+ src/liblzma/common/stream_decoder.c            |  50 +++++-----
+ src/liblzma/common/stream_encoder.c            |  56 ++++++-----
+ src/liblzma/common/stream_encoder_mt.c         | 124 ++++++++++++++-----------
+ src/liblzma/delta/delta_common.c               |  25 ++---
+ src/liblzma/delta/delta_decoder.c              |   6 +-
+ src/liblzma/delta/delta_encoder.c              |  12 ++-
+ src/liblzma/delta/delta_private.h              |   4 +-
+ src/liblzma/lz/lz_decoder.c                    |  60 ++++++------
+ src/liblzma/lz/lz_decoder.h                    |  13 ++-
+ src/liblzma/lz/lz_encoder.c                    |  57 +++++++-----
+ src/liblzma/lz/lz_encoder.h                    |   9 +-
+ src/liblzma/lzma/lzma2_decoder.c               |  32 ++++---
+ src/liblzma/lzma/lzma2_encoder.c               |  51 +++++-----
+ src/liblzma/lzma/lzma_decoder.c                |  27 +++---
+ src/liblzma/lzma/lzma_encoder.c                |  29 +++---
+ src/liblzma/lzma/lzma_encoder.h                |   9 +-
+ src/liblzma/lzma/lzma_encoder_optimum_fast.c   |   3 +-
+ src/liblzma/lzma/lzma_encoder_optimum_normal.c |  23 ++---
+ src/liblzma/lzma/lzma_encoder_private.h        |   6 +-
+ src/liblzma/simple/arm.c                       |   2 +-
+ src/liblzma/simple/armthumb.c                  |   2 +-
+ src/liblzma/simple/ia64.c                      |   2 +-
+ src/liblzma/simple/powerpc.c                   |   2 +-
+ src/liblzma/simple/simple_coder.c              |  61 ++++++------
+ src/liblzma/simple/simple_private.h            |  12 +--
+ src/liblzma/simple/sparc.c                     |   2 +-
+ src/liblzma/simple/x86.c                       |  15 +--
+ 35 files changed, 532 insertions(+), 423 deletions(-)
+
+commit 8e0f1af3dcaec00a3879cce8ad7441edc6359d1c
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-12-26 20:50:25 +0200
+
+    Document --enable-sandbox configure option in INSTALL.
+
+ INSTALL | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+commit ce2542d220de06acd618fd9f5c0a6683029fb4eb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-03-31 22:19:34 +0300
+
+    xz: Add support for sandboxing with Capsicum (disabled by default).
+    
+    In the v5.2 branch this feature is considered experimental
+    and thus disabled by default.
+    
+    The sandboxing is used conditionally as described in main.c.
+    This isn't optimal but it was much easier to implement than
+    a full sandboxing solution and it still covers the most common
+    use cases where xz is writing to standard output. This should
+    have practically no effect on performance even with small files
+    as fork() isn't needed.
+    
+    C and locale libraries can open files as needed. This has been
+    fine in the past, but it's a problem with things like Capsicum.
+    io_sandbox_enter() tries to ensure that various locale-related
+    files have been loaded before cap_enter() is called, but it's
+    possible that there are other similar problems which haven't
+    been seen yet.
+    
+    Currently Capsicum is available on FreeBSD 10 and later
+    and there is a port to Linux too.
+    
+    Thanks to Loganaden Velvindron for help.
+
+ configure.ac       | 41 +++++++++++++++++++++++++++
+ src/xz/Makefile.am |  2 +-
+ src/xz/file_io.c   | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/xz/file_io.h   |  6 ++++
+ src/xz/main.c      | 18 ++++++++++++
+ src/xz/private.h   |  4 +++
+ 6 files changed, 151 insertions(+), 1 deletion(-)
+
+commit 3ca1d5e6320111043e19434da881065fadafa0e4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-03-31 21:12:30 +0300
+
+    Fix bugs and otherwise improve ax_check_capsicum.m4.
+    
+    AU_ALIAS was removed because the new version is incompatible
+    with the old version.
+    
+    It no longer checks for <sys/capability.h> separately.
+    It's enough to test for it as part of AC_CHECK_DECL.
+    The defines HAVE_CAPSICUM_SYS_CAPSICUM_H and
+    HAVE_CAPSICUM_SYS_CAPABILITY_H were removed as unneeded.
+    HAVE_SYS_CAPSICUM_H from AC_CHECK_HEADERS is enough.
+    
+    It no longer does a useless search for the Capsicum library
+    if the header wasn't found.
+    
+    Fixed a bug in ACTION-IF-FOUND (the first argument). Specifying
+    the argument omitted the default action but the given action
+    wasn't used instead.
+    
+    AC_DEFINE([HAVE_CAPSICUM]) is now always called when Capsicum
+    support is found. Previously it was part of the default
+    ACTION-IF-FOUND which a custom action would override. Now
+    the default action only prepends ${CAPSICUM_LIB} to LIBS.
+    
+    The documentation was updated.
+    
+    Since there as no serial number, "#serial 2" was added.
+
+ m4/ax_check_capsicum.m4 | 103 ++++++++++++++++++++++++------------------------
+ 1 file changed, 51 insertions(+), 52 deletions(-)
+
+commit 5f3a742b64197fe8bedb6f05fc6ce5d177d11145
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-03-31 19:20:24 +0300
+
+    Add m4/ax_check_capsicum.m4 for detecting Capsicum support.
+    
+    The file was loaded from this web page:
+    https://github.com/google/capsicum-test/blob/dev/autoconf/m4/ax_check_capsicum.m4
+    
+    Thanks to Loganaden Velvindron for pointing it out for me.
+
+ m4/ax_check_capsicum.m4 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 86 insertions(+)
+
+commit d74377e62b4c649e40294dd441de72c0f092e67c
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-10-12 20:29:09 +0300
+
+    liblzma: Fix a memory leak in error path of lzma_index_dup().
+    
+    lzma_index_dup() calls index_dup_stream() which, in case of
+    an error, calls index_stream_end() to free memory allocated
+    by index_stream_init(). However, it illogically didn't
+    actually free the memory. To make it logical, the tree
+    handling code was modified a bit in addition to changing
+    index_stream_end().
+    
+    Thanks to Evan Nemerson for the bug report.
+
+ src/liblzma/common/index.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+commit f580732216dcf971f3f006fe8e01cd4979e1d964
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-10-24 18:53:25 +0300
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 88d7a7fd153bf1355cdf798ffdac7443d0169afc
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-10-24 18:51:36 +0300
+
+    tuklib_cpucores: Add support for sched_getaffinity().
+    
+    It's available in glibc (GNU/Linux, GNU/kFreeBSD). It's better
+    than sysconf(_SC_NPROCESSORS_ONLN) because sched_getaffinity()
+    gives the number of cores available to the process instead of
+    the total number of cores online.
+    
+    As a side effect, this commit fixes a bug on GNU/kFreeBSD where
+    configure would detect the FreeBSD-specific cpuset_getaffinity()
+    but it wouldn't actually work because on GNU/kFreeBSD it requires
+    using -lfreebsd-glue when linking. Now the glibc-specific function
+    will be used instead.
+    
+    Thanks to Sebastian Andrzej Siewior for the original patch
+    and testing.
+
+ m4/tuklib_cpucores.m4        | 30 +++++++++++++++++++++++++++++-
+ src/common/tuklib_cpucores.c |  9 +++++++++
+ 2 files changed, 38 insertions(+), 1 deletion(-)
+
+commit 51baf684376903dbeddd840582bfdf9fa91b311b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-06-30 20:27:36 +0300
+
+    xz: Fix copying of timestamps on Windows.
+    
+    xz used to call utime() on Windows, but its result gets lost
+    on close(). Using _futime() seems to work.
+    
+    Thanks to Martok for reporting the bug:
+    http://www.mail-archive.com/xz-devel@tukaani.org/msg00261.html
+
+ configure.ac     |  2 +-
+ src/xz/file_io.c | 18 ++++++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+commit 1ddc479851139d6e8202e5835421bfe6578d9e07
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-06-16 22:46:02 +0300
+
+    xz: Silence warnings from -Wlogical-op.
+    
+    Thanks to Evan Nemerson.
+
+ src/xz/file_io.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+commit be647ff5ed5a1c244a65722af6ce250259f3b14a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-04-10 20:55:49 +0300
+
+    Build: Fix = to += for xz_SOURCES in src/xz/Makefile.am.
+    
+    Thanks to Christian Kujau.
+
+ src/xz/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit fb6d50c15343831f35305982cefa82053099191d
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-04-10 20:54:17 +0300
+
+    Build: Bump GNU Gettext version requirement to 0.19.
+    
+    It silences a few warnings and most people probably have
+    0.19 even on stable distributions.
+    
+    Thanks to Christian Kujau.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 74f8dad9f912a2993768d93d108ea2b0b2c196e0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-03-13 20:21:49 +0200
+
+    liblzma: Disable external SHA-256 by default.
+    
+    This is the sane thing to do. The conflict with OpenSSL
+    on some OSes and especially that the OS-provided versions
+    can be significantly slower makes it clear that it was
+    a mistake to have the external SHA-256 support enabled by
+    default.
+    
+    Those who want it can now pass --enable-external-sha256 to
+    configure. INSTALL was updated with notes about OSes where
+    this can be a bad idea.
+    
+    The SHA-256 detection code in configure.ac had some bugs that
+    could lead to a build failure in some situations. These were
+    fixed, although it doesn't matter that much now that the
+    external SHA-256 is disabled by default.
+    
+    MINIX >= 3.2.0 uses NetBSD's libc and thus has SHA256_Init
+    in libc instead of libutil. Support for the libutil version
+    was removed.
+
+ INSTALL                   | 36 ++++++++++++++++++++++
+ configure.ac              | 76 +++++++++++++++++++++++------------------------
+ src/liblzma/check/check.h | 16 ++++------
+ 3 files changed, 79 insertions(+), 49 deletions(-)
+
+commit ea7f6ff04cb5bb1498088eb09960a4c3f13dfe39
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-03-10 20:27:05 +0200
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit d0e018016b311232e82d9a98dc68f1e3dabce794
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2016-03-10 20:26:49 +0200
+
+    Build: Avoid SHA256_Init on FreeBSD and MINIX 3.
+    
+    On FreeBSD 10 and older, SHA256_Init from libmd conflicts
+    with libcrypto from OpenSSL. The OpenSSL version has
+    different sizeof(SHA256_CTX) and it can cause weird
+    problems if wrong SHA256_Init gets used.
+    
+    Looking at the source, MINIX 3 seems to have a similar issue but
+    I'm not sure. To be safe, I disabled SHA256_Init on MINIX 3 too.
+    
+    NetBSD has SHA256_Init in libc and they had a similar problem,
+    but they already fixed it in 2009.
+    
+    Thanks to Jim Wilcoxson for the bug report that helped
+    in finding the problem.
+
+ configure.ac | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+commit 5daae123915f32a4ed6dc948b831533c2d1beec3
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-08 20:16:10 +0200
+
+    tuklib_physmem: Hopefully silence a warning on Windows.
+
+ src/common/tuklib_physmem.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 491acc406e098167ccb7fce0728b94c2f32cff9f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-04 23:17:43 +0200
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 8173ff8790ad3502d04e1c07d014cb84a3b8187b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-04 23:14:00 +0200
+
+    liblzma: Make Valgrind happier with optimized (gcc -O2) liblzma.
+    
+    When optimizing, GCC can reorder code so that an uninitialized
+    value gets used in a comparison, which makes Valgrind unhappy.
+    It doesn't happen when compiled with -O0, which I tend to use
+    when running Valgrind.
+    
+    Thanks to Rich Prohaska. I remember this being mentioned long
+    ago by someone else but nothing was done back then.
+
+ src/liblzma/lz/lz_encoder.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 013de2b5ab8094d2c82a2771f3d143eeb656eda9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 20:55:45 +0200
+
+    liblzma: Rename lzma_presets.c back to lzma_encoder_presets.c.
+    
+    It would be too annoying to update other build systems
+    just because of this.
+
+ src/liblzma/lzma/Makefile.inc                               | 2 +-
+ src/liblzma/lzma/{lzma_presets.c => lzma_encoder_presets.c} | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a322f70ad96de88968c2c36e6a36bc08ae30bd20
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 20:47:07 +0200
+
+    Build: Disable xzdec, lzmadec, and lzmainfo when they cannot be built.
+    
+    They all need decoder support and if that isn't available,
+    there's no point trying to build them.
+
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 8ea49606cf6427e32319de7693eca9e43f1c8ad6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 20:35:19 +0200
+
+    Build: Simplify $enable_{encoders,decoders} usage a bit.
+
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 42131a25e52bfe400acfa7df93469a96bb78bb78
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 20:31:31 +0200
+
+    Windows/MSVC: Update config.h.
+
+ windows/config.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit e9184e87cc989d14c7413e6adb3eca98f6ae0290
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 20:29:58 +0200
+
+    DOS: Update config.h.
+
+ dos/config.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 2296778f3c9a1e3a8699973b09dd3610b8baa402
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 20:29:33 +0200
+
+    xz: Make xz buildable even when encoders or decoders are disabled.
+    
+    The patch is quite long but it's mostly about adding new #ifdefs
+    to omit code when encoders or decoders have been disabled.
+    
+    This adds two new #defines to config.h: HAVE_ENCODERS and
+    HAVE_DECODERS.
+
+ configure.ac       |  4 ++++
+ src/xz/Makefile.am |  8 ++++++--
+ src/xz/args.c      | 16 ++++++++++++++++
+ src/xz/coder.c     | 33 +++++++++++++++++++++++++--------
+ src/xz/main.c      |  9 +++++++--
+ src/xz/private.h   |  5 ++++-
+ 6 files changed, 62 insertions(+), 13 deletions(-)
+
+commit 97a3109281e475d9cf1b5095237d672fa0ad25e5
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 18:06:40 +0200
+
+    Build: Build LZMA1/2 presets also when only decoder is wanted.
+    
+    People shouldn't rely on the presets when decoding raw streams,
+    but xz uses the presets as the starting point for raw decoder
+    options anyway.
+    
+    lzma_encocder_presets.c was renamed to lzma_presets.c to
+    make it clear it's not used solely by the encoder code.
+
+ src/liblzma/lzma/Makefile.inc                               | 6 +++++-
+ src/liblzma/lzma/{lzma_encoder_presets.c => lzma_presets.c} | 3 ++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit dc6b78d7f0f6fe43e9d4215146e8581feb8090e7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 17:54:48 +0200
+
+    Build: Fix configure to handle LZMA1 dependency with LZMA2.
+    
+    Now it gives an error if LZMA1 encoder/decoder is missing
+    when LZMA2 encoder/decoder was requested. Even better would
+    be LZMA2 implicitly enabling LZMA1 but it would need more code.
+
+ configure.ac | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 46d76c9cd3cb26a31f5ae6c3a8bbcf38e6da1add
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-03 17:41:54 +0200
+
+    Build: Don't omit lzma_cputhreads() unless using --disable-threads.
+    
+    Previously it was omitted if encoders were disabled
+    with --disable-encoders. It didn't make sense and
+    it also broke the build.
+
+ src/liblzma/common/Makefile.inc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 16d68f874d89f1e4a1919786a35bbaef7d71a077
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-02 18:16:51 +0200
+
+    liblzma: Fix a build failure related to external SHA-256 support.
+    
+    If an appropriate header and structure were found by configure,
+    but a library with a usable SHA-256 functions wasn't, the build
+    failed.
+
+ src/liblzma/check/check.h | 32 +++++++++++++++++++++++---------
+ 1 file changed, 23 insertions(+), 9 deletions(-)
+
+commit d9311647fc1ab512a3394596221ab8039c00af6b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-11-02 15:19:10 +0200
+
+    xz: Always close the file before trying to delete it.
+    
+    unlink() can return EBUSY in errno for open files on some
+    operating systems and file systems.
+
+ src/xz/file_io.c | 25 ++++++++++++-------------
+ 1 file changed, 12 insertions(+), 13 deletions(-)
+
+commit f59c4183f3c9066626ce45dc3db4642fa603fa21
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-10-12 21:08:42 +0300
+
+    Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 35f189673e280c12e4c5129f9f97e54eef3bbc04
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-10-12 21:07:41 +0300
+
+    Tests: Add tests for the two bugs fixed in index.c.
+
+ tests/test_index.c | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+commit e10bfdb0fcaff12f3a6dadee51e0a022aadccb51
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-10-12 20:45:15 +0300
+
+    liblzma: Fix lzma_index_dup() for empty Streams.
+    
+    Stream Flags and Stream Padding weren't copied from
+    empty Streams.
+
+ src/liblzma/common/index.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+commit 06f434bd8980f25ca23232eb7bb7df7e37dc8448
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   2015-10-12 20:31:44 +0300
+
+    liblzma: Add a note to index.c for those using static analyzers.
+
+ src/liblzma/common/index.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
 commit 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0a
 Author: Lasse Collin <lasse.collin@tukaani.org>
 Date:   2015-09-29 13:59:35 +0300
@@ -129,11 +689,10 @@ Date:   2015-06-19 20:21:30 +0300
 
     Windows: Update the docs.
 
- INSTALL                     |  29 ++++++----
- windows/INSTALL-MSVC.txt    |  47 +++++++++++++++
- windows/INSTALL-MinGW.txt   | 138 ++++++++++++++++++++++++++++++++++++++++++++
- windows/INSTALL-Windows.txt | 138 --------------------------------------------
- 4 files changed, 204 insertions(+), 148 deletions(-)
+ INSTALL                                            | 29 ++++++++-----
+ windows/INSTALL-MSVC.txt                           | 47 ++++++++++++++++++++++
+ windows/{INSTALL-Windows.txt => INSTALL-MinGW.txt} |  2 +-
+ 3 files changed, 67 insertions(+), 11 deletions(-)
 
 commit 28195e4c877007cc760ecea1d17f740693d66873
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -1587,11 +2146,10 @@ Date:   2014-05-04 11:07:17 +0300
     It can be confusing that two header files have the same name.
     The public API file is still lzma.h.
 
- src/liblzma/api/Makefile.am   |   2 +-
- src/liblzma/api/lzma.h        |   2 +-
- src/liblzma/api/lzma/lzma.h   | 420 ------------------------------------------
- src/liblzma/api/lzma/lzma12.h | 420 ++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 422 insertions(+), 422 deletions(-)
+ src/liblzma/api/Makefile.am               | 2 +-
+ src/liblzma/api/lzma.h                    | 2 +-
+ src/liblzma/api/lzma/{lzma.h => lzma12.h} | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 1555a9c5664afc7893a2b75e9970105437f01ef1
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -2650,20 +3208,20 @@ Date:   2012-11-19 00:10:10 -0800
     with “|-”.  That worked well for a while, but the version string from
     ‘less’ versions 448 (June, 2012) is misparsed, producing a warning:
     
-    	$ xzless /tmp/test.xz; echo $?
-    	/usr/bin/xzless: line 49: test: 456 (GNU regular expressions): \
-    	integer expression expected
-    	0
+            $ xzless /tmp/test.xz; echo $?
+            /usr/bin/xzless: line 49: test: 456 (GNU regular expressions): \
+            integer expression expected
+            0
     
     More precisely, modern ‘less’ lists the regexp implementation along
     with its version number, and xzless passes the entire version number
     with attached parenthetical phrase as a number to "test $a -gt $b",
     producing the above confusing message.
     
-    	$ less-444 -V | head -1
-    	less 444
-    	$ less -V | head -1
-    	less 456 (no regular expressions)
+            $ less-444 -V | head -1
+            less 444
+            $ less -V | head -1
+            less 456 (no regular expressions)
     
     So relax the pattern matched --- instead of expecting "less <number>",
     look for a line of the form "less <number>[ (extra parenthetical)]".
@@ -3058,11 +3616,9 @@ Date:   2012-06-14 10:33:27 +0300
     copied the decompressor bug from xz_pipe_decomp.c he has
     an example how to easily fix it.
 
- doc/examples/xz_pipe_comp.c       | 127 --------------------------------------
- doc/examples/xz_pipe_decomp.c     | 123 ------------------------------------
- doc/examples_old/xz_pipe_comp.c   | 127 ++++++++++++++++++++++++++++++++++++++
- doc/examples_old/xz_pipe_decomp.c | 123 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 250 insertions(+), 250 deletions(-)
+ doc/{examples => examples_old}/xz_pipe_comp.c   | 0
+ doc/{examples => examples_old}/xz_pipe_decomp.c | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
 
 commit 905f0ab5b5ce544d4b68a2ed6077df0f3d021292
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -4159,10 +4715,9 @@ Date:   2011-04-10 14:58:10 +0300
 
     DOS: Update the docs and include notes about 8.3 filenames.
 
- dos/INSTALL.txt |  79 ++++++++++++++++++++++++++++++++++++
- dos/README      |  88 ----------------------------------------
- dos/README.txt  | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 202 insertions(+), 88 deletions(-)
+ dos/{README => INSTALL.txt} |  13 +----
+ dos/README.txt              | 123 ++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 125 insertions(+), 11 deletions(-)
 
 commit ebd54dbd6e481d31e80757f900ac8109ad1423c6
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -4279,10 +4834,9 @@ Date:   2011-04-05 17:12:20 +0300
     
     It was renamed to ax_pthread.m4 in Autoconf Archive.
 
- configure.ac      |   2 +-
- m4/acx_pthread.m4 | 279 -----------------------------------------------------
- m4/ax_pthread.m4  | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 284 insertions(+), 280 deletions(-)
+ configure.ac                         |   2 +-
+ m4/{acx_pthread.m4 => ax_pthread.m4} | 170 ++++++++++++++++++-----------------
+ 2 files changed, 88 insertions(+), 84 deletions(-)
 
 commit 1039bfcfc098b69d56ecb39d198a092552eacf6d
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -4664,10 +5218,10 @@ Date:   2010-11-12 15:22:13 -0600
     
     Builds from a separate build directory with
     
-    	mkdir build
-    	cd build
-    	../configure
-    	doxygen Doxyfile
+            mkdir build
+            cd build
+            ../configure
+            doxygen Doxyfile
     
     include an even longer prefix /home/someone/src/xz/src; this
     patch has the nice side-effect of eliminating that prefix, too.
@@ -5232,12 +5786,11 @@ Date:   2010-09-28 10:59:53 +0300
 
     Move version.sh to build-aux.
 
- Makefile.am          |  4 ++--
- build-aux/version.sh | 24 ++++++++++++++++++++++++
- configure.ac         |  2 +-
- version.sh           | 24 ------------------------
- windows/build.bash   |  2 +-
- 5 files changed, 28 insertions(+), 28 deletions(-)
+ Makefile.am                        | 4 ++--
+ version.sh => build-aux/version.sh | 0
+ configure.ac                       | 2 +-
+ windows/build.bash                 | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 84af9d8770451339a692e9b70f96cf56156a6069
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -5739,11 +6292,10 @@ Date:   2010-07-27 20:45:03 +0300
 
     Windows: build.sh is a bash script so name it correctly.
 
- INSTALL                     |   2 +-
- windows/INSTALL-Windows.txt |   6 +-
- windows/build.bash          | 189 ++++++++++++++++++++++++++++++++++++++++++++
- windows/build.sh            | 189 --------------------------------------------
- 4 files changed, 193 insertions(+), 193 deletions(-)
+ INSTALL                          | 2 +-
+ windows/INSTALL-Windows.txt      | 6 +++---
+ windows/{build.sh => build.bash} | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
 
 commit b1cbfd40f049a646a639eb78a3e41e9e3ef73339
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -7597,48 +8149,44 @@ Date:   2009-09-19 09:47:30 +0300
     building XZ Utils on OpenVMS. Thanks to Jouk Jansen for the
     original patch.
 
- THANKS                          |   1 +
- configure.ac                    |  12 ++--
- m4/lc_cpucores.m4               |  57 ----------------
- m4/lc_physmem.m4                |  84 -----------------------
- m4/tuklib_common.m4             |  22 ++++++
- m4/tuklib_cpucores.m4           |  72 ++++++++++++++++++++
- m4/tuklib_physmem.m4            | 119 ++++++++++++++++++++++++++++++++
- m4/tuklib_progname.m4           |  25 +++++++
- src/common/cpucores.h           |  51 --------------
- src/common/open_stdxxx.h        |  49 --------------
- src/common/physmem.h            | 144 ---------------------------------------
- src/common/sysdefs.h            |   4 --
- src/common/tuklib_common.h      |  67 ++++++++++++++++++
- src/common/tuklib_config.h      |   1 +
- src/common/tuklib_cpucores.c    |  46 +++++++++++++
- src/common/tuklib_cpucores.h    |  23 +++++++
- src/common/tuklib_exit.c        |  57 ++++++++++++++++
- src/common/tuklib_exit.h        |  25 +++++++
- src/common/tuklib_gettext.h     |  44 ++++++++++++
- src/common/tuklib_open_stdxxx.c |  51 ++++++++++++++
- src/common/tuklib_open_stdxxx.h |  23 +++++++
- src/common/tuklib_physmem.c     | 146 ++++++++++++++++++++++++++++++++++++++++
- src/common/tuklib_physmem.h     |  28 ++++++++
- src/common/tuklib_progname.c    |  50 ++++++++++++++
- src/common/tuklib_progname.h    |  32 +++++++++
- src/lzmainfo/Makefile.am        |   5 +-
- src/lzmainfo/lzmainfo.c         |  65 ++++++------------
- src/xz/Makefile.am              |   7 +-
- src/xz/args.c                   |   8 +--
- src/xz/file_io.c                |  43 ++++++------
- src/xz/hardware.c               |   8 +--
- src/xz/main.c                   | 100 ++++++---------------------
- src/xz/main.h                   |   7 --
- src/xz/message.c                |  30 +++++----
- src/xz/message.h                |   8 +--
- src/xz/private.h                |  11 +--
- src/xz/signals.c                |   2 +
- src/xz/signals.h                |  17 +++--
- src/xz/suffix.c                 |   2 +-
- src/xzdec/Makefile.am           |  13 +++-
- src/xzdec/xzdec.c               |  55 +++++----------
- 41 files changed, 974 insertions(+), 640 deletions(-)
+ THANKS                                             |   1 +
+ configure.ac                                       |  12 +--
+ m4/lc_physmem.m4                                   |  84 ---------------
+ m4/tuklib_common.m4                                |  22 ++++
+ m4/{lc_cpucores.m4 => tuklib_cpucores.m4}          |  83 ++++++++------
+ m4/tuklib_physmem.m4                               | 119 +++++++++++++++++++++
+ m4/tuklib_progname.m4                              |  25 +++++
+ src/common/sysdefs.h                               |   4 -
+ src/common/tuklib_common.h                         |  67 ++++++++++++
+ src/common/tuklib_config.h                         |   1 +
+ src/common/{cpucores.h => tuklib_cpucores.c}       |  39 +++----
+ src/common/tuklib_cpucores.h                       |  23 ++++
+ src/common/tuklib_exit.c                           |  57 ++++++++++
+ src/common/tuklib_exit.h                           |  25 +++++
+ src/common/tuklib_gettext.h                        |  44 ++++++++
+ src/common/{open_stdxxx.h => tuklib_open_stdxxx.c} |  24 +++--
+ src/common/tuklib_open_stdxxx.h                    |  23 ++++
+ src/common/{physmem.h => tuklib_physmem.c}         |  58 +++++-----
+ src/common/tuklib_physmem.h                        |  28 +++++
+ src/common/tuklib_progname.c                       |  50 +++++++++
+ src/common/tuklib_progname.h                       |  32 ++++++
+ src/lzmainfo/Makefile.am                           |   5 +-
+ src/lzmainfo/lzmainfo.c                            |  65 ++++-------
+ src/xz/Makefile.am                                 |   7 +-
+ src/xz/args.c                                      |   8 +-
+ src/xz/file_io.c                                   |  43 ++++----
+ src/xz/hardware.c                                  |   8 +-
+ src/xz/main.c                                      | 100 ++++-------------
+ src/xz/main.h                                      |   7 --
+ src/xz/message.c                                   |  30 +++---
+ src/xz/message.h                                   |   8 +-
+ src/xz/private.h                                   |  11 +-
+ src/xz/signals.c                                   |   2 +
+ src/xz/signals.h                                   |  17 ++-
+ src/xz/suffix.c                                    |   2 +-
+ src/xzdec/Makefile.am                              |  13 ++-
+ src/xzdec/xzdec.c                                  |  55 +++-------
+ 37 files changed, 768 insertions(+), 434 deletions(-)
 
 commit 49cfc8d392cf535f8dd10233225b1fc726fec9ef
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -8268,11 +8816,11 @@ Date:   2009-08-09 13:22:12 -0500
     
     It can be somewhat confusing that
     
-    	less < some_file.txt
+            less < some_file.txt
     
     works fine, whereas
     
-    	xzless < some_file.txt.xz
+            xzless < some_file.txt.xz
     
     does not.  Since version 429, ‘less’ allows a filter specified in
     the LESSOPEN environment variable to preprocess its input even if
@@ -8760,18 +9308,13 @@ Date:   2009-06-27 17:28:01 +0300
     Moved the Windows resource files outside the windows directory
     to prepare for building them with Autotools.
 
- src/common/common_w32res.rc   | 46 +++++++++++++++++++++++++++++++++++++++++++
- src/liblzma/liblzma_w32res.rc |  5 +++++
- src/xz/xz_w32res.rc           |  5 +++++
- src/xzdec/lzmadec_w32res.rc   |  5 +++++
- src/xzdec/xzdec_w32res.rc     |  5 +++++
- windows/Makefile              | 35 +++++++++++++++++---------------
- windows/common.rc             | 46 -------------------------------------------
- windows/liblzma.rc            |  5 -----
- windows/lzmadec.rc            |  5 -----
- windows/xz.rc                 |  5 -----
- windows/xzdec.rc              |  5 -----
- 11 files changed, 85 insertions(+), 82 deletions(-)
+ windows/common.rc => src/common/common_w32res.rc   |  0
+ .../liblzma.rc => src/liblzma/liblzma_w32res.rc    |  2 +-
+ windows/xz.rc => src/xz/xz_w32res.rc               |  2 +-
+ windows/lzmadec.rc => src/xzdec/lzmadec_w32res.rc  |  2 +-
+ windows/xzdec.rc => src/xzdec/xzdec_w32res.rc      |  2 +-
+ windows/Makefile                                   | 35 ++++++++++++----------
+ 6 files changed, 23 insertions(+), 20 deletions(-)
 
 commit 449c634674f35336a4815d398172e447659a135e
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -8853,19 +9396,15 @@ Date:   2009-06-26 20:49:54 +0300
     to avoid problems on systems with system headers with those
     names.
 
- dos/Makefile       |   4 +-
- src/xz/Makefile.am |   8 +-
- src/xz/coder.c     | 488 ++++++++++++++++++++++++++++++++++++
- src/xz/coder.h     |  57 +++++
- src/xz/file_io.c   | 716 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/xz/file_io.h   |  86 +++++++
- src/xz/io.c        | 716 -----------------------------------------------------
- src/xz/io.h        |  86 -------
- src/xz/private.h   |   4 +-
- src/xz/process.c   | 488 ------------------------------------
- src/xz/process.h   |  57 -----
- windows/Makefile   |   4 +-
- 12 files changed, 1357 insertions(+), 1357 deletions(-)
+ dos/Makefile                  | 4 ++--
+ src/xz/Makefile.am            | 8 ++++----
+ src/xz/{process.c => coder.c} | 0
+ src/xz/{process.h => coder.h} | 0
+ src/xz/{io.c => file_io.c}    | 0
+ src/xz/{io.h => file_io.h}    | 0
+ src/xz/private.h              | 4 ++--
+ windows/Makefile              | 4 ++--
+ 8 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 5e1257466dcb66f1d7a3f71814a5ad885cba43e8
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -9247,9 +9786,8 @@ Date:   2009-05-01 11:20:23 +0300
     Renamed the file format specification to xz-file-format.txt
     which is the filename used on the WWW.
 
- doc/file-format.txt    | 1127 ------------------------------------------------
- doc/xz-file-format.txt | 1127 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1127 insertions(+), 1127 deletions(-)
+ doc/{file-format.txt => xz-file-format.txt} | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 21c6b94373d239d7e86bd480fcd558e30391712f
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -9318,20 +9856,14 @@ Date:   2009-04-13 14:49:48 +0300
 
     Quick & dirty update to support xz in diff/grep/more scripts.
 
- src/scripts/Makefile.am |  38 +++++++++------
- src/scripts/lzdiff      |  67 --------------------------
- src/scripts/lzdiff.1    |  51 --------------------
- src/scripts/lzgrep      | 123 ------------------------------------------------
- src/scripts/lzgrep.1    |  61 ------------------------
- src/scripts/lzmore      |  74 -----------------------------
- src/scripts/lzmore.1    |  55 ----------------------
- src/scripts/xzdiff      |  67 ++++++++++++++++++++++++++
- src/scripts/xzdiff.1    |  58 +++++++++++++++++++++++
- src/scripts/xzgrep      | 123 ++++++++++++++++++++++++++++++++++++++++++++++++
- src/scripts/xzgrep.1    |  77 ++++++++++++++++++++++++++++++
- src/scripts/xzmore      |  74 +++++++++++++++++++++++++++++
- src/scripts/xzmore.1    |  66 ++++++++++++++++++++++++++
- 13 files changed, 489 insertions(+), 445 deletions(-)
+ src/scripts/Makefile.am            | 38 +++++++++++++++++++-----------
+ src/scripts/{lzdiff => xzdiff}     | 24 +++++++++----------
+ src/scripts/{lzdiff.1 => xzdiff.1} | 29 ++++++++++++++---------
+ src/scripts/{lzgrep => xzgrep}     | 10 ++++----
+ src/scripts/{lzgrep.1 => xzgrep.1} | 48 +++++++++++++++++++++++++-------------
+ src/scripts/{lzmore => xzmore}     | 12 +++++-----
+ src/scripts/{lzmore.1 => xzmore.1} | 33 +++++++++++++++++---------
+ 7 files changed, 119 insertions(+), 75 deletions(-)
 
 commit 02ddf09bc3079b3e17297729b9e43f14d407b8fc
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -9675,16 +10207,15 @@ Date:   2009-02-17 10:43:00 +0200
     pieces to avoid unneeded dependencies making statically
     linked applications bigger than needed.
 
- dos/Makefile                               |   6 +-
- src/liblzma/common/easy.c                  | 128 -----------------------------
- src/liblzma/common/easy_buffer_encoder.c   |  34 ++++++++
- src/liblzma/common/easy_decoder_memusage.c |  31 +++++++
- src/liblzma/common/easy_encoder.c          |  87 ++++++++++++++++++++
- src/liblzma/common/easy_encoder_memusage.c |  31 +++++++
- src/liblzma/common/easy_preset.c           |  34 ++++++++
- src/liblzma/common/easy_preset.h           |  39 +++++++++
- windows/Makefile                           |   6 +-
- 9 files changed, 266 insertions(+), 130 deletions(-)
+ dos/Makefile                                  |  6 ++-
+ src/liblzma/common/easy_buffer_encoder.c      | 34 +++++++++++++++++
+ src/liblzma/common/easy_decoder_memusage.c    | 31 ++++++++++++++++
+ src/liblzma/common/{easy.c => easy_encoder.c} | 53 +++------------------------
+ src/liblzma/common/easy_encoder_memusage.c    | 31 ++++++++++++++++
+ src/liblzma/common/easy_preset.c              | 34 +++++++++++++++++
+ src/liblzma/common/easy_preset.h              | 39 ++++++++++++++++++++
+ windows/Makefile                              |  6 ++-
+ 8 files changed, 185 insertions(+), 49 deletions(-)
 
 commit 7494816ab08d82f4d6409788825930c4e43cfd0d
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -10657,15 +11188,14 @@ Date:   2008-12-31 16:29:39 +0200
     The internal implementation is still using the name "simple".
     It may need some cleanups, so I look at it later.
 
- src/liblzma/api/Makefile.am         |  2 +-
- src/liblzma/api/lzma.h              |  2 +-
- src/liblzma/api/lzma/bcj.h          | 94 +++++++++++++++++++++++++++++++++++++
- src/liblzma/api/lzma/simple.h       | 94 -------------------------------------
- src/liblzma/simple/simple_coder.c   |  2 +-
- src/liblzma/simple/simple_decoder.c |  4 +-
- src/liblzma/simple/simple_encoder.c |  4 +-
- tests/test_filter_flags.c           |  8 ++--
- 8 files changed, 105 insertions(+), 105 deletions(-)
+ src/liblzma/api/Makefile.am              |  2 +-
+ src/liblzma/api/lzma.h                   |  2 +-
+ src/liblzma/api/lzma/{simple.h => bcj.h} | 22 +++++++++++-----------
+ src/liblzma/simple/simple_coder.c        |  2 +-
+ src/liblzma/simple/simple_decoder.c      |  4 ++--
+ src/liblzma/simple/simple_encoder.c      |  4 ++--
+ tests/test_filter_flags.c                |  8 ++++----
+ 7 files changed, 22 insertions(+), 22 deletions(-)
 
 commit 7eea8bec3abfed883efba66264a1452a1c04f6b0
 Author: Lasse Collin <lasse.collin@tukaani.org>
@@ -10719,47 +11249,44 @@ Date:   2008-12-31 00:30:49 +0200
     as the more bloated uint32_t array on x86; hopefully it's not bad
     on other architectures.
 
- configure.ac                              | 29 ++++++++--
- src/common/mythread.h                     | 34 ++++++++++++
- src/liblzma/api/Makefile.am               |  1 -
- src/liblzma/api/lzma.h                    |  1 -
- src/liblzma/api/lzma/init.h               | 85 -----------------------------
- src/liblzma/check/Makefile.am             | 29 ++++------
- src/liblzma/check/check.c                 | 10 ++--
- src/liblzma/check/check.h                 | 25 ++++-----
- src/liblzma/check/check_init.c            | 37 -------------
- src/liblzma/check/crc32.c                 | 88 -------------------------------
- src/liblzma/check/crc32_fast.c            | 88 +++++++++++++++++++++++++++++++
- src/liblzma/check/crc32_init.c            | 55 -------------------
- src/liblzma/check/crc32_small.c           | 54 +++++++++++++++++++
- src/liblzma/check/crc32_tablegen.c        | 55 ++++++++++++++++---
- src/liblzma/check/crc64.c                 | 75 --------------------------
- src/liblzma/check/crc64_fast.c            | 75 ++++++++++++++++++++++++++
- src/liblzma/check/crc64_small.c           | 54 +++++++++++++++++++
- src/liblzma/check/crc64_tablegen.c        | 55 ++++++++++++++++---
- src/liblzma/common/Makefile.am            |  3 --
- src/liblzma/common/common.h               |  1 +
- src/liblzma/common/init.c                 | 39 --------------
- src/liblzma/common/init_decoder.c         | 31 -----------
- src/liblzma/common/init_encoder.c         | 40 --------------
- src/liblzma/liblzma.pc.in                 | 12 +++++
- src/liblzma/lz/lz_encoder.c               |  6 +++
- src/liblzma/lzma.pc.in                    | 11 ----
- src/liblzma/rangecoder/Makefile.am        |  8 +--
- src/liblzma/rangecoder/price.h            | 16 +-----
- src/liblzma/rangecoder/price_table.c      |  2 +-
- src/liblzma/rangecoder/price_table_init.c | 55 -------------------

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701200638.v0K6cuu5074850>