Changeset 1993

Timestamp:

Feb 8, 2017, 8:58:22 PM (8 years ago)

Author:

Silvan Scherrer

Message:

xz: update vendor to version 5.2.3

Location:

xz/vendor/current

Files:

• ABOUT-NLS (modified) (20 diffs)
• ChangeLog (modified) (41 diffs)
• INSTALL (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• NEWS (modified) (1 diff)
• THANKS (modified) (4 diffs)
• aclocal.m4 (modified) (2 diffs)
• build-aux/config.rpath (modified) (20 diffs)
• config.h.in (modified) (8 diffs)
• configure (modified) (73 diffs)
• configure.ac (modified) (17 diffs)
• debug/Makefile.in (modified) (2 diffs)
• doc/man/pdf-a4/lzmainfo-a4.pdf (modified) ( previous)
• doc/man/pdf-a4/xz-a4.pdf (modified) ( previous)
• doc/man/pdf-a4/xzdec-a4.pdf (modified) ( previous)
• doc/man/pdf-a4/xzdiff-a4.pdf (modified) ( previous)
• doc/man/pdf-a4/xzgrep-a4.pdf (modified) ( previous)
• doc/man/pdf-a4/xzless-a4.pdf (modified) ( previous)
• doc/man/pdf-a4/xzmore-a4.pdf (modified) ( previous)
• doc/man/pdf-letter/lzmainfo-letter.pdf (modified) ( previous)
• doc/man/pdf-letter/xz-letter.pdf (modified) ( previous)
• doc/man/pdf-letter/xzdec-letter.pdf (modified) ( previous)
• doc/man/pdf-letter/xzdiff-letter.pdf (modified) ( previous)
• doc/man/pdf-letter/xzgrep-letter.pdf (modified) ( previous)
• doc/man/pdf-letter/xzless-letter.pdf (modified) ( previous)
• doc/man/pdf-letter/xzmore-letter.pdf (modified) ( previous)
• dos/config.h (modified) (2 diffs)
• lib/Makefile.in (modified) (2 diffs)
• m4/ax_check_capsicum.m4 (added)
• m4/gettext.m4 (modified) (8 diffs)
• m4/iconv.m4 (modified) (12 diffs)
• m4/intlmacosx.m4 (modified) (4 diffs)
• m4/lib-ld.m4 (modified) (4 diffs)
• m4/lib-link.m4 (modified) (8 diffs)
• m4/lib-prefix.m4 (modified) (1 diff)
• m4/nls.m4 (modified) (1 diff)
• m4/po.m4 (modified) (13 diffs)
• m4/progtest.m4 (modified) (2 diffs)
• m4/tuklib_cpucores.m4 (modified) (3 diffs)
• m4/visibility.m4 (modified) (4 diffs)
• po/Makefile.in.in (modified) (10 diffs)
• po/Rules-quot (modified) (3 diffs)
• po/cs.gmo (modified) ( previous)
• po/cs.po (modified) (5 diffs)
• po/de.gmo (modified) ( previous)
• po/de.po (modified) (6 diffs)
• po/fr.gmo (modified) ( previous)
• po/fr.po (modified) (8 diffs)
• po/it.gmo (modified) ( previous)
• po/it.po (modified) (5 diffs)
• po/pl.gmo (modified) ( previous)
• po/pl.po (modified) (18 diffs)
• po/vi.gmo (modified) ( previous)
• po/vi.po (modified) (5 diffs)
• po/xz.pot (modified) (5 diffs)
• src/Makefile.in (modified) (2 diffs)
• src/common/tuklib_cpucores.c (modified) (2 diffs)
• src/common/tuklib_physmem.c (modified) (1 diff)
• src/liblzma/Makefile.am (modified) (1 diff)
• src/liblzma/Makefile.in (modified) (20 diffs)
• src/liblzma/api/Makefile.in (modified) (2 diffs)
• src/liblzma/api/lzma/version.h (modified) (1 diff)
• src/liblzma/check/check.h (modified) (3 diffs)
• src/liblzma/common/Makefile.inc (modified) (2 diffs)
• src/liblzma/common/alone_decoder.c (modified) (6 diffs)
• src/liblzma/common/alone_encoder.c (modified) (7 diffs)
• src/liblzma/common/auto_decoder.c (modified) (6 diffs)
• src/liblzma/common/block_decoder.c (modified) (6 diffs)
• src/liblzma/common/block_encoder.c (modified) (5 diffs)
• src/liblzma/common/common.h (modified) (5 diffs)
• src/liblzma/common/index.c (modified) (5 diffs)
• src/liblzma/common/index_decoder.c (modified) (8 diffs)
• src/liblzma/common/index_encoder.c (modified) (7 diffs)
• src/liblzma/common/stream_decoder.c (modified) (8 diffs)
• src/liblzma/common/stream_encoder.c (modified) (7 diffs)
• src/liblzma/common/stream_encoder_mt.c (modified) (16 diffs)
• src/liblzma/delta/delta_common.c (modified) (4 diffs)
• src/liblzma/delta/delta_decoder.c (modified) (2 diffs)
• src/liblzma/delta/delta_encoder.c (modified) (4 diffs)
• src/liblzma/delta/delta_private.h (modified) (2 diffs)
• src/liblzma/lz/lz_decoder.c (modified) (10 diffs)
• src/liblzma/lz/lz_decoder.h (modified) (2 diffs)
• src/liblzma/lz/lz_encoder.c (modified) (7 diffs)
• src/liblzma/lz/lz_encoder.h (modified) (1 diff)
• src/liblzma/lzma/Makefile.inc (modified) (2 diffs)
• src/liblzma/lzma/lzma2_decoder.c (modified) (5 diffs)
• src/liblzma/lzma/lzma2_encoder.c (modified) (9 diffs)
• src/liblzma/lzma/lzma_decoder.c (modified) (5 diffs)
• src/liblzma/lzma/lzma_encoder.c (modified) (11 diffs)
• src/liblzma/lzma/lzma_encoder.h (modified) (3 diffs)
• src/liblzma/lzma/lzma_encoder_optimum_fast.c (modified) (1 diff)
• src/liblzma/lzma/lzma_encoder_optimum_normal.c (modified) (11 diffs)
• src/liblzma/lzma/lzma_encoder_presets.c (modified) (1 diff)
• src/liblzma/lzma/lzma_encoder_private.h (modified) (2 diffs)
• src/liblzma/simple/arm.c (modified) (1 diff)
• src/liblzma/simple/armthumb.c (modified) (1 diff)
• src/liblzma/simple/ia64.c (modified) (1 diff)
• src/liblzma/simple/powerpc.c (modified) (1 diff)
• src/liblzma/simple/simple_coder.c (modified) (7 diffs)
• src/liblzma/simple/simple_private.h (modified) (4 diffs)
• src/liblzma/simple/sparc.c (modified) (1 diff)
• src/liblzma/simple/x86.c (modified) (3 diffs)
• src/lzmainfo/Makefile.in (modified) (2 diffs)
• src/scripts/Makefile.in (modified) (2 diffs)
• src/xz/Makefile.am (modified) (3 diffs)
• src/xz/Makefile.in (modified) (7 diffs)
• src/xz/args.c (modified) (1 diff)
• src/xz/coder.c (modified) (14 diffs)
• src/xz/file_io.c (modified) (9 diffs)
• src/xz/file_io.h (modified) (1 diff)
• src/xz/main.c (modified) (3 diffs)
• src/xz/private.h (modified) (2 diffs)
• src/xzdec/Makefile.in (modified) (2 diffs)
• tests/Makefile.in (modified) (2 diffs)
• tests/test_index.c (modified) (2 diffs)
• windows/config.h (modified) (2 diffs)

xz/vendor/current/ABOUT-NLS ¶

@@ -19 +19 @@
 work on translations can contact the appropriate team.
 
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-1.1 Quick configuration advice
-==============================
-
-If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation.  Future versions of GNU `gettext' will
-very likely convey even more functionality.  So it might be a good idea
-to change to GNU `gettext' as soon as possible.
-
-   So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-1.2 INSTALL Matters
+1.1 INSTALL Matters
 ===================
 
@@ -57 +29 @@
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the included GNU
-`gettext' library will be used.  This library is wholly contained
-within this package, usually in the `intl/' subdirectory, so prior
-installation of the GNU `gettext' package is _not_ required.
-Installers may use special options at configuration time for changing
-the default behaviour.  The commands:
-
-     ./configure --with-included-gettext
+provides the GNU `gettext' functions.  Installers may use special
+options at configuration time for changing the default behaviour.  The
+command:
+
      ./configure --disable-nls
 
-will, respectively, bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
+will _totally_ disable translation of messages.
 
    When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might not be desirable.  You should use
-the more recent version of the GNU `gettext' library.  I.e. if the file
-`intl/VERSION' shows that the library which comes with this package is
-more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   The configuration process will not test for the `catgets' function
-and therefore it will not be used.  The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
+probably detect the previously built and installed `libintl' library
+and will decide to use it.  If not, you may have to to use the
+`--with-libintl-prefix' option to tell `configure' where to look for it.
 
    Internationalized packages usually have many `po/LL.po' files, where
@@ -97 +52 @@
 codes, stating which languages are allowed.
 
-1.3 Using This Package
+1.2 Using This Package
 ======================
 
@@ -149 +104 @@
 (Portuguese as spoken in Portugal) in this context.
 
-1.4 Translating Teams
+1.3 Translating Teams
 =====================
 
@@ -178 +133 @@
 programming skills, here.
 
-1.5 Available Packages
+1.4 Available Packages
 ======================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of May 2010.
-The matrix shows, in regard of each package, for which languages PO
-files have been submitted to translation coordination, with a
+matrix shows the current state of internationalization, as of June
+2010.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files       af am ar as ast az be be@latin bg bn_IN bs ca crh
-                        +---------------------------------------------------+
-     a2ps               |                    []                      []     |
-     aegis              |                                                   |
-     ant-phone          |                                                   |
-     anubis             |                                                   |
-     aspell             |             []                             []     |
-     bash               |                                                   |
-     bfd                |                                                   |
-     bibshelf           |             []                                    |
-     binutils           |                                                   |
-     bison              |                                                   |
-     bison-runtime      |             []                                    |
-     bluez-pin          | []          []                                    |
-     bombono-dvd        |                                                   |
-     buzztard           |                                                   |
-     cflow              |                                                   |
-     clisp              |                                                   |
-     coreutils          |                                []          []     |
-     cpio               |                                                   |
-     cppi               |                                                   |
-     cpplib             |                                            []     |
-     cryptsetup         |                                                   |
-     dfarc              |                                                   |
-     dialog             |                          []                []     |
-     dico               |                                                   |
-     diffutils          |                                            []     |
-     dink               |                                                   |
-     doodle             |                                                   |
-     e2fsprogs          |                                            []     |
-     enscript           |                                            []     |
-     exif               |                                                   |
-     fetchmail          |                                            []     |
-     findutils          |                                []                 |
-     flex               |                                            []     |
-     freedink           |                                                   |
-     gas                |                                                   |
-     gawk               |             []                             []     |
-     gcal               |                                            []     |
-     gcc                |                                                   |
-     gettext-examples   | []          []                 []          []     |
-     gettext-runtime    |                    []          []          []     |
-     gettext-tools      |                                []          []     |
-     gip                |                                []                 |
-     gjay               |                                                   |
-     gliv               |                                []                 |
-     glunarclock        |             []                 []                 |
-     gnubiff            |                                                   |
-     gnucash            |                                            []     |
-     gnuedu             |                                                   |
-     gnulib             |                                                   |
-     gnunet             |                                                   |
-     gnunet-gtk         |                                                   |
-     gnutls             |                                                   |
-     gold               |                                                   |
-     gpe-aerial         |                                                   |
-     gpe-beam           |                                                   |
-     gpe-bluetooth      |                                                   |
-     gpe-calendar       |                                                   |
-     gpe-clock          |             []                                    |
-     gpe-conf           |                                                   |
-     gpe-contacts       |                                                   |
-     gpe-edit           |                                                   |
-     gpe-filemanager    |                                                   |
-     gpe-go             |                                                   |
-     gpe-login          |                                                   |
-     gpe-ownerinfo      |             []                                    |
-     gpe-package        |                                                   |
-     gpe-sketchbook     |                                                   |
-     gpe-su             |             []                                    |
-     gpe-taskmanager    |             []                                    |
-     gpe-timesheet      |             []                                    |
-     gpe-today          |             []                                    |
-     gpe-todo           |                                                   |
-     gphoto2            |                                                   |
-     gprof              |                                []                 |
-     gpsdrive           |                                                   |
-     gramadoir          |                                                   |
-     grep               |                                                   |
-     grub               |             []                             []     |
-     gsasl              |                                                   |
-     gss                |                                                   |
-     gst-plugins-bad    |                                []                 |
-     gst-plugins-base   |                                []                 |
-     gst-plugins-good   |                                []                 |
-     gst-plugins-ugly   |                                []                 |
-     gstreamer          | []                             []          []     |
-     gtick              |                                                   |
-     gtkam              |                    []                             |
-     gtkorphan          |                                []                 |
-     gtkspell           | []          []     []                             |
-     gutenprint         |                                                   |
-     hello              |                                []                 |
-     help2man           |                                                   |
-     hylafax            |                                                   |
-     idutils            |                                                   |
-     indent             |                                []          []     |
-     iso_15924          |                                                   |
-     iso_3166           | []       []        []          []  []   [] [] []  |
-     iso_3166_2         |                                                   |
-     iso_4217           |                                                   |
-     iso_639            |          [] []     []              []         []  |
-     iso_639_3          |                                               []  |
-     jwhois             |                                                   |
-     kbd                |                                                   |
-     keytouch           |                                            []     |
-     keytouch-editor    |                                                   |
-     keytouch-keyboa... |                                            []     |
-     klavaro            |       []                                          |
-     latrine            |                                                   |
-     ld                 |                                []                 |
-     leafpad            |                                []          []     |
-     libc               |                                []          []     |
-     libexif            |                    ()                             |
-     libextractor       |                                                   |
-     libgnutls          |                                                   |
-     libgpewidget       |                                                   |
-     libgpg-error       |                                                   |
-     libgphoto2         |                                                   |
-     libgphoto2_port    |                                                   |
-     libgsasl           |                                                   |
-     libiconv           |                                []                 |
-     libidn             |                                                   |
-     lifelines          |                                                   |
-     liferea            |                          []                []     |
-     lilypond           |                                                   |
-     linkdr             |       []                                          |
-     lordsawar          |                                                   |
-     lprng              |                                                   |
-     lynx               |                                            []     |
-     m4                 |                                                   |
-     mailfromd          |                                                   |
-     mailutils          |                                                   |
-     make               |                                                   |
-     man-db             |                                                   |
-     man-db-manpages    |                                                   |
-     minicom            |                                                   |
-     mkisofs            |                                                   |
-     myserver           |                                                   |
-     nano               |                                []          []     |
-     opcodes            |                                                   |
-     parted             |                                                   |
-     pies               |                                                   |
-     popt               |                                                   |
-     psmisc             |                                                   |
-     pspp               |                                            []     |
-     pwdutils           |                                                   |
-     radius             |                                            []     |
-     recode             |                    []                      []     |
-     rosegarden         |                                                   |
-     rpm                |                                                   |
-     rush               |                                                   |
-     sarg               |                                                   |
-     screem             |                                                   |
-     scrollkeeper       |                 [] []                      []     |
-     sed                |             []                             []     |
-     sharutils          |                                []          []     |
-     shishi             |                                                   |
-     skencil            |                                                   |
-     solfege            |                                                   |
-     solfege-manual     |                                                   |
-     soundtracker       |                                                   |
-     sp                 |                                                   |
-     sysstat            |                                                   |
-     tar                |                                []                 |
-     texinfo            |                                                   |
-     tin                |                                                   |
-     unicode-han-tra... |                                                   |
-     unicode-transla... |                                                   |
-     util-linux-ng      |                                            []     |
-     vice               |                                                   |
-     vmm                |                                                   |
-     vorbis-tools       |                                                   |
-     wastesedge         |                                                   |
-     wdiff              |                                                   |
-     wget               |                    []                      []     |
-     wyslij-po          |                                                   |
-     xchat              |             []     []          []          []     |
-     xdg-user-dirs      | []       [] []     []    []    []  []      [] []  |
-     xkeyboard-config   |                                []          [] []  |
-                        +---------------------------------------------------+
-                          af am ar as ast az be be@latin bg bn_IN bs ca crh
-                           6  0  2  3 19   1 11     3    28   3    1 38  5
-
-                          cs da  de  el en en_GB en_ZA eo es et eu fa fi
+     Ready PO files       af am an ar as ast az be be@latin bg bn_IN bs ca
+                        +--------------------------------------------------+
+     a2ps               |                       []                      [] |
+     aegis              |                                                  |
+     ant-phone          |                                                  |
+     anubis             |                                                  |
+     aspell             |                []                             [] |
+     bash               |                                                  |
+     bfd                |                                                  |
+     bibshelf           |                []                                |
+     binutils           |                                                  |
+     bison              |                                                  |
+     bison-runtime      |                []                                |
+     bluez-pin          | []             []                                |
+     bombono-dvd        |                                                  |
+     buzztard           |                                                  |
+     cflow              |                                                  |
+     clisp              |                                                  |
+     coreutils          |                                   []          [] |
+     cpio               |                                                  |
+     cppi               |                                                  |
+     cpplib             |                                               [] |
+     cryptsetup         |                                                  |
+     dfarc              |                                                  |
+     dialog             |                             []                [] |
+     dico               |                                                  |
+     diffutils          |                                               [] |
+     dink               |                                                  |
+     doodle             |                                                  |
+     e2fsprogs          |                                               [] |
+     enscript           |                                               [] |
+     exif               |                                                  |
+     fetchmail          |                                               [] |
+     findutils          |                                   []             |
+     flex               |                                               [] |
+     freedink           |                                                  |
+     gas                |                                                  |
+     gawk               |                []                             [] |
+     gcal               |                                               [] |
+     gcc                |                                                  |
+     gettext-examples   | []             []                 []          [] |
+     gettext-runtime    |                                   []          [] |
+     gettext-tools      |                                   []          [] |
+     gip                |                                   []             |
+     gjay               |                                                  |
+     gliv               |                                   []             |
+     glunarclock        |                []                 []             |
+     gnubiff            |                                                  |
+     gnucash            |                                               [] |
+     gnuedu             |                                                  |
+     gnulib             |                                                  |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gold               |                                                  |
+     gpe-aerial         |                                                  |
+     gpe-beam           |                                                  |
+     gpe-bluetooth      |                                                  |
+     gpe-calendar       |                                                  |
+     gpe-clock          |                []                                |
+     gpe-conf           |                                                  |
+     gpe-contacts       |                                                  |
+     gpe-edit           |                                                  |
+     gpe-filemanager    |                                                  |
+     gpe-go             |                                                  |
+     gpe-login          |                                                  |
+     gpe-ownerinfo      |                []                                |
+     gpe-package        |                                                  |
+     gpe-sketchbook     |                                                  |
+     gpe-su             |                []                                |
+     gpe-taskmanager    |                []                                |
+     gpe-timesheet      |                []                                |
+     gpe-today          |                []                                |
+     gpe-todo           |                                                  |
+     gphoto2            |                                                  |
+     gprof              |                                   []             |
+     gpsdrive           |                                                  |
+     gramadoir          |                                                  |
+     grep               |                                                  |
+     grub               |                []                             [] |
+     gsasl              |                                                  |
+     gss                |                                                  |
+     gst-plugins-bad    |                                   []             |
+     gst-plugins-base   |                                   []             |
+     gst-plugins-good   |                                   []             |
+     gst-plugins-ugly   |                                   []             |
+     gstreamer          | []                                []          [] |
+     gtick              |                                                  |
+     gtkam              |                       []                         |
+     gtkorphan          |                                   []             |
+     gtkspell           | []             []     []                         |
+     gutenprint         |                                                  |
+     hello              |                                   []             |
+     help2man           |                                                  |
+     hylafax            |                                                  |
+     idutils            |                                                  |
+     indent             |                                   []          [] |
+     iso_15924          |                                                  |
+     iso_3166           | []          []        []          []  []   [] [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |                                                  |
+     iso_639            |             [] []     []              []         |
+     iso_639_3          |                                                  |
+     jwhois             |                                                  |
+     kbd                |                                                  |
+     keytouch           |                                               [] |
+     keytouch-editor    |                                                  |
+     keytouch-keyboa... |                                               [] |
+     klavaro            |          []                                      |
+     latrine            |                                                  |
+     ld                 |                                   []             |
+     leafpad            |                                   []          [] |
+     libc               |                                   []          [] |
+     libexif            |                       ()                         |
+     libextractor       |                                                  |
+     libgnutls          |                                                  |
+     libgpewidget       |                                                  |
+     libgpg-error       |                                                  |
+     libgphoto2         |                                                  |
+     libgphoto2_port    |                                                  |
+     libgsasl           |                                                  |
+     libiconv           |                                   []             |
+     libidn             |                                                  |
+     lifelines          |                                                  |
+     liferea            |                             []                [] |
+     lilypond           |                                                  |
+     linkdr             |          []                                      |
+     lordsawar          |                                                  |
+     lprng              |                                                  |
+     lynx               |                                               [] |
+     m4                 |                                                  |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               |                                                  |
+     man-db             |                                                  |
+     man-db-manpages    |                                                  |
+     minicom            |                                                  |
+     mkisofs            |                                                  |
+     myserver           |                                                  |
+     nano               |                                   []          [] |
+     opcodes            |                                                  |
+     parted             |                                                  |
+     pies               |                                                  |
+     popt               |                                                  |
+     psmisc             |                                                  |
+     pspp               |                                               [] |
+     pwdutils           |                                                  |
+     radius             |                                               [] |
+     recode             |                       []                      [] |
+     rosegarden         |                                                  |
+     rpm                |                                                  |
+     rush               |                                                  |
+     sarg               |                                                  |
+     screem             |                                                  |
+     scrollkeeper       |                    [] []                      [] |
+     sed                |                []                             [] |
+     sharutils          |                                   []          [] |
+     shishi             |                                                  |
+     skencil            |                                                  |
+     solfege            |                                                  |
+     solfege-manual     |                                                  |
+     soundtracker       |                                                  |
+     sp                 |                                                  |
+     sysstat            |                                                  |
+     tar                |                                   []             |
+     texinfo            |                                                  |
+     tin                |                                                  |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux-ng      |                                               [] |
+     vice               |                                                  |
+     vmm                |                                                  |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                                  |
+     wdiff              |                                                  |
+     wget               |                       []                      [] |
+     wyslij-po          |                                                  |
+     xchat              |                []     []          []          [] |
+     xdg-user-dirs      | []    []    [] []     []    []    []  []      [] |
+     xkeyboard-config   |                                   []          [] |
+                        +--------------------------------------------------+
+                          af am an ar as ast az be be@latin bg bn_IN bs ca
+                           6  0  1  2  3 19   1 10     3    28   3    1 38
+
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
                         +-------------------------------------------------+
-     a2ps               | [] []  []  []     []            [] []       []  |
-     aegis              |    []  []                       []              |
-     ant-phone          |    []  ()                                       |
-     anubis             |    []  []                                   []  |
-     aspell             | [] []  []         []            []              |
-     bash               | []                           [] []          []  |
-     bfd                |                                 []          []  |
-     bibshelf           |    []  []                       []          []  |
-     binutils           |                                 []          []  |
-     bison              |        []  []                               []  |
-     bison-runtime      |    []  []  []                      []       []  |
-     bluez-pin          | [] []  []  []                [] []          []  |
-     bombono-dvd        |    []                                       []  |
-     buzztard           | [] []  []                                       |
-     cflow              |    []  []                                   []  |
-     clisp              |    []  []     []                []              |
-     coreutils          | [] []  []                          []           |
-     cpio               |                                             []  |
-     cppi               |                                             []  |
-     cpplib             |    []  []                       []              |
-     cryptsetup         |        []                                       |
-     dfarc              |    []  []                       []          []  |
-     dialog             |    []  []                    [] []    []        |
+     a2ps               |     [] []  []  []     []            [] []       |
+     aegis              |        []  []                       []          |
+     ant-phone          |        []  ()                                   |
+     anubis             |        []  []                                   |
+     aspell             |     [] []  []         []            []          |
+     bash               |     []                           [] []          |
+     bfd                |                                     []          |
+     bibshelf           |        []  []                       []          |
+     binutils           |                                     []          |
+     bison              |            []  []                               |
+     bison-runtime      |        []  []  []                      []       |
+     bluez-pin          |     [] []  []  []                [] []          |
+     bombono-dvd        |        []                                       |
+     buzztard           |     [] []  []                                   |
+     cflow              |        []  []                                   |
+     clisp              |        []  []     []                []          |
+     coreutils          |     [] []  []                          []       |
+     cpio               |                                                 |
+     cppi               |                                                 |
+     cpplib             |        []  []                       []          |
+     cryptsetup         |            []                                   |
+     dfarc              |        []  []                       []          |
+     dialog             |        []  []                    [] []    []    |
      dico               |                                                 |
-     diffutils          | [] []  []  []                [] []          []  |
-     dink               |    []  []                       []              |
-     doodle             |        []                                       |
-     e2fsprogs          | []     []                       []              |
-     enscript           |    []  []         []                            |
-     exif               | () []  []                                   []  |
-     fetchmail          | [] []  ()  []     []            []              |
-     findutils          | [] []  []                                   []  |
-     flex               |        []                       []          []  |
-     freedink           |    []  []                       []          []  |
-     gas                |                                 []              |
-     gawk               |    []  []                       []              |
-     gcal               |                                 []              |
-     gcc                |        []                       []              |
-     gettext-examples   |        []  []                [] []          []  |
-     gettext-runtime    |    []  []                    [] []          []  |
-     gettext-tools      |        []                       []    []        |
-     gip                |    []  []                       []    []    []  |
-     gjay               |        []                                   []  |
-     gliv               | [] []  []                                   []  |
-     glunarclock        |    []  []                                   []  |
-     gnubiff            |        ()                                       |
-     gnucash            | []     ()  ()     ()            ()          ()  |
-     gnuedu             |    []                           []              |
-     gnulib             |        []                       []          []  |
+     diffutils          |     [] []  []  []                [] []          |
+     dink               |        []  []                       []          |
+     doodle             |            []                                   |
+     e2fsprogs          |     []     []                       []          |
+     enscript           |        []  []         []                        |
+     exif               |     () []  []                                   |
+     fetchmail          |     [] []  ()  []     []            []          |
+     findutils          |     [] []  []                                   |
+     flex               |            []                       []          |
+     freedink           |        []  []                       []          |
+     gas                |                                     []          |
+     gawk               |        []  []                       []          |
+     gcal               |                                     []          |
+     gcc                |            []                       []          |
+     gettext-examples   |            []  []                [] []          |
+     gettext-runtime    |        []  []                    [] []          |
+     gettext-tools      |            []                       []    []    |
+     gip                |        []  []                       []    []    |
+     gjay               |            []                                   |
+     gliv               |     [] []  []                                   |
+     glunarclock        |        []  []                                   |
+     gnubiff            |            ()                                   |
+     gnucash            |     []     ()  ()     ()            ()          |
+     gnuedu             |        []                           []          |
+     gnulib             |            []                       []          |
      gnunet             |                                                 |
-     gnunet-gtk         |    []                                           |
-     gnutls             | []     []                                       |
-     gold               |                                 []          []  |
-     gpe-aerial         | [] []  []                       []          []  |
-     gpe-beam           | [] []  []                       []          []  |
-     gpe-bluetooth      |    []  []                                   []  |
-     gpe-calendar       |    []                                       []  |
-     gpe-clock          | [] []  []                       []          []  |
-     gpe-conf           | [] []  []                                   []  |
-     gpe-contacts       |    []  []                       []          []  |
-     gpe-edit           |    []  []                                   []  |
-     gpe-filemanager    |    []  []                       []          []  |
-     gpe-go             | [] []  []                       []          []  |
-     gpe-login          |    []  []                                   []  |
-     gpe-ownerinfo      | [] []  []                       []          []  |
-     gpe-package        |    []  []                       []          []  |
-     gpe-sketchbook     | [] []  []                       []          []  |
-     gpe-su             | [] []  []                       []          []  |
-     gpe-taskmanager    | [] []  []                       []          []  |
-     gpe-timesheet      | [] []  []                       []          []  |
-     gpe-today          | [] []  []                       []          []  |
-     gpe-todo           |    []  []                       []          []  |
-     gphoto2            | [] []  ()         []            []    []    []  |
-     gprof              |    []  []                       []          []  |
-     gpsdrive           |    []                           [] []           |
-     gramadoir          |    []  []                    []                 |
-     grep               | []                                          []  |
-     grub               |    []  []                                   []  |
-     gsasl              |        []                                   []  |
-     gss                |                                             []  |
-     gst-plugins-bad    | [] []  []                       []    []    []  |
-     gst-plugins-base   | [] []  []                       []    []    []  |
-     gst-plugins-good   | [] []  []  []                   []    []    []  |
-     gst-plugins-ugly   | [] []  []  []                   []    []    []  |
-     gstreamer          | [] []  []                       []    []    []  |
-     gtick              |    []  ()                    []             []  |
-     gtkam              | [] []  ()                    [] []              |
-     gtkorphan          | [] []  []                    []                 |
-     gtkspell           | [] []  []  []                [] []    []    []  |
-     gutenprint         |    []  []         []                        []  |
-     hello              |    []  []                    [] []          []  |
-     help2man           |        []                                   []  |
-     hylafax            |        []                       []              |
-     idutils            |    []  []                                   []  |
-     indent             | [] []  []                    [] [] [] []    []  |
-     iso_15924          |    []      ()                [] []          []  |
-     iso_3166           | [] []  []  ()                [] [] [] ()    []  |
-     iso_3166_2         |            ()                                   |
-     iso_4217           | [] []  []  ()                   [] []       []  |
-     iso_639            | [] []  []  ()                [] []          []  |
-     iso_639_3          |                                                 |
-     jwhois             |                                 []          []  |
-     kbd                | [] []  []  []                   []              |
-     keytouch           |    []  []                                   []  |
-     keytouch-editor    |    []  []                                   []  |
-     keytouch-keyboa... |    []                                       []  |
-     klavaro            | [] []  []                    []                 |
-     latrine            |    []  ()                                   []  |
-     ld                 |    []                           []          []  |
-     leafpad            | [] []  []  []                   []    []    []  |
-     libc               | [] []  []                       []          []  |
-     libexif            |    []  []         ()                            |
+     gnunet-gtk         |        []                                       |
+     gnutls             |     []     []                                   |
+     gold               |                                     []          |
+     gpe-aerial         |     [] []  []                       []          |
+     gpe-beam           |     [] []  []                       []          |
+     gpe-bluetooth      |        []  []                                   |
+     gpe-calendar       |        []                                       |
+     gpe-clock          |     [] []  []                       []          |
+     gpe-conf           |     [] []  []                                   |
+     gpe-contacts       |        []  []                       []          |
+     gpe-edit           |        []  []                                   |
+     gpe-filemanager    |        []  []                       []          |
+     gpe-go             |     [] []  []                       []          |
+     gpe-login          |        []  []                                   |
+     gpe-ownerinfo      |     [] []  []                       []          |
+     gpe-package        |        []  []                       []          |
+     gpe-sketchbook     |     [] []  []                       []          |
+     gpe-su             |     [] []  []                       []          |
+     gpe-taskmanager    |     [] []  []                       []          |
+     gpe-timesheet      |     [] []  []                       []          |
+     gpe-today          |     [] []  []                       []          |
+     gpe-todo           |        []  []                       []          |
+     gphoto2            |     [] []  ()         []            []    []    |
+     gprof              |        []  []                       []          |
+     gpsdrive           |        []                           [] []       |
+     gramadoir          |        []  []                    []             |
+     grep               |     []                                          |
+     grub               |        []  []                                   |
+     gsasl              |            []                                   |
+     gss                |                                                 |
+     gst-plugins-bad    |     [] []  []                       []    []    |
+     gst-plugins-base   |     [] []  []                       []    []    |
+     gst-plugins-good   |     [] []  []  []                   []    []    |
+     gst-plugins-ugly   |     [] []  []  []                   []    []    |
+     gstreamer          |     [] []  []                       []    []    |
+     gtick              |        []  ()                    []             |
+     gtkam              |     [] []  ()                    [] []          |
+     gtkorphan          |     [] []  []                    []             |
+     gtkspell           |     [] []  []  []                [] []    []    |
+     gutenprint         |        []  []         []                        |
+     hello              |        []  []                    [] []          |
+     help2man           |            []                                   |
+     hylafax            |            []                       []          |
+     idutils            |        []  []                                   |
+     indent             |     [] []  []                    [] [] [] []    |
+     iso_15924          |        []      ()                [] []          |
+     iso_3166           | []  [] []  []  ()                [] [] [] ()    |
+     iso_3166_2         |                ()                               |
+     iso_4217           |     [] []  []  ()                   [] []       |
+     iso_639            | []  [] []  []  ()                [] []          |
+     iso_639_3          | []                                              |
+     jwhois             |                                     []          |
+     kbd                |     [] []  []  []                   []          |
+     keytouch           |        []  []                                   |
+     keytouch-editor    |        []  []                                   |
+     keytouch-keyboa... |        []                                       |
+     klavaro            |     [] []  []                    []             |
+     latrine            |        []  ()                                   |
+     ld                 |        []                           []          |
+     leafpad            |     [] []  []  []                   []    []    |
+     libc               |     [] []  []                       []          |
+     libexif            |        []  []         ()                        |
      libextractor       |                                                 |
-     libgnutls          | []                                              |
-     libgpewidget       |    []  []                                   []  |
-     libgpg-error       | []     []                                       |
-     libgphoto2         |    []  ()                                       |
-     libgphoto2_port    |    []  ()                             []        |
-     libgsasl           |                                             []  |
-     libiconv           | [] []  []                    []    []       []  |
-     libidn             | []     []                    []             []  |
-     lifelines          |    []  ()                                       |
-     liferea            | []     []  []                   []    []        |
-     lilypond           | []     []                       []          []  |
-     linkdr             |    []  []                       []          []  |
-     lordsawar          |    []                                           |
+     libgnutls          |     []                                          |
+     libgpewidget       |        []  []                                   |
+     libgpg-error       |     []     []                                   |
+     libgphoto2         |        []  ()                                   |
+     libgphoto2_port    |        []  ()                             []    |
+     libgsasl           |                                                 |
+     libiconv           |     [] []  []                    []    []       |
+     libidn             |     []     []                    []             |
+     lifelines          |        []  ()                                   |
+     liferea            |     []     []  []                   []    []    |
+     lilypond           |     []     []                       []          |
+     linkdr             |        []  []                       []          |
+     lordsawar          |        []                                       |
      lprng              |                                                 |
-     lynx               | [] []  []                          []           |
-     m4                 | [] []  []  []                               []  |
+     lynx               |     [] []  []                          []       |
+     m4                 |     [] []  []  []                               |
      mailfromd          |                                                 |
-     mailutils          |                                 []              |
-     make               |    []  []                       []          []  |
+     mailutils          |                                     []          |
+     make               |        []  []                       []          |
      man-db             |                                                 |
      man-db-manpages    |                                                 |
-     minicom            | [] []  []                       []          []  |
-     mkisofs            |                                             []  |
+     minicom            |     [] []  []                       []          |
+     mkisofs            |                                                 |
      myserver           |                                                 |
-     nano               |        []                       []    []    []  |
-     opcodes            |        []                       []          []  |
-     parted             | []     []                                       |
+     nano               |            []                       []    []    |
+     opcodes            |            []                       []          |
+     parted             |     []     []                                   |
      pies               |                                                 |
-     popt               | [] []  []                    [] []          []  |
-     psmisc             | []     []                             []    []  |
-     pspp               |                                 []              |
-     pwdutils           |    []                                           |
-     radius             |                                 []              |
-     recode             | [] []  []  []                [] []          []  |
-     rosegarden         | ()     ()                       ()          ()  |
-     rpm                |    []  []                       []              |
+     popt               |     [] []  []                    [] []          |
+     psmisc             |     []     []                             []    |
+     pspp               |                                     []          |
+     pwdutils           |        []                                       |
+     radius             |                                     []          |
+     recode             |     [] []  []  []                [] []          |
+     rosegarden         |     ()     ()                       ()          |
+     rpm                |        []  []                       []          |
      rush               |                                                 |
      sarg               |                                                 |
      screem             |                                                 |
-     scrollkeeper       | [] []  []         []            []          []  |
-     sed                | []     []  []                [] [] []       []  |
-     sharutils          |    []  []                       [] []       []  |
+     scrollkeeper       |     [] []  []         []            []          |
+     sed                |     []     []  []                [] [] []       |
+     sharutils          |        []  []                       [] []       |
      shishi             |                                                 |
-     skencil            |    []  ()                       []              |
-     solfege            |        []                    []    []       []  |
-     solfege-manual     |                              []    []           |
-     soundtracker       |    []  []                       []              |
-     sp                 |        []                                       |
-     sysstat            |    []  []                             []    []  |
-     tar                | []     []                          [] []    []  |
-     texinfo            |        []                    [] []              |
-     tin                |        []                          []           |
+     skencil            |        []  ()                       []          |
+     solfege            |            []                    []    []       |
+     solfege-manual     |                                  []    []       |
+     soundtracker       |        []  []                       []          |
+     sp                 |            []                                   |
+     sysstat            |        []  []                             []    |
+     tar                |     []     []                          [] []    |
+     texinfo            |            []                    [] []          |
+     tin                |            []                          []       |
      unicode-han-tra... |                                                 |
      unicode-transla... |                                                 |
-     util-linux-ng      | [] []  []                       []          []  |
-     vice               |    ()  ()                                       |
-     vmm                |        []                                       |
-     vorbis-tools       | []                           []                 |
-     wastesedge         |    []                                           |
-     wdiff              |        []                       []          []  |
-     wget               | []     []                          []       []  |
-     wyslij-po          |                                             []  |
-     xchat              | []     []  []                   [] []       []  |
-     xdg-user-dirs      | [] []  []  []                [] [] [] []    []  |
-     xkeyboard-config   | [] []  []                    [] []          []  |
+     util-linux-ng      |     [] []  []                       []          |
+     vice               |        ()  ()                                   |
+     vmm                |            []                                   |
+     vorbis-tools       |     []                           []             |
+     wastesedge         |        []                                       |
+     wdiff              |            []                       []          |
+     wget               |     []     []                          []       |
+     wyslij-po          |                                                 |
+     xchat              |     []     []  []                   [] []       |
+     xdg-user-dirs      | []  [] []  []  []                [] [] [] []    |
+     xkeyboard-config   | []  [] []  []                    [] []          |
                         +-------------------------------------------------+
-                          cs da  de  el en en_GB en_ZA eo es et eu fa fi
-                          64 105 117 18  1   8     0   28 89 18 19  0 104
-
-                          fr  ga gl gu he hi hr hu hy id  is it ja ka kn
-                        +------------------------------------------------+
-     a2ps               | []                          []        []       |
-     aegis              | []                                 []          |
-     ant-phone          | []                                 []          |
-     anubis             | []                          []     []          |
-     aspell             | []  []                      []     []          |
-     bash               | []                          []        []       |
-     bfd                | []                          []                 |
-     bibshelf           | []  []                      []     []          |
-     binutils           | []                          []                 |
-     bison              | []  []                      []                 |
-     bison-runtime      | []  []                      []     [] []       |
-     bluez-pin          | []  []                [] [] []  []    []       |
-     bombono-dvd        |                                                |
-     buzztard           |                             []                 |
-     cflow              |     []                      []                 |
-     clisp              | []                                             |
-     coreutils          | []  []                []    []     []          |
-     cpio               | []  []                      []                 |
-     cppi               | []                                             |
-     cpplib             | []                          []                 |
-     cryptsetup         | []                          []     []          |
-     dfarc              | []                                 []          |
-     dialog             | []  [] []                   []  [] [] []       |
-     dico               |                                                |
-     diffutils          | []  [] []    []       []    []     [] []       |
-     dink               | []                                             |
-     doodle             |     []                             []          |
-     e2fsprogs          | []                          []                 |
-     enscript           | []  []             []       []                 |
-     exif               | []                          []  [] [] []       |
-     fetchmail          | []                          []     [] []       |
-     findutils          | []  []                []    []     []          |
-     flex               | []  []                                         |
-     freedink           | []                          []                 |
-     gas                | []                          []                 |
-     gawk               | []  []       []             []     () []       |
-     gcal               | []                                             |
-     gcc                |                             []                 |
-     gettext-examples   | []  []                []    []     [] []       |
-     gettext-runtime    | []  []                      []     [] []       |
-     gettext-tools      | []                          []     [] []       |
-     gip                | []  [] []                   []        []       |
-     gjay               |                                                |
-     gliv               | ()                                             |
-     glunarclock        |     []                []    []                 |
-     gnubiff            | ()                          []     ()          |
-     gnucash            | ()           ()       ()           () []       |
-     gnuedu             | []                                 []          |
-     gnulib             | []  []                []           [] []       |
-     gnunet             |                                                |
-     gnunet-gtk         | []                                             |
-     gnutls             | []                                 []          |
-     gold               |                             []                 |
-     gpe-aerial         | []                          []                 |
-     gpe-beam           | []                          []        []       |
-     gpe-bluetooth      |                             []     [] []       |
-     gpe-calendar       |                                       []       |
-     gpe-clock          | []                    []    []        []       |
-     gpe-conf           | []                          []        []       |
-     gpe-contacts       | []                          []        []       |
-     gpe-edit           |                             []        []       |
-     gpe-filemanager    |                       []    []        []       |
-     gpe-go             | []                    []    []        []       |
-     gpe-login          |                             []        []       |
-     gpe-ownerinfo      | []                    []    []        []       |
-     gpe-package        |                             []        []       |
-     gpe-sketchbook     | []                          []        []       |
-     gpe-su             | []     []             []    []        []       |
-     gpe-taskmanager    | []                    []    []        []       |
-     gpe-timesheet      | []  []                      []        []       |
-     gpe-today          | []  [] []             []    []        []       |
-     gpe-todo           |                             []        []       |
-     gphoto2            | []                    []    []     [] []       |
-     gprof              | []  []                      []                 |
-     gpsdrive           |        []                   []     []          |
-     gramadoir          | []  []                      []                 |
-     grep               |                                    []          |
-     grub               |                       []    []     []          |
-     gsasl              | []  []                      []     []          |
-     gss                | []  []                      []     []          |
-     gst-plugins-bad    | []                    []    []     []          |
-     gst-plugins-base   | []                    []    []     [] []       |
-     gst-plugins-good   | []                    []    []     [] []       |
-     gst-plugins-ugly   | []                    []    []     [] []       |
-     gstreamer          | []                    []    []     []          |
-     gtick              | []  []                      []     []          |
-     gtkam              | []                    []    []     [] []       |
-     gtkorphan          | []                          []     []          |
-     gtkspell           | []  [] []             [] [] []     [] []       |
-     gutenprint         | []                    []           []          |
-     hello              |     []                      []                 |
-     help2man           | []                                             |
-     hylafax            |                             []                 |
-     idutils            | []  []                []    []     []          |
-     indent             | []  [] []             []    []     [] []       |
-     iso_15924          | ()                          []     []          |
-     iso_3166           | ()  [] [] [] [] [] [] []    []     [] []       |
-     iso_3166_2         | ()                    []    []     []          |
-     iso_4217           | ()                    []    []     [] []       |
-     iso_639            | ()  []    []          []    []     [] []    [] |
-     iso_639_3          | ()                                 []       [] |
-     jwhois             | []                    []    []     []          |
-     kbd                | []                          []                 |
-     keytouch           | []  []                []    []     []          |
-     keytouch-editor    |     []                []    []     []          |
-     keytouch-keyboa... |     []                []    []     []          |
-     klavaro            |        []             []                       |
-     latrine            |                             []     []          |
-     ld                 | []  []                      []                 |
-     leafpad            | []  []       []       []    []     [] ()       |
-     libc               | []     []                   []        []       |
-     libexif            |                                                |
-     libextractor       |                                                |
-     libgnutls          | []                                 []          |
-     libgpewidget       |     []                      []        []       |
-     libgpg-error       | []                                 []          |
-     libgphoto2         | []                                 [] []       |
-     libgphoto2_port    | []                                 [] []       |
-     libgsasl           | []  []                      []     []          |
-     libiconv           | []  []                      []     [] []       |
-     libidn             | []                          []     []          |
-     lifelines          | ()                                             |
-     liferea            | []                    []           [] []       |
-     lilypond           | []                                             |
-     linkdr             |              []    [] []           []          |
-     lordsawar          |                                                |
-     lprng              |                             []                 |
-     lynx               | []                    []    []     [] []       |
-     m4                 | []  [] []                   []        []       |
-     mailfromd          |                                                |
-     mailutils          | []                          []                 |
-     make               | []  [] []    []    []       []     [] []       |
-     man-db             |                             []     []          |
-     man-db-manpages    |                             []                 |
-     minicom            | []                    []    []        []       |
-     mkisofs            | []                          []     []          |
-     myserver           |                                                |
-     nano               | []  [] []             []           []          |
-     opcodes            | []  []                      []                 |
-     parted             | []                          []     [] []       |
-     pies               |                                                |
-     popt               | []  [] []             []    []  [] [] []       |
-     psmisc             | []                          []                 |
-     pspp               |                                                |
-     pwdutils           | []                          []                 |
-     radius             | []                          []                 |
-     recode             | []  [] []    []       []    []     []          |
-     rosegarden         | ()                          ()     () ()       |
-     rpm                |                             []        []       |
-     rush               |                                                |
-     sarg               | []                                             |
-     screem             |                                    [] []       |
-     scrollkeeper       |                       []    []     []          |
-     sed                | []  [] []             []    []     [] []       |
-     sharutils          | []  []                []    []     [] []       |
-     shishi             | []                                             |
-     skencil            | []                                             |
-     solfege            | []     []                          []          |
-     solfege-manual     | []     []                                      |
-     soundtracker       | []                                 []          |
-     sp                 | []                                    ()       |
-     sysstat            | []                          []     [] []       |
-     tar                | []  []                []    []     [] []       |
-     texinfo            | []                          []     [] []       |
-     tin                | []                                             |
-     unicode-han-tra... |                                                |
-     unicode-transla... | []  []                                         |
-     util-linux-ng      | []                    []    []     [] []       |
-     vice               | ()                    ()           ()          |
-     vmm                | []                                             |
-     vorbis-tools       |                             []                 |
-     wastesedge         | ()                                 ()          |
-     wdiff              |                                                |
-     wget               | []  []             [] []    []     [] []       |
-     wyslij-po          | []                          []                 |
-     xchat              | []        []    []    []    []     [] []    [] |
-     xdg-user-dirs      | []  [] [] [] []       []    []  [] [] []    [] |
-     xkeyboard-config   | []                    []    []     []          |
-                        +------------------------------------------------+
-                          fr  ga gl gu he hi hr hu hy id  is it ja ka kn
-                          121 53 20  4  8  2  5 53  2 120  5 83 66  0  4
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                           5  64 105 117 18  1   8     0   28 89 18 19  0
+
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                        +----------------------------------------------------+
+     a2ps               | []  []                          []        []       |
+     aegis              |     []                                 []          |
+     ant-phone          |     []                                 []          |
+     anubis             | []  []                          []     []          |
+     aspell             |     []  []                      []     []          |
+     bash               | []  []                          []        []       |
+     bfd                | []  []                          []                 |
+     bibshelf           | []  []  []                      []     []          |
+     binutils           | []  []                          []                 |
+     bison              | []  []  []                      []                 |
+     bison-runtime      | []  []  []                      []     [] []       |
+     bluez-pin          | []  []  []                [] [] []  []    []       |
+     bombono-dvd        | []                                                 |
+     buzztard           |                                 []                 |
+     cflow              | []      []                      []                 |
+     clisp              |     []                                             |
+     coreutils          |     []  []                []    []     []          |
+     cpio               | []  []  []                      []                 |
+     cppi               | []  []                                             |
+     cpplib             | []  []                          []                 |
+     cryptsetup         |     []                          []     []          |
+     dfarc              | []  []                                 []          |
+     dialog             |     []  [] []                   []  [] [] []       |
+     dico               |                                                    |
+     diffutils          | []  []  [] []    []       []    []     [] []       |
+     dink               |     []                                             |
+     doodle             |         []                             []          |
+     e2fsprogs          |     []                          []                 |
+     enscript           |     []  []             []       []                 |
+     exif               | []  []                          []  [] [] []       |
+     fetchmail          |     []                          []     [] []       |
+     findutils          | []  []  []                []    []     []          |
+     flex               | []  []  []                                         |
+     freedink           | []  []                          []                 |
+     gas                |     []                          []                 |
+     gawk               |     []  []       []             []     () []       |
+     gcal               |     []                                             |
+     gcc                |                                 []                 |
+     gettext-examples   | []  []  []                []    []     [] []       |
+     gettext-runtime    | []  []  []                      []     [] []       |
+     gettext-tools      |     []                          []     [] []       |
+     gip                | []  []  [] []                   []        []       |
+     gjay               | []                                                 |
+     gliv               | []  ()                                             |
+     glunarclock        | []      []                []    []                 |
+     gnubiff            |     ()                          []     ()          |
+     gnucash            | ()  ()           ()       ()           () []       |
+     gnuedu             |     []                                 []          |
+     gnulib             | []  []  []                []           [] []       |
+     gnunet             |                                                    |
+     gnunet-gtk         |     []                                             |
+     gnutls             |     []                                 []          |
+     gold               | []                              []                 |
+     gpe-aerial         | []  []                          []                 |
+     gpe-beam           | []  []                          []        []       |
+     gpe-bluetooth      | []                              []     [] []       |
+     gpe-calendar       | []                                        []       |
+     gpe-clock          | []  []                    []    []        []       |
+     gpe-conf           | []  []                          []        []       |
+     gpe-contacts       | []  []                          []        []       |
+     gpe-edit           | []                              []        []       |
+     gpe-filemanager    | []                        []    []        []       |
+     gpe-go             | []  []                    []    []        []       |
+     gpe-login          | []                              []        []       |
+     gpe-ownerinfo      | []  []                    []    []        []       |
+     gpe-package        | []                              []        []       |
+     gpe-sketchbook     | []  []                          []        []       |
+     gpe-su             | []  []     []             []    []        []       |
+     gpe-taskmanager    | []  []                    []    []        []       |
+     gpe-timesheet      | []  []  []                      []        []       |
+     gpe-today          | []  []  [] []             []    []        []       |
+     gpe-todo           | []                              []        []       |
+     gphoto2            | []  []                    []    []     [] []       |
+     gprof              | []  []  []                      []                 |
+     gpsdrive           |            []                   []     []          |
+     gramadoir          |     []  []                      []                 |
+     grep               | []                                     []          |
+     grub               | []                        []    []     []          |
+     gsasl              | []  []  []                      []     []          |
+     gss                | []  []  []                      []     []          |
+     gst-plugins-bad    | []  []                    []    []     [] []       |
+     gst-plugins-base   | []  []                    []    []     [] []       |
+     gst-plugins-good   | []  []                    []    []     [] []       |
+     gst-plugins-ugly   | []  []                    []    []     [] []       |
+     gstreamer          | []  []                    []    []     []          |
+     gtick              | []  []  []                      []     []          |
+     gtkam              |     []                    []    []     [] []       |
+     gtkorphan          |     []                          []     []          |
+     gtkspell           | []  []  [] []             [] [] []     [] []       |
+     gutenprint         | []  []                    []           []          |
+     hello              | []      []                      []                 |
+     help2man           | []  []                                             |
+     hylafax            |                                 []                 |
+     idutils            | []  []  []                []    []     []          |
+     indent             | []  []  [] []             []    []     [] []       |
+     iso_15924          | []  ()                          []     []          |
+     iso_3166           | []  ()  [] [] [] [] [] [] []    []     [] []       |
+     iso_3166_2         |     ()                    []    []     []          |
+     iso_4217           | []  ()                    []    []     [] []       |
+     iso_639            | []  ()  []    []          []    []     [] []    [] |
+     iso_639_3          |     ()                                 []       [] |
+     jwhois             | []  []                    []    []     []          |
+     kbd                |     []                          []                 |
+     keytouch           | []  []  []                []    []     []          |
+     keytouch-editor    | []      []                []    []     []          |
+     keytouch-keyboa... | []      []                []    []     []          |
+     klavaro            |            []             []                       |
+     latrine            | []                              []     []          |
+     ld                 | []  []  []                      []                 |
+     leafpad            | []  []  []       []       []    []     [] ()       |
+     libc               | []  []     []                   []        []       |
+     libexif            |                                        []          |
+     libextractor       |                                                    |
+     libgnutls          |     []                                 []          |
+     libgpewidget       | []      []                      []        []       |
+     libgpg-error       |     []                                 []          |
+     libgphoto2         |     []                                 [] []       |
+     libgphoto2_port    |     []                                 [] []       |
+     libgsasl           | []  []  []                      []     []          |
+     libiconv           | []  []  []                      []     [] []       |
+     libidn             | []  []                          []     []          |
+     lifelines          |     ()                                             |
+     liferea            |     []                    []           [] []       |
+     lilypond           | []  []                                             |
+     linkdr             | []               []    [] []           []          |
+     lordsawar          |                                                    |
+     lprng              |                                 []                 |
+     lynx               |     []                    []    []     [] []       |
+     m4                 | []  []  [] []                   []        []       |
+     mailfromd          |                                                    |
+     mailutils          |     []                          []                 |
+     make               | []  []  [] []    []    []       []     [] []       |
+     man-db             |                                 []     []          |
+     man-db-manpages    |                                 []                 |
+     minicom            | []  []                    []    []        []       |
+     mkisofs            | []  []                          []     []          |
+     myserver           |                                                    |
+     nano               | []  []  [] []             []           []          |
+     opcodes            | []  []  []                      []                 |
+     parted             |     []                          []     [] []       |
+     pies               |                                                    |
+     popt               | []  []  [] []             []    []  [] [] []       |
+     psmisc             | []  []                          []                 |
+     pspp               |                                                    |
+     pwdutils           |     []                          []                 |
+     radius             |     []                          []                 |
+     recode             | []  []  [] []    []       []    []     []          |
+     rosegarden         | ()  ()                          ()     () ()       |
+     rpm                |                                 []        []       |
+     rush               |                                                    |
+     sarg               |     []                                             |
+     screem             |                                        [] []       |
+     scrollkeeper       | []                        []    []     []          |
+     sed                | []  []  [] []             []    []     [] []       |
+     sharutils          | []  []  []                []    []     [] []       |
+     shishi             |     []                                             |
+     skencil            |     []                                             |
+     solfege            | []  []     []                          []          |
+     solfege-manual     |     []     []                                      |
+     soundtracker       |     []                                 []          |
+     sp                 |     []                                    ()       |
+     sysstat            | []  []                          []     [] []       |
+     tar                | []  []  []                []    []     [] []       |
+     texinfo            |     []                          []     [] []       |
+     tin                |     []                                             |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |     []  []                                         |
+     util-linux-ng      | []  []                    []    []     [] []       |
+     vice               |     ()                    ()           ()          |
+     vmm                |     []                                             |
+     vorbis-tools       |                                 []                 |
+     wastesedge         |     ()                                 ()          |
+     wdiff              | []                                                 |
+     wget               | []  []  []             [] []    []     [] []       |
+     wyslij-po          | []  []                          []                 |
+     xchat              | []  []        []    []    []    []     [] []    [] |
+     xdg-user-dirs      | []  []  [] [] [] [] []    []    []  [] [] []    [] |
+     xkeyboard-config   | []  []                    []    []     []          |
+                        +----------------------------------------------------+
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                          105 121 53 20  4  8  3  5 53  2 120  5 84 67  0  4
 
                           ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
@@ -821 +776 @@
      gsasl              |                                               |
      gss                |                                               |
-     gst-plugins-bad    |                []                []           |
+     gst-plugins-bad    |             [] []                [] []        |
      gst-plugins-base   |             [] []                             |
      gst-plugins-good   |                []                []           |
@@ -921 +876 @@
                         +-----------------------------------------------+
                           ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
-                          20  5 10  1 12 48  4  2  2  4 24 10 19  3   1
+                          20  5 10  1 13 48  4  2  2  4 24 10 20  3   1
 
                           nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
@@ -1005 +960 @@
      gsasl              | []           []                       []       [] |
      gss                |              []              []       []          |
-     gst-plugins-bad    | []           []         []      []    []          |
+     gst-plugins-bad    | []           []         []      []    []    []    |
      gst-plugins-base   | []           []         []      []    []          |
      gst-plugins-good   | []           []         []      []    []          |
@@ -1042 +997 @@
      libgpg-error       |              []              []                   |
      libgphoto2         | []           []                                   |
-     libgphoto2_port    | []           []                 []    []          |
+     libgphoto2_port    | []           []         []      []    []          |
      libgsasl           | []           []              []       []       [] |
      libiconv           | []           []                       [] []    [] |
@@ -1102 +1057 @@
      xchat              | []        [] []     []          []    [] [] [] [] |
      xdg-user-dirs      | []  [] [] [] []  [] []  []   [] []    [] [] [] [] |
-     xkeyboard-config   | []           []                 []    [] []       |
+     xkeyboard-config   | []           []                 []                |
                         +---------------------------------------------------+
                           nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                          135 10  4  7 105  1 29  61   47 91  3 55 47  8 37
+                          135 10  4  7 105  1 29  62   47 91  3 54 46  9 37
 
                           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
@@ -1114 +1069 @@
      anubis             | []                 [] [] []                       | 15
      aspell             |                       [] []  []                   | 20
-     bash               | []                       []                       | 11
+     bash               | []                    [] []                       | 12
      bfd                |                          []                       |  6
      bibshelf           | []                       []      []               | 16
@@ -1128 +1083 @@
      cpio               | []                 [] [] []      []          []   | 13
      cppi               |                       [] []                       |  5
-     cpplib             | []                 [] [] []      []          []   | 13
+     cpplib             | []                 [] [] []      []          []   | 14
      cryptsetup         | []                       []                       |  7
      dfarc              |                          []                       |  9
@@ -1148 +1103 @@
      gcc                | []                 []            []               |  7
      gettext-examples   | []                 [] [] []      []    []    []   | 34
-     gettext-runtime    | []                 [] [] []      []    []    []   | 30
+     gettext-runtime    | []                 [] [] []      []    []    []   | 29
      gettext-tools      | []                 [] [] []      []          []   | 22
      gip                | []                       []      []          []   | 22
@@ -1155 +1110 @@
      glunarclock        | []                       []  []  []          []   | 19
      gnubiff            | []                       []                       |  4
-     gnucash            |                    () [] ()                  ()   |  9
+     gnucash            |                    () [] ()      []          ()   | 10
      gnuedu             |                          []                  []   |  7
      gnulib             | []                    [] []      []               | 16
@@ -1189 +1144 @@
      gsasl              | []                       []      []          []   | 14
      gss                | []                       []      []               | 11
-     gst-plugins-bad    | []                 []    []      []               | 22
+     gst-plugins-bad    | []                 []    []      []               | 26
      gst-plugins-base   | []                 [] [] []      []               | 24
-     gst-plugins-good   | []                 [] [] []      []               | 25
+     gst-plugins-good   | []                 []    []      []               | 24
      gst-plugins-ugly   | []                 [] [] []      []               | 29
      gstreamer          | []                    [] []      []               | 22
@@ -1220 +1175 @@
      leafpad            | []                 [] [] []      []          []   | 33
      libc               | []                 []    []      []          []   | 21
-     libexif            |                          []      ()               |  6
+     libexif            |                          []      ()               |  7
      libextractor       |                          []                       |  1
      libgnutls          | []                       []      []               |  9
@@ -1226 +1181 @@
      libgpg-error       | []                       []      []               |  9
      libgphoto2         |                       [] []                       |  8
-     libgphoto2_port    | []                    [] []                  []   | 13
+     libgphoto2_port    | []                    [] []                  []   | 14
      libgsasl           | []                       []      []               | 13
      libiconv           | []                       []  []  []               | 21
@@ -1272 +1227 @@
      sysstat            |                          []      []               | 15
      tar                | []                 [] [] []      []          []   | 23
-     texinfo            | []                 []    []      []               | 16
+     texinfo            | []                 [] [] []      []               | 17
      tin                |                                                   |  4
      unicode-han-tra... |                                                   |  0
@@ -1285 +1240 @@
      wyslij-po          |                       [] []                       |  8
      xchat              | []              []    [] []      []          []   | 36
-     xdg-user-dirs      | []     []       [] [] [] []      []    []    []   | 60
-     xkeyboard-config   | []                 [] [] []                       | 25
+     xdg-user-dirs      | []     [] []    [] [] [] []      []    []    []   | 63
+     xkeyboard-config   | []                    [] []                       | 22
                         +---------------------------------------------------+
-       84 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
-      178 domains         119  1  3  2  0 10 66 50 155 17  97     7    41    2610
+       85 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+      178 domains         119  1  3  3  0 10 65 51 155 17  98     7    41    2618
 
    Some counters in the preceding matrix are higher than the number of
@@ -1302 +1257 @@
 distribution.
 
-   If May 2010 seems to be old, you may fetch a more recent copy of
+   If June 2010 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://translationproject.org/extra/matrix.html'.
 
-1.6 Using `gettext' in new packages
+1.5 Using `gettext' in new packages
 ===================================
 

xz/vendor/current/ChangeLog ¶

@@ +1 @@
+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>
@@ -130 +690 @@
     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
@@ -1588 +2147 @@
     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
@@ -2651 +3209 @@
     ‘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
@@ -2661 +3219 @@
     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>",
@@ -3059 +3617 @@
     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
@@ -4160 +4716 @@
     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
@@ -4280 +4835 @@
     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
@@ -4665 +5219 @@
     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
@@ -5233 +5787 @@
     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
@@ -5740 +6293 @@
     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
@@ -7598 +8150 @@
     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
@@ -8269 +8817 @@
     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
@@ -8761 +9309 @@
     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
@@ -8854 +9397 @@
     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
@@ -9248 +9787 @@
     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
@@ -9319 +9857 @@
     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
@@ -9676 +10208 @@
     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
@@ -10658 +11189 @@
     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
@@ -10720 +11250 @@
     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 -------------------
- src/liblzma/rangecoder/price_tablegen.c   | 51 +++++++++++++++---
- src/xz/Makefile.am                        |  5 +-
- src/xz/main.c                             |  3 --
- src/xzdec/xzdec.c                         |  3 --
- tests/test_block_header.c                 |  1 -
- tests/test_check.c                        |  2 -
- tests/test_filter_flags.c                 |  2 -
- tests/test_index.c                        |  2 -
- tests/test_stream_flags.c                 |  2 -
- tests/tests.h                             |  2 +-
- 40 files changed, 519 insertions(+), 628 deletions(-)
+ 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 => crc32_fast.c} |  0
+ 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 => crc64_fast.c} |  0
+ 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/{lzma.pc.in => liblzma.pc.in}   |  5 +-
+ src/liblzma/lz/lz_encoder.c                 |  6 ++
+ 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 -------------------
+ src/liblzma/rangecoder/price_tablegen.c     | 51 ++++++++++++++---
+ src/xz/Makefile.am                          |  5 +-
+ src/xz/main.c                               |  3 -
+ src/xzdec/xzdec.c                           |  3 -
+ tests/test_block_header.c                   |  1 -
+ tests/test_check.c                          |  2 -
+ tests/test_filter_flags.c                   |  2 -
+ tests/test_index.c                          |  2 -
+ tests/test_stream_flags.c                   |  2 -
+ tests/tests.h                               |  2 +-
+ 37 files changed, 347 insertions(+), 456 deletions(-)
 
 commit 5cda29b5665004fc0f21d0c41d78022a6a559ab2
@@ -11213 +11740 @@
     should be the default though.
 
- configure.ac            |   4 +-
- po/POTFILES.in          |  21 +-
- src/Makefile.am         |   2 +-
- src/lzma/Makefile.am    |  72 ----
- src/lzma/args.c         | 500 ---------------------------
- src/lzma/args.h         |  56 ---
- src/lzma/hardware.c     | 122 -------
- src/lzma/hardware.h     |  45 ---
- src/lzma/io.c           | 658 -----------------------------------
- src/lzma/io.h           |  97 ------
- src/lzma/list.c         | 477 --------------------------
- src/lzma/main.c         | 402 ----------------------
- src/lzma/main.h         |  60 ----
- src/lzma/message.c      | 892 ------------------------------------------------
- src/lzma/message.h      | 132 -------
- src/lzma/options.c      | 352 -------------------
- src/lzma/options.h      |  46 ---
- src/lzma/private.h      |  52 ---
- src/lzma/process.c      | 391 ---------------------
- src/lzma/process.h      |  70 ----
- src/lzma/suffix.c       | 213 ------------
- src/lzma/suffix.h       |  40 ---
- src/lzma/util.c         | 199 -----------
- src/lzma/util.h         |  71 ----
- src/lzmadec/Makefile.am |  29 --
- src/lzmadec/lzmadec.c   | 492 --------------------------
- src/xz/Makefile.am      |  74 ++++
- src/xz/args.c           | 500 +++++++++++++++++++++++++++
- src/xz/args.h           |  56 +++
- src/xz/hardware.c       | 122 +++++++
- src/xz/hardware.h       |  45 +++
- src/xz/io.c             | 658 +++++++++++++++++++++++++++++++++++
- src/xz/io.h             |  97 ++++++
- src/xz/list.c           | 477 ++++++++++++++++++++++++++
- src/xz/main.c           | 402 ++++++++++++++++++++++
- src/xz/main.h           |  60 ++++
- src/xz/message.c        | 892 ++++++++++++++++++++++++++++++++++++++++++++++++
- src/xz/message.h        | 132 +++++++
- src/xz/options.c        | 352 +++++++++++++++++++
- src/xz/options.h        |  46 +++
- src/xz/private.h        |  52 +++
- src/xz/process.c        | 391 +++++++++++++++++++++
- src/xz/process.h        |  70 ++++
- src/xz/suffix.c         | 213 ++++++++++++
- src/xz/suffix.h         |  40 +++
- src/xz/util.c           | 199 +++++++++++
- src/xz/util.h           |  71 ++++
- src/xzdec/Makefile.am   |  29 ++
- src/xzdec/xzdec.c       | 492 ++++++++++++++++++++++++++
- tests/test_compress.sh  |  29 +-
- tests/test_files.sh     |   4 +-
- 51 files changed, 5498 insertions(+), 5500 deletions(-)
+ configure.ac                             |  4 ++--
+ po/POTFILES.in                           | 21 +++++++++------------
+ src/Makefile.am                          |  2 +-
+ src/{lzma => xz}/Makefile.am             | 32 +++++++++++++++++---------------
+ src/{lzma => xz}/args.c                  |  0
+ src/{lzma => xz}/args.h                  |  0
+ src/{lzma => xz}/hardware.c              |  0
+ src/{lzma => xz}/hardware.h              |  0
+ src/{lzma => xz}/io.c                    |  0
+ src/{lzma => xz}/io.h                    |  0
+ src/{lzma => xz}/list.c                  |  0
+ src/{lzma => xz}/main.c                  |  0
+ src/{lzma => xz}/main.h                  |  0
+ src/{lzma => xz}/message.c               |  0
+ src/{lzma => xz}/message.h               |  0
+ src/{lzma => xz}/options.c               |  0
+ src/{lzma => xz}/options.h               |  0
+ src/{lzma => xz}/private.h               |  0
+ src/{lzma => xz}/process.c               |  0
+ src/{lzma => xz}/process.h               |  0
+ src/{lzma => xz}/suffix.c                |  0
+ src/{lzma => xz}/suffix.h                |  0
+ src/{lzma => xz}/util.c                  |  0
+ src/{lzma => xz}/util.h                  |  0
+ src/{lzmadec => xzdec}/Makefile.am       | 12 ++++++------
+ src/{lzmadec/lzmadec.c => xzdec/xzdec.c} |  4 ++--
+ tests/test_compress.sh                   | 29 ++++++++++++++---------------
+ tests/test_files.sh                      |  4 ++--
+ 28 files changed, 53 insertions(+), 55 deletions(-)
 
 commit e114502b2bc371e4a45449832cb69be036360722
@@ -11290 +11794 @@
  lib/Makefile.am                              |  10 +-
  lib/getopt.c                                 |  14 +-
- lib/getopt.in.h                              | 226 +++++++
+ lib/{getopt_.h => getopt.in.h}               |   8 +-
  lib/getopt1.c                                |   8 +-
- lib/getopt_.h                                | 226 -------
  lib/gettext.h                                | 240 -------
  m4/getopt.m4                                 |  64 +-
@@ -11394 +11897 @@
  tests/test_block_header.c                    |  16 +-
  tests/test_index.c                           |  42 +-
- 113 files changed, 3462 insertions(+), 2946 deletions(-)
+ 112 files changed, 3240 insertions(+), 2724 deletions(-)
 
 commit 3c3905b53462ae235c9438d86a4dc51086410932
@@ -11468 +11971 @@
     Renamed the test files from .lzma suffix to .xz suffix.
 
- tests/files/README                             | 128 ++++++++++++-------------
- tests/files/bad-0-backward_size.lzma           | Bin 32 -> 0 bytes
- tests/files/bad-0-backward_size.xz             | Bin 0 -> 32 bytes
- tests/files/bad-0-empty-truncated.lzma         | Bin 31 -> 0 bytes
- tests/files/bad-0-empty-truncated.xz           | Bin 0 -> 31 bytes
- tests/files/bad-0-footer_magic.lzma            | Bin 32 -> 0 bytes
- tests/files/bad-0-footer_magic.xz              | Bin 0 -> 32 bytes
- tests/files/bad-0-header_magic.lzma            | Bin 32 -> 0 bytes
- tests/files/bad-0-header_magic.xz              | Bin 0 -> 32 bytes
- tests/files/bad-0-nonempty_index.lzma          | Bin 32 -> 0 bytes
- tests/files/bad-0-nonempty_index.xz            | Bin 0 -> 32 bytes
- tests/files/bad-0cat-alone.lzma                | Bin 55 -> 0 bytes
- tests/files/bad-0cat-alone.xz                  | Bin 0 -> 55 bytes
- tests/files/bad-0cat-header_magic.lzma         | Bin 64 -> 0 bytes
- tests/files/bad-0cat-header_magic.xz           | Bin 0 -> 64 bytes
- tests/files/bad-0catpad-empty.lzma             | Bin 69 -> 0 bytes
- tests/files/bad-0catpad-empty.xz               | Bin 0 -> 69 bytes
- tests/files/bad-0pad-empty.lzma                | Bin 37 -> 0 bytes
- tests/files/bad-0pad-empty.xz                  | Bin 0 -> 37 bytes
- tests/files/bad-1-block_header-1.lzma          | Bin 64 -> 0 bytes
- tests/files/bad-1-block_header-1.xz            | Bin 0 -> 64 bytes
- tests/files/bad-1-block_header-2.lzma          | Bin 64 -> 0 bytes
- tests/files/bad-1-block_header-2.xz            | Bin 0 -> 64 bytes
- tests/files/bad-1-block_header-3.lzma          | Bin 68 -> 0 bytes
- tests/files/bad-1-block_header-3.xz            | Bin 0 -> 68 bytes
- tests/files/bad-1-block_header-4.lzma          | Bin 72 -> 0 bytes
- tests/files/bad-1-block_header-4.xz            | Bin 0 -> 72 bytes
- tests/files/bad-1-check-crc32.lzma             | Bin 68 -> 0 bytes
- tests/files/bad-1-check-crc32.xz               | Bin 0 -> 68 bytes
- tests/files/bad-1-check-crc64.lzma             | Bin 72 -> 0 bytes
- tests/files/bad-1-check-crc64.xz               | Bin 0 -> 72 bytes
- tests/files/bad-1-check-sha256.lzma            | Bin 96 -> 0 bytes
- tests/files/bad-1-check-sha256.xz              | Bin 0 -> 96 bytes
- tests/files/bad-1-lzma2-1.lzma                 | Bin 64 -> 0 bytes
- tests/files/bad-1-lzma2-1.xz                   | Bin 0 -> 64 bytes
- tests/files/bad-1-lzma2-2.lzma                 | Bin 424 -> 0 bytes
- tests/files/bad-1-lzma2-2.xz                   | Bin 0 -> 424 bytes
- tests/files/bad-1-lzma2-3.lzma                 | Bin 424 -> 0 bytes
- tests/files/bad-1-lzma2-3.xz                   | Bin 0 -> 424 bytes
- tests/files/bad-1-lzma2-4.lzma                 | Bin 408 -> 0 bytes
- tests/files/bad-1-lzma2-4.xz                   | Bin 0 -> 408 bytes
- tests/files/bad-1-lzma2-5.lzma                 | Bin 408 -> 0 bytes
- tests/files/bad-1-lzma2-5.xz                   | Bin 0 -> 408 bytes
- tests/files/bad-1-lzma2-6.lzma                 | Bin 68 -> 0 bytes
- tests/files/bad-1-lzma2-6.xz                   | Bin 0 -> 68 bytes
- tests/files/bad-1-lzma2-7.lzma                 | Bin 408 -> 0 bytes
- tests/files/bad-1-lzma2-7.xz                   | Bin 0 -> 408 bytes
- tests/files/bad-1-stream_flags-1.lzma          | Bin 68 -> 0 bytes
- tests/files/bad-1-stream_flags-1.xz            | Bin 0 -> 68 bytes
- tests/files/bad-1-stream_flags-2.lzma          | Bin 68 -> 0 bytes
- tests/files/bad-1-stream_flags-2.xz            | Bin 0 -> 68 bytes
- tests/files/bad-1-stream_flags-3.lzma          | Bin 68 -> 0 bytes
- tests/files/bad-1-stream_flags-3.xz            | Bin 0 -> 68 bytes
- tests/files/bad-1-vli-1.lzma                   | Bin 72 -> 0 bytes
- tests/files/bad-1-vli-1.xz                     | Bin 0 -> 72 bytes
- tests/files/bad-1-vli-2.lzma                   | Bin 72 -> 0 bytes
- tests/files/bad-1-vli-2.xz                     | Bin 0 -> 72 bytes
- tests/files/bad-2-compressed_data_padding.lzma | Bin 92 -> 0 bytes
- tests/files/bad-2-compressed_data_padding.xz   | Bin 0 -> 92 bytes
- tests/files/bad-2-index-1.lzma                 | Bin 92 -> 0 bytes
- tests/files/bad-2-index-1.xz                   | Bin 0 -> 92 bytes
- tests/files/bad-2-index-2.lzma                 | Bin 92 -> 0 bytes
- tests/files/bad-2-index-2.xz                   | Bin 0 -> 92 bytes
- tests/files/bad-2-index-3.lzma                 | Bin 92 -> 0 bytes
- tests/files/bad-2-index-3.xz                   | Bin 0 -> 92 bytes
- tests/files/bad-2-index-4.lzma                 | Bin 92 -> 0 bytes
- tests/files/bad-2-index-4.xz                   | Bin 0 -> 92 bytes
- tests/files/good-0-empty.lzma                  | Bin 32 -> 0 bytes
- tests/files/good-0-empty.xz                    | Bin 0 -> 32 bytes
- tests/files/good-0cat-empty.lzma               | Bin 64 -> 0 bytes
- tests/files/good-0cat-empty.xz                 | Bin 0 -> 64 bytes
- tests/files/good-0catpad-empty.lzma            | Bin 68 -> 0 bytes
- tests/files/good-0catpad-empty.xz              | Bin 0 -> 68 bytes
- tests/files/good-0pad-empty.lzma               | Bin 36 -> 0 bytes
- tests/files/good-0pad-empty.xz                 | Bin 0 -> 36 bytes
- tests/files/good-1-3delta-lzma2.lzma           | Bin 528 -> 0 bytes
- tests/files/good-1-3delta-lzma2.xz             | Bin 0 -> 528 bytes
- tests/files/good-1-block_header-1.lzma         | Bin 72 -> 0 bytes
- tests/files/good-1-block_header-1.xz           | Bin 0 -> 72 bytes
- tests/files/good-1-block_header-2.lzma         | Bin 68 -> 0 bytes
- tests/files/good-1-block_header-2.xz           | Bin 0 -> 68 bytes
- tests/files/good-1-block_header-3.lzma         | Bin 68 -> 0 bytes
- tests/files/good-1-block_header-3.xz           | Bin 0 -> 68 bytes
- tests/files/good-1-check-crc32.lzma            | Bin 68 -> 0 bytes
- tests/files/good-1-check-crc32.xz              | Bin 0 -> 68 bytes
- tests/files/good-1-check-crc64.lzma            | Bin 72 -> 0 bytes
- tests/files/good-1-check-crc64.xz              | Bin 0 -> 72 bytes
- tests/files/good-1-check-none.lzma             | Bin 64 -> 0 bytes
- tests/files/good-1-check-none.xz               | Bin 0 -> 64 bytes
- tests/files/good-1-check-sha256.lzma           | Bin 96 -> 0 bytes
- tests/files/good-1-check-sha256.xz             | Bin 0 -> 96 bytes
- tests/files/good-1-delta-lzma2.tiff.lzma       | Bin 51312 -> 0 bytes
- tests/files/good-1-delta-lzma2.tiff.xz         | Bin 0 -> 51312 bytes
- tests/files/good-1-lzma2-1.lzma                | Bin 424 -> 0 bytes
- tests/files/good-1-lzma2-1.xz                  | Bin 0 -> 424 bytes
- tests/files/good-1-lzma2-2.lzma                | Bin 424 -> 0 bytes
- tests/files/good-1-lzma2-2.xz                  | Bin 0 -> 424 bytes
- tests/files/good-1-lzma2-3.lzma                | Bin 408 -> 0 bytes
- tests/files/good-1-lzma2-3.xz                  | Bin 0 -> 408 bytes
- tests/files/good-1-sparc-lzma2.lzma            | Bin 2292 -> 0 bytes
- tests/files/good-1-sparc-lzma2.xz              | Bin 0 -> 2292 bytes
- tests/files/good-1-x86-lzma2.lzma              | Bin 1936 -> 0 bytes
- tests/files/good-1-x86-lzma2.xz                | Bin 0 -> 1936 bytes
- tests/files/good-2-lzma2.lzma                  | Bin 92 -> 0 bytes
- tests/files/good-2-lzma2.xz                    | Bin 0 -> 92 bytes
- tests/files/unsupported-block_header.lzma      | Bin 68 -> 0 bytes
- tests/files/unsupported-block_header.xz        | Bin 0 -> 68 bytes
- tests/files/unsupported-check.lzma             | Bin 68 -> 0 bytes
- tests/files/unsupported-check.xz               | Bin 0 -> 68 bytes
- tests/files/unsupported-filter_flags-1.lzma    | Bin 68 -> 0 bytes
- tests/files/unsupported-filter_flags-1.xz      | Bin 0 -> 68 bytes
- tests/files/unsupported-filter_flags-2.lzma    | Bin 68 -> 0 bytes
- tests/files/unsupported-filter_flags-2.xz      | Bin 0 -> 68 bytes
- tests/files/unsupported-filter_flags-3.lzma    | Bin 68 -> 0 bytes
- tests/files/unsupported-filter_flags-3.xz      | Bin 0 -> 68 bytes
- tests/test_files.sh                            |   6 +-
- 116 files changed, 66 insertions(+), 68 deletions(-)
+ tests/files/README                                 | 128 ++++++++++-----------
+ ...0-backward_size.lzma => bad-0-backward_size.xz} | Bin
+ ...pty-truncated.lzma => bad-0-empty-truncated.xz} | Bin
+ ...d-0-footer_magic.lzma => bad-0-footer_magic.xz} | Bin
+ ...d-0-header_magic.lzma => bad-0-header_magic.xz} | Bin
+ ...nonempty_index.lzma => bad-0-nonempty_index.xz} | Bin
+ .../{bad-0cat-alone.lzma => bad-0cat-alone.xz}     | Bin
+ ...-header_magic.lzma => bad-0cat-header_magic.xz} | Bin
+ ...bad-0catpad-empty.lzma => bad-0catpad-empty.xz} | Bin
+ .../{bad-0pad-empty.lzma => bad-0pad-empty.xz}     | Bin
+ ...block_header-1.lzma => bad-1-block_header-1.xz} | Bin
+ ...block_header-2.lzma => bad-1-block_header-2.xz} | Bin
+ ...block_header-3.lzma => bad-1-block_header-3.xz} | Bin
+ ...block_header-4.lzma => bad-1-block_header-4.xz} | Bin
+ ...bad-1-check-crc32.lzma => bad-1-check-crc32.xz} | Bin
+ ...bad-1-check-crc64.lzma => bad-1-check-crc64.xz} | Bin
+ ...d-1-check-sha256.lzma => bad-1-check-sha256.xz} | Bin
+ .../files/{bad-1-lzma2-1.lzma => bad-1-lzma2-1.xz} | Bin
+ .../files/{bad-1-lzma2-2.lzma => bad-1-lzma2-2.xz} | Bin
+ .../files/{bad-1-lzma2-3.lzma => bad-1-lzma2-3.xz} | Bin
+ .../files/{bad-1-lzma2-4.lzma => bad-1-lzma2-4.xz} | Bin
+ .../files/{bad-1-lzma2-5.lzma => bad-1-lzma2-5.xz} | Bin
+ .../files/{bad-1-lzma2-6.lzma => bad-1-lzma2-6.xz} | Bin
+ .../files/{bad-1-lzma2-7.lzma => bad-1-lzma2-7.xz} | Bin
+ ...stream_flags-1.lzma => bad-1-stream_flags-1.xz} | Bin
+ ...stream_flags-2.lzma => bad-1-stream_flags-2.xz} | Bin
+ ...stream_flags-3.lzma => bad-1-stream_flags-3.xz} | Bin
+ tests/files/{bad-1-vli-1.lzma => bad-1-vli-1.xz}   | Bin
+ tests/files/{bad-1-vli-2.lzma => bad-1-vli-2.xz}   | Bin
+ ...dding.lzma => bad-2-compressed_data_padding.xz} | Bin
+ .../files/{bad-2-index-1.lzma => bad-2-index-1.xz} | Bin
+ .../files/{bad-2-index-2.lzma => bad-2-index-2.xz} | Bin
+ .../files/{bad-2-index-3.lzma => bad-2-index-3.xz} | Bin
+ .../files/{bad-2-index-4.lzma => bad-2-index-4.xz} | Bin
+ tests/files/{good-0-empty.lzma => good-0-empty.xz} | Bin
+ .../{good-0cat-empty.lzma => good-0cat-empty.xz}   | Bin
+ ...od-0catpad-empty.lzma => good-0catpad-empty.xz} | Bin
+ .../{good-0pad-empty.lzma => good-0pad-empty.xz}   | Bin
+ ...-1-3delta-lzma2.lzma => good-1-3delta-lzma2.xz} | Bin
+ ...lock_header-1.lzma => good-1-block_header-1.xz} | Bin
+ ...lock_header-2.lzma => good-1-block_header-2.xz} | Bin
+ ...lock_header-3.lzma => good-1-block_header-3.xz} | Bin
+ ...od-1-check-crc32.lzma => good-1-check-crc32.xz} | Bin
+ ...od-1-check-crc64.lzma => good-1-check-crc64.xz} | Bin
+ ...good-1-check-none.lzma => good-1-check-none.xz} | Bin
+ ...-1-check-sha256.lzma => good-1-check-sha256.xz} | Bin
+ ...-lzma2.tiff.lzma => good-1-delta-lzma2.tiff.xz} | Bin
+ .../{good-1-lzma2-1.lzma => good-1-lzma2-1.xz}     | Bin
+ .../{good-1-lzma2-2.lzma => good-1-lzma2-2.xz}     | Bin
+ .../{good-1-lzma2-3.lzma => good-1-lzma2-3.xz}     | Bin
+ ...od-1-sparc-lzma2.lzma => good-1-sparc-lzma2.xz} | Bin
+ .../{good-1-x86-lzma2.lzma => good-1-x86-lzma2.xz} | Bin
+ tests/files/{good-2-lzma2.lzma => good-2-lzma2.xz} | Bin
+ ...ock_header.lzma => unsupported-block_header.xz} | Bin
+ ...unsupported-check.lzma => unsupported-check.xz} | Bin
+ ..._flags-1.lzma => unsupported-filter_flags-1.xz} | Bin
+ ..._flags-2.lzma => unsupported-filter_flags-2.xz} | Bin
+ ..._flags-3.lzma => unsupported-filter_flags-3.xz} | Bin
+ tests/test_files.sh                                |   6 +-
+ 59 files changed, 66 insertions(+), 68 deletions(-)
 
 commit 8e60c889a2816a63013a35c99ce26bf28f5b78eb
@@ -12175 +12621 @@
  configure.ac                                       |  356 +++---
  debug/Makefile.am                                  |    5 +-
- debug/crc32.c                                      |   45 +
+ .../lz/lz_encoder_private.h => debug/crc32.c       |   41 +-
  debug/full_flush.c                                 |   14 +-
  debug/hex2bin.c                                    |   54 +
@@ -12224 +12670 @@
  src/liblzma/common/block_header_encoder.c          |    9 +-
  src/liblzma/common/block_util.c                    |   10 +-
- src/liblzma/common/code.c                          |  203 ---
- src/liblzma/common/common.c                        |  298 +++++
+ src/liblzma/common/{code.c => common.c}            |  129 +-
  src/liblzma/common/common.h                        |  237 ++--
- src/liblzma/common/delta_common.c                  |   66 -
- src/liblzma/common/delta_common.h                  |   44 -
- src/liblzma/common/delta_decoder.c                 |   61 -
- src/liblzma/common/delta_decoder.h                 |   28 -
- src/liblzma/common/delta_encoder.c                 |   98 --
- src/liblzma/common/delta_encoder.h                 |   28 -
  src/liblzma/common/easy.c                          |   18 +-
  src/liblzma/common/features.c                      |   66 -
@@ -12250 +12689 @@
  src/liblzma/common/next_coder.c                    |   65 -
  src/liblzma/common/raw_common.c                    |  127 --
- src/liblzma/common/raw_common.h                    |   30 -
  src/liblzma/common/raw_decoder.c                   |  116 --
- src/liblzma/common/raw_decoder.h                   |   29 -
  src/liblzma/common/raw_encoder.c                   |  111 --
- src/liblzma/common/raw_encoder.h                   |   29 -
  src/liblzma/common/stream_common.c                 |   23 -
- src/liblzma/common/stream_common.h                 |   31 -
  src/liblzma/common/stream_decoder.c                |  238 +++-
  src/liblzma/common/stream_decoder.h                |    4 +-
  src/liblzma/common/stream_encoder.c                |   35 +-
  src/liblzma/common/stream_encoder.h                |    2 +-
- src/liblzma/common/stream_flags_common.c           |   40 +
- src/liblzma/common/stream_flags_common.h           |   31 +
+ ...{stream_flags_equal.c => stream_flags_common.c} |   14 +-
+ .../{stream_common.h => stream_flags_common.h}     |    8 +-
  src/liblzma/common/stream_flags_decoder.c          |    2 +-
  src/liblzma/common/stream_flags_encoder.c          |    2 +-
- src/liblzma/common/stream_flags_equal.c            |   36 -
- src/liblzma/common/version.c                       |   25 -
  src/liblzma/common/vli_decoder.c                   |   29 +-
  src/liblzma/common/vli_encoder.c                   |   23 +-
- src/liblzma/common/vli_size.c                      |   37 +
+ src/liblzma/common/{version.c => vli_size.c}       |   22 +-
  src/liblzma/delta/Makefile.am                      |   34 +
- src/liblzma/delta/delta_common.c                   |   66 +
- src/liblzma/delta/delta_common.h                   |   44 +
- src/liblzma/delta/delta_decoder.c                  |   82 ++
- src/liblzma/delta/delta_decoder.h                  |   32 +
- src/liblzma/delta/delta_encoder.c                  |  119 ++
- src/liblzma/delta/delta_encoder.h                  |   30 +
+ src/liblzma/{common => delta}/delta_common.c       |    2 +-
+ src/liblzma/{common => delta}/delta_common.h       |    0
+ src/liblzma/{common => delta}/delta_decoder.c      |   21 +
+ src/liblzma/{common => delta}/delta_decoder.h      |    4 +
+ src/liblzma/{common => delta}/delta_encoder.c      |   21 +
+ src/liblzma/{common => delta}/delta_encoder.h      |    2 +
  src/liblzma/lz/Makefile.am                         |   35 +-
  src/liblzma/lz/bt2.c                               |   27 -
@@ -12294 +12727 @@
  src/liblzma/lz/lz_encoder_hash.h                   |  104 ++
  src/liblzma/lz/lz_encoder_mf.c                     |  780 ++++++++++++
- src/liblzma/lz/lz_encoder_private.h                |   40 -
  src/liblzma/lz/match_c.h                           |  412 ------
  src/liblzma/lz/match_h.h                           |   69 --
@@ -12302 +12734 @@
  src/liblzma/lzma/lzma2_decoder.h                   |   35 +
  src/liblzma/lzma/lzma2_encoder.c                   |  406 ++++++
- src/liblzma/lzma/lzma2_encoder.h                   |   34 +
+ .../{common/raw_common.h => lzma/lzma2_encoder.h}  |   22 +-
  src/liblzma/lzma/lzma_common.h                     |  208 +++-
  src/liblzma/lzma/lzma_decoder.c                    | 1306 ++++++++++++--------
@@ -12321 +12753 @@
  src/liblzma/rangecoder/price.h                     |  111 ++
  src/liblzma/rangecoder/price_table.c               |   84 +-
- src/liblzma/rangecoder/price_table_gen.c           |   55 -
  src/liblzma/rangecoder/price_table_init.c          |   33 +-
- src/liblzma/rangecoder/price_tablegen.c            |   56 +
+ .../{price_table_gen.c => price_tablegen.c}        |   19 +-
  src/liblzma/rangecoder/range_common.h              |   17 +-
  src/liblzma/rangecoder/range_decoder.h             |  209 ++--
@@ -12330 +12761 @@
  src/liblzma/simple/simple_coder.c                  |    8 +-
  src/liblzma/simple/simple_decoder.c                |   47 +
- src/liblzma/simple/simple_decoder.h                |   29 +
+ .../raw_decoder.h => simple/simple_decoder.h}      |   18 +-
  src/liblzma/simple/simple_encoder.c                |   45 +
- src/liblzma/simple/simple_encoder.h                |   30 +
+ .../raw_encoder.h => simple/simple_encoder.h}      |   17 +-
  src/liblzma/subblock/Makefile.am                   |    4 +-
  src/liblzma/subblock/subblock_decoder.c            |   20 +-
@@ -12424 +12855 @@
  tests/files/good-1-lzma2-2.lzma                    |  Bin 0 -> 424 bytes
  tests/files/good-1-lzma2-3.lzma                    |  Bin 0 -> 408 bytes
- tests/files/good-1-sparc-lzma2.lzma                |  Bin 0 -> 2292 bytes
- tests/files/good-1-x86-lzma2.lzma                  |  Bin 0 -> 1936 bytes
+ ...gle-sparc-lzma.lzma => good-1-sparc-lzma2.lzma} |  Bin 2263 -> 2292 bytes
+ ...-single-x86-lzma.lzma => good-1-x86-lzma2.lzma} |  Bin 1909 -> 1936 bytes
  tests/files/good-2-lzma2.lzma                      |  Bin 0 -> 92 bytes
  tests/files/good-cat-single-none-pad.lzma          |  Bin 64 -> 0 bytes
@@ -12448 +12879 @@
  tests/files/good-single-none-pad.lzma              |  Bin 32 -> 0 bytes
  tests/files/good-single-none.lzma                  |  Bin 30 -> 0 bytes
- tests/files/good-single-sparc-lzma.lzma            |  Bin 2263 -> 0 bytes
  tests/files/good-single-subblock-lzma.lzma         |  Bin 50 -> 0 bytes
  tests/files/good-single-subblock_implicit.lzma     |  Bin 35 -> 0 bytes
  tests/files/good-single-subblock_rle.lzma          |  Bin 118 -> 0 bytes
- tests/files/good-single-x86-lzma.lzma              |  Bin 1909 -> 0 bytes
  tests/files/malicious-multi-metadata-64PiB.lzma    |  Bin 51 -> 0 bytes
  tests/files/malicious-single-subblock-256MiB.lzma  |  Bin 30 -> 0 bytes
@@ -12467 +12896 @@
  tests/test_stream_flags.c                          |    4 +-
  tests/tests.h                                      |    8 +
- 294 files changed, 9768 insertions(+), 8195 deletions(-)
+ 277 files changed, 9050 insertions(+), 7477 deletions(-)
 
 commit 57b9a145a527f0716822615e5ed536d33aebd3fc
@@ -12543 +12972 @@
     has been decided.
 
- configure.ac                                   |  41 +-
- debug/full_flush.c                             |  16 +-
- debug/sync_flush.c                             |  15 +-
- src/common/bswap.h                             |  44 ++
- src/common/integer.h                           | 167 +++++
- src/liblzma/api/Makefile.am                    |   5 +-
- src/liblzma/api/lzma.h                         |   9 +-
- src/liblzma/api/lzma/alone.h                   |  32 +-
- src/liblzma/api/lzma/auto.h                    |   7 +-
- src/liblzma/api/lzma/base.h                    |  15 +
- src/liblzma/api/lzma/block.h                   | 306 +++-------
- src/liblzma/api/lzma/check.h                   |  18 +-
- src/liblzma/api/lzma/copy.h                    |  29 -
- src/liblzma/api/lzma/easy.h                    |  61 +-
- src/liblzma/api/lzma/extra.h                   | 114 ----
- src/liblzma/api/lzma/filter.h                  |   5 +-
- src/liblzma/api/lzma/index.h                   | 204 ++++++-
- src/liblzma/api/lzma/index_hash.h              |  94 +++
- src/liblzma/api/lzma/info.h                    | 315 ----------
- src/liblzma/api/lzma/lzma.h                    |   2 +-
- src/liblzma/api/lzma/metadata.h                | 100 ---
- src/liblzma/api/lzma/raw.h                     |  20 +-
- src/liblzma/api/lzma/stream.h                  | 157 +----
- src/liblzma/api/lzma/stream_flags.h            | 146 +++--
- src/liblzma/api/lzma/version.h                 |   2 +-
- src/liblzma/api/lzma/vli.h                     |  83 ++-
- src/liblzma/check/Makefile.am                  |   1 -
- src/liblzma/check/check.c                      |  55 +-
- src/liblzma/check/check.h                      |  47 +-
- src/liblzma/check/check_byteswap.h             |  43 --
- src/liblzma/check/crc32_init.c                 |   2 +-
- src/liblzma/check/crc64_init.c                 |   2 +-
- src/liblzma/check/crc_macros.h                 |   2 +-
- src/liblzma/check/sha256.c                     |  53 +-
- src/liblzma/common/Makefile.am                 |  31 +-
- src/liblzma/common/alignment.c                 |   5 +-
- src/liblzma/common/alone_decoder.c             |  77 +--
- src/liblzma/common/alone_encoder.c             |  99 ++-
- src/liblzma/common/auto_decoder.c              |  18 +-
- src/liblzma/common/block_decoder.c             | 298 +++------
- src/liblzma/common/block_encoder.c             | 228 ++-----
- src/liblzma/common/block_header_decoder.c      | 400 +++---------
- src/liblzma/common/block_header_encoder.c      | 207 +++----
- src/liblzma/common/block_private.h             |  51 +-
- src/liblzma/common/block_util.c                |  73 +++
- src/liblzma/common/common.h                    |  44 +-
- src/liblzma/common/copy_coder.c                | 144 -----
- src/liblzma/common/copy_coder.h                |  31 -
- src/liblzma/common/delta_common.c              |   4 -
- src/liblzma/common/delta_common.h              |   4 -
- src/liblzma/common/delta_decoder.c             |  55 +-
- src/liblzma/common/delta_encoder.c             |   7 +-
- src/liblzma/common/easy.c                      | 122 ++++
- src/liblzma/common/easy_common.c               |  54 --
- src/liblzma/common/easy_common.h               |  28 -
- src/liblzma/common/easy_multi.c                | 103 ----
- src/liblzma/common/easy_single.c               |  37 --
- src/liblzma/common/extra.c                     |  34 --
- src/liblzma/common/features.c                  |   4 -
- src/liblzma/common/filter_flags_decoder.c      | 384 ++++--------
- src/liblzma/common/filter_flags_encoder.c      | 120 +---
- src/liblzma/common/index.c                     | 773 ++++++++++++++++++++---
- src/liblzma/common/index.h                     |  67 ++
- src/liblzma/common/index_decoder.c             | 252 ++++++++
- src/liblzma/common/index_encoder.c             | 222 +++++++
- src/liblzma/common/index_encoder.h             |  30 +
- src/liblzma/common/index_hash.c                | 340 +++++++++++
- src/liblzma/common/info.c                      | 814 -------------------------
- src/liblzma/common/memory_usage.c              |   1 -
- src/liblzma/common/metadata_decoder.c          | 578 ------------------
- src/liblzma/common/metadata_decoder.h          |  31 -
- src/liblzma/common/metadata_encoder.c          | 435 -------------
- src/liblzma/common/metadata_encoder.h          |  30 -
- src/liblzma/common/raw_common.c                | 178 ++----
- src/liblzma/common/raw_common.h                |   5 +-
- src/liblzma/common/raw_decoder.c               |  19 +-
- src/liblzma/common/raw_decoder.h               |   3 +-
- src/liblzma/common/raw_encoder.c               | 101 +--
- src/liblzma/common/raw_encoder.h               |   3 +-
- src/liblzma/common/stream_common.h             |   3 +
- src/liblzma/common/stream_decoder.c            | 458 +++++---------
- src/liblzma/common/stream_decoder.h            |  28 +
- src/liblzma/common/stream_encoder.c            | 282 +++++++++
- src/liblzma/common/stream_encoder.h            |  30 +
- src/liblzma/common/stream_encoder_multi.c      | 445 --------------
- src/liblzma/common/stream_encoder_multi.h      |  26 -
- src/liblzma/common/stream_encoder_single.c     | 219 -------
- src/liblzma/common/stream_flags_decoder.c      | 260 ++------
- src/liblzma/common/stream_flags_encoder.c      |  56 +-
- src/liblzma/common/stream_flags_equal.c        |  36 ++
- src/liblzma/common/vli_decoder.c               |  68 ++-
- src/liblzma/common/vli_encoder.c               |  59 +-
- src/liblzma/common/vli_reverse_decoder.c       |  55 --
- src/liblzma/lz/lz_decoder.c                    |   6 +-
- src/liblzma/lz/lz_decoder.h                    |  10 +-
- src/liblzma/lzma/lzma_decoder.c                |  13 +-
- src/liblzma/lzma/lzma_decoder.h                |  10 +-
- src/liblzma/simple/simple_coder.c              |  29 +-
- src/liblzma/simple/simple_private.h            |   4 -
- src/liblzma/subblock/subblock_decoder.c        | 106 +---
- src/liblzma/subblock/subblock_decoder_helper.c |   5 +-
- src/liblzma/subblock/subblock_encoder.c        |   8 +-
- src/lzma/args.c                                |  22 +-
- src/lzma/args.h                                |   2 -
- src/lzma/error.c                               |   6 +
- src/lzma/process.c                             |  26 +-
- src/lzmadec/lzmadec.c                          |   8 +-
- tests/Makefile.am                              |   5 +-
- tests/test_block_header.c                      | 411 +++++--------
- tests/test_compress.sh                         |  65 +-
- tests/test_filter_flags.c                      | 116 ++--
- tests/test_index.c                             | 504 ++++++++++++++-
- tests/test_info.c                              | 717 ----------------------
- tests/test_stream_flags.c                      | 134 ++--
- tests/tests.h                                  |  14 +-
- 115 files changed, 4846 insertions(+), 8156 deletions(-)
+ configure.ac                                       |  41 +-
+ debug/full_flush.c                                 |  16 +-
+ debug/sync_flush.c                                 |  15 +-
+ .../check/check_byteswap.h => common/bswap.h}      |  15 +-
+ src/common/integer.h                               | 167 +++++
+ src/liblzma/api/Makefile.am                        |   5 +-
+ src/liblzma/api/lzma.h                             |   9 +-
+ src/liblzma/api/lzma/alone.h                       |  32 +-
+ src/liblzma/api/lzma/auto.h                        |   7 +-
+ src/liblzma/api/lzma/base.h                        |  15 +
+ src/liblzma/api/lzma/block.h                       | 306 +++-----
+ src/liblzma/api/lzma/check.h                       |  18 +-
+ src/liblzma/api/lzma/copy.h                        |  29 -
+ src/liblzma/api/lzma/easy.h                        |  61 +-
+ src/liblzma/api/lzma/extra.h                       | 114 ---
+ src/liblzma/api/lzma/filter.h                      |   5 +-
+ src/liblzma/api/lzma/index.h                       | 204 +++++-
+ src/liblzma/api/lzma/index_hash.h                  |  94 +++
+ src/liblzma/api/lzma/info.h                        | 315 --------
+ src/liblzma/api/lzma/lzma.h                        |   2 +-
+ src/liblzma/api/lzma/metadata.h                    | 100 ---
+ src/liblzma/api/lzma/raw.h                         |  20 +-
+ src/liblzma/api/lzma/stream.h                      | 157 +---
+ src/liblzma/api/lzma/stream_flags.h                | 146 ++--
+ src/liblzma/api/lzma/version.h                     |   2 +-
+ src/liblzma/api/lzma/vli.h                         |  83 +--
+ src/liblzma/check/Makefile.am                      |   1 -
+ src/liblzma/check/check.c                          |  55 +-
+ src/liblzma/check/check.h                          |  47 +-
+ src/liblzma/check/crc32_init.c                     |   2 +-
+ src/liblzma/check/crc64_init.c                     |   2 +-
+ src/liblzma/check/crc_macros.h                     |   2 +-
+ src/liblzma/check/sha256.c                         |  53 +-
+ src/liblzma/common/Makefile.am                     |  31 +-
+ src/liblzma/common/alignment.c                     |   5 +-
+ src/liblzma/common/alone_decoder.c                 |  77 +-
+ src/liblzma/common/alone_encoder.c                 |  99 ++-
+ src/liblzma/common/auto_decoder.c                  |  18 +-
+ src/liblzma/common/block_decoder.c                 | 298 ++------
+ src/liblzma/common/block_encoder.c                 | 228 ++----
+ src/liblzma/common/block_header_decoder.c          | 400 ++--------
+ src/liblzma/common/block_header_encoder.c          | 207 ++----
+ src/liblzma/common/block_private.h                 |  51 +-
+ src/liblzma/common/block_util.c                    |  73 ++
+ src/liblzma/common/common.h                        |  44 +-
+ src/liblzma/common/copy_coder.c                    | 144 ----
+ src/liblzma/common/copy_coder.h                    |  31 -
+ src/liblzma/common/delta_common.c                  |   4 -
+ src/liblzma/common/delta_common.h                  |   4 -
+ src/liblzma/common/delta_decoder.c                 |  55 +-
+ src/liblzma/common/delta_encoder.c                 |   7 +-
+ src/liblzma/common/{easy_multi.c => easy.c}        |  87 ++-
+ src/liblzma/common/easy_common.c                   |  54 --
+ src/liblzma/common/extra.c                         |  34 -
+ src/liblzma/common/features.c                      |   4 -
+ src/liblzma/common/filter_flags_decoder.c          | 384 +++-------
+ src/liblzma/common/filter_flags_encoder.c          | 120 +--
+ src/liblzma/common/index.c                         | 773 ++++++++++++++++---
+ src/liblzma/common/index.h                         |  67 ++
+ src/liblzma/common/index_decoder.c                 | 252 +++++++
+ src/liblzma/common/index_encoder.c                 | 222 ++++++
+ .../{stream_encoder_multi.h => index_encoder.h}    |  18 +-
+ src/liblzma/common/index_hash.c                    | 340 +++++++++
+ src/liblzma/common/info.c                          | 814 ---------------------
+ src/liblzma/common/memory_usage.c                  |   1 -
+ src/liblzma/common/metadata_decoder.c              | 578 ---------------
+ src/liblzma/common/metadata_decoder.h              |  31 -
+ src/liblzma/common/metadata_encoder.c              | 435 -----------
+ src/liblzma/common/raw_common.c                    | 178 ++---
+ src/liblzma/common/raw_common.h                    |   5 +-
+ src/liblzma/common/raw_decoder.c                   |  19 +-
+ src/liblzma/common/raw_decoder.h                   |   3 +-
+ src/liblzma/common/raw_encoder.c                   | 101 +--
+ src/liblzma/common/raw_encoder.h                   |   3 +-
+ src/liblzma/common/stream_common.h                 |   3 +
+ src/liblzma/common/stream_decoder.c                | 458 ++++--------
+ .../common/{easy_common.h => stream_decoder.h}     |  14 +-
+ src/liblzma/common/stream_encoder.c                | 282 +++++++
+ .../{metadata_encoder.h => stream_encoder.h}       |  14 +-
+ src/liblzma/common/stream_encoder_multi.c          | 445 -----------
+ src/liblzma/common/stream_encoder_single.c         | 219 ------
+ src/liblzma/common/stream_flags_decoder.c          | 260 ++-----
+ src/liblzma/common/stream_flags_encoder.c          |  56 +-
+ .../common/{easy_single.c => stream_flags_equal.c} |  27 +-
+ src/liblzma/common/vli_decoder.c                   |  68 +-
+ src/liblzma/common/vli_encoder.c                   |  59 +-
+ src/liblzma/common/vli_reverse_decoder.c           |  55 --
+ src/liblzma/lz/lz_decoder.c                        |   6 +-
+ src/liblzma/lz/lz_decoder.h                        |  10 +-
+ src/liblzma/lzma/lzma_decoder.c                    |  13 +-
+ src/liblzma/lzma/lzma_decoder.h                    |  10 +-
+ src/liblzma/simple/simple_coder.c                  |  29 +-
+ src/liblzma/simple/simple_private.h                |   4 -
+ src/liblzma/subblock/subblock_decoder.c            | 106 +--
+ src/liblzma/subblock/subblock_decoder_helper.c     |   5 +-
+ src/liblzma/subblock/subblock_encoder.c            |   8 +-
+ src/lzma/args.c                                    |  22 +-
+ src/lzma/args.h                                    |   2 -
+ src/lzma/error.c                                   |   6 +
+ src/lzma/process.c                                 |  26 +-
+ src/lzmadec/lzmadec.c                              |   8 +-
+ tests/Makefile.am                                  |   5 +-
+ tests/test_block_header.c                          | 411 ++++-------
+ tests/test_compress.sh                             |  65 +-
+ tests/test_filter_flags.c                          | 116 ++-
+ tests/test_index.c                                 | 504 ++++++++++++-
+ tests/test_info.c                                  | 717 ------------------
+ tests/test_stream_flags.c                          | 134 ++--
+ tests/tests.h                                      |  14 +-
+ 109 files changed, 4655 insertions(+), 7965 deletions(-)
 
 commit bf6348d1a3ff09fdc06940468f318f75ffa6af11
@@ -12826 +13249 @@
     liblzma's API.
 
- doc/liblzma-security.txt             |  14 +-
- src/liblzma/api/lzma/base.h          |   4 +-
- src/liblzma/api/lzma/memlimit.h      |  10 +-
- src/liblzma/api/lzma/stream.h        |   4 +-
- src/liblzma/common/Makefile.am       |   2 +-
- src/liblzma/common/memory_limiter.c  | 288 +++++++++++++++++++++++++++++++++++
- src/liblzma/common/memory_limitter.c | 288 -----------------------------------
- src/lzma/list.c                      |   6 +-
- src/lzmadec/lzmadec.c                |  12 +-
- tests/test_memlimit.c                |   4 +-
- 10 files changed, 316 insertions(+), 316 deletions(-)
+ doc/liblzma-security.txt                                   | 14 +++++++-------
+ src/liblzma/api/lzma/base.h                                |  4 ++--
+ src/liblzma/api/lzma/memlimit.h                            | 10 +++++-----
+ src/liblzma/api/lzma/stream.h                              |  4 ++--
+ src/liblzma/common/Makefile.am                             |  2 +-
+ src/liblzma/common/{memory_limitter.c => memory_limiter.c} |  2 +-
+ src/lzma/list.c                                            |  6 +++---
+ src/lzmadec/lzmadec.c                                      | 12 ++++++------
+ tests/test_memlimit.c                                      |  4 ++--
+ 9 files changed, 29 insertions(+), 29 deletions(-)
 
 commit beeb81060821dfec4e7898e0d44b7900dcb2215e
@@ -13657 +14079 @@
     This doesn't change anything in the file format.
 
- src/liblzma/common/Makefile.am     |  14 ++-
- src/liblzma/common/delta_coder.c   | 189 -------------------------------------
- src/liblzma/common/delta_coder.h   |  31 ------
- src/liblzma/common/delta_common.c  |  70 ++++++++++++++
- src/liblzma/common/delta_common.h  |  48 ++++++++++
- src/liblzma/common/delta_decoder.c | 102 ++++++++++++++++++++
- src/liblzma/common/delta_decoder.h |  28 ++++++
- src/liblzma/common/delta_encoder.c |  97 +++++++++++++++++++
- src/liblzma/common/delta_encoder.h |  28 ++++++
- src/liblzma/common/raw_decoder.c   |   2 +-
- src/liblzma/common/raw_encoder.c   |   2 +-
- 11 files changed, 387 insertions(+), 224 deletions(-)
+ src/liblzma/common/Makefile.am                     |  14 +-
+ src/liblzma/common/delta_coder.c                   | 189 ---------------------
+ src/liblzma/common/delta_common.c                  |  70 ++++++++
+ src/liblzma/common/delta_common.h                  |  48 ++++++
+ src/liblzma/common/delta_decoder.c                 | 102 +++++++++++
+ .../common/{delta_coder.h => delta_decoder.h}      |  11 +-
+ src/liblzma/common/delta_encoder.c                 |  97 +++++++++++
+ src/liblzma/common/delta_encoder.h                 |  28 +++
+ src/liblzma/common/raw_decoder.c                   |   2 +-
+ src/liblzma/common/raw_encoder.c                   |   2 +-
+ 10 files changed, 363 insertions(+), 200 deletions(-)
 
 commit 61dc82f3e306b25ce3cd3d529df9ec7a0ec04b73
@@ -14002 +14423 @@
     Added precomputed range coder probability price table.
 
- src/liblzma/common/init_encoder.c         |  5 ++-
- src/liblzma/rangecoder/Makefile.am        |  9 +++-
- src/liblzma/rangecoder/price_table.c      | 70 +++++++++++++++++++++++++++++++
- src/liblzma/rangecoder/price_table_gen.c  | 55 ++++++++++++++++++++++++
- src/liblzma/rangecoder/price_table_init.c | 48 +++++++++++++++++++++
- src/liblzma/rangecoder/range_common.h     |  4 +-
- src/liblzma/rangecoder/range_encoder.c    | 46 --------------------
- src/liblzma/rangecoder/range_encoder.h    | 21 +++++-----
- 8 files changed, 197 insertions(+), 61 deletions(-)
+ src/liblzma/common/init_encoder.c                  |  5 +-
+ src/liblzma/rangecoder/Makefile.am                 |  9 ++-
+ src/liblzma/rangecoder/price_table.c               | 70 ++++++++++++++++++++++
+ src/liblzma/rangecoder/price_table_gen.c           | 55 +++++++++++++++++
+ .../{range_encoder.c => price_table_init.c}        |  6 +-
+ src/liblzma/rangecoder/range_common.h              |  4 +-
+ src/liblzma/rangecoder/range_encoder.h             | 21 ++++---
+ 7 files changed, 153 insertions(+), 17 deletions(-)
 
 commit 362dc3843b373c1007a50a4719f378981f18ae03
@@ -14200 +14620 @@
  tests/files/bad-cat-single-none-pad_garbage_2.lzma | Bin 0 -> 65 bytes
  tests/files/bad-cat-single-none-pad_garbage_3.lzma | Bin 0 -> 65 bytes
- tests/files/bad-single-data_after_eopm.lzma        | Bin 55 -> 0 bytes
- tests/files/bad-single-data_after_eopm_1.lzma      | Bin 0 -> 55 bytes
+ ...eopm.lzma => bad-single-data_after_eopm_1.lzma} | Bin
  tests/files/bad-single-none-truncated.lzma         | Bin 0 -> 29 bytes
- 7 files changed, 18 insertions(+), 3 deletions(-)
+ 6 files changed, 18 insertions(+), 3 deletions(-)
 
 commit b4943ccf73b64fc93a90a23474509c316f55eb2b
@@ -14293 +14712 @@
     Cleaned up the tests/files directory.
 
- tests/files/bad-single-subblock-padding_loop.lzma   | Bin 0 -> 43 bytes
- tests/files/bad-single-subblock1023-slow.lzma       | Bin 0 -> 7886 bytes
- tests/files/malicious-single-subblock-loop.lzma     | Bin 43 -> 0 bytes
- tests/files/malicious-single-subblock-lzma.lzma     | Bin 505 -> 0 bytes
- tests/files/malicious-single-subblock1023-slow.lzma | Bin 7886 -> 0 bytes
- 5 files changed, 0 insertions(+), 0 deletions(-)
+ ...ck-loop.lzma => bad-single-subblock-padding_loop.lzma} | Bin
+ ...ck1023-slow.lzma => bad-single-subblock1023-slow.lzma} | Bin
+ tests/files/malicious-single-subblock-lzma.lzma           | Bin 505 -> 0 bytes
+ 3 files changed, 0 insertions(+), 0 deletions(-)
 
 commit 908b2ac604b9940369d7fe8a45e9eb6da5d2a24c
@@ -14484 +14901 @@
     that otherwise work with this code.
 
- src/liblzma/check/Makefile.am |   4 +-
- src/liblzma/check/crc32_x86.S | 217 ++++++++++++++++++++++++++++++++++++++++++
- src/liblzma/check/crc32_x86.s | 217 ------------------------------------------
- src/liblzma/check/crc64_x86.S | 203 +++++++++++++++++++++++++++++++++++++++
- src/liblzma/check/crc64_x86.s | 203 ---------------------------------------
- 5 files changed, 422 insertions(+), 422 deletions(-)
+ src/liblzma/check/Makefile.am                  | 4 ++--
+ src/liblzma/check/{crc32_x86.s => crc32_x86.S} | 0
+ src/liblzma/check/{crc64_x86.s => crc64_x86.S} | 0
+ 3 files changed, 2 insertions(+), 2 deletions(-)
 
 commit ec1c82b2e82f395f6e8e19ac212a639644330cd7

xz/vendor/current/INSTALL ¶

@@ -247 +247 @@
                 it is known to not cause problems.
 
+    --enable-external-sha256
+                Try to use SHA-256 code from the operating system libc
+                or similar base system libraries. This doesn't try to
+                use OpenSSL or libgcrypt or such libraries.
+
+                The reasons to use this option:
+
+                  - It makes liblzma slightly smaller.
+
+                  - It might improve SHA-256 speed if the implementation
+                    in the operating is very good (but see below).
+
+                External SHA-256 is disabled by default for two reasons:
+
+                  - On some operating systems the symbol names of the
+                    SHA-256 functions conflict with OpenSSL's libcrypto.
+                    This causes weird problems such as decompression
+                    errors if an application is linked against both
+                    liblzma and libcrypto. This problem affects at least
+                    FreeBSD 10 and older and MINIX 3.3.0 and older, but
+                    other OSes that provide a function "SHA256_Init" might
+                    also be affected. FreeBSD 11 has the problem fixed.
+                    NetBSD had the problem but it was fixed it in 2009
+                    already. OpenBSD uses "SHA256Init" and thus never had
+                    a conflict with libcrypto.
+
+                  - The SHA-256 code in liblzma is faster than the SHA-256
+                    code provided by some operating systems. If you are
+                    curious, build two copies of xz (internal and external
+                    SHA-256) and compare the decompression (xz --test)
+                    times:
+
+                        dd if=/dev/zero bs=1024k count=1024 \
+                            | xz -v -0 -Csha256 > foo.xz
+                        time xz --test foo.xz
+
     --disable-xz
     --disable-xzdec
@@ -363 +399 @@
                                 calls any liblzma functions from more than
                                 one thread, something bad may happen.
+
+    --enable-sandbox=METHOD
+                This feature is EXPERIMENTAL in the XZ Utils 5.2.x and
+                disabled by default. If you test this, look especially
+                if message translations and locale-specific decimal and
+                thousand separators (e.g. xz --list foo.xz) work the
+                same way as they do without sandboxing.
+
+                There is limited sandboxing support in the xz tool. If
+                built with sandbox support, it's used automatically when
+                (de)compressing exactly one file to standard output and
+                the options --files or --files0 weren't used. This is a
+                common use case, for example, (de)compressing .tar.xz
+                files via GNU tar. The sandbox is also used for
+                single-file `xz --test' or `xz --list'.
+
+                Supported METHODs:
+
+                        auto    Look for a supported sandboxing method
+                                and use it if found. If no method is
+                                found, then sandboxing isn't used.
+
+                        no      Disable sandboxing support.
+
+                        capsicum
+                                Use Capsicum (FreeBSD >= 10) for
+                                sandboxing. If no Capsicum support
+                                is found, configure will give an error.
 
     --enable-symbol-versions

xz/vendor/current/Makefile.in ¶

@@ -92 +92 @@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -278 +278 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@
@@ -782 +783 @@
         else :; fi
 dist-gzip: distdir
-        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+        tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
         $(am__post_remove_distdir)
 
@@ -808 +809 @@
                        "deprecated." >&2
         @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+        shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
         $(am__post_remove_distdir)
 
@@ -826 +827 @@
         case '$(DIST_ARCHIVES)' in \
         *.tar.gz*) \
-          GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
         *.tar.bz2*) \
           bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -836 +837 @@
           uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
         *.shar.gz*) \
-          GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
         *.zip*) \
           unzip $(distdir).zip ;;\

xz/vendor/current/NEWS ¶

@@ -2 +2 @@
 XZ Utils Release Notes
 ======================
+
+5.2.3 (2016-12-30)
+
+    * xz:
+
+        - Always close a file before trying to delete it to avoid
+          problems on some operating system and file system combinations.
+
+        - Fixed copying of file timestamps on Windows.
+
+        - Added experimental (disabled by default) sandbox support using
+          Capsicum (FreeBSD >= 10). See --enable-sandbox in INSTALL.
+
+    * C99/C11 conformance fixes to liblzma. The issues affected at least
+      some builds using link-time optimizations.
+
+    * Fixed bugs in the rarely-used function lzma_index_dup().
+
+    * Use of external SHA-256 code is now disabled by default.
+      It can still be enabled by passing --enable-external-sha256
+      to configure. The reasons to disable it by default (see INSTALL
+      for more details):
+
+        - Some OS-specific SHA-256 implementations conflict with
+          OpenSSL and cause problems in programs that link against both
+          liblzma and libcrypto. At least FreeBSD 10 and MINIX 3.3.0
+          are affected.
+
+        - The internal SHA-256 is faster than the SHA-256 code in
+          some operating systems.
+
+    * Changed CPU core count detection to use sched_getaffinity() on
+      GNU/Linux and GNU/kFreeBSD.
+
+    * Fixes to the build-system and xz to make xz buildable even when
+      encoders, decoders, or threading have been disabled from libilzma
+      using configure options. These fixes added two new #defines to
+      config.h: HAVE_ENCODERS and HAVE_DECODERS.
+
 
 5.2.2 (2015-09-29)

xz/vendor/current/THANKS ¶

@@ -65 +65 @@
   - Rafał MuÅŒyło
   - Adrien Nader
+  - Evan Nemerson
   - Hongbo Ni
   - Jonathan Nieder
@@ -75 +76 @@
   - Elbert Pol
   - Mikko Pouru
+  - Rich Prohaska
   - Trần Ngọc Quân
   - Pavel Raiskup
@@ -90 +92 @@
   - Dan Shechter
   - Stuart Shelton
+  - Sebastian Andrzej Siewior
   - Brad Smith
   - Jonathan Stott
@@ -103 +106 @@
   - Bert Wesarg
   - Fredrik Wikstrom
+  - Jim Wilcoxson
   - Ralf Wildenhues
   - Charles Wilson

xz/vendor/current/aclocal.m4 ¶

@@ -755 +755 @@
 ])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for 'mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl FIXME we are no longer going to remove this! adjust warning
-dnl FIXME message accordingly.
-AC_DIAGNOSE([obsolete],
-[$0: this macro is deprecated, and will soon be removed.
-You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
-and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -1203 +1171 @@
 ]) # _AM_PROG_TAR
 
+m4_include([m4/ax_check_capsicum.m4])
 m4_include([m4/ax_pthread.m4])
 m4_include([m4/getopt.m4])

xz/vendor/current/build-aux/config.rpath ¶

@@ -3 +3 @@
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2010 Free Software Foundation, Inc.
+#   Copyright 1996-2014 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -26 +26 @@
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
@@ -58 +58 @@
       wl='-Wl,'
       ;;
-    darwin*)
-      case $cc_basename in
-        xlc*)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       ;;
@@ -73 +66 @@
       wl='-Wl,'
       ;;
-    newsos6)
-      ;;
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
         ecc*)
@@ -86 +77 @@
           wl='-Wl,'
           ;;
-        pgcc | pgf77 | pgf90)
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
           wl='-Wl,'
           ;;
@@ -92 +86 @@
           wl='-Wl,'
           ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
         como)
           wl='-lopt='
@@ -97 +94 @@
         *)
           case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
             *Sun\ C*)
               wl='-Wl,'
@@ -104 +104 @@
       esac
       ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
@@ -110 +114 @@
       ;;
     solaris*)
-      wl='-Wl,'
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
       ;;
     sunos4*)
@@ -172 +183 @@
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we cannot use
-      # them.
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
     beos*)
@@ -199 +209 @@
       fi
       ;;
+    haiku*)
+      ;;
     interix[3-9]*)
       hardcode_direct=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       ;;
-    gnu* | linux* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
@@ -326 +338 @@
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
     bsdi[45]*)
@@ -343 +359 @@
     darwin* | rhapsody*)
       hardcode_direct=no
-      if test "$GCC" = yes ; then
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
         :
       else
-        case $cc_basename in
-          xlc*)
-            ;;
-          *)
-            ld_shlibs=no
-            ;;
-        esac
+        ld_shlibs=no
       fi
       ;;
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    freebsd1*)
-      ld_shlibs=no
       ;;
     freebsd2.2*)
@@ -421 +428 @@
       hardcode_libdir_separator=:
       ;;
+    *nto* | *qnx*)
+      ;;
     openbsd*)
       if test -f /usr/libexec/ld.so; then
@@ -516 +525 @@
     ;;
   amigaos*)
-    library_names_spec='$libname.a'
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
     ;;
   beos*)
@@ -534 +548 @@
   dgux*)
     library_names_spec='$libname$shrext'
-    ;;
-  freebsd1*)
     ;;
   freebsd* | dragonfly*)
@@ -546 +558 @@
     ;;
   gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
     library_names_spec='$libname$shrext'
     ;;
@@ -583 +598 @@
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
     library_names_spec='$libname$shrext'
     ;;
@@ -595 +610 @@
     library_names_spec='$libname$shrext'
     ;;
-  nto-qnx*)
+  *nto* | *qnx*)
     library_names_spec='$libname$shrext'
     ;;
@@ -624 +639 @@
     ;;
   sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  tpf*)
     library_names_spec='$libname$shrext'
     ;;

xz/vendor/current/config.h.in ¶

@@ -23 +23 @@
 #undef HAVE_BYTESWAP_H
 
+/* Define to 1 if Capsicum is available. */
+#undef HAVE_CAPSICUM
+
 /* Define to 1 if the system has the type `CC_SHA256_CTX'. */
 #undef HAVE_CC_SHA256_CTX
@@ -29 +32 @@
 #undef HAVE_CC_SHA256_INIT
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
@@ -64 +67 @@
 #undef HAVE_DECL_PROGRAM_INVOCATION_NAME
 
+/* Define to 1 if any of HAVE_DECODER_foo have been defined. */
+#undef HAVE_DECODERS
+
 /* Define to 1 if arm decoder is enabled. */
 #undef HAVE_DECODER_ARM
@@ -94 +100 @@
 #undef HAVE_DLFCN_H
 
+/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */
+#undef HAVE_ENCODERS
+
 /* Define to 1 if arm encoder is enabled. */
 #undef HAVE_ENCODER_ARM
@@ -175 +184 @@
 #undef HAVE_MF_HC4
 
-/* Define to 1 if you have the <minix/sha2.h> header file. */
-#undef HAVE_MINIX_SHA2_H
-
 /* Define to 1 if getopt.h declares extern int optreset. */
 #undef HAVE_OPTRESET
@@ -243 +249 @@
 /* Define to 1 if you have the <sys/byteorder.h> header file. */
 #undef HAVE_SYS_BYTEORDER_H
+
+/* Define to 1 if you have the <sys/capsicum.h> header file. */
+#undef HAVE_SYS_CAPSICUM_H
 
 /* Define to 1 if you have the <sys/endian.h> header file. */
@@ -281 +290 @@
 #undef HAVE__BOOL
 
+/* Define to 1 if you have the `_futime' function. */
+#undef HAVE__FUTIME
+
 /* Define to 1 if _mm_movemask_epi8 is available. */
 #undef HAVE__MM_MOVEMASK_EPI8
@@ -339 +351 @@
    pstat_getdynamic(). */
 #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC
+
+/* Define to 1 if the number of available CPU cores can be detected with
+   sched_getaffinity() */
+#undef TUKLIB_CPUCORES_SCHED_GETAFFINITY
 
 /* Define to 1 if the number of available CPU cores can be detected with

xz/vendor/current/configure ¶

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for XZ Utils 5.2.2.
+# Generated by GNU Autoconf 2.69 for XZ Utils 5.2.3.
 #
 # Report bugs to <lasse.collin@tukaani.org>.
@@ -591 +591 @@
 PACKAGE_NAME='XZ Utils'
 PACKAGE_TARNAME='xz'
-PACKAGE_VERSION='5.2.2'
-PACKAGE_STRING='XZ Utils 5.2.2'
+PACKAGE_VERSION='5.2.3'
+PACKAGE_STRING='XZ Utils 5.2.3'
 PACKAGE_BUGREPORT='lasse.collin@tukaani.org'
 PACKAGE_URL='http://tukaani.org/xz/'
@@ -643 +643 @@
 HAVE_VISIBILITY
 CFLAG_VISIBILITY
+CAPSICUM_LIB
 COND_INTERNAL_SHA256_FALSE
 COND_INTERNAL_SHA256_TRUE
@@ -903 +904 @@
 enable_match_finders
 enable_checks
+enable_external_sha256
 enable_assembler
 enable_small
@@ -915 +917 @@
 enable_doc
 enable_symbol_versions
+enable_sandbox
 enable_silent_rules
 enable_dependency_tracking
@@ -1485 +1488 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures XZ Utils 5.2.2 to adapt to many kinds of systems.
+\`configure' configures XZ Utils 5.2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1555 +1558 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of XZ Utils 5.2.2:";;
+     short | recursive ) echo "Configuration of XZ Utils 5.2.3:";;
    esac
   cat <<\_ACEOF
@@ -1578 +1581 @@
                           Default=all. Available integrity checks: crc32 crc64
                           sha256
+  --enable-external-sha256
+                          Use SHA-256 code from the operating system. See
+                          INSTALL for possible subtle problems.
   --disable-assembler     Do not use assembler optimizations even if such
                           exist for the architecture.
@@ -1605 +1611 @@
                           default on GNU/Linux, other GNU-based systems, and
                           FreeBSD.
+  --enable-sandbox=METHOD This is an experimental feature. Sandboxing METHOD
+                          can be `auto', `no', or `capsicum'. The default is
+                          `no'.
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
@@ -1638 +1647 @@
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -1725 +1734 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-XZ Utils configure 5.2.2
+XZ Utils configure 5.2.3
 generated by GNU Autoconf 2.69
 
@@ -2564 +2573 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by XZ Utils $as_me 5.2.2, which was
+It was created by XZ Utils $as_me 5.2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -3131 +3140 @@
 enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'`
 if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then
+        enable_encoders=no
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
 $as_echo "(none)" >&6; }
@@ -3207 +3217 @@
                 esac
         done
+
+$as_echo "#define HAVE_ENCODERS 1" >>confdefs.h
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_encoders" >&5
 $as_echo "$enable_encoders" >&6; }
@@ -3222 +3235 @@
 enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'`
 if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then
+        enable_decoders=no
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
 $as_echo "(none)" >&6; }
@@ -3299 +3313 @@
         done
 
-        # LZMA2 requires that LZMA1 is enabled.
-        test "x$enable_encoder_lzma2" = xyes && enable_encoder_lzma1=yes
-        test "x$enable_decoder_lzma2" = xyes && enable_decoder_lzma1=yes
+$as_echo "#define HAVE_DECODERS 1" >>confdefs.h
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_decoders" >&5
@@ -3312 +3324 @@
 fi
 
- if test "x$enable_encoders" != xno && test "x$enable_encoders" != x; then
+ if test "x$enable_encoders" != xno; then
   COND_MAIN_ENCODER_TRUE=
   COND_MAIN_ENCODER_FALSE='#'
@@ -3320 +3332 @@
 fi
 
- if test "x$enable_decoders" != xno && test "x$enable_decoders" != x; then
+ if test "x$enable_decoders" != xno; then
   COND_MAIN_DECODER_TRUE=
   COND_MAIN_DECODER_FALSE='#'
@@ -3785 +3797 @@
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if external SHA-256 should be used" >&5
+$as_echo_n "checking if external SHA-256 should be used... " >&6; }
+# Check whether --enable-external-sha256 was given.
+if test "${enable_external_sha256+set}" = set; then :
+  enableval=$enable_external_sha256;
+else
+  enable_external_sha256=no
+fi
+
+if test "x$enable_check_sha256" != "xyes"; then
+        enable_external_sha256=no
+fi
+if test "x$enable_external_sha256" = xyes; 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; }
+fi
+
 
 ###########################
@@ -3989 +4021 @@
 fi
 
+test "x$enable_decoders" = xno && enable_xzdec=no
  if test x$enable_xzdec != xno; then
   COND_XZDEC_TRUE=
@@ -4005 +4038 @@
 fi
 
+test "x$enable_decoder_lzma1" = xno && enable_lzmadec=no
  if test x$enable_lzmadec != xno; then
   COND_LZMADEC_TRUE=
@@ -4021 +4055 @@
 fi
 
+test "x$enable_decoder_lzma1" = xno && enable_lzmainfo=no
  if test x$enable_lzmainfo != xno; then
   COND_LZMAINFO_TRUE=
@@ -4116 +4151 @@
 fi
 
+
+
+##############
+# Sandboxing #
+##############
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sandboxing should be used" >&5
+$as_echo_n "checking if sandboxing should be used... " >&6; }
+# Check whether --enable-sandbox was given.
+if test "${enable_sandbox+set}" = set; then :
+  enableval=$enable_sandbox;
+else
+  enable_sandbox=no
+fi
+
+case $enable_sandbox in
+        auto)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: maybe (autodetect)" >&5
+$as_echo "maybe (autodetect)" >&6; }
+                ;;
+        no | capsicum)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sandbox" >&5
+$as_echo "$enable_sandbox" >&6; }
+                ;;
+        *)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+                as_fn_error $? "--enable-sandbox only accepts \`auto', \`no', or \`capsicum'." "$LINENO" 5
+                ;;
+esac
 
 
@@ -4676 +4741 @@
 # Define the identity of the package.
  PACKAGE='xz'
- VERSION='5.2.2'
+ VERSION='5.2.3'
 
 
@@ -15234 +15299 @@
 
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
@@ -15256 +15314 @@
 
 
-      GETTEXT_MACRO_VERSION=0.18
+      GETTEXT_MACRO_VERSION=0.19
 
 
@@ -15264 +15322 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
@@ -15387 +15444 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
@@ -15465 +15521 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
@@ -15557 +15612 @@
 
 
+
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
@@ -15567 +15623 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -15591 +15647 @@
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
+    [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
@@ -15620 +15676 @@
 else
   if test -z "$LD"; then
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-        test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
@@ -15656 +15715 @@
   $as_echo_n "(cached) " >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac
 fi
@@ -15844 +15905 @@
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
@@ -16373 +16434 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
@@ -16439 +16504 @@
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
@@ -16461 +16528 @@
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
@@ -16492 +16561 @@
 else
 
-            am_save_LIBS="$LIBS"
+                  am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
+
+         case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16509 +16580 @@
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
@@ -16525 +16597 @@
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
@@ -16544 +16617 @@
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
@@ -16563 +16656 @@
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
@@ -16577 +16671 @@
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
+    result |= 16;
+  return result;
 }
 _ACEOF
@@ -16695 +16789 @@
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
@@ -17093 +17187 @@
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
@@ -17101 +17196 @@
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
@@ -17121 +17219 @@
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
@@ -17129 +17228 @@
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
@@ -17140 +17242 @@
 if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
@@ -18103 +18205 @@
 
 # Find the best function to set timestamps.
-for ac_func in futimens futimes futimesat utimes utime
+for ac_func in futimens futimes futimesat utimes _futime utime
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -18598 +18700 @@
 
 
+# glibc-based systems (GNU/Linux and GNU/kFreeBSD) have sched_getaffinity().
+# The CPU_COUNT() macro was added in glibc 2.9 so we try to link the
+# test program instead of merely compiling it. glibc 2.9 is old enough that
+# if someone uses the code on older glibc, the fallback to sysconf() should
+# be good enough.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sched.h>
+int
+main(void)
+{
+        cpu_set_t cpu_mask;
+        sched_getaffinity(0, sizeof(cpu_mask), &cpu_mask);
+        return CPU_COUNT(&cpu_mask);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  tuklib_cv_cpucores_method=sched_getaffinity
+else
+
+
 # FreeBSD has both cpuset and sysctl. Look for cpuset first because
 # it's a better approach.
+#
+# This test would match on GNU/kFreeBSD too but it would require
+# -lfreebsd-glue when linking and thus in the current form this would
+# fail on GNU/kFreeBSD. The above test for sched_getaffinity() matches
+# on GNU/kFreeBSD so the test below should never run on that OS.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18711 +18841 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -18717 +18850 @@
 
 case $tuklib_cv_cpucores_method in
+        sched_getaffinity)
+
+$as_echo "#define TUKLIB_CPUCORES_SCHED_GETAFFINITY 1" >>confdefs.h
+
+                ;;
         cpuset)
 
@@ -18791 +18929 @@
 
 
-# Check for system-provided SHA-256. At least the following is supported:
+# If requsted, check for system-provided SHA-256. At least the following
+# implementations are supported:
 #
 # OS       Headers                     Library  Type           Function
@@ -18798 +18937 @@
 # OpenBSD  sys/types.h + sha2.h                 SHA2_CTX       SHA256Init
 # Solaris  sys/types.h + sha2.h        libmd    SHA256_CTX     SHA256Init
-# MINIX 3  sys/types.h + minix/sha2.h  libutil  SHA256_CTX     SHA256_Init
+# MINIX 3  sys/types.h + sha2.h                 SHA256_CTX     SHA256_Init
 # Darwin   CommonCrypto/CommonDigest.h          CC_SHA256_CTX  CC_SHA256_Init
 #
@@ -18804 +18943 @@
 # of size_t.
 #
-# We don't check for e.g. OpenSSL or libgcrypt because we don't want
-# to introduce dependencies to other packages by default. Maybe such
-# libraries could be supported via additional configure options though.
-#
-if test "x$enable_check_sha256" = "xyes"; then
+sha256_header_found=no
+sha256_type_found=no
+sha256_func_found=no
+if test "x$enable_external_sha256" = "xyes"; then
         # Test for Common Crypto before others, because Darwin has sha256.h
         # too and we don't want to use that, because on older versions it
         # uses OpenSSL functions, whose SHA256_Init is not guaranteed to
         # succeed.
-        sha256_header_found=no
-        for ac_header in CommonCrypto/CommonDigest.h sha256.h sha2.h minix/sha2.h
+        for ac_header in CommonCrypto/CommonDigest.h sha256.h sha2.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -18840 +18977 @@
                           # include <sha2.h>
                           #endif
-                          #ifdef HAVE_MINIX_SHA2_H
-                          # include <minix/sha2.h>
-                          #endif
 "
 if test "x$ac_cv_type_CC_SHA256_CTX" = xyes; then :
@@ -18850 +18984 @@
 _ACEOF
 
-
+sha256_type_found=yes
 fi
 ac_fn_c_check_type "$LINENO" "SHA256_CTX" "ac_cv_type_SHA256_CTX" "#ifdef HAVE_SYS_TYPES_H
@@ -18864 +18998 @@
                           # include <sha2.h>
                           #endif
-                          #ifdef HAVE_MINIX_SHA2_H
-                          # include <minix/sha2.h>
-                          #endif
 "
 if test "x$ac_cv_type_SHA256_CTX" = xyes; then :
@@ -18874 +19005 @@
 _ACEOF
 
-
+sha256_type_found=yes
 fi
 ac_fn_c_check_type "$LINENO" "SHA2_CTX" "ac_cv_type_SHA2_CTX" "#ifdef HAVE_SYS_TYPES_H
@@ -18888 +19019 @@
                           # include <sha2.h>
                           #endif
-                          #ifdef HAVE_MINIX_SHA2_H
-                          # include <minix/sha2.h>
-                          #endif
 "
 if test "x$ac_cv_type_SHA2_CTX" = xyes; then :
@@ -18898 +19026 @@
 _ACEOF
 
-
-fi
-
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256_Init" >&5
-$as_echo_n "checking for library containing SHA256_Init... " >&6; }
-if ${ac_cv_search_SHA256_Init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SHA256_Init ();
-int
-main ()
-{
-return SHA256_Init ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' md util; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SHA256_Init=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_SHA256_Init+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_SHA256_Init+:} false; then :
-
-else
-  ac_cv_search_SHA256_Init=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5
-$as_echo "$ac_cv_search_SHA256_Init" >&6; }
-ac_res=$ac_cv_search_SHA256_Init
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Init" >&5
+sha256_type_found=yes
+fi
+
+                if test "x$sha256_type_found" = xyes ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Init" >&5
 $as_echo_n "checking for library containing SHA256Init... " >&6; }
 if ${ac_cv_search_SHA256Init+:} false; then :
@@ -19013 +19086 @@
 fi
 
-                for ac_func in CC_SHA256_Init SHA256_Init SHA256Init
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256_Init" >&5
+$as_echo_n "checking for library containing SHA256_Init... " >&6; }
+if ${ac_cv_search_SHA256_Init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SHA256_Init ();
+int
+main ()
+{
+return SHA256_Init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' md; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_SHA256_Init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_SHA256_Init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_SHA256_Init+:} false; then :
+
+else
+  ac_cv_search_SHA256_Init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5
+$as_echo "$ac_cv_search_SHA256_Init" >&6; }
+ac_res=$ac_cv_search_SHA256_Init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+                        for ac_func in CC_SHA256_Init SHA256Init SHA256_Init
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -19021 +19150 @@
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
- break
+ sha256_func_found=yes ; break
 fi
 done
 
+                fi
         fi
 fi
- if test "x$ac_cv_func_SHA256_Init" != xyes \
-                && test "x$ac_cv_func_SHA256Init" != xyes \
-                && test "x$ac_cv_func_CC_SHA256_Init" != xyes; then
+ if test "x$sha256_func_found" = xno; then
   COND_INTERNAL_SHA256_TRUE=
   COND_INTERNAL_SHA256_FALSE='#'
@@ -19037 +19165 @@
 fi
 
+if test "x$enable_external_sha256$sha256_func_found" = xyesno; then
+        as_fn_error $? "--enable-external-sha256 was specified but no supported external SHA-256 implementation was found" "$LINENO" 5
+fi
 
 # Check for SSE2 intrinsics.
@@ -19049 +19180 @@
 fi
 
+
+# Check for sandbox support. If one is found, set enable_sandbox=found.
+case $enable_sandbox in
+        auto | capsicum)
+
+# On FreeBSD >= 11.x and Linux, Capsicum is uses <sys/capsicum.h>.
+# If this header is found, it is assumed to be the right one.
+capsicum_header_found=no
+for ac_header in sys/capsicum.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_capsicum_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_CAPSICUM_H 1
+_ACEOF
+ capsicum_header_found=yes
+fi
+
+done
+
+if test "$capsicum_header_found" = no ; then
+    # On FreeBSD 10.x Capsicum uses <sys/capability.h>. Such a header exists
+    # on Linux too but it describes POSIX.1e capabilities. Look for the
+    # declaration of cap_rights_limit to check if <sys/capability.h> is
+    # a Capsicum header.
+    ac_fn_c_check_decl "$LINENO" "cap_rights_limit" "ac_cv_have_decl_cap_rights_limit" "#include <sys/capability.h>
+"
+if test "x$ac_cv_have_decl_cap_rights_limit" = xyes; then :
+  capsicum_header_found=yes
+fi
+
+fi
+
+capsicum_lib_found=no
+CAPSICUM_LIB=
+if test "$capsicum_header_found" = yes ; then
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    # FreeBSD >= 10.x has Capsicum functions in libc.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cap_rights_limit ();
+int
+main ()
+{
+return cap_rights_limit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  capsicum_lib_found=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    # Linux has Capsicum functions in libcaprights.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_rights_limit in -lcaprights" >&5
+$as_echo_n "checking for cap_rights_limit in -lcaprights... " >&6; }
+if ${ac_cv_lib_caprights_cap_rights_limit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcaprights  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cap_rights_limit ();
+int
+main ()
+{
+return cap_rights_limit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_caprights_cap_rights_limit=yes
+else
+  ac_cv_lib_caprights_cap_rights_limit=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_caprights_cap_rights_limit" >&5
+$as_echo "$ac_cv_lib_caprights_cap_rights_limit" >&6; }
+if test "x$ac_cv_lib_caprights_cap_rights_limit" = xyes; then :
+  CAPSICUM_LIB=-lcaprights
+                  capsicum_lib_found=yes
+fi
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+
+
+if test "$capsicum_lib_found" = yes ; then
+
+$as_echo "#define HAVE_CAPSICUM 1" >>confdefs.h
+
+    enable_sandbox=found
+else
+    :
+fi
+                ;;
+esac
+
+# If a specific sandboxing method was explicitly requested and it wasn't
+# found, give an error.
+case $enable_sandbox in
+        auto | no | found)
+                ;;
+        *)
+                as_fn_error $? "$enable_sandbox support not found" "$LINENO" 5
+                ;;
+esac
 
 
@@ -19111 +19379 @@
 /* end confdefs.h.  */
 extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-         extern __attribute__((__visibility__("default"))) int exportedvar;
-         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-         void dummyfunc (void) {}
+             extern __attribute__((__visibility__("default"))) int exportedvar;
+             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+             void dummyfunc (void) {}
+
 int
 main ()
@@ -20010 +20279 @@
 # values after options handling.
 ac_log="
-This file was extended by XZ Utils $as_me 5.2.2, which was
+This file was extended by XZ Utils $as_me 5.2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -20077 +20346 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-XZ Utils config.status 5.2.2
+XZ Utils config.status 5.2.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
@@ -21976 +22245 @@
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
@@ -21992 +22261 @@
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[   ]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
@@ -22003 +22273 @@
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi

xz/vendor/current/configure.ac ¶

@@ -98 +98 @@
 enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'`
 if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then
+        enable_encoders=no
         AC_MSG_RESULT([(none)])
 else
@@ -115 +116 @@
                 esac
         done
+        AC_DEFINE([HAVE_ENCODERS], [1],
+                [Define to 1 if any of HAVE_ENCODER_foo have been defined.])
         AC_MSG_RESULT([$enable_encoders])
 fi
@@ -125 +128 @@
 enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'`
 if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then
+        enable_decoders=no
         AC_MSG_RESULT([(none)])
 else
@@ -142 +146 @@
                 esac
         done
-
-        # LZMA2 requires that LZMA1 is enabled.
-        test "x$enable_encoder_lzma2" = xyes && enable_encoder_lzma1=yes
-        test "x$enable_decoder_lzma2" = xyes && enable_decoder_lzma1=yes
-
+        AC_DEFINE([HAVE_DECODERS], [1],
+                [Define to 1 if any of HAVE_DECODER_foo have been defined.])
         AC_MSG_RESULT([$enable_decoders])
 fi
@@ -155 +156 @@
 fi
 
-AM_CONDITIONAL(COND_MAIN_ENCODER, test "x$enable_encoders" != xno && test "x$enable_encoders" != x)
-AM_CONDITIONAL(COND_MAIN_DECODER, test "x$enable_decoders" != xno && test "x$enable_decoders" != x)
+AM_CONDITIONAL(COND_MAIN_ENCODER, test "x$enable_encoders" != xno)
+AM_CONDITIONAL(COND_MAIN_DECODER, test "x$enable_decoders" != xno)
 
 m4_foreach([NAME], [SUPPORTED_FILTERS],
@@ -275 +276 @@
 ])dnl
 
+AC_MSG_CHECKING([if external SHA-256 should be used])
+AC_ARG_ENABLE([external-sha256], AS_HELP_STRING([--enable-external-sha256],
+                [Use SHA-256 code from the operating system.
+                See INSTALL for possible subtle problems.]),
+                [], [enable_external_sha256=no])
+if test "x$enable_check_sha256" != "xyes"; then
+        enable_external_sha256=no
+fi
+if test "x$enable_external_sha256" = xyes; then
+        AC_MSG_RESULT([yes])
+else
+        AC_MSG_RESULT([no])
+fi
+
 
 ###########################
@@ -416 +431 @@
                 [do not build xzdec])],
         [], [enable_xzdec=yes])
+test "x$enable_decoders" = xno && enable_xzdec=no
 AM_CONDITIONAL([COND_XZDEC], [test x$enable_xzdec != xno])
 
@@ -422 +438 @@
                 (it exists primarily for LZMA Utils compatibility)])],
         [], [enable_lzmadec=yes])
+test "x$enable_decoder_lzma1" = xno && enable_lzmadec=no
 AM_CONDITIONAL([COND_LZMADEC], [test x$enable_lzmadec != xno])
 
@@ -428 +445 @@
                 (it exists primarily for LZMA Utils compatibility)])],
         [], [enable_lzmainfo=yes])
+test "x$enable_decoder_lzma1" = xno && enable_lzmainfo=no
 AM_CONDITIONAL([COND_LZMAINFO], [test x$enable_lzmainfo != xno])
 
@@ -475 +493 @@
 
 
+##############
+# Sandboxing #
+##############
+
+AC_MSG_CHECKING([if sandboxing should be used])
+AC_ARG_ENABLE([sandbox], [AS_HELP_STRING([--enable-sandbox=METHOD],
+                [This is an experimental feature.
+                Sandboxing METHOD can be `auto', `no', or `capsicum'.
+                The default is `no'.])],
+        [], [enable_sandbox=no])
+case $enable_sandbox in
+        auto)
+                AC_MSG_RESULT([maybe (autodetect)])
+                ;;
+        no | capsicum)
+                AC_MSG_RESULT([$enable_sandbox])
+                ;;
+        *)
+                AC_MSG_RESULT([])
+                AC_MSG_ERROR([--enable-sandbox only accepts `auto', `no', or `capsicum'.])
+                ;;
+esac
+
+
 ###############################################################################
 # Checks for programs.
@@ -568 +610 @@
 echo
 echo "Initializing gettext:"
-AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT_VERSION([0.19])
 AM_GNU_GETTEXT([external])
 
@@ -631 +673 @@
 
 # Find the best function to set timestamps.
-AC_CHECK_FUNCS([futimens futimes futimesat utimes utime], [break])
+AC_CHECK_FUNCS([futimens futimes futimesat utimes _futime utime], [break])
 
 # This is nice to have but not mandatory.
@@ -642 +684 @@
 TUKLIB_MBSTR
 
-# Check for system-provided SHA-256. At least the following is supported:
+# If requsted, check for system-provided SHA-256. At least the following
+# implementations are supported:
 #
 # OS       Headers                     Library  Type           Function
@@ -649 +692 @@
 # OpenBSD  sys/types.h + sha2.h                 SHA2_CTX       SHA256Init
 # Solaris  sys/types.h + sha2.h        libmd    SHA256_CTX     SHA256Init
-# MINIX 3  sys/types.h + minix/sha2.h  libutil  SHA256_CTX     SHA256_Init
+# MINIX 3  sys/types.h + sha2.h                 SHA256_CTX     SHA256_Init
 # Darwin   CommonCrypto/CommonDigest.h          CC_SHA256_CTX  CC_SHA256_Init
 #
@@ -655 +698 @@
 # of size_t.
 #
-# We don't check for e.g. OpenSSL or libgcrypt because we don't want
-# to introduce dependencies to other packages by default. Maybe such
-# libraries could be supported via additional configure options though.
-#
-if test "x$enable_check_sha256" = "xyes"; then
+sha256_header_found=no
+sha256_type_found=no
+sha256_func_found=no
+if test "x$enable_external_sha256" = "xyes"; then
         # Test for Common Crypto before others, because Darwin has sha256.h
         # too and we don't want to use that, because on older versions it
         # uses OpenSSL functions, whose SHA256_Init is not guaranteed to
         # succeed.
-        sha256_header_found=no
         AC_CHECK_HEADERS(
-                [CommonCrypto/CommonDigest.h sha256.h sha2.h minix/sha2.h],
+                [CommonCrypto/CommonDigest.h sha256.h sha2.h],
                 [sha256_header_found=yes ; break])
         if test "x$sha256_header_found" = xyes; then
-                AC_CHECK_TYPES([CC_SHA256_CTX, SHA256_CTX, SHA2_CTX], [], [],
+                AC_CHECK_TYPES([CC_SHA256_CTX, SHA256_CTX, SHA2_CTX],
+                        [sha256_type_found=yes], [],
                         [[#ifdef HAVE_SYS_TYPES_H
                           # include <sys/types.h>
@@ -681 +723 @@
                           #ifdef HAVE_SHA2_H
                           # include <sha2.h>
-                          #endif
-                          #ifdef HAVE_MINIX_SHA2_H
-                          # include <minix/sha2.h>
                           #endif]])
-                AC_SEARCH_LIBS([SHA256_Init], [md util])
-                AC_SEARCH_LIBS([SHA256Init], [md])
-                AC_CHECK_FUNCS([CC_SHA256_Init SHA256_Init SHA256Init],
-                        [break])
+                if test "x$sha256_type_found" = xyes ; then
+                        AC_SEARCH_LIBS([SHA256Init], [md])
+                        AC_SEARCH_LIBS([SHA256_Init], [md])
+                        AC_CHECK_FUNCS([CC_SHA256_Init SHA256Init SHA256_Init],
+                                [sha256_func_found=yes ; break])
+                fi
         fi
 fi
-AM_CONDITIONAL([COND_INTERNAL_SHA256],
-        [test "x$ac_cv_func_SHA256_Init" != xyes \
-                && test "x$ac_cv_func_SHA256Init" != xyes \
-                && test "x$ac_cv_func_CC_SHA256_Init" != xyes])
+AM_CONDITIONAL([COND_INTERNAL_SHA256], [test "x$sha256_func_found" = xno])
+if test "x$enable_external_sha256$sha256_func_found" = xyesno; then
+        AC_MSG_ERROR([--enable-external-sha256 was specified but no supported external SHA-256 implementation was found])
+fi
 
 # Check for SSE2 intrinsics.
@@ -704 +745 @@
 #include <immintrin.h>
 #endif])
+
+# Check for sandbox support. If one is found, set enable_sandbox=found.
+case $enable_sandbox in
+        auto | capsicum)
+                AX_CHECK_CAPSICUM([enable_sandbox=found], [:])
+                ;;
+esac
+
+# If a specific sandboxing method was explicitly requested and it wasn't
+# found, give an error.
+case $enable_sandbox in
+        auto | no | found)
+                ;;
+        *)
+                AC_MSG_ERROR([$enable_sandbox support not found])
+                ;;
+esac
 
 

xz/vendor/current/debug/Makefile.in ¶

@@ -95 +95 @@
 subdir = debug
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -234 +234 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/dos/config.h ¶

@@ -10 +10 @@
 /* Define to 1 if sha256 integrity check is enabled. */
 #define HAVE_CHECK_SHA256 1
+
+/* Define to 1 if any of HAVE_DECODER_foo have been defined. */
+#define HAVE_DECODERS 1
 
 /* Define to 1 if arm decoder is enabled. */
@@ -37 +40 @@
 /* Define to 1 if x86 decoder is enabled. */
 #define HAVE_DECODER_X86 1
+
+/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */
+#define HAVE_ENCODERS 1
 
 /* Define to 1 if arm encoder is enabled. */

xz/vendor/current/lib/Makefile.in ¶

@@ -91 +91 @@
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -182 +182 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/m4/gettext.m4 ¶

@@ -1 @@
-# gettext.m4 serial 63 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+# gettext.m4 serial 66 (gettext-0.18.2)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36 +36 @@
 dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
+dnl    the value '$(top_builddir)/intl/' is used.
 dnl
 dnl The result of the configuration is one of three cases:
@@ -98 +98 @@
   ])
 
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
   gt_INTL_MACOSX
 
@@ -158 +158 @@
 
         AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_TRY_LINK([#include <libintl.h>
+         [AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+extern int *_nl_domain_bindings;
+               ]],
+               [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+               ]])],
             [eval "$gt_func_gnugettext_libc=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])
@@ -184 +190 @@
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
+            AC_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -191 +200 @@
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
-              [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+const char *_nl_expand_alias (const char *);
+                 ]],
+                 [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                 ]])],
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
@@ -199 +211 @@
             if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
+              AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -206 +221 @@
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
-                [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
-               ])
+const char *_nl_expand_alias (const char *);
+                   ]],
+                   [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                   ]])],
+                [LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"

xz/vendor/current/m4/iconv.m4 ¶

@@ -1 @@
-# iconv.m4 serial 9 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+# iconv.m4 serial 18 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -31 +31 @@
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
@@ -38 +38 @@
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <iconv.h>
+         ]],
+         [[iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);]])],
       [am_cv_func_iconv=yes])
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+           ]],
+           [[iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);]])],
         [am_cv_lib_iconv=yes]
         [am_cv_func_iconv=yes])
@@ -59 +67 @@
   if test "$am_cv_func_iconv" = yes; then
     AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10.
       am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      AC_TRY_RUN([
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
 #include <iconv.h>
 #include <string.h>
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
@@ -85 +96 @@
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
@@ -104 +116 @@
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
@@ -123 +155 @@
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
@@ -137 +170 @@
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
-        [case "$host_os" in
+    result |= 16;
+  return result;
+}]])],
+        [am_cv_func_iconv_works=yes],
+        [am_cv_func_iconv_works=no],
+        [
+changequote(,)dnl
+         case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac])
+         esac
+changequote([,])dnl
+        ])
       LIBS="$am_save_LIBS"
     ])
@@ -171 +210 @@
 ])
 
-AC_DEFUN([AM_ICONV],
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define([gl_iconv_AC_DEFUN],
+  m4_version_prereq([2.64],
+    [[AC_DEFUN_ONCE(
+        [$1], [$2])]],
+    [m4_ifdef([gl_00GNULIB],
+       [[AC_DEFUN_ONCE(
+           [$1], [$2])]],
+       [[AC_DEFUN(
+           [$1], [$2])]])]))
+gl_iconv_AC_DEFUN([AM_ICONV],
 [
   AM_ICONV_LINK
@@ -177 +234 @@
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_TRY_COMPILE([
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
 #include <stdlib.h>
 #include <iconv.h>
@@ -184 +243 @@
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
-], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+           ]],
+           [[]])],
+        [am_cv_proto_iconv_arg1=""],
+        [am_cv_proto_iconv_arg1="const"])
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
@@ -196 +258 @@
     AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
       [Define as const if the declaration of iconv() needs const.])
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef([gl_ICONV_H_DEFAULTS],
+      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      ])
   fi
 ])

xz/vendor/current/m4/intlmacosx.m4 ¶

@@ -1 @@
-# intlmacosx.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14 +14 @@
 dnl They are *not* in the public domain.
 
-dnl Checks for special options needed on MacOS X.
+dnl Checks for special options needed on Mac OS X.
 dnl Defines INTL_MACOSX_LIBS.
 AC_DEFUN([gt_INTL_MACOSX],
 [
-  dnl Check for API introduced in MacOS X 10.2.
+  dnl Check for API introduced in Mac OS X 10.2.
   AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
     [gt_cv_func_CFPreferencesCopyAppValue],
     [gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFPreferences.h>]],
+          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
        [gt_cv_func_CFPreferencesCopyAppValue=yes],
        [gt_cv_func_CFPreferencesCopyAppValue=no])
@@ -30 +32 @@
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
   fi
-  dnl Check for API introduced in MacOS X 10.3.
+  dnl Check for API introduced in Mac OS X 10.3.
   AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
     [gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFLocale.h>]],
+          [[CFLocaleCopyCurrent();]])],
        [gt_cv_func_CFLocaleCopyCurrent=yes],
        [gt_cv_func_CFLocaleCopyCurrent=no])
@@ -42 +47 @@
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
     AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
   fi
   INTL_MACOSX_LIBS=

xz/vendor/current/m4/lib-ld.m4 ¶

@@ -1 @@
-# lib-ld.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6 +6 @@
 
 dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
 
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
 AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
+[AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
@@ -55 +61 @@
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
@@ -80 +86 @@
 AC_CACHE_VAL([acl_cv_path_LD],
 [if test -z "$LD"; then
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-        test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.

xz/vendor/current/m4/lib-link.m4 ¶

@@ -1 @@
-# lib-link.m4 serial 21 (gettext-0.18)
-dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19 +19 @@
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[translit([$1],[./-], [___])])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
     AC_LIB_LINKFLAGS_BODY([$1], [$2])
@@ -59 +59 @@
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[translit([$1],[./-], [___])])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 
   dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
@@ -86 +86 @@
       *)       LIBS="$LIB[]NAME $LIBS" ;;
     esac
-    AC_TRY_LINK([$3], [$4],
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$3]], [[$4]])],
       [ac_cv_lib[]Name=yes],
       [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
@@ -116 +117 @@
 dnl   acl_libext,
 dnl   acl_shlibext,
+dnl   acl_libname_spec,
+dnl   acl_library_names_spec,
 dnl   acl_hardcode_libdir_flag_spec,
 dnl   acl_hardcode_libdir_separator,
@@ -158 +161 @@
 AC_DEFUN([AC_LIB_FROMPACKAGE],
 [
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   define([acl_frompackage_]NAME, [$2])
   popdef([NAME])
   pushdef([PACK],[$2])
-  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
   popdef([PACKUP])
   popdef([PACK])
@@ -179 +182 @@
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
   dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
@@ -243 +246 @@
         dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
         dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then

xz/vendor/current/m4/lib-prefix.m4 ¶

@@ -1 +1 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,

xz/vendor/current/m4/nls.m4 ¶

@@ -1 +1 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation

xz/vendor/current/m4/po.m4 ¶

@@ -1 @@
-# po.m4 serial 17 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+# po.m4 serial 22 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -18 +18 @@
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
@@ -25 +25 @@
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
   dnl Perform the following tests also if --disable-nls has been given,
@@ -103 +104 @@
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
@@ -119 +120 @@
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[   ]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
@@ -130 +132 @@
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
@@ -227 +229 @@
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
@@ -255 +257 @@
 
   # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
   sed_x_variable='
 # Test if the hold space is empty.
@@ -262 +265 @@
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^[      ]*VARIABLE[     ]*=/{
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
   # Seen the first line of the variable definition.
-  s/^[   ]*VARIABLE[     ]*=//
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
   ba
 }
@@ -316 +319 @@
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
@@ -406 +409 @@
 
   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
@@ -412 +416 @@
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-        @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-        \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
@@ -423 +427 @@
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-        @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-        \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done

xz/vendor/current/m4/progtest.m4 ¶

@@ -1 @@
-# progtest.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -28 +28 @@
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 

xz/vendor/current/m4/tuklib_cpucores.m4 ¶

@@ -11 +11 @@
 #   Supported methods:
 #     - GetSystemInfo(): Windows (including Cygwin)
+#     - sched_getaffinity(): glibc (GNU/Linux, GNU/kFreeBSD)
+#     - cpuset_getaffinity(): FreeBSD
 #     - sysctl(): BSDs, OS/2
 #     - sysconf(): GNU/Linux, Solaris, Tru64, IRIX, AIX, QNX, Cygwin (but
@@ -46 +48 @@
 ]])], [tuklib_cv_cpucores_method=special], [
 
+# glibc-based systems (GNU/Linux and GNU/kFreeBSD) have sched_getaffinity().
+# The CPU_COUNT() macro was added in glibc 2.9 so we try to link the
+# test program instead of merely compiling it. glibc 2.9 is old enough that
+# if someone uses the code on older glibc, the fallback to sysconf() should
+# be good enough.
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
+#include <sched.h>
+int
+main(void)
+{
+        cpu_set_t cpu_mask;
+        sched_getaffinity(0, sizeof(cpu_mask), &cpu_mask);
+        return CPU_COUNT(&cpu_mask);
+}
+]])], [tuklib_cv_cpucores_method=sched_getaffinity], [
+
 # FreeBSD has both cpuset and sysctl. Look for cpuset first because
 # it's a better approach.
+#
+# This test would match on GNU/kFreeBSD too but it would require
+# -lfreebsd-glue when linking and thus in the current form this would
+# fail on GNU/kFreeBSD. The above test for sched_getaffinity() matches
+# on GNU/kFreeBSD so the test below should never run on that OS.
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <sys/param.h>
@@ -121 +144 @@
 
         tuklib_cv_cpucores_method=unknown
-])])])])])])
+])])])])])])])
 
 case $tuklib_cv_cpucores_method in
+        sched_getaffinity)
+                AC_DEFINE([TUKLIB_CPUCORES_SCHED_GETAFFINITY], [1],
+                        [Define to 1 if the number of available CPU cores
+                        can be detected with sched_getaffinity()])
+                ;;
         cpuset)
                 AC_DEFINE([TUKLIB_CPUCORES_CPUSET], [1],

xz/vendor/current/m4/visibility.m4 ¶

@@ -1 @@
-# visibility.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
+# visibility.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13 +13 @@
 dnl Does *not* test for __visibility__("protected") - which has tricky
 dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
+dnl Mac OS X.
 dnl Does *not* test for __visibility__("internal") - which has processor
 dnl dependent semantics.
@@ -34 +34 @@
       gl_save_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS -Werror"
-      AC_TRY_COMPILE([], [],
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([[]], [[]])],
         [gl_cv_cc_vis_werror=yes],
         [gl_cv_cc_vis_werror=no])
@@ -52 +53 @@
         CFLAGS="$CFLAGS -Werror"
       fi
-      AC_TRY_COMPILE(
-        [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-         extern __attribute__((__visibility__("default"))) int exportedvar;
-         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-         void dummyfunc (void) {}],
-        [],
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+             extern __attribute__((__visibility__("default"))) int exportedvar;
+             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+             void dummyfunc (void) {}
+           ]],
+           [[]])],
         [gl_cv_cc_visibility=yes],
         [gl_cv_cc_visibility=no])

xz/vendor/current/po/Makefile.in.in ¶

@@ -9 +9 @@
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18
-GETTEXT_MACRO_VERSION = 0.18
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
@@ -16 +16 @@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
@@ -77 +78 @@
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
@@ -97 +108 @@
 
 
-all: check-macro-version all-@USE_NLS@
+all: all-@USE_NLS@
 
 all-yes: stamp-po
@@ -103 +114 @@
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
-        @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+        test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
           || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
                exit 1; \
@@ -124 +135 @@
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+        @$(CHECK_MACRO_VERSION)
         test ! -f $(srcdir)/$(DOMAIN).pot || \
           test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
@@ -138 +150 @@
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-        if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
-          package_gnu='GNU '; \
-        else \
-          package_gnu=''; \
+        package_gnu="$(PACKAGE_GNU)"; \
+        test -n "$$package_gnu" || { \
+          if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+                 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+                               -size -10000000c -exec grep 'GNU @PACKAGE@' \
+                               /dev/null '{}' ';' 2>/dev/null; \
+               else \
+                 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+               fi; \
+             } | grep -v 'libtool:' >/dev/null; then \
+             package_gnu=yes; \
+           else \
+             package_gnu=no; \
+           fi; \
+        }; \
+        if test "$$package_gnu" = "yes"; then \
+          package_prefix='GNU '; \
+        else \
+          package_prefix=''; \
         fi; \
         if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
@@ -162 +192 @@
               --files-from=$(srcdir)/POTFILES.in \
               --copyright-holder='$(COPYRIGHT_HOLDER)' \
-              --package-name="$${package_gnu}@PACKAGE@" \
+              --package-name="$${package_prefix}@PACKAGE@" \
               --package-version='@VERSION@' \
               --msgid-bugs-address="$$msgid_bugs_address" \
@@ -190 +220 @@
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
+$(POFILES): $(POFILESDEPS)
         @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
         if test -f "$(srcdir)/$${lang}.po"; then \
+          test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
           test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
           echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
@@ -353 +384 @@
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-        $(MAKE) update-po
+        test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
         @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.

xz/vendor/current/po/Rules-quot ¶

@@ +1 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
@@ -15 +16 @@
 .insert-header.po-update-en:
         @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-        if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+        if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
         tmpdir=`pwd`; \
         echo "$$lang:"; \
@@ -21 +22 @@
         LC_ALL=C; export LC_ALL; \
         cd $(srcdir); \
-        if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+        if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+           | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+           { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+             '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+               $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+               ;; \
+             *) \
+               $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+               ;; \
+             esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+             ; then \
           if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
             rm -f $$tmpdir/$$lang.new.po; \

xz/vendor/current/po/cs.po ¶

@@ -7 +7 @@
 "Project-Id-Version: xz-utils\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2015-09-29 14:03+0300\n"
+"POT-Creation-Date: 2016-12-30 13:27+0200\n"
 "PO-Revision-Date: 2010-12-03 11:32+0100\n"
 "Last-Translator: Marek ČernockÃœ <marek@manet.cz>\n"
@@ -52 +52 @@
 msgstr "Proměnná prostředí %s obsahuje příliš mnoho argumentů"
 
+#: src/xz/args.c:643
+msgid "Compression support was disabled at build time"
+msgstr ""
+
+#: src/xz/args.c:650
+msgid "Decompression support was disabled at build time"
+msgstr ""
+
 #: src/xz/coder.c:110
 msgid "Maximum number of filters is four"
@@ -84 +92 @@
 msgstr ""
 
-#: src/xz/coder.c:234
+#: src/xz/coder.c:235
 #, c-format
 msgid "Using up to %<PRIu32> threads."
 msgstr ""
 
-#: src/xz/coder.c:247
+#: src/xz/coder.c:251
 msgid "Unsupported filter chain or filter options"
 msgstr "NepodporovanÜ omezující filtr nebo volby filtru"
 
-#: src/xz/coder.c:255
+#: src/xz/coder.c:263
 #, c-format
 msgid "Decompression will need %s MiB of memory."
 msgstr "Dekomprimace bude vyÅŸadovat %s MiB paměti."
 
-#: src/xz/coder.c:290
+#: src/xz/coder.c:300
 #, fuzzy, c-format
 msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB"
 msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení pouÅŸitelné paměti %s MiB"
 
-#: src/xz/coder.c:344
+#: src/xz/coder.c:354
 #, c-format
 msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB"
 msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení pouÅŸitelné paměti %s MiB"
 
-#: src/xz/file_io.c:87 src/xz/file_io.c:95
+#: src/xz/file_io.c:110 src/xz/file_io.c:118
 #, fuzzy, c-format
 msgid "Error creating a pipe: %s"
 msgstr "%s: Chyba při čtení názvů souborů: %s"
 
-#: src/xz/file_io.c:172
+#: src/xz/file_io.c:173
+msgid "Sandbox is disabled due to incompatible command line arguments"
+msgstr ""
+
+#: src/xz/file_io.c:216
+msgid "Sandbox was successfully enabled"
+msgstr ""
+
+#: src/xz/file_io.c:220
+msgid "Failed to enable the sandbox"
+msgstr ""
+
+#: src/xz/file_io.c:262
 #, fuzzy, c-format
 msgid "%s: poll() failed: %s"
@@ -128 +148 @@
 #. of the original file, and in that case it obviously
 #. shouldn't be removed.
-#: src/xz/file_io.c:242
+#: src/xz/file_io.c:332
 #, c-format
 msgid "%s: File seems to have been moved, not removing"
 msgstr "%s: Vypadá to, ÅŸe soubor byl přesunut, proto nebude odstraněn"
 
-#: src/xz/file_io.c:249 src/xz/file_io.c:762
+#: src/xz/file_io.c:339 src/xz/file_io.c:872
 #, c-format
 msgid "%s: Cannot remove: %s"
 msgstr "%s: Nelze odstranit: %s"
 
-#: src/xz/file_io.c:274
+#: src/xz/file_io.c:364
 #, c-format
 msgid "%s: Cannot set the file owner: %s"
 msgstr "%s: Nelze nastavit vlastníka souboru: %s"
 
-#: src/xz/file_io.c:280
+#: src/xz/file_io.c:370
 #, c-format
 msgid "%s: Cannot set the file group: %s"
 msgstr "%s: Nelze nastavit skupinu souboru: %s"
 
-#: src/xz/file_io.c:299
+#: src/xz/file_io.c:389
 #, c-format
 msgid "%s: Cannot set the file permissions: %s"
 msgstr "%s: Nelze nastavit oprávnění souboru: %s"
 
-#: src/xz/file_io.c:409
+#: src/xz/file_io.c:515
 #, fuzzy, c-format
 msgid "Error getting the file status flags from standard input: %s"
 msgstr "Chyba při obnovení příznaku O_APPEND na standardní vÃœstup: %s"
 
-#: src/xz/file_io.c:463 src/xz/file_io.c:525
+#: src/xz/file_io.c:569 src/xz/file_io.c:631
 #, c-format
 msgid "%s: Is a symbolic link, skipping"
 msgstr "%s: Jedná se o symbolickÜ odkaz, vynechává se"
 
-#: src/xz/file_io.c:554
+#: src/xz/file_io.c:660
 #, c-format
 msgid "%s: Is a directory, skipping"
 msgstr "%s: Jedná se o sloşku, vynechává se"
 
-#: src/xz/file_io.c:560
+#: src/xz/file_io.c:666
 #, c-format
 msgid "%s: Not a regular file, skipping"
 msgstr "%s: Nejedná se o běşnÃœ soubor, vynechává se"
 
-#: src/xz/file_io.c:577
+#: src/xz/file_io.c:683
 #, c-format
 msgid "%s: File has setuid or setgid bit set, skipping"
 msgstr "%s: Soubor má nastavenÜ bit setuid nebo setgid, vynechává se"
 
-#: src/xz/file_io.c:584
+#: src/xz/file_io.c:690
 #, c-format
 msgid "%s: File has sticky bit set, skipping"
 msgstr "%s: Soubor má nastavenÜ bit sticky, vynechává se"
 
-#: src/xz/file_io.c:591
+#: src/xz/file_io.c:697
 #, c-format
 msgid "%s: Input file has more than one hard link, skipping"
 msgstr "%s: Vstupní soubor má více neş jeden pevnÜ odkaz, vynechává se"
 
-#: src/xz/file_io.c:671
+#: src/xz/file_io.c:782
 #, fuzzy, c-format
 msgid "Error restoring the status flags to standard input: %s"
 msgstr "Chyba při obnovení příznaku O_APPEND na standardní vÃœstup: %s"
 
-#: src/xz/file_io.c:720
+#: src/xz/file_io.c:830
 #, fuzzy, c-format
 msgid "Error getting the file status flags from standard output: %s"
 msgstr "Chyba při obnovení příznaku O_APPEND na standardní vÃœstup: %s"
 
-#: src/xz/file_io.c:898
+#: src/xz/file_io.c:1008
 #, c-format
 msgid "Error restoring the O_APPEND flag to standard output: %s"
 msgstr "Chyba při obnovení příznaku O_APPEND na standardní vÃœstup: %s"
 
-#: src/xz/file_io.c:910
+#: src/xz/file_io.c:1020
 #, c-format
 msgid "%s: Closing the file failed: %s"
 msgstr "%s: Selhalo zavření souboru: %s"
 
-#: src/xz/file_io.c:946 src/xz/file_io.c:1172
+#: src/xz/file_io.c:1056 src/xz/file_io.c:1282
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr "%s: Selhalo nastavení pozice při pokusu o vytvoření souboru řídké matice: %s"
 
-#: src/xz/file_io.c:1041
+#: src/xz/file_io.c:1151
 #, c-format
 msgid "%s: Read error: %s"
 msgstr "%s: Chyba čtení: %s"
 
-#: src/xz/file_io.c:1061
+#: src/xz/file_io.c:1171
 #, c-format
 msgid "%s: Error seeking the file: %s"
 msgstr "%s: Chyba při posunu v rámci souboru: %s"
 
-#: src/xz/file_io.c:1071
+#: src/xz/file_io.c:1181
 #, c-format
 msgid "%s: Unexpected end of file"
 msgstr "%s: NeočekávanÜ konec souboru"
 
-#: src/xz/file_io.c:1130
+#: src/xz/file_io.c:1240
 #, c-format
 msgid "%s: Write error: %s"
@@ -467 +487 @@
 msgstr "Komprimace a dekomprimace s přepínačem --robot není zatím podporovaná."
 
-#: src/xz/main.c:231
+#: src/xz/main.c:252
 msgid "Cannot read data from standard input when reading filenames from standard input"
 msgstr "Ze standardního vstupu nelze číst data, kdyş se ze standardního vstupu načítají názvy souborů"

xz/vendor/current/po/de.po ¶

@@ -7 +7 @@
 "Project-Id-Version: XZ Utils 4.999.9beta\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2015-09-29 14:03+0300\n"
+"POT-Creation-Date: 2016-12-30 13:27+0200\n"
 "PO-Revision-Date: 2015-08-07 14:00+0200\n"
 "Last-Translator:  <sqrt@entless.org>\n"
@@ -50 +50 @@
 msgstr "Die Umgebungsvariable %s enthÀlt zu viele Argumente"
 
+#: src/xz/args.c:643
+msgid "Compression support was disabled at build time"
+msgstr ""
+
+#: src/xz/args.c:650
+msgid "Decompression support was disabled at build time"
+msgstr ""
+
 #: src/xz/coder.c:110
 msgid "Maximum number of filters is four"
@@ -82 +90 @@
 msgstr "Schalte um auf Single-Thread-Modus wegen --flush-timeout"
 
-#: src/xz/coder.c:234
+#: src/xz/coder.c:235
 #, c-format
 msgid "Using up to %<PRIu32> threads."
 msgstr "Benutze bis zu %<PRIu32> Threads."
 
-#: src/xz/coder.c:247
+#: src/xz/coder.c:251
 msgid "Unsupported filter chain or filter options"
 msgstr "Optionen nicht unterstÃŒtzt"
 
-#: src/xz/coder.c:255
+#: src/xz/coder.c:263
 #, c-format
 msgid "Decompression will need %s MiB of memory."
 msgstr "Dekomprimierung wird %s MiB Speicher brauchen."
 
-#: src/xz/coder.c:290
+#: src/xz/coder.c:300
 #, c-format
 msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB"
 msgstr "Passte die Anzahl Threads von %s auf %s an um nicht das Speichernutzungslimit von %s MiB zu ÃŒbersteigen"
 
-#: src/xz/coder.c:344
+#: src/xz/coder.c:354
 #, c-format
 msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB"
 msgstr "Passte LZMA%c-Wörterbuchgröße von %s MiB to %s MiB an, um nicht das Speichernutzungslimit von %s MiB zu ÃŒbersteigen"
 
-#: src/xz/file_io.c:87 src/xz/file_io.c:95
+#: src/xz/file_io.c:110 src/xz/file_io.c:118
 #, c-format
 msgid "Error creating a pipe: %s"
 msgstr "Fehler beim Erzeugen der Pipeline: %s"
 
-#: src/xz/file_io.c:172
+#: src/xz/file_io.c:173
+msgid "Sandbox is disabled due to incompatible command line arguments"
+msgstr "Sandbox ist wegen inkompatibler Kommandozeilenargumente deaktiviert"
+
+#: src/xz/file_io.c:216
+msgid "Sandbox was successfully enabled"
+msgstr "Sandbox wurde erfolgreich aktiviert"
+
+#: src/xz/file_io.c:220
+msgid "Failed to enable the sandbox"
+msgstr "Konnte Sandbox nicht aktivieren"
+
+#: src/xz/file_io.c:262
 #, c-format
 msgid "%s: poll() failed: %s"
@@ -126 +146 @@
 #. of the original file, and in that case it obviously
 #. shouldn't be removed.
-#: src/xz/file_io.c:242
+#: src/xz/file_io.c:332
 #, c-format
 msgid "%s: File seems to have been moved, not removing"
 msgstr "%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht"
 
-#: src/xz/file_io.c:249 src/xz/file_io.c:762
+#: src/xz/file_io.c:339 src/xz/file_io.c:872
 #, c-format
 msgid "%s: Cannot remove: %s"
 msgstr "%s: Kann nicht löschen: %s"
 
-#: src/xz/file_io.c:274
+#: src/xz/file_io.c:364
 #, c-format
 msgid "%s: Cannot set the file owner: %s"
 msgstr "%s: Kann DateieigentÃŒmer nicht setzen: %s"
 
-#: src/xz/file_io.c:280
+#: src/xz/file_io.c:370
 #, c-format
 msgid "%s: Cannot set the file group: %s"
 msgstr "%s: Kann Dateigruppe nicht setzen: %s"
 
-#: src/xz/file_io.c:299
+#: src/xz/file_io.c:389
 #, c-format
 msgid "%s: Cannot set the file permissions: %s"
 msgstr "%s: Kann Zugriffsrechte nicht setzen: %s"
 
-#: src/xz/file_io.c:409
+#: src/xz/file_io.c:515
 #, c-format
 msgid "Error getting the file status flags from standard input: %s"
 msgstr "Kann Status-Flags der Standardeingabe nicht ermitteln: %s"
 
-#: src/xz/file_io.c:463 src/xz/file_io.c:525
+#: src/xz/file_io.c:569 src/xz/file_io.c:631
 #, c-format
 msgid "%s: Is a symbolic link, skipping"
 msgstr "%s: Überspringe symbolischen Link"
 
-#: src/xz/file_io.c:554
+#: src/xz/file_io.c:660
 #, c-format
 msgid "%s: Is a directory, skipping"
 msgstr "%s: Überspringe Verzeichnis"
 
-#: src/xz/file_io.c:560
+#: src/xz/file_io.c:666
 #, c-format
 msgid "%s: Not a regular file, skipping"
 msgstr "%s: Keine regulÀre Datei, Ìberspringe"
 
-#: src/xz/file_io.c:577
+#: src/xz/file_io.c:683
 #, c-format
 msgid "%s: File has setuid or setgid bit set, skipping"
 msgstr "%s: Datei hat das setuid- oder setgid-Bit gesetzt, ÃŒberspringe"
 
-#: src/xz/file_io.c:584
+#: src/xz/file_io.c:690
 #, c-format
 msgid "%s: File has sticky bit set, skipping"
 msgstr "%s: Datei hat sticky-Bit gesetzt, ÃŒberspringe"
 
-#: src/xz/file_io.c:591
+#: src/xz/file_io.c:697
 #, c-format
 msgid "%s: Input file has more than one hard link, skipping"
 msgstr "%s: Eingabedatei hat mehr als einen Hard Link, ÃŒberspringe"
 
-#: src/xz/file_io.c:671
+#: src/xz/file_io.c:782
 #, c-format
 msgid "Error restoring the status flags to standard input: %s"
 msgstr "Fehler beim Wiederherstellen der Status-Flags fÃŒr die Standardausgabe: %s"
 
-#: src/xz/file_io.c:720
+#: src/xz/file_io.c:830
 #, c-format
 msgid "Error getting the file status flags from standard output: %s"
 msgstr "Kann Status-Flags der Standardausgabe nicht ermitteln: %s"
 
-#: src/xz/file_io.c:898
+#: src/xz/file_io.c:1008
 #, c-format
 msgid "Error restoring the O_APPEND flag to standard output: %s"
 msgstr "Fehler beim Wiederherstellen des O_APPEND-Flags bei Standardausgabe: %s"
 
-#: src/xz/file_io.c:910
+#: src/xz/file_io.c:1020
 #, c-format
 msgid "%s: Closing the file failed: %s"
 msgstr "%s: Fehler beim Schließen der Datei: %s"
 
-#: src/xz/file_io.c:946 src/xz/file_io.c:1172
+#: src/xz/file_io.c:1056 src/xz/file_io.c:1282
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr "%s: Positionierungsfehler beim Versuch eine sparse (dÃŒnnbesetzte) Datei zu erzeugen: %s"
 
-#: src/xz/file_io.c:1041
+#: src/xz/file_io.c:1151
 #, c-format
 msgid "%s: Read error: %s"
 msgstr "%s: Lesefehler: %s"
 
-#: src/xz/file_io.c:1061
+#: src/xz/file_io.c:1171
 #, c-format
 msgid "%s: Error seeking the file: %s"
 msgstr "%s: Fehler beim Lesen der Dateinamen: %s"
 
-#: src/xz/file_io.c:1071
+#: src/xz/file_io.c:1181
 #, c-format
 msgid "%s: Unexpected end of file"
 msgstr "%s: Unerwartetes Ende der Datei"
 
-#: src/xz/file_io.c:1130
+#: src/xz/file_io.c:1240
 #, c-format
 msgid "%s: Write error: %s"
@@ -464 +484 @@
 msgstr "Komprimierung und Dekomprimierung mit --robot ist noch nicht unterstÃŒtzt."
 
-#: src/xz/main.c:231
+#: src/xz/main.c:252
 msgid "Cannot read data from standard input when reading filenames from standard input"
 msgstr "Lesen der Standardeingabe ist nicht möglich, wenn die Dateinamen auch von der Standardeingabe gelesen werden"
@@ -975 +995 @@
 msgstr "Unbekannter Fehler"
 
-#~ msgid "Sandbox is disabled due to incompatible command line arguments"
-#~ msgstr "Sandbox ist wegen inkompatibler Kommandozeilenargumente deaktiviert"
-
-#~ msgid "Sandbox was successfully enabled"
-#~ msgstr "Sandbox wurde erfolgreich aktiviert"
-
-#~ msgid "Failed to enable the sandbox"
-#~ msgstr "Konnte Sandbox nicht aktivieren"
-
 #~ msgid "Error setting O_NONBLOCK on standard input: %s"
 #~ msgstr "Fehler beim Setzen des O_NONBLOCK-Flags fÃŒr Standardausgabe: %s"

xz/vendor/current/po/fr.po ¶

@@ -7 +7 @@
 "Project-Id-Version: xz-utils\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2015-09-29 14:03+0300\n"
+"POT-Creation-Date: 2016-12-30 13:27+0200\n"
 "PO-Revision-Date: 2010-09-24 21;12+0200\n"
 "Last-Translator: Adrien Nader <adrien@notk.org>\n"
@@ -50 +50 @@
 msgstr "La variable d'environnement %s contient trop d'arguments"
 
+#: src/xz/args.c:643
+msgid "Compression support was disabled at build time"
+msgstr ""
+
+#: src/xz/args.c:650
+msgid "Decompression support was disabled at build time"
+msgstr ""
+
 #: src/xz/coder.c:110
 msgid "Maximum number of filters is four"
@@ -82 +90 @@
 msgstr ""
 
-#: src/xz/coder.c:234
+#: src/xz/coder.c:235
 #, c-format
 msgid "Using up to %<PRIu32> threads."
 msgstr "Jusqu'à %<PRIu32> threads seront utilisés."
 
-#: src/xz/coder.c:247
+#: src/xz/coder.c:251
 msgid "Unsupported filter chain or filter options"
 msgstr "Enchaînement ou options de filtres non pris en charge"
 
-#: src/xz/coder.c:255
+#: src/xz/coder.c:263
 #, c-format
 msgid "Decompression will need %s MiB of memory."
 msgstr "La décompression nécessitera %s MiB de mémoire."
 
-#: src/xz/coder.c:290
+#: src/xz/coder.c:300
 #, c-format
 msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB"
 msgstr "Nombre de threads réduit de %s à %s pour ne pas dépasser la limite d'utilisation mémoire de %s MiB"
 
-#: src/xz/coder.c:344
+#: src/xz/coder.c:354
 #, c-format
 msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB"
 msgstr "Taille du dictionnaire LZMA%c réduite de %s MiB à %s MiB pour ne pas dépasser la limite d'utilisation mémoire de %s MiB"
 
-#: src/xz/file_io.c:87 src/xz/file_io.c:95
+#: src/xz/file_io.c:110 src/xz/file_io.c:118
 #, c-format
 msgid "Error creating a pipe: %s"
 msgstr "Impossible de créer un tube anonyme (pipe) : %s"
 
-#: src/xz/file_io.c:172
+#: src/xz/file_io.c:173
+msgid "Sandbox is disabled due to incompatible command line arguments"
+msgstr ""
+
+#: src/xz/file_io.c:216
+msgid "Sandbox was successfully enabled"
+msgstr ""
+
+#: src/xz/file_io.c:220
+msgid "Failed to enable the sandbox"
+msgstr ""
+
+#: src/xz/file_io.c:262
 #, c-format
 msgid "%s: poll() failed: %s"
@@ -126 +146 @@
 #. of the original file, and in that case it obviously
 #. shouldn't be removed.
-#: src/xz/file_io.c:242
+#: src/xz/file_io.c:332
 #, c-format
 msgid "%s: File seems to have been moved, not removing"
 msgstr "%s : Le fichier a apparemment été déplacé, suppression annulée"
 
-#: src/xz/file_io.c:249 src/xz/file_io.c:762
+#: src/xz/file_io.c:339 src/xz/file_io.c:872
 #, c-format
 msgid "%s: Cannot remove: %s"
 msgstr "%s : Impossible de supprimer : %s"
 
-#: src/xz/file_io.c:274
+#: src/xz/file_io.c:364
 #, c-format
 msgid "%s: Cannot set the file owner: %s"
 msgstr "%s : Impossible de modifier le propriétaire du fichier : %s"
 
-#: src/xz/file_io.c:280
+#: src/xz/file_io.c:370
 #, c-format
 msgid "%s: Cannot set the file group: %s"
 msgstr "%s : Impossible de modifier le groupe propriétaire du fichier : %s"
 
-#: src/xz/file_io.c:299
+#: src/xz/file_io.c:389
 #, c-format
 msgid "%s: Cannot set the file permissions: %s"
@@ -159 +179 @@
 # a million times, if we dilute the error message in 20 languages, it will be
 # almost impossible to find an explanation and support for the error.
-#: src/xz/file_io.c:409
+#: src/xz/file_io.c:515
 #, c-format
 msgid "Error getting the file status flags from standard input: %s"
 msgstr ""
 
-#: src/xz/file_io.c:463 src/xz/file_io.c:525
+#: src/xz/file_io.c:569 src/xz/file_io.c:631
 #, c-format
 msgid "%s: Is a symbolic link, skipping"
 msgstr "%s est un lien symbolique : ignoré"
 
-#: src/xz/file_io.c:554
+#: src/xz/file_io.c:660
 #, c-format
 msgid "%s: Is a directory, skipping"
 msgstr "%s est un répertoire : ignoré"
 
-#: src/xz/file_io.c:560
+#: src/xz/file_io.c:666
 #, c-format
 msgid "%s: Not a regular file, skipping"
 msgstr "%s n'est pas un fichier régulier : ignoré"
 
-#: src/xz/file_io.c:577
+#: src/xz/file_io.c:683
 #, c-format
 msgid "%s: File has setuid or setgid bit set, skipping"
 msgstr "%s : Le fichier possÚde les bits `setuid' ou `setgid' : ignoré"
 
-#: src/xz/file_io.c:584
+#: src/xz/file_io.c:690
 #, c-format
 msgid "%s: File has sticky bit set, skipping"
 msgstr "%s : Le fichier possÚde le bit `sticky' : ignoré"
 
-#: src/xz/file_io.c:591
+#: src/xz/file_io.c:697
 #, c-format
 msgid "%s: Input file has more than one hard link, skipping"
@@ -195 +215 @@
 
 # See note from translator above titled "file status flags".
-#: src/xz/file_io.c:671
+#: src/xz/file_io.c:782
 #, c-format
 msgid "Error restoring the status flags to standard input: %s"
@@ -201 +221 @@
 
 # See note from translator above titled "file status flags".
-#: src/xz/file_io.c:720
+#: src/xz/file_io.c:830
 #, c-format
 msgid "Error getting the file status flags from standard output: %s"
 msgstr ""
 
-#: src/xz/file_io.c:898
+#: src/xz/file_io.c:1008
 #, c-format
 msgid "Error restoring the O_APPEND flag to standard output: %s"
 msgstr "Impossible de rétablir le drapeau O_APPEND sur la sortie standard : %s"
 
-#: src/xz/file_io.c:910
+#: src/xz/file_io.c:1020
 #, c-format
 msgid "%s: Closing the file failed: %s"
 msgstr "%s : Impossible de fermer le fichier : %s"
 
-#: src/xz/file_io.c:946 src/xz/file_io.c:1172
+#: src/xz/file_io.c:1056 src/xz/file_io.c:1282
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr "%s : Impossible de se déplacer dans le fichier pour créer un 'sparse file' : %s"
 
-#: src/xz/file_io.c:1041
+#: src/xz/file_io.c:1151
 #, c-format
 msgid "%s: Read error: %s"
 msgstr "%s : Erreur d'écriture : %s"
 
-#: src/xz/file_io.c:1061
+#: src/xz/file_io.c:1171
 #, c-format
 msgid "%s: Error seeking the file: %s"
 msgstr "%s : Impossible de se déplacer dans le fichier : %s"
 
-#: src/xz/file_io.c:1071
+#: src/xz/file_io.c:1181
 #, c-format
 msgid "%s: Unexpected end of file"
 msgstr "%s : Fin de fichier inattendue"
 
-#: src/xz/file_io.c:1130
+#: src/xz/file_io.c:1240
 #, c-format
 msgid "%s: Write error: %s"
@@ -474 +494 @@
 msgstr "La compression et la décompression ne marchent pas encore avec --robot."
 
-#: src/xz/main.c:231
+#: src/xz/main.c:252
 msgid "Cannot read data from standard input when reading filenames from standard input"
 msgstr "Impossible de lire à la fois les données et les noms de fichiers depuis l'entrée standard"

xz/vendor/current/po/it.po ¶

@@ -9 +9 @@
 "Project-Id-Version: xz-utils\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2015-09-29 14:03+0300\n"
+"POT-Creation-Date: 2016-12-30 13:27+0200\n"
 "PO-Revision-Date: 2014-10-20 13:16+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
@@ -54 +54 @@
 msgstr "La variabile d'ambiente %s contiene troppi argomenti"
 
+#: src/xz/args.c:643
+msgid "Compression support was disabled at build time"
+msgstr ""
+
+#: src/xz/args.c:650
+msgid "Decompression support was disabled at build time"
+msgstr ""
+
 #: src/xz/coder.c:110
 msgid "Maximum number of filters is four"
@@ -86 +94 @@
 msgstr "Passaggio a modalità singolo thread poiché viene usato --flush-timeout"
 
-#: src/xz/coder.c:234
+#: src/xz/coder.c:235
 #, c-format
 msgid "Using up to %<PRIu32> threads."
 msgstr "Vengono usati circa %<PRIu32> thread."
 
-#: src/xz/coder.c:247
+#: src/xz/coder.c:251
 msgid "Unsupported filter chain or filter options"
 msgstr "Catena di filtri od opzioni del filtro non supportata"
 
-#: src/xz/coder.c:255
+#: src/xz/coder.c:263
 #, c-format
 msgid "Decompression will need %s MiB of memory."
 msgstr "L'estrazione necessita di %s MiB di memoria."
 
-#: src/xz/coder.c:290
+#: src/xz/coder.c:300
 #, c-format
 msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB"
 msgstr "Regolato il numero di thread da %s a %s per non eccedere il limite di utilizzo della memoria di %s MiB"
 
-#: src/xz/coder.c:344
+#: src/xz/coder.c:354
 #, c-format
 msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB"
 msgstr "Regolata la dimensione del dizionario LZMA%c da %s MiB a %s MiB per non superare il limite dell'uso della memoria di %s MiB"
 
-#: src/xz/file_io.c:87 src/xz/file_io.c:95
+#: src/xz/file_io.c:110 src/xz/file_io.c:118
 #, c-format
 msgid "Error creating a pipe: %s"
 msgstr "Errore nel creare una pipe: %s"
 
-#: src/xz/file_io.c:172
+#: src/xz/file_io.c:173
+msgid "Sandbox is disabled due to incompatible command line arguments"
+msgstr ""
+
+#: src/xz/file_io.c:216
+msgid "Sandbox was successfully enabled"
+msgstr ""
+
+#: src/xz/file_io.c:220
+msgid "Failed to enable the sandbox"
+msgstr ""
+
+#: src/xz/file_io.c:262
 #, c-format
 msgid "%s: poll() failed: %s"
@@ -130 +150 @@
 #. of the original file, and in that case it obviously
 #. shouldn't be removed.
-#: src/xz/file_io.c:242
+#: src/xz/file_io.c:332
 #, c-format
 msgid "%s: File seems to have been moved, not removing"
 msgstr "%s: sembra che il file sia stato spostato, non viene rimosso"
 
-#: src/xz/file_io.c:249 src/xz/file_io.c:762
+#: src/xz/file_io.c:339 src/xz/file_io.c:872
 #, c-format
 msgid "%s: Cannot remove: %s"
 msgstr "%s: impossibile rimuovere: %s"
 
-#: src/xz/file_io.c:274
+#: src/xz/file_io.c:364
 #, c-format
 msgid "%s: Cannot set the file owner: %s"
 msgstr "%s: impossibile impostare il proprietario del file: %s"
 
-#: src/xz/file_io.c:280
+#: src/xz/file_io.c:370
 #, c-format
 msgid "%s: Cannot set the file group: %s"
 msgstr "%s: impossibile impostare il gruppo del file: %s"
 
-#: src/xz/file_io.c:299
+#: src/xz/file_io.c:389
 #, c-format
 msgid "%s: Cannot set the file permissions: %s"
 msgstr "%s: impossibile impostare i permessi del file: %s"
 
-#: src/xz/file_io.c:409
+#: src/xz/file_io.c:515
 #, c-format
 msgid "Error getting the file status flags from standard input: %s"
 msgstr "Errore nel recuperare le flag di stato del file dallo standard input: %s"
 
-#: src/xz/file_io.c:463 src/xz/file_io.c:525
+#: src/xz/file_io.c:569 src/xz/file_io.c:631
 #, c-format
 msgid "%s: Is a symbolic link, skipping"
 msgstr "%s: Ú un collegamento simbolico, viene saltato"
 
-#: src/xz/file_io.c:554
+#: src/xz/file_io.c:660
 #, c-format
 msgid "%s: Is a directory, skipping"
 msgstr "%s: Ú una directory, viene saltata"
 
-#: src/xz/file_io.c:560
+#: src/xz/file_io.c:666
 #, c-format
 msgid "%s: Not a regular file, skipping"
 msgstr "%s: non Ú un file regolare, viene saltato"
 
-#: src/xz/file_io.c:577
+#: src/xz/file_io.c:683
 #, c-format
 msgid "%s: File has setuid or setgid bit set, skipping"
 msgstr "%s: il file ha il bit setuid o setgid impostato, viene saltato"
 
-#: src/xz/file_io.c:584
+#: src/xz/file_io.c:690
 #, c-format
 msgid "%s: File has sticky bit set, skipping"
 msgstr "%s: il file ha lo sticky bit impostato, viene saltato"
 
-#: src/xz/file_io.c:591
+#: src/xz/file_io.c:697
 #, c-format
 msgid "%s: Input file has more than one hard link, skipping"
 msgstr "%s: il file di input ha più di un collegamento fisico, viene saltato"
 
-#: src/xz/file_io.c:671
+#: src/xz/file_io.c:782
 #, c-format
 msgid "Error restoring the status flags to standard input: %s"
 msgstr "Errore nel ripristinare le flag di stato sullo standard input: %s"
 
-#: src/xz/file_io.c:720
+#: src/xz/file_io.c:830
 #, c-format
 msgid "Error getting the file status flags from standard output: %s"
 msgstr "Errore nel recuperare le flag di stato del file dallo standard output: %s"
 
-#: src/xz/file_io.c:898
+#: src/xz/file_io.c:1008
 #, c-format
 msgid "Error restoring the O_APPEND flag to standard output: %s"
 msgstr "Errore nel ripristinare la flag O_APPEND sullo standard output: %s"
 
-#: src/xz/file_io.c:910
+#: src/xz/file_io.c:1020
 #, c-format
 msgid "%s: Closing the file failed: %s"
 msgstr "%s: chiusura del file non riuscita: %s"
 
-#: src/xz/file_io.c:946 src/xz/file_io.c:1172
+#: src/xz/file_io.c:1056 src/xz/file_io.c:1282
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr "%s: posizionamento non riuscito nel tentativo di creare un file sparso: %s"
 
-#: src/xz/file_io.c:1041
+#: src/xz/file_io.c:1151
 #, c-format
 msgid "%s: Read error: %s"
 msgstr "%s: errore di lettura: %s"
 
-#: src/xz/file_io.c:1061
+#: src/xz/file_io.c:1171
 #, c-format
 msgid "%s: Error seeking the file: %s"
 msgstr "%s: errore nel cercare il file: %s"
 
-#: src/xz/file_io.c:1071
+#: src/xz/file_io.c:1181
 #, c-format
 msgid "%s: Unexpected end of file"
 msgstr "%s: fine del file inaspettata"
 
-#: src/xz/file_io.c:1130
+#: src/xz/file_io.c:1240
 #, c-format
 msgid "%s: Write error: %s"
@@ -468 +488 @@
 msgstr "La compressione e l'estrazione con --robot non sono ancora supportate."
 
-#: src/xz/main.c:231
+#: src/xz/main.c:252
 msgid "Cannot read data from standard input when reading filenames from standard input"
 msgstr "Impossibile leggere i dati dallo standard input durante la lettura dei nomi dei file dallo standard input"

xz/vendor/current/po/pl.po ¶

@@ -7 +7 @@
 "Project-Id-Version: xz 5.1.4\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2015-09-29 14:03+0300\n"
+"POT-Creation-Date: 2016-12-30 13:27+0200\n"
 "PO-Revision-Date: 2014-10-15 20:53+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
@@ -52 +52 @@
 msgstr "Zmienna środowiskowa %s zawiera zbyt duÅŒo argumentów"
 
+#: src/xz/args.c:643
+msgid "Compression support was disabled at build time"
+msgstr ""
+
+#: src/xz/args.c:650
+msgid "Decompression support was disabled at build time"
+msgstr ""
+
 #: src/xz/coder.c:110
 msgid "Maximum number of filters is four"
@@ -87 +95 @@
 tkowy z powodu --flush-timeout"
 
-#: src/xz/coder.c:234
+#: src/xz/coder.c:235
 #, c-format
 msgid "Using up to %<PRIu32> threads."
@@ -93 +101 @@
 tków: %<PRIu32>."
 
-#: src/xz/coder.c:247
+#: src/xz/coder.c:251
 msgid "Unsupported filter chain or filter options"
 msgstr "Nieobsługiwany łańcuch filtrów lub opcje filtra"
 
-#: src/xz/coder.c:255
+#: src/xz/coder.c:263
 #, c-format
 msgid "Decompression will need %s MiB of memory."
 msgstr "Dekompresja będzie wymagała %s MiB pamięci."
 
-#: src/xz/coder.c:290
+#: src/xz/coder.c:300
 #, c-format
 msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB"
@@ -108 +116 @@
 tków z %s do %s, aby nie przekroczyć limitu uÅŒycia pamięci %s MiB"
 
-#: src/xz/coder.c:344
+#: src/xz/coder.c:354
 #, c-format
 msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB"
 msgstr "Skorygowano rozmiar słownika LZMA%c z %s MiB do %s MiB aby nie przekroczyć limitu uÅŒycia pamięci %s MiB"
 
-#: src/xz/file_io.c:87 src/xz/file_io.c:95
+#: src/xz/file_io.c:110 src/xz/file_io.c:118
 #, c-format
 msgid "Error creating a pipe: %s"
@@ -119 +127 @@
 d tworzenia potoku: %s"
 
-#: src/xz/file_io.c:172
+#: src/xz/file_io.c:173
+msgid "Sandbox is disabled due to incompatible command line arguments"
+msgstr ""
+
+#: src/xz/file_io.c:216
+msgid "Sandbox was successfully enabled"
+msgstr ""
+
+#: src/xz/file_io.c:220
+msgid "Failed to enable the sandbox"
+msgstr ""
+
+#: src/xz/file_io.c:262
 #, c-format
 msgid "%s: poll() failed: %s"
@@ -134 +154 @@
 #. of the original file, and in that case it obviously
 #. shouldn't be removed.
-#: src/xz/file_io.c:242
+#: src/xz/file_io.c:332
 #, c-format
 msgid "%s: File seems to have been moved, not removing"
@@ -140 +160 @@
 da na przeniesiony, nie zostanie usunięty"
 
-#: src/xz/file_io.c:249 src/xz/file_io.c:762
+#: src/xz/file_io.c:339 src/xz/file_io.c:872
 #, c-format
 msgid "%s: Cannot remove: %s"
@@ -146 +166 @@
 ć: %s"
 
-#: src/xz/file_io.c:274
+#: src/xz/file_io.c:364
 #, c-format
 msgid "%s: Cannot set the file owner: %s"
 msgstr "%s: Nie moÅŒna ustawić właściciela pliku: %s"
 
-#: src/xz/file_io.c:280
+#: src/xz/file_io.c:370
 #, c-format
 msgid "%s: Cannot set the file group: %s"
 msgstr "%s: Nie moÅŒna ustawić grupy pliku: %s"
 
-#: src/xz/file_io.c:299
+#: src/xz/file_io.c:389
 #, c-format
 msgid "%s: Cannot set the file permissions: %s"
 msgstr "%s: Nie moÅŒna ustawić uprawnień pliku: %s"
 
-#: src/xz/file_io.c:409
+#: src/xz/file_io.c:515
 #, c-format
 msgid "Error getting the file status flags from standard input: %s"
@@ -167 +187 @@
 d podczas pobierania flag stanu pliku ze standardowego wejścia: %s"
 
-#: src/xz/file_io.c:463 src/xz/file_io.c:525
+#: src/xz/file_io.c:569 src/xz/file_io.c:631
 #, c-format
 msgid "%s: Is a symbolic link, skipping"
@@ -173 +193 @@
 zaniem symbolicznym, pominięto"
 
-#: src/xz/file_io.c:554
+#: src/xz/file_io.c:660
 #, c-format
 msgid "%s: Is a directory, skipping"
 msgstr "%s: Jest katalogiem, pominięto"
 
-#: src/xz/file_io.c:560
+#: src/xz/file_io.c:666
 #, c-format
 msgid "%s: Not a regular file, skipping"
 msgstr "%s: Nie jest zwykłym plikiem, pominięto"
 
-#: src/xz/file_io.c:577
+#: src/xz/file_io.c:683
 #, c-format
 msgid "%s: File has setuid or setgid bit set, skipping"
 msgstr "%s: Plik ma ustawiony bit setuid lub setgid, pominięto"
 
-#: src/xz/file_io.c:584
+#: src/xz/file_io.c:690
 #, c-format
 msgid "%s: File has sticky bit set, skipping"
 msgstr "%s: Plik ma ustawiony bit sticky, pominięto"
 
-#: src/xz/file_io.c:591
+#: src/xz/file_io.c:697
 #, c-format
 msgid "%s: Input file has more than one hard link, skipping"
@@ -199 +219 @@
 zanie zwykłe, pominięto"
 
-#: src/xz/file_io.c:671
+#: src/xz/file_io.c:782
 #, c-format
 msgid "Error restoring the status flags to standard input: %s"
@@ -205 +225 @@
 d podczas odtwarzania flag stanu dla standardowego wejścia: %s"
 
-#: src/xz/file_io.c:720
+#: src/xz/file_io.c:830
 #, c-format
 msgid "Error getting the file status flags from standard output: %s"
@@ -211 +231 @@
 d podczas pobierania flag stanu pliku ze standardowego wyjścia: %s"
 
-#: src/xz/file_io.c:898
+#: src/xz/file_io.c:1008
 #, c-format
 msgid "Error restoring the O_APPEND flag to standard output: %s"
@@ -217 +237 @@
 d podczas odtwarzania flagi O_APPEND dla standardowego wyjścia: %s"
 
-#: src/xz/file_io.c:910
+#: src/xz/file_io.c:1020
 #, c-format
 msgid "%s: Closing the file failed: %s"
 msgstr "%s: Zamknięcie pliku nie powiodło się: %s"
 
-#: src/xz/file_io.c:946 src/xz/file_io.c:1172
+#: src/xz/file_io.c:1056 src/xz/file_io.c:1282
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr "%s: Zmiana pozycji nie powiodła się podczas próby utworzenia pliku rzadkiego: %s"
 
-#: src/xz/file_io.c:1041
+#: src/xz/file_io.c:1151
 #, c-format
 msgid "%s: Read error: %s"
@@ -233 +253 @@
 d odczytu: %s"
 
-#: src/xz/file_io.c:1061
+#: src/xz/file_io.c:1171
 #, c-format
 msgid "%s: Error seeking the file: %s"
@@ -239 +259 @@
 d podczas zmiany pozycji w pliku: %s"
 
-#: src/xz/file_io.c:1071
+#: src/xz/file_io.c:1181
 #, c-format
 msgid "%s: Unexpected end of file"
 msgstr "%s: Nieoczekiwany koniec pliku"
 
-#: src/xz/file_io.c:1130
+#: src/xz/file_io.c:1240
 #, c-format
 msgid "%s: Write error: %s"
@@ -487 +507 @@
  --robot nie jest jeszcze obsługiwana."
 
-#: src/xz/main.c:231
+#: src/xz/main.c:252
 msgid "Cannot read data from standard input when reading filenames from standard input"
 msgstr "Nie moÅŒna odczytać danych ze standardowego wejścia przy czytaniu nazw plików ze standardowego wejścia"

xz/vendor/current/po/vi.po ¶

@@ -8 +8 @@
 "Project-Id-Version: xz 5.1.4beta\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2015-09-29 14:03+0300\n"
+"POT-Creation-Date: 2016-12-30 13:27+0200\n"
 "PO-Revision-Date: 2014-09-25 09:06+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
@@ -52 +52 @@
 msgstr "Biến mÃŽi trường %s chứa quá nhiều đối số"
 
+#: src/xz/args.c:643
+msgid "Compression support was disabled at build time"
+msgstr ""
+
+#: src/xz/args.c:650
+msgid "Decompression support was disabled at build time"
+msgstr ""
+
 #: src/xz/coder.c:110
 msgid "Maximum number of filters is four"
@@ -84 +92 @@
 msgstr "Chuyển sang chế độ đơn tuyến trình bởi vì --flush-timeout"
 
-#: src/xz/coder.c:234
+#: src/xz/coder.c:235
 #, c-format
 msgid "Using up to %<PRIu32> threads."
 msgstr "Dùng đến %<PRIu32> tuyến trình."
 
-#: src/xz/coder.c:247
+#: src/xz/coder.c:251
 msgid "Unsupported filter chain or filter options"
 msgstr "KhÃŽng hỗ trợ lọc móc xích hay tùy chọn lọc"
 
-#: src/xz/coder.c:255
+#: src/xz/coder.c:263
 #, c-format
 msgid "Decompression will need %s MiB of memory."
 msgstr "Giải nén sẜ cần %s MiB bộ nhớ."
 
-#: src/xz/coder.c:290
+#: src/xz/coder.c:300
 #, c-format
 msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB"
 msgstr "Chỉnh số lượng tuyến trình từ %s thà nh %s để khÃŽng vượt quá giới hạn tiêu dùng bộ nhớ là  %s MiB"
 
-#: src/xz/coder.c:344
+#: src/xz/coder.c:354
 #, c-format
 msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB"
 msgstr "Chỉnh cỡ từ điển LZMA%c từ %s MiB thà nh %s MiB để khÃŽng vượt quá giới hạn tiêu dùng bộ nhớ là  %s MiB"
 
-#: src/xz/file_io.c:87 src/xz/file_io.c:95
+#: src/xz/file_io.c:110 src/xz/file_io.c:118
 #, c-format
 msgid "Error creating a pipe: %s"
 msgstr "Gặp lỗi khi tạo một ống dẫn: %s"
 
-#: src/xz/file_io.c:172
+#: src/xz/file_io.c:173
+msgid "Sandbox is disabled due to incompatible command line arguments"
+msgstr ""
+
+#: src/xz/file_io.c:216
+msgid "Sandbox was successfully enabled"
+msgstr ""
+
+#: src/xz/file_io.c:220
+msgid "Failed to enable the sandbox"
+msgstr ""
+
+#: src/xz/file_io.c:262
 #, c-format
 msgid "%s: poll() failed: %s"
@@ -128 +148 @@
 #. of the original file, and in that case it obviously
 #. shouldn't be removed.
-#: src/xz/file_io.c:242
+#: src/xz/file_io.c:332
 #, c-format
 msgid "%s: File seems to have been moved, not removing"
 msgstr "%s: Tập tin có lẜ đã bị di chuyển, khÃŽng phải gỡ bỏ"
 
-#: src/xz/file_io.c:249 src/xz/file_io.c:762
+#: src/xz/file_io.c:339 src/xz/file_io.c:872
 #, c-format
 msgid "%s: Cannot remove: %s"
 msgstr "%s: KhÃŽng thể gỡ bỏ: %s"
 
-#: src/xz/file_io.c:274
+#: src/xz/file_io.c:364
 #, c-format
 msgid "%s: Cannot set the file owner: %s"
 msgstr "%s: KhÃŽng thể đặt chủ sở hữu tập tin: %s"
 
-#: src/xz/file_io.c:280
+#: src/xz/file_io.c:370
 #, c-format
 msgid "%s: Cannot set the file group: %s"
 msgstr "%s: KhÃŽng thể đặt nhóm tập tin: %s"
 
-#: src/xz/file_io.c:299
+#: src/xz/file_io.c:389
 #, c-format
 msgid "%s: Cannot set the file permissions: %s"
 msgstr "%s: KhÃŽng thể đặt chế độ đọc ghi cho tập tin: %s"
 
-#: src/xz/file_io.c:409
+#: src/xz/file_io.c:515
 #, c-format
 msgid "Error getting the file status flags from standard input: %s"
 msgstr "Gặp lỗi khi lấy các cờ trạng thái tập tin từ đầu và o tiêu chuẩn: %s"
 
-#: src/xz/file_io.c:463 src/xz/file_io.c:525
+#: src/xz/file_io.c:569 src/xz/file_io.c:631
 #, c-format
 msgid "%s: Is a symbolic link, skipping"
 msgstr "%s: Là một liên kết mềm nên bỏ qua"
 
-#: src/xz/file_io.c:554
+#: src/xz/file_io.c:660
 #, c-format
 msgid "%s: Is a directory, skipping"
 msgstr "%s: KhÃŽng phải là  một thÆ° mục nên bỏ qua"
 
-#: src/xz/file_io.c:560
+#: src/xz/file_io.c:666
 #, c-format
 msgid "%s: Not a regular file, skipping"
 msgstr "%s: KhÎng phải là tập tin thường nên bỏ qua"
 
-#: src/xz/file_io.c:577
+#: src/xz/file_io.c:683
 #, c-format
 msgid "%s: File has setuid or setgid bit set, skipping"
 msgstr "%s: Tập tin có đặt bít setuid hoặc setgid nên bỏ qua"
 
-#: src/xz/file_io.c:584
+#: src/xz/file_io.c:690
 #, c-format
 msgid "%s: File has sticky bit set, skipping"
 msgstr "%s: Tập tin có bít sticky nên bỏ qua"
 
-#: src/xz/file_io.c:591
+#: src/xz/file_io.c:697
 #, c-format
 msgid "%s: Input file has more than one hard link, skipping"
 msgstr "%s: Tập tin đầu và o có nhiều hơn một liên kết cứng nên bỏ qua"
 
-#: src/xz/file_io.c:671
+#: src/xz/file_io.c:782
 #, c-format
 msgid "Error restoring the status flags to standard input: %s"
 msgstr "Gặp lỗi khi phục hồi các cờ trạng thái tới đầu và o tiêu chuẩn: %s"
 
-#: src/xz/file_io.c:720
+#: src/xz/file_io.c:830
 #, c-format
 msgid "Error getting the file status flags from standard output: %s"
 msgstr "Gặp lỗi khi lấy các cờ trạng thái tập tin từ đầu và o tiêu chuẩn: %s"
 
-#: src/xz/file_io.c:898
+#: src/xz/file_io.c:1008
 #, c-format
 msgid "Error restoring the O_APPEND flag to standard output: %s"
 msgstr "Gặp lỗi khi phục hồi cờ O_APPEND trên đầu ra tiêu chuẩn: %s"
 
-#: src/xz/file_io.c:910
+#: src/xz/file_io.c:1020
 #, c-format
 msgid "%s: Closing the file failed: %s"
 msgstr "%s: Gặp lỗi khi đóng tập tin: %s"
 
-#: src/xz/file_io.c:946 src/xz/file_io.c:1172
+#: src/xz/file_io.c:1056 src/xz/file_io.c:1282
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr "%s: Gặp lỗi khi di chuyển vị trí đọc khi cố tạo một tập tin rải rác: %s"
 
-#: src/xz/file_io.c:1041
+#: src/xz/file_io.c:1151
 #, c-format
 msgid "%s: Read error: %s"
 msgstr "%s: Lỗi đọc: %s"
 
-#: src/xz/file_io.c:1061
+#: src/xz/file_io.c:1171
 #, c-format
 msgid "%s: Error seeking the file: %s"
 msgstr "%s: Gặp lỗi khi di chuyển vị trí đọc tập tin: %s"
 
-#: src/xz/file_io.c:1071
+#: src/xz/file_io.c:1181
 #, c-format
 msgid "%s: Unexpected end of file"
 msgstr "%s: Kết thúc tập tin bất ngờ"
 
-#: src/xz/file_io.c:1130
+#: src/xz/file_io.c:1240
 #, c-format
 msgid "%s: Write error: %s"
@@ -465 +485 @@
 msgstr "Nén và giải nén với --robot vẫn chưa được hỗ trợ."
 
-#: src/xz/main.c:231
+#: src/xz/main.c:252
 msgid "Cannot read data from standard input when reading filenames from standard input"
 msgstr "KhÃŽng thể đọc dữ liệu từ đầu và o tiêu chuẩn khi đọc tập tin từ đầu và o tiêu chuẩn"

xz/vendor/current/po/xz.pot ¶

@@ -6 +6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: xz 5.2.2\n"
+"Project-Id-Version: xz 5.2.3\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2015-09-29 14:03+0300\n"
+"POT-Creation-Date: 2016-12-30 13:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -51 +51 @@
 msgstr ""
 
+#: src/xz/args.c:643
+msgid "Compression support was disabled at build time"
+msgstr ""
+
+#: src/xz/args.c:650
+msgid "Decompression support was disabled at build time"
+msgstr ""
+
 #: src/xz/coder.c:110
 msgid "Maximum number of filters is four"
@@ -83 +91 @@
 msgstr ""
 
-#: src/xz/coder.c:234
+#: src/xz/coder.c:235
 #, c-format
 msgid "Using up to %<PRIu32> threads."
 msgstr ""
 
-#: src/xz/coder.c:247
+#: src/xz/coder.c:251
 msgid "Unsupported filter chain or filter options"
 msgstr ""
 
-#: src/xz/coder.c:255
+#: src/xz/coder.c:263
 #, c-format
 msgid "Decompression will need %s MiB of memory."
 msgstr ""
 
-#: src/xz/coder.c:290
+#: src/xz/coder.c:300
 #, c-format
 msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB"
 msgstr ""
 
-#: src/xz/coder.c:344
+#: src/xz/coder.c:354
 #, c-format
 msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB"
 msgstr ""
 
-#: src/xz/file_io.c:87 src/xz/file_io.c:95
+#: src/xz/file_io.c:110 src/xz/file_io.c:118
 #, c-format
 msgid "Error creating a pipe: %s"
 msgstr ""
 
-#: src/xz/file_io.c:172
+#: src/xz/file_io.c:173
+msgid "Sandbox is disabled due to incompatible command line arguments"
+msgstr ""
+
+#: src/xz/file_io.c:216
+msgid "Sandbox was successfully enabled"
+msgstr ""
+
+#: src/xz/file_io.c:220
+msgid "Failed to enable the sandbox"
+msgstr ""
+
+#: src/xz/file_io.c:262
 #, c-format
 msgid "%s: poll() failed: %s"
@@ -127 +147 @@
 #. of the original file, and in that case it obviously
 #. shouldn't be removed.
-#: src/xz/file_io.c:242
+#: src/xz/file_io.c:332
 #, c-format
 msgid "%s: File seems to have been moved, not removing"
 msgstr ""
 
-#: src/xz/file_io.c:249 src/xz/file_io.c:762
+#: src/xz/file_io.c:339 src/xz/file_io.c:872
 #, c-format
 msgid "%s: Cannot remove: %s"
 msgstr ""
 
-#: src/xz/file_io.c:274
+#: src/xz/file_io.c:364
 #, c-format
 msgid "%s: Cannot set the file owner: %s"
 msgstr ""
 
-#: src/xz/file_io.c:280
+#: src/xz/file_io.c:370
 #, c-format
 msgid "%s: Cannot set the file group: %s"
 msgstr ""
 
-#: src/xz/file_io.c:299
+#: src/xz/file_io.c:389
 #, c-format
 msgid "%s: Cannot set the file permissions: %s"
 msgstr ""
 
-#: src/xz/file_io.c:409
+#: src/xz/file_io.c:515
 #, c-format
 msgid "Error getting the file status flags from standard input: %s"
 msgstr ""
 
-#: src/xz/file_io.c:463 src/xz/file_io.c:525
+#: src/xz/file_io.c:569 src/xz/file_io.c:631
 #, c-format
 msgid "%s: Is a symbolic link, skipping"
 msgstr ""
 
-#: src/xz/file_io.c:554
+#: src/xz/file_io.c:660
 #, c-format
 msgid "%s: Is a directory, skipping"
 msgstr ""
 
-#: src/xz/file_io.c:560
+#: src/xz/file_io.c:666
 #, c-format
 msgid "%s: Not a regular file, skipping"
 msgstr ""
 
-#: src/xz/file_io.c:577
+#: src/xz/file_io.c:683
 #, c-format
 msgid "%s: File has setuid or setgid bit set, skipping"
 msgstr ""
 
-#: src/xz/file_io.c:584
+#: src/xz/file_io.c:690
 #, c-format
 msgid "%s: File has sticky bit set, skipping"
 msgstr ""
 
-#: src/xz/file_io.c:591
+#: src/xz/file_io.c:697
 #, c-format
 msgid "%s: Input file has more than one hard link, skipping"
 msgstr ""
 
-#: src/xz/file_io.c:671
+#: src/xz/file_io.c:782
 #, c-format
 msgid "Error restoring the status flags to standard input: %s"
 msgstr ""
 
-#: src/xz/file_io.c:720
+#: src/xz/file_io.c:830
 #, c-format
 msgid "Error getting the file status flags from standard output: %s"
 msgstr ""
 
-#: src/xz/file_io.c:898
+#: src/xz/file_io.c:1008
 #, c-format
 msgid "Error restoring the O_APPEND flag to standard output: %s"
 msgstr ""
 
-#: src/xz/file_io.c:910
+#: src/xz/file_io.c:1020
 #, c-format
 msgid "%s: Closing the file failed: %s"
 msgstr ""
 
-#: src/xz/file_io.c:946 src/xz/file_io.c:1172
+#: src/xz/file_io.c:1056 src/xz/file_io.c:1282
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr ""
 
-#: src/xz/file_io.c:1041
+#: src/xz/file_io.c:1151
 #, c-format
 msgid "%s: Read error: %s"
 msgstr ""
 
-#: src/xz/file_io.c:1061
+#: src/xz/file_io.c:1171
 #, c-format
 msgid "%s: Error seeking the file: %s"
 msgstr ""
 
-#: src/xz/file_io.c:1071
+#: src/xz/file_io.c:1181
 #, c-format
 msgid "%s: Unexpected end of file"
 msgstr ""
 
-#: src/xz/file_io.c:1130
+#: src/xz/file_io.c:1240
 #, c-format
 msgid "%s: Write error: %s"
@@ -461 +481 @@
 msgstr ""
 
-#: src/xz/main.c:231
+#: src/xz/main.c:252
 msgid "Cannot read data from standard input when reading filenames from standard input"
 msgstr ""

xz/vendor/current/src/Makefile.in ¶

@@ -93 +93 @@
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -208 +208 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/src/common/tuklib_cpucores.c ¶

@@ -18 +18 @@
 #       endif
 #       include <windows.h>
+
+// glibc >= 2.9
+#elif defined(TUKLIB_CPUCORES_SCHED_GETAFFINITY)
+#       include <sched.h>
 
 // FreeBSD
@@ -49 +53 @@
         GetSystemInfo(&sysinfo);
         ret = sysinfo.dwNumberOfProcessors;
+
+#elif defined(TUKLIB_CPUCORES_SCHED_GETAFFINITY)
+        cpu_set_t cpu_mask;
+        if (sched_getaffinity(0, sizeof(cpu_mask), &cpu_mask) == 0)
+                ret = CPU_COUNT(&cpu_mask);
 
 #elif defined(TUKLIB_CPUCORES_CPUSET)

xz/vendor/current/src/common/tuklib_physmem.c ¶

@@ -87 +87 @@
                 HMODULE kernel32 = GetModuleHandle("kernel32.dll");
                 if (kernel32 != NULL) {
-                        BOOL (WINAPI *gmse)(LPMEMORYSTATUSEX) = GetProcAddress(
+                        typedef BOOL (WINAPI *gmse_type)(LPMEMORYSTATUSEX);
+                        gmse_type gmse = (gmse_type)GetProcAddress(
                                         kernel32, "GlobalMemoryStatusEx");
                         if (gmse != NULL) {

xz/vendor/current/src/liblzma/Makefile.am ¶

@@ -25 +25 @@
         -I$(top_srcdir)/src/common \
         -DTUKLIB_SYMBOL_PREFIX=lzma_
-liblzma_la_LDFLAGS = -no-undefined -version-info 7:2:2
+liblzma_la_LDFLAGS = -no-undefined -version-info 7:3:2
 
 EXTRA_DIST += liblzma.map validate_map.sh

xz/vendor/current/src/liblzma/Makefile.in ¶

@@ -94 +94 @@
 
 @COND_THREADS_TRUE@am__append_2 = ../common/tuklib_cpucores.c
-@COND_MAIN_ENCODER_TRUE@am__append_3 = \
+@COND_THREADS_TRUE@am__append_3 = common/hardware_cputhreads.c
+@COND_MAIN_ENCODER_TRUE@am__append_4 = \
 @COND_MAIN_ENCODER_TRUE@        common/alone_encoder.c \
 @COND_MAIN_ENCODER_TRUE@        common/block_buffer_encoder.c \
@@ -115 +116 @@
 @COND_MAIN_ENCODER_TRUE@        common/vli_encoder.c
 
-@COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@am__append_4 = \
-@COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@     common/hardware_cputhreads.c \
+@COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@am__append_5 = \
 @COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@     common/outqueue.c \
 @COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@     common/outqueue.h \
 @COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@     common/stream_encoder_mt.c
 
-@COND_MAIN_DECODER_TRUE@am__append_5 = \
+@COND_MAIN_DECODER_TRUE@am__append_6 = \
 @COND_MAIN_DECODER_TRUE@        common/alone_decoder.c \
 @COND_MAIN_DECODER_TRUE@        common/alone_decoder.h \
@@ -142 +142 @@
 @COND_MAIN_DECODER_TRUE@        common/vli_decoder.c
 
-@COND_CHECK_CRC32_TRUE@@COND_SMALL_TRUE@am__append_6 = check/crc32_small.c
-@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__append_7 = \
+@COND_CHECK_CRC32_TRUE@@COND_SMALL_TRUE@am__append_7 = check/crc32_small.c
+@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__append_8 = \
 @COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@       check/crc32_table.c \
 @COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@       check/crc32_table_le.h \
 @COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@       check/crc32_table_be.h
 
-@COND_ASM_X86_TRUE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__append_8 = check/crc32_x86.S
-@COND_ASM_X86_FALSE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__append_9 = check/crc32_fast.c
-@COND_CHECK_CRC64_TRUE@@COND_SMALL_TRUE@am__append_10 = check/crc64_small.c
-@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__append_11 = \
+@COND_ASM_X86_TRUE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__append_9 = check/crc32_x86.S
+@COND_ASM_X86_FALSE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__append_10 = check/crc32_fast.c
+@COND_CHECK_CRC64_TRUE@@COND_SMALL_TRUE@am__append_11 = check/crc64_small.c
+@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__append_12 = \
 @COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@       check/crc64_table.c \
 @COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@       check/crc64_table_le.h \
 @COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@       check/crc64_table_be.h
 
-@COND_ASM_X86_TRUE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__append_12 = check/crc64_x86.S
-@COND_ASM_X86_FALSE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__append_13 = check/crc64_fast.c
-@COND_CHECK_SHA256_TRUE@@COND_INTERNAL_SHA256_TRUE@am__append_14 = check/sha256.c
-@COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__append_15 = \
+@COND_ASM_X86_TRUE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__append_13 = check/crc64_x86.S
+@COND_ASM_X86_FALSE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__append_14 = check/crc64_fast.c
+@COND_CHECK_SHA256_TRUE@@COND_INTERNAL_SHA256_TRUE@am__append_15 = check/sha256.c
+@COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__append_16 = \
 @COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@     lz/lz_encoder.c \
 @COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@     lz/lz_encoder.h \
@@ -166 +166 @@
 @COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@     lz/lz_encoder_mf.c
 
-@COND_DECODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__append_16 = \
+@COND_DECODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__append_17 = \
 @COND_DECODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@     lz/lz_decoder.c \
 @COND_DECODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@     lz/lz_decoder.h
 
-@COND_FILTER_LZMA1_TRUE@am__append_17 = lzma/fastpos_tablegen.c \
+@COND_FILTER_LZMA1_TRUE@am__append_18 = lzma/fastpos_tablegen.c \
 @COND_FILTER_LZMA1_TRUE@        rangecoder/price_tablegen.c
-@COND_FILTER_LZMA1_TRUE@am__append_18 = lzma/lzma_common.h
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_19 = \
+@COND_FILTER_LZMA1_TRUE@am__append_19 = lzma/lzma_common.h \
+@COND_FILTER_LZMA1_TRUE@        lzma/lzma_encoder_presets.c
+@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_20 = \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/fastpos.h \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_encoder.h \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_encoder.c \
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_encoder_presets.c \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_encoder_private.h \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_encoder_optimum_fast.c \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_encoder_optimum_normal.c
 
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@@COND_SMALL_FALSE@am__append_20 = lzma/fastpos_table.c
-@COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_21 = \
+@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@@COND_SMALL_FALSE@am__append_21 = lzma/fastpos_table.c
+@COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_22 = \
 @COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_decoder.c \
 @COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma_decoder.h
 
-@COND_ENCODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_22 = \
+@COND_ENCODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_23 = \
 @COND_ENCODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma2_encoder.c \
 @COND_ENCODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma2_encoder.h
 
-@COND_DECODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_23 = \
+@COND_DECODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_24 = \
 @COND_DECODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma2_decoder.c \
 @COND_DECODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@       lzma/lzma2_decoder.h
 
-@COND_FILTER_LZMA1_TRUE@am__append_24 = rangecoder/range_common.h
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_25 = \
+@COND_FILTER_LZMA1_TRUE@am__append_25 = rangecoder/range_common.h
+@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_26 = \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       rangecoder/range_encoder.h \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       rangecoder/price.h \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       rangecoder/price_table.c
 
-@COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_26 = rangecoder/range_decoder.h
-@COND_FILTER_DELTA_TRUE@am__append_27 = \
+@COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__append_27 = rangecoder/range_decoder.h
+@COND_FILTER_DELTA_TRUE@am__append_28 = \
 @COND_FILTER_DELTA_TRUE@        delta/delta_common.c \
 @COND_FILTER_DELTA_TRUE@        delta/delta_common.h \
 @COND_FILTER_DELTA_TRUE@        delta/delta_private.h
 
-@COND_ENCODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__append_28 = \
+@COND_ENCODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__append_29 = \
 @COND_ENCODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@       delta/delta_encoder.c \
 @COND_ENCODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@       delta/delta_encoder.h
 
-@COND_DECODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__append_29 = \
+@COND_DECODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__append_30 = \
 @COND_DECODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@       delta/delta_decoder.c \
 @COND_DECODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@       delta/delta_decoder.h
 
-@COND_FILTER_SIMPLE_TRUE@am__append_30 = \
+@COND_FILTER_SIMPLE_TRUE@am__append_31 = \
 @COND_FILTER_SIMPLE_TRUE@       simple/simple_coder.c \
 @COND_FILTER_SIMPLE_TRUE@       simple/simple_coder.h \
 @COND_FILTER_SIMPLE_TRUE@       simple/simple_private.h
 
-@COND_ENCODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_31 = \
+@COND_ENCODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_32 = \
 @COND_ENCODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@     simple/simple_encoder.c \
 @COND_ENCODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@     simple/simple_encoder.h
 
-@COND_DECODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_32 = \
+@COND_DECODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_33 = \
 @COND_DECODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@     simple/simple_decoder.c \
 @COND_DECODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@     simple/simple_decoder.h
 
-@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_X86_TRUE@am__append_33 = simple/x86.c
-@COND_FILTER_POWERPC_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_34 = simple/powerpc.c
-@COND_FILTER_IA64_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_35 = simple/ia64.c
-@COND_FILTER_ARM_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_36 = simple/arm.c
-@COND_FILTER_ARMTHUMB_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_37 = simple/armthumb.c
-@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_SPARC_TRUE@am__append_38 = simple/sparc.c
-@COND_W32_TRUE@am__append_39 = liblzma.def liblzma.def.in empty.c
-@COND_W32_TRUE@am__append_40 = liblzma_w32res.rc
-@COND_W32_TRUE@am__append_41 = -Xlinker --output-def -Xlinker liblzma.def.in
-@COND_SHARED_TRUE@@COND_W32_TRUE@am__append_42 = liblzma.def
+@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_X86_TRUE@am__append_34 = simple/x86.c
+@COND_FILTER_POWERPC_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_35 = simple/powerpc.c
+@COND_FILTER_IA64_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_36 = simple/ia64.c
+@COND_FILTER_ARM_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_37 = simple/arm.c
+@COND_FILTER_ARMTHUMB_TRUE@@COND_FILTER_SIMPLE_TRUE@am__append_38 = simple/armthumb.c
+@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_SPARC_TRUE@am__append_39 = simple/sparc.c
+@COND_W32_TRUE@am__append_40 = liblzma.def liblzma.def.in empty.c
+@COND_W32_TRUE@am__append_41 = liblzma_w32res.rc
+@COND_W32_TRUE@am__append_42 = -Xlinker --output-def -Xlinker liblzma.def.in
+@COND_SHARED_TRUE@@COND_W32_TRUE@am__append_43 = liblzma.def
 subdir = src/liblzma
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -301 +301 @@
         common/index.c common/index.h common/stream_flags_common.c \
         common/stream_flags_common.h common/vli_size.c \
-        common/alone_encoder.c common/block_buffer_encoder.c \
-        common/block_buffer_encoder.h common/block_encoder.c \
-        common/block_encoder.h common/block_header_encoder.c \
-        common/easy_buffer_encoder.c common/easy_encoder.c \
-        common/easy_encoder_memusage.c common/filter_buffer_encoder.c \
-        common/filter_encoder.c common/filter_encoder.h \
-        common/filter_flags_encoder.c common/index_encoder.c \
-        common/index_encoder.h common/stream_buffer_encoder.c \
-        common/stream_encoder.c common/stream_flags_encoder.c \
-        common/vli_encoder.c common/hardware_cputhreads.c \
+        common/hardware_cputhreads.c common/alone_encoder.c \
+        common/block_buffer_encoder.c common/block_buffer_encoder.h \
+        common/block_encoder.c common/block_encoder.h \
+        common/block_header_encoder.c common/easy_buffer_encoder.c \
+        common/easy_encoder.c common/easy_encoder_memusage.c \
+        common/filter_buffer_encoder.c common/filter_encoder.c \
+        common/filter_encoder.h common/filter_flags_encoder.c \
+        common/index_encoder.c common/index_encoder.h \
+        common/stream_buffer_encoder.c common/stream_encoder.c \
+        common/stream_flags_encoder.c common/vli_encoder.c \
         common/outqueue.c common/outqueue.h common/stream_encoder_mt.c \
         common/alone_decoder.c common/alone_decoder.h \
@@ -330 +330 @@
         lz/lz_encoder_hash.h lz/lz_encoder_hash_table.h \
         lz/lz_encoder_mf.c lz/lz_decoder.c lz/lz_decoder.h \
-        lzma/lzma_common.h lzma/fastpos.h lzma/lzma_encoder.h \
-        lzma/lzma_encoder.c lzma/lzma_encoder_presets.c \
+        lzma/lzma_common.h lzma/lzma_encoder_presets.c lzma/fastpos.h \
+        lzma/lzma_encoder.h lzma/lzma_encoder.c \
         lzma/lzma_encoder_private.h lzma/lzma_encoder_optimum_fast.c \
         lzma/lzma_encoder_optimum_normal.c lzma/fastpos_table.c \
@@ -349 +349 @@
         liblzma_w32res.rc
 @COND_THREADS_TRUE@am__objects_1 = liblzma_la-tuklib_cpucores.lo
-@COND_MAIN_ENCODER_TRUE@am__objects_2 = liblzma_la-alone_encoder.lo \
+@COND_THREADS_TRUE@am__objects_2 = liblzma_la-hardware_cputhreads.lo
+@COND_MAIN_ENCODER_TRUE@am__objects_3 = liblzma_la-alone_encoder.lo \
 @COND_MAIN_ENCODER_TRUE@        liblzma_la-block_buffer_encoder.lo \
 @COND_MAIN_ENCODER_TRUE@        liblzma_la-block_encoder.lo \
@@ -364 +365 @@
 @COND_MAIN_ENCODER_TRUE@        liblzma_la-stream_flags_encoder.lo \
 @COND_MAIN_ENCODER_TRUE@        liblzma_la-vli_encoder.lo
-@COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@am__objects_3 = liblzma_la-hardware_cputhreads.lo \
-@COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@     liblzma_la-outqueue.lo \
+@COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@am__objects_4 = liblzma_la-outqueue.lo \
 @COND_MAIN_ENCODER_TRUE@@COND_THREADS_TRUE@     liblzma_la-stream_encoder_mt.lo
-@COND_MAIN_DECODER_TRUE@am__objects_4 = liblzma_la-alone_decoder.lo \
+@COND_MAIN_DECODER_TRUE@am__objects_5 = liblzma_la-alone_decoder.lo \
 @COND_MAIN_DECODER_TRUE@        liblzma_la-auto_decoder.lo \
 @COND_MAIN_DECODER_TRUE@        liblzma_la-block_buffer_decoder.lo \
@@ -382 +382 @@
 @COND_MAIN_DECODER_TRUE@        liblzma_la-stream_flags_decoder.lo \
 @COND_MAIN_DECODER_TRUE@        liblzma_la-vli_decoder.lo
-@COND_CHECK_CRC32_TRUE@@COND_SMALL_TRUE@am__objects_5 = liblzma_la-crc32_small.lo
-@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__objects_6 = liblzma_la-crc32_table.lo
-@COND_ASM_X86_TRUE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__objects_7 = liblzma_la-crc32_x86.lo
-@COND_ASM_X86_FALSE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__objects_8 = liblzma_la-crc32_fast.lo
-@COND_CHECK_CRC64_TRUE@@COND_SMALL_TRUE@am__objects_9 = liblzma_la-crc64_small.lo
-@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__objects_10 = liblzma_la-crc64_table.lo
-@COND_ASM_X86_TRUE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__objects_11 = liblzma_la-crc64_x86.lo
-@COND_ASM_X86_FALSE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__objects_12 = liblzma_la-crc64_fast.lo
-@COND_CHECK_SHA256_TRUE@@COND_INTERNAL_SHA256_TRUE@am__objects_13 = liblzma_la-sha256.lo
-@COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__objects_14 = liblzma_la-lz_encoder.lo \
+@COND_CHECK_CRC32_TRUE@@COND_SMALL_TRUE@am__objects_6 = liblzma_la-crc32_small.lo
+@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__objects_7 = liblzma_la-crc32_table.lo
+@COND_ASM_X86_TRUE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__objects_8 = liblzma_la-crc32_x86.lo
+@COND_ASM_X86_FALSE@@COND_CHECK_CRC32_TRUE@@COND_SMALL_FALSE@am__objects_9 = liblzma_la-crc32_fast.lo
+@COND_CHECK_CRC64_TRUE@@COND_SMALL_TRUE@am__objects_10 = liblzma_la-crc64_small.lo
+@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__objects_11 = liblzma_la-crc64_table.lo
+@COND_ASM_X86_TRUE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__objects_12 = liblzma_la-crc64_x86.lo
+@COND_ASM_X86_FALSE@@COND_CHECK_CRC64_TRUE@@COND_SMALL_FALSE@am__objects_13 = liblzma_la-crc64_fast.lo
+@COND_CHECK_SHA256_TRUE@@COND_INTERNAL_SHA256_TRUE@am__objects_14 = liblzma_la-sha256.lo
+@COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__objects_15 = liblzma_la-lz_encoder.lo \
 @COND_ENCODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@     liblzma_la-lz_encoder_mf.lo
-@COND_DECODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__objects_15 = liblzma_la-lz_decoder.lo
-am__objects_16 =
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_17 = liblzma_la-lzma_encoder.lo \
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       liblzma_la-lzma_encoder_presets.lo \
+@COND_DECODER_LZ_TRUE@@COND_FILTER_LZ_TRUE@am__objects_16 = liblzma_la-lz_decoder.lo
+@COND_FILTER_LZMA1_TRUE@am__objects_17 =  \
+@COND_FILTER_LZMA1_TRUE@        liblzma_la-lzma_encoder_presets.lo
+@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_18 = liblzma_la-lzma_encoder.lo \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       liblzma_la-lzma_encoder_optimum_fast.lo \
 @COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@       liblzma_la-lzma_encoder_optimum_normal.lo
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@@COND_SMALL_FALSE@am__objects_18 = liblzma_la-fastpos_table.lo
-@COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_19 = liblzma_la-lzma_decoder.lo
-@COND_ENCODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_20 = liblzma_la-lzma2_encoder.lo
-@COND_DECODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_21 = liblzma_la-lzma2_decoder.lo
-@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_22 = liblzma_la-price_table.lo
-@COND_FILTER_DELTA_TRUE@am__objects_23 = liblzma_la-delta_common.lo
-@COND_ENCODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__objects_24 = liblzma_la-delta_encoder.lo
-@COND_DECODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__objects_25 = liblzma_la-delta_decoder.lo
-@COND_FILTER_SIMPLE_TRUE@am__objects_26 = liblzma_la-simple_coder.lo
-@COND_ENCODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_27 = liblzma_la-simple_encoder.lo
-@COND_DECODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_28 = liblzma_la-simple_decoder.lo
-@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_X86_TRUE@am__objects_29 = liblzma_la-x86.lo
-@COND_FILTER_POWERPC_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_30 = liblzma_la-powerpc.lo
-@COND_FILTER_IA64_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_31 = liblzma_la-ia64.lo
-@COND_FILTER_ARM_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_32 = liblzma_la-arm.lo
-@COND_FILTER_ARMTHUMB_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_33 = liblzma_la-armthumb.lo
-@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_SPARC_TRUE@am__objects_34 = liblzma_la-sparc.lo
-@COND_W32_TRUE@am__objects_35 = liblzma_w32res.lo
+@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@@COND_SMALL_FALSE@am__objects_19 = liblzma_la-fastpos_table.lo
+@COND_DECODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_20 = liblzma_la-lzma_decoder.lo
+@COND_ENCODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_21 = liblzma_la-lzma2_encoder.lo
+@COND_DECODER_LZMA2_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_22 = liblzma_la-lzma2_decoder.lo
+am__objects_23 =
+@COND_ENCODER_LZMA1_TRUE@@COND_FILTER_LZMA1_TRUE@am__objects_24 = liblzma_la-price_table.lo
+@COND_FILTER_DELTA_TRUE@am__objects_25 = liblzma_la-delta_common.lo
+@COND_ENCODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__objects_26 = liblzma_la-delta_encoder.lo
+@COND_DECODER_DELTA_TRUE@@COND_FILTER_DELTA_TRUE@am__objects_27 = liblzma_la-delta_decoder.lo
+@COND_FILTER_SIMPLE_TRUE@am__objects_28 = liblzma_la-simple_coder.lo
+@COND_ENCODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_29 = liblzma_la-simple_encoder.lo
+@COND_DECODER_SIMPLE_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_30 = liblzma_la-simple_decoder.lo
+@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_X86_TRUE@am__objects_31 = liblzma_la-x86.lo
+@COND_FILTER_POWERPC_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_32 = liblzma_la-powerpc.lo
+@COND_FILTER_IA64_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_33 = liblzma_la-ia64.lo
+@COND_FILTER_ARM_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_34 = liblzma_la-arm.lo
+@COND_FILTER_ARMTHUMB_TRUE@@COND_FILTER_SIMPLE_TRUE@am__objects_35 = liblzma_la-armthumb.lo
+@COND_FILTER_SIMPLE_TRUE@@COND_FILTER_SPARC_TRUE@am__objects_36 = liblzma_la-sparc.lo
+@COND_W32_TRUE@am__objects_37 = liblzma_w32res.lo
 am_liblzma_la_OBJECTS = liblzma_la-tuklib_physmem.lo $(am__objects_1) \
         liblzma_la-common.lo liblzma_la-block_util.lo \
@@ -423 +424 @@
         liblzma_la-stream_flags_common.lo liblzma_la-vli_size.lo \
         $(am__objects_2) $(am__objects_3) $(am__objects_4) \
-        liblzma_la-check.lo $(am__objects_5) $(am__objects_6) \
+        $(am__objects_5) liblzma_la-check.lo $(am__objects_6) \
         $(am__objects_7) $(am__objects_8) $(am__objects_9) \
         $(am__objects_10) $(am__objects_11) $(am__objects_12) \
@@ -429 +430 @@
         $(am__objects_16) $(am__objects_17) $(am__objects_18) \
         $(am__objects_19) $(am__objects_20) $(am__objects_21) \
-        $(am__objects_16) $(am__objects_22) $(am__objects_16) \
-        $(am__objects_23) $(am__objects_24) $(am__objects_25) \
-        $(am__objects_26) $(am__objects_27) $(am__objects_28) \
-        $(am__objects_29) $(am__objects_30) $(am__objects_31) \
-        $(am__objects_32) $(am__objects_33) $(am__objects_34) \
-        $(am__objects_35)
+        $(am__objects_22) $(am__objects_23) $(am__objects_24) \
+        $(am__objects_23) $(am__objects_25) $(am__objects_26) \
+        $(am__objects_27) $(am__objects_28) $(am__objects_29) \
+        $(am__objects_30) $(am__objects_31) $(am__objects_32) \
+        $(am__objects_33) $(am__objects_34) $(am__objects_35) \
+        $(am__objects_36) $(am__objects_37)
 liblzma_la_OBJECTS = $(am_liblzma_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -572 +573 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@
@@ -713 +715 @@
 SUBDIRS = api
 EXTRA_DIST = liblzma.map validate_map.sh check/crc32_tablegen.c \
-        check/crc64_tablegen.c $(am__append_17) liblzma.pc.in
-CLEANFILES = $(am__append_39)
-doc_DATA = $(am__append_42)
+        check/crc64_tablegen.c $(am__append_18) liblzma.pc.in
+CLEANFILES = $(am__append_40)
+doc_DATA = $(am__append_43)
 lib_LTLIBRARIES = liblzma.la
 liblzma_la_SOURCES = ../common/tuklib_physmem.c $(am__append_2) \
@@ -724 +726 @@
         common/stream_flags_common.c common/stream_flags_common.h \
         common/vli_size.c $(am__append_3) $(am__append_4) \
-        $(am__append_5) check/check.c check/check.h check/crc_macros.h \
-        $(am__append_6) $(am__append_7) $(am__append_8) \
+        $(am__append_5) $(am__append_6) check/check.c check/check.h \
+        check/crc_macros.h $(am__append_7) $(am__append_8) \
         $(am__append_9) $(am__append_10) $(am__append_11) \
         $(am__append_12) $(am__append_13) $(am__append_14) \
-        $(am__append_15) $(am__append_16) $(am__append_18) \
+        $(am__append_15) $(am__append_16) $(am__append_17) \
         $(am__append_19) $(am__append_20) $(am__append_21) \
         $(am__append_22) $(am__append_23) $(am__append_24) \
@@ -735 +737 @@
         $(am__append_31) $(am__append_32) $(am__append_33) \
         $(am__append_34) $(am__append_35) $(am__append_36) \
-        $(am__append_37) $(am__append_38) $(am__append_40)
+        $(am__append_37) $(am__append_38) $(am__append_39) \
+        $(am__append_41)
 liblzma_la_CPPFLAGS = \
         -I$(top_srcdir)/src/liblzma/api \
@@ -748 +751 @@
         -DTUKLIB_SYMBOL_PREFIX=lzma_
 
-liblzma_la_LDFLAGS = -no-undefined -version-info 7:2:2 $(am__append_1) \
-        $(am__append_41)
+liblzma_la_LDFLAGS = -no-undefined -version-info 7:3:2 $(am__append_1) \
+        $(am__append_42)
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = liblzma.pc
@@ -1038 +1041 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_size.lo `test -f 'common/vli_size.c' || echo '$(srcdir)/'`common/vli_size.c
 
+liblzma_la-hardware_cputhreads.lo: common/hardware_cputhreads.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-hardware_cputhreads.lo -MD -MP -MF $(DEPDIR)/liblzma_la-hardware_cputhreads.Tpo -c -o liblzma_la-hardware_cputhreads.lo `test -f 'common/hardware_cputhreads.c' || echo '$(srcdir)/'`common/hardware_cputhreads.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-hardware_cputhreads.Tpo $(DEPDIR)/liblzma_la-hardware_cputhreads.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='common/hardware_cputhreads.c' object='liblzma_la-hardware_cputhreads.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-hardware_cputhreads.lo `test -f 'common/hardware_cputhreads.c' || echo '$(srcdir)/'`common/hardware_cputhreads.c
+
 liblzma_la-alone_encoder.lo: common/alone_encoder.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-alone_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-alone_encoder.Tpo -c -o liblzma_la-alone_encoder.lo `test -f 'common/alone_encoder.c' || echo '$(srcdir)/'`common/alone_encoder.c
@@ -1143 +1153 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_encoder.lo `test -f 'common/vli_encoder.c' || echo '$(srcdir)/'`common/vli_encoder.c
 
-liblzma_la-hardware_cputhreads.lo: common/hardware_cputhreads.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-hardware_cputhreads.lo -MD -MP -MF $(DEPDIR)/liblzma_la-hardware_cputhreads.Tpo -c -o liblzma_la-hardware_cputhreads.lo `test -f 'common/hardware_cputhreads.c' || echo '$(srcdir)/'`common/hardware_cputhreads.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-hardware_cputhreads.Tpo $(DEPDIR)/liblzma_la-hardware_cputhreads.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='common/hardware_cputhreads.c' object='liblzma_la-hardware_cputhreads.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-hardware_cputhreads.lo `test -f 'common/hardware_cputhreads.c' || echo '$(srcdir)/'`common/hardware_cputhreads.c
-
 liblzma_la-outqueue.lo: common/outqueue.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-outqueue.lo -MD -MP -MF $(DEPDIR)/liblzma_la-outqueue.Tpo -c -o liblzma_la-outqueue.lo `test -f 'common/outqueue.c' || echo '$(srcdir)/'`common/outqueue.c
@@ -1346 +1349 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lz_decoder.lo `test -f 'lz/lz_decoder.c' || echo '$(srcdir)/'`lz/lz_decoder.c
 
+liblzma_la-lzma_encoder_presets.lo: lzma/lzma_encoder_presets.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_presets.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_presets.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='lzma/lzma_encoder_presets.c' object='liblzma_la-lzma_encoder_presets.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c
+
 liblzma_la-lzma_encoder.lo: lzma/lzma_encoder.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder.Tpo -c -o liblzma_la-lzma_encoder.lo `test -f 'lzma/lzma_encoder.c' || echo '$(srcdir)/'`lzma/lzma_encoder.c
@@ -1352 +1362 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder.lo `test -f 'lzma/lzma_encoder.c' || echo '$(srcdir)/'`lzma/lzma_encoder.c
-
-liblzma_la-lzma_encoder_presets.lo: lzma/lzma_encoder_presets.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_presets.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_presets.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='lzma/lzma_encoder_presets.c' object='liblzma_la-lzma_encoder_presets.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c
 
 liblzma_la-lzma_encoder_optimum_fast.lo: lzma/lzma_encoder_optimum_fast.c

xz/vendor/current/src/liblzma/api/Makefile.in ¶

@@ -91 +91 @@
 subdir = src/liblzma/api
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -194 +194 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/src/liblzma/api/lzma/version.h ¶

@@ -23 +23 @@
 #define LZMA_VERSION_MAJOR 5
 #define LZMA_VERSION_MINOR 2
-#define LZMA_VERSION_PATCH 2
+#define LZMA_VERSION_PATCH 3
 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE
 

xz/vendor/current/src/liblzma/check/check.h ¶

@@ -16 +16 @@
 #include "common.h"
 
-#if defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
+// If the function for external SHA-256 is missing, use the internal SHA-256
+// code. Due to how configure works, these defines can only get defined when
+// both a usable header and a type have already been found.
+#if !(defined(HAVE_CC_SHA256_INIT) \
+                || defined(HAVE_SHA256_INIT) \
+                || defined(HAVE_SHA256INIT))
+#       define HAVE_INTERNAL_SHA256 1
+#endif
+
+#if defined(HAVE_INTERNAL_SHA256)
+// Nothing
+#elif defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
 #       include <CommonCrypto/CommonDigest.h>
 #elif defined(HAVE_SHA256_H)
@@ -24 +35 @@
 #       include <sys/types.h>
 #       include <sha2.h>
-#elif defined(HAVE_MINIX_SHA2_H)
-#       include <sys/types.h>
-#       include <minix/sha2.h>
 #endif
 
-#if defined(HAVE_CC_SHA256_CTX)
-typedef CC_SHA256_CTX lzma_sha256_state;
-#elif defined(HAVE_SHA256_CTX)
-typedef SHA256_CTX lzma_sha256_state;
-#elif defined(HAVE_SHA2_CTX)
-typedef SHA2_CTX lzma_sha256_state;
-#else
+#if defined(HAVE_INTERNAL_SHA256)
 /// State for the internal SHA-256 implementation
 typedef struct {
@@ -44 +46 @@
         uint64_t size;
 } lzma_sha256_state;
+#elif defined(HAVE_CC_SHA256_CTX)
+typedef CC_SHA256_CTX lzma_sha256_state;
+#elif defined(HAVE_SHA256_CTX)
+typedef SHA256_CTX lzma_sha256_state;
+#elif defined(HAVE_SHA2_CTX)
+typedef SHA2_CTX lzma_sha256_state;
 #endif
 
-#if defined(HAVE_CC_SHA256_INIT)
+#if defined(HAVE_INTERNAL_SHA256)
+// Nothing
+#elif defined(HAVE_CC_SHA256_INIT)
 #       define LZMA_SHA256FUNC(x) CC_SHA256_ ## x
 #elif defined(HAVE_SHA256_INIT)

xz/vendor/current/src/liblzma/common/Makefile.inc ¶

@@ -21 +21 @@
         common/stream_flags_common.h \
         common/vli_size.c
+
+if COND_THREADS
+liblzma_la_SOURCES += common/hardware_cputhreads.c
+endif
 
 if COND_MAIN_ENCODER
@@ -46 +50 @@
 if COND_THREADS
 liblzma_la_SOURCES += \
-        common/hardware_cputhreads.c \
         common/outqueue.c \
         common/outqueue.h \

xz/vendor/current/src/liblzma/common/alone_decoder.c ¶

@@ -16 +16 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         lzma_next_coder next;
 
@@ -47 +47 @@
         /// the LZMA decoder
         lzma_options_lzma options;
-};
+} lzma_alone_coder;
 
 
 static lzma_ret
-alone_decode(lzma_coder *coder,
+alone_decode(void *coder_ptr,
                 const lzma_allocator *allocator lzma_attribute((__unused__)),
                 const uint8_t *restrict in, size_t *restrict in_pos,
@@ -58 +58 @@
                 lzma_action action)
 {
+        lzma_alone_coder *coder = coder_ptr;
+
         while (*out_pos < out_size
                         && (coder->sequence == SEQ_CODE || *in_pos < in_size))
@@ -167 +169 @@
 
 static void
-alone_decoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+alone_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_alone_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder, allocator);
@@ -176 +179 @@
 
 static lzma_ret
-alone_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
+alone_decoder_memconfig(void *coder_ptr, uint64_t *memusage,
                 uint64_t *old_memlimit, uint64_t new_memlimit)
 {
+        lzma_alone_coder *coder = coder_ptr;
+
         *memusage = coder->memusage;
         *old_memlimit = coder->memlimit;
@@ -202 +207 @@
                 return LZMA_PROG_ERROR;
 
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_alone_coder *coder = next->coder;
+
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_alone_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &alone_decode;
                 next->end = &alone_decoder_end;
                 next->memconfig = &alone_decoder_memconfig;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
-        }
-
-        next->coder->sequence = SEQ_PROPERTIES;
-        next->coder->picky = picky;
-        next->coder->pos = 0;
-        next->coder->options.dict_size = 0;
-        next->coder->options.preset_dict = NULL;
-        next->coder->options.preset_dict_size = 0;
-        next->coder->uncompressed_size = 0;
-        next->coder->memlimit = memlimit;
-        next->coder->memusage = LZMA_MEMUSAGE_BASE;
+                coder->next = LZMA_NEXT_CODER_INIT;
+        }
+
+        coder->sequence = SEQ_PROPERTIES;
+        coder->picky = picky;
+        coder->pos = 0;
+        coder->options.dict_size = 0;
+        coder->options.preset_dict = NULL;
+        coder->options.preset_dict_size = 0;
+        coder->uncompressed_size = 0;
+        coder->memlimit = memlimit;
+        coder->memusage = LZMA_MEMUSAGE_BASE;
 
         return LZMA_OK;

xz/vendor/current/src/liblzma/common/alone_encoder.c ¶

@@ -18 +18 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         lzma_next_coder next;
 
@@ -28 +28 @@
         size_t header_pos;
         uint8_t header[ALONE_HEADER_SIZE];
-};
+} lzma_alone_coder;
 
 
 static lzma_ret
-alone_encode(lzma_coder *coder,
+alone_encode(void *coder_ptr,
                 const lzma_allocator *allocator lzma_attribute((__unused__)),
                 const uint8_t *restrict in, size_t *restrict in_pos,
@@ -39 +39 @@
                 lzma_action action)
 {
+        lzma_alone_coder *coder = coder_ptr;
+
         while (*out_pos < out_size)
         switch (coder->sequence) {
@@ -66 +68 @@
 
 static void
-alone_encoder_end(lzma_coder *coder, const lzma_allocator *allocator)
+alone_encoder_end(void *coder_ptr, const lzma_allocator *allocator)
 {
+        lzma_alone_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder, allocator);
@@ -81 +84 @@
         lzma_next_coder_init(&alone_encoder_init, next, allocator);
 
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_alone_coder *coder = next->coder;
+
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_alone_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &alone_encode;
                 next->end = &alone_encoder_end;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
         // Basic initializations
-        next->coder->sequence = SEQ_HEADER;
-        next->coder->header_pos = 0;
+        coder->sequence = SEQ_HEADER;
+        coder->header_pos = 0;
 
         // Encode the header:
         // - Properties (1 byte)
-        if (lzma_lzma_lclppb_encode(options, next->coder->header))
+        if (lzma_lzma_lclppb_encode(options, coder->header))
                 return LZMA_OPTIONS_ERROR;
 
@@ -117 +123 @@
                 ++d;
 
-        unaligned_write32le(next->coder->header + 1, d);
+        unaligned_write32le(coder->header + 1, d);
 
         // - Uncompressed size (always unknown and using EOPM)
-        memset(next->coder->header + 1 + 4, 0xFF, 8);
+        memset(coder->header + 1 + 4, 0xFF, 8);
 
         // Initialize the LZMA encoder.
@@ -132 +138 @@
         };
 
-        return lzma_next_filter_init(&next->coder->next, allocator, filters);
+        return lzma_next_filter_init(&coder->next, allocator, filters);
 }
 

xz/vendor/current/src/liblzma/common/auto_decoder.c ¶

@@ -15 +15 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         /// Stream decoder or LZMA_Alone decoder
         lzma_next_coder next;
@@ -27 +27 @@
                 SEQ_FINISH,
         } sequence;
-};
+} lzma_auto_coder;
 
 
 static lzma_ret
-auto_decode(lzma_coder *coder, const lzma_allocator *allocator,
+auto_decode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_auto_coder *coder = coder_ptr;
+
         switch (coder->sequence) {
         case SEQ_INIT:
@@ -101 +103 @@
 
 static void
-auto_decoder_end(lzma_coder *coder, const lzma_allocator *allocator)
+auto_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
 {
+        lzma_auto_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder, allocator);
@@ -110 +113 @@
 
 static lzma_check
-auto_decoder_get_check(const lzma_coder *coder)
+auto_decoder_get_check(const void *coder_ptr)
 {
+        const lzma_auto_coder *coder = coder_ptr;
+
         // It is LZMA_Alone if get_check is NULL.
         return coder->next.get_check == NULL ? LZMA_CHECK_NONE
@@ -119 +124 @@
 
 static lzma_ret
-auto_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
+auto_decoder_memconfig(void *coder_ptr, uint64_t *memusage,
                 uint64_t *old_memlimit, uint64_t new_memlimit)
 {
+        lzma_auto_coder *coder = coder_ptr;
+
         lzma_ret ret;
 
@@ -155 +162 @@
                 return LZMA_OPTIONS_ERROR;
 
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_auto_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_auto_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &auto_decode;
                 next->end = &auto_decoder_end;
                 next->get_check = &auto_decoder_get_check;
                 next->memconfig = &auto_decoder_memconfig;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
-        next->coder->memlimit = memlimit;
-        next->coder->flags = flags;
-        next->coder->sequence = SEQ_INIT;
+        coder->memlimit = memlimit;
+        coder->flags = flags;
+        coder->sequence = SEQ_INIT;
 
         return LZMA_OK;

xz/vendor/current/src/liblzma/common/block_decoder.c ¶

@@ -16 +16 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         enum {
                 SEQ_CODE,
@@ -49 +49 @@
         /// True if the integrity check won't be calculated and verified.
         bool ignore_check;
-};
+} lzma_block_coder;
 
 
@@ -75 +75 @@
 
 static lzma_ret
-block_decode(lzma_coder *coder, const lzma_allocator *allocator,
+block_decode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_block_coder *coder = coder_ptr;
+
         switch (coder->sequence) {
         case SEQ_CODE: {
@@ -178 +180 @@
 
 static void
-block_decoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+block_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_block_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder, allocator);
@@ -199 +202 @@
                 return LZMA_PROG_ERROR;
 
-        // Allocate and initialize *next->coder if needed.
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        // Allocate *next->coder if needed.
+        lzma_block_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_block_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &block_decode;
                 next->end = &block_decoder_end;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
         // Basic initializations
-        next->coder->sequence = SEQ_CODE;
-        next->coder->block = block;
-        next->coder->compressed_size = 0;
-        next->coder->uncompressed_size = 0;
+        coder->sequence = SEQ_CODE;
+        coder->block = block;
+        coder->compressed_size = 0;
+        coder->uncompressed_size = 0;
 
         // If Compressed Size is not known, we calculate the maximum allowed
         // value so that encoded size of the Block (including Block Padding)
         // is still a valid VLI and a multiple of four.
-        next->coder->compressed_limit
+        coder->compressed_limit
                         = block->compressed_size == LZMA_VLI_UNKNOWN
                                 ? (LZMA_VLI_MAX & ~LZMA_VLI_C(3))
@@ -229 +234 @@
         // supported, and the Block decoder cannot verify the Check field.
         // Caller can test lzma_check_is_supported(block->check).
-        next->coder->check_pos = 0;
-        lzma_check_init(&next->coder->check, block->check);
-
-        next->coder->ignore_check = block->version >= 1
+        coder->check_pos = 0;
+        lzma_check_init(&coder->check, block->check);
+
+        coder->ignore_check = block->version >= 1
                         ? block->ignore_check : false;
 
         // Initialize the filter chain.
-        return lzma_raw_decoder_init(&next->coder->next, allocator,
+        return lzma_raw_decoder_init(&coder->next, allocator,
                         block->filters);
 }

xz/vendor/current/src/liblzma/common/block_encoder.c ¶

@@ -16 +16 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         /// The filters in the chain; initialized with lzma_raw_decoder_init().
         lzma_next_coder next;
@@ -42 +42 @@
         /// Check of the uncompressed data
         lzma_check_state check;
-};
+} lzma_block_coder;
 
 
 static lzma_ret
-block_encode(lzma_coder *coder, const lzma_allocator *allocator,
+block_encode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_block_coder *coder = coder_ptr;
+
         // Check that our amount of input stays in proper limits.
         if (LZMA_VLI_MAX - coder->uncompressed_size < in_size - *in_pos)
@@ -135 +137 @@
 
 static void
-block_encoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+block_encoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_block_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder, allocator);
@@ -144 +147 @@
 
 static lzma_ret
-block_encoder_update(lzma_coder *coder, const lzma_allocator *allocator,
+block_encoder_update(void *coder_ptr, const lzma_allocator *allocator,
                 const lzma_filter *filters lzma_attribute((__unused__)),
                 const lzma_filter *reversed_filters)
 {
+        lzma_block_coder *coder = coder_ptr;
+
         if (coder->sequence != SEQ_CODE)
                 return LZMA_PROG_ERROR;
@@ -179 +184 @@
 
         // Allocate and initialize *next->coder if needed.
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_block_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_block_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &block_encode;
                 next->end = &block_encoder_end;
                 next->update = &block_encoder_update;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
         // Basic initializations
-        next->coder->sequence = SEQ_CODE;
-        next->coder->block = block;
-        next->coder->compressed_size = 0;
-        next->coder->uncompressed_size = 0;
-        next->coder->pos = 0;
+        coder->sequence = SEQ_CODE;
+        coder->block = block;
+        coder->compressed_size = 0;
+        coder->uncompressed_size = 0;
+        coder->pos = 0;
 
         // Initialize the check
-        lzma_check_init(&next->coder->check, block->check);
+        lzma_check_init(&coder->check, block->check);
 
         // Initialize the requested filters.
-        return lzma_raw_encoder_init(&next->coder->next, allocator,
-                        block->filters);
+        return lzma_raw_encoder_init(&coder->next, allocator, block->filters);
 }
 

xz/vendor/current/src/liblzma/common/common.h ¶

@@ -89 +89 @@
 
 
-/// Type of encoder/decoder specific data; the actual structure is defined
-/// differently in different coders.
-typedef struct lzma_coder_s lzma_coder;
-
 typedef struct lzma_next_coder_s lzma_next_coder;
 
@@ -108 +104 @@
 /// function prototype.
 typedef lzma_ret (*lzma_code_function)(
-                lzma_coder *coder, const lzma_allocator *allocator,
+                void *coder, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
@@ -116 +112 @@
 /// Type of a function to free the memory allocated for the coder
 typedef void (*lzma_end_function)(
-                lzma_coder *coder, const lzma_allocator *allocator);
+                void *coder, const lzma_allocator *allocator);
 
 
@@ -139 +135 @@
 struct lzma_next_coder_s {
         /// Pointer to coder-specific data
-        lzma_coder *coder;
+        void *coder;
 
         /// Filter ID. This is LZMA_VLI_UNKNOWN when this structure doesn't
@@ -161 +157 @@
         /// Pointer to a function to get progress information. If this is NULL,
         /// lzma_stream.total_in and .total_out are used instead.
-        void (*get_progress)(lzma_coder *coder,
+        void (*get_progress)(void *coder,
                         uint64_t *progress_in, uint64_t *progress_out);
 
         /// Pointer to function to return the type of the integrity check.
         /// Most coders won't support this.
-        lzma_check (*get_check)(const lzma_coder *coder);
+        lzma_check (*get_check)(const void *coder);
 
         /// Pointer to function to get and/or change the memory usage limit.
         /// If new_memlimit == 0, the limit is not changed.
-        lzma_ret (*memconfig)(lzma_coder *coder, uint64_t *memusage,
+        lzma_ret (*memconfig)(void *coder, uint64_t *memusage,
                         uint64_t *old_memlimit, uint64_t new_memlimit);
 
         /// Update the filter-specific options or the whole filter chain
         /// in the encoder.
-        lzma_ret (*update)(lzma_coder *coder, const lzma_allocator *allocator,
+        lzma_ret (*update)(void *coder, const lzma_allocator *allocator,
                         const lzma_filter *filters,
                         const lzma_filter *reversed_filters);

xz/vendor/current/src/liblzma/common/index.c ¶

@@ -203 +203 @@
                 index_tree_node_end(node->right, allocator, free_func);
 
-        if (free_func != NULL)
-                free_func(node, allocator);
-
-        lzma_free(node, allocator);
+        free_func(node, allocator);
         return;
 }
 
 
-/// Free the meory allocated for a tree. If free_func is not NULL,
-/// it is called on each node before freeing the node. This is used
-/// to free the Record groups from each index_stream before freeing
-/// the index_stream itself.
+/// Free the memory allocated for a tree. Each node is freed using the
+/// given free_func which is either &lzma_free or &index_stream_end.
+/// The latter is used to free the Record groups from each index_stream
+/// before freeing the index_stream itself.
 static void
 index_tree_end(index_tree *tree, const lzma_allocator *allocator,
                 void (*free_func)(void *node, const lzma_allocator *allocator))
 {
+        assert(free_func != NULL);
+
         if (tree->root != NULL)
                 index_tree_node_end(tree->root, allocator, free_func);
@@ -372 +371 @@
 {
         index_stream *s = node;
-        index_tree_end(&s->groups, allocator, NULL);
+        index_tree_end(&s->groups, allocator, &lzma_free);
+        lzma_free(s, allocator);
         return;
 }
@@ -830 +830 @@
 
                         lzma_free(g, allocator);
+
+                        // NOTE: newg isn't leaked here because
+                        // newg == (void *)&newg->node.
                 }
         }
@@ -870 +873 @@
                         src->node.uncompressed_base, src->number,
                         src->block_number_base, allocator);
-
-        // Return immediately if allocation failed or if there are
-        // no groups to duplicate.
-        if (dest == NULL || src->groups.leftmost == NULL)
-                return dest;
+        if (dest == NULL)
+                return NULL;
 
         // Copy the overall information.
@@ -881 +881 @@
         dest->stream_flags = src->stream_flags;
         dest->stream_padding = src->stream_padding;
+
+        // Return if there are no groups to duplicate.
+        if (src->groups.leftmost == NULL)
+                return dest;
 
         // Allocate memory for the Records. We put all the Records into

xz/vendor/current/src/liblzma/common/index_decoder.c ¶

@@ -15 +15 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         enum {
                 SEQ_INDICATOR,
@@ -51 +51 @@
         /// CRC32 of the List of Records field
         uint32_t crc32;
-};
+} lzma_index_coder;
 
 
 static lzma_ret
-index_decode(lzma_coder *coder, const lzma_allocator *allocator,
+index_decode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size,
@@ -63 +63 @@
                 lzma_action action lzma_attribute((__unused__)))
 {
+        lzma_index_coder *coder = coder_ptr;
+
         // Similar optimization as in index_encoder.c
         const size_t in_start = *in_pos;
@@ -208 +210 @@
 
 static void
-index_decoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+index_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_index_coder *coder = coder_ptr;
         lzma_index_end(coder->index, allocator);
         lzma_free(coder, allocator);
@@ -217 +220 @@
 
 static lzma_ret
-index_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
+index_decoder_memconfig(void *coder_ptr, uint64_t *memusage,
                 uint64_t *old_memlimit, uint64_t new_memlimit)
 {
+        lzma_index_coder *coder = coder_ptr;
+
         *memusage = lzma_index_memusage(1, coder->count);
         *old_memlimit = coder->memlimit;
@@ -235 +240 @@
 
 static lzma_ret
-index_decoder_reset(lzma_coder *coder, const lzma_allocator *allocator,
+index_decoder_reset(lzma_index_coder *coder, const lzma_allocator *allocator,
                 lzma_index **i, uint64_t memlimit)
 {
@@ -270 +275 @@
                 return LZMA_PROG_ERROR;
 
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_index_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_index_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &index_decode;
                 next->end = &index_decoder_end;
                 next->memconfig = &index_decoder_memconfig;
-                next->coder->index = NULL;
+                coder->index = NULL;
         } else {
-                lzma_index_end(next->coder->index, allocator);
-        }
-
-        return index_decoder_reset(next->coder, allocator, i, memlimit);
+                lzma_index_end(coder->index, allocator);
+        }
+
+        return index_decoder_reset(coder, allocator, i, memlimit);
 }
 
@@ -310 +317 @@
 
         // Initialize the decoder.
-        lzma_coder coder;
+        lzma_index_coder coder;
         return_if_error(index_decoder_reset(&coder, allocator, i, *memlimit));
 

xz/vendor/current/src/liblzma/common/index_encoder.c ¶

@@ -16 +16 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         enum {
                 SEQ_INDICATOR,
@@ -38 +38 @@
         /// CRC32 of the List of Records field
         uint32_t crc32;
-};
+} lzma_index_coder;
 
 
 static lzma_ret
-index_encode(lzma_coder *coder,
+index_encode(void *coder_ptr,
                 const lzma_allocator *allocator lzma_attribute((__unused__)),
                 const uint8_t *restrict in lzma_attribute((__unused__)),
@@ -51 +51 @@
                 lzma_action action lzma_attribute((__unused__)))
 {
+        lzma_index_coder *coder = coder_ptr;
+
         // Position where to start calculating CRC32. The idea is that we
         // need to call lzma_crc32() only once per call to index_encode().
@@ -160 +162 @@
 
 static void
-index_encoder_end(lzma_coder *coder, const lzma_allocator *allocator)
+index_encoder_end(void *coder, const lzma_allocator *allocator)
 {
         lzma_free(coder, allocator);
@@ -168 +170 @@
 
 static void
-index_encoder_reset(lzma_coder *coder, const lzma_index *i)
+index_encoder_reset(lzma_index_coder *coder, const lzma_index *i)
 {
         lzma_index_iter_init(&coder->iter, i);
@@ -191 +193 @@
 
         if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
+                next->coder = lzma_alloc(sizeof(lzma_index_coder), allocator);
                 if (next->coder == NULL)
                         return LZMA_MEM_ERROR;
@@ -231 +233 @@
         // The Index encoder needs just one small data structure so we can
         // allocate it on stack.
-        lzma_coder coder;
+        lzma_index_coder coder;
         index_encoder_reset(&coder, i);
 

xz/vendor/current/src/liblzma/common/stream_decoder.c ¶

@@ -15 +15 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         enum {
                 SEQ_STREAM_HEADER,
@@ -81 +81 @@
         /// Block Header has biggest maximum size.
         uint8_t buffer[LZMA_BLOCK_HEADER_SIZE_MAX];
-};
+} lzma_stream_coder;
 
 
 static lzma_ret
-stream_decoder_reset(lzma_coder *coder, const lzma_allocator *allocator)
+stream_decoder_reset(lzma_stream_coder *coder, const lzma_allocator *allocator)
 {
         // Initialize the Index hash used to verify the Index.
@@ -101 +101 @@
 
 static lzma_ret
-stream_decode(lzma_coder *coder, const lzma_allocator *allocator,
+stream_decode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_stream_coder *coder = coder_ptr;
+
         // When decoding the actual Block, it may be able to produce more
         // output even if we don't give it any new input.
@@ -376 +378 @@
 
 static void
-stream_decoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+stream_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_stream_coder *coder = coder_ptr;
         lzma_next_end(&coder->block_decoder, allocator);
         lzma_index_hash_end(coder->index_hash, allocator);
@@ -386 +389 @@
 
 static lzma_check
-stream_decoder_get_check(const lzma_coder *coder)
-{
+stream_decoder_get_check(const void *coder_ptr)
+{
+        const lzma_stream_coder *coder = coder_ptr;
         return coder->stream_flags.check;
 }
@@ -393 +397 @@
 
 static lzma_ret
-stream_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
+stream_decoder_memconfig(void *coder_ptr, uint64_t *memusage,
                 uint64_t *old_memlimit, uint64_t new_memlimit)
 {
+        lzma_stream_coder *coder = coder_ptr;
+
         *memusage = coder->memusage;
         *old_memlimit = coder->memlimit;
@@ -423 +429 @@
                 return LZMA_OPTIONS_ERROR;
 
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_stream_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_stream_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &stream_decode;
                 next->end = &stream_decoder_end;
@@ -433 +441 @@
                 next->memconfig = &stream_decoder_memconfig;
 
-                next->coder->block_decoder = LZMA_NEXT_CODER_INIT;
-                next->coder->index_hash = NULL;
-        }
-
-        next->coder->memlimit = memlimit;
-        next->coder->memusage = LZMA_MEMUSAGE_BASE;
-        next->coder->tell_no_check = (flags & LZMA_TELL_NO_CHECK) != 0;
-        next->coder->tell_unsupported_check
+                coder->block_decoder = LZMA_NEXT_CODER_INIT;
+                coder->index_hash = NULL;
+        }
+
+        coder->memlimit = memlimit;
+        coder->memusage = LZMA_MEMUSAGE_BASE;
+        coder->tell_no_check = (flags & LZMA_TELL_NO_CHECK) != 0;
+        coder->tell_unsupported_check
                         = (flags & LZMA_TELL_UNSUPPORTED_CHECK) != 0;
-        next->coder->tell_any_check = (flags & LZMA_TELL_ANY_CHECK) != 0;
-        next->coder->ignore_check = (flags & LZMA_IGNORE_CHECK) != 0;
-        next->coder->concatenated = (flags & LZMA_CONCATENATED) != 0;
-        next->coder->first_stream = true;
-
-        return stream_decoder_reset(next->coder, allocator);
+        coder->tell_any_check = (flags & LZMA_TELL_ANY_CHECK) != 0;
+        coder->ignore_check = (flags & LZMA_IGNORE_CHECK) != 0;
+        coder->concatenated = (flags & LZMA_CONCATENATED) != 0;
+        coder->first_stream = true;
+
+        return stream_decoder_reset(coder, allocator);
 }
 

xz/vendor/current/src/liblzma/common/stream_encoder.c ¶

@@ -15 +15 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         enum {
                 SEQ_STREAM_HEADER,
@@ -56 +56 @@
         /// Block Header has biggest maximum size.
         uint8_t buffer[LZMA_BLOCK_HEADER_SIZE_MAX];
-};
+} lzma_stream_coder;
 
 
 static lzma_ret
-block_encoder_init(lzma_coder *coder, const lzma_allocator *allocator)
+block_encoder_init(lzma_stream_coder *coder, const lzma_allocator *allocator)
 {
         // Prepare the Block options. Even though Block encoder doesn't need
@@ -79 +79 @@
 
 static lzma_ret
-stream_encode(lzma_coder *coder, const lzma_allocator *allocator,
+stream_encode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_stream_coder *coder = coder_ptr;
+
         // Main loop
         while (*out_pos < out_size)
@@ -210 +212 @@
 
 static void
-stream_encoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+stream_encoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_stream_coder *coder = coder_ptr;
+
         lzma_next_end(&coder->block_encoder, allocator);
         lzma_next_end(&coder->index_encoder, allocator);
@@ -225 +229 @@
 
 static lzma_ret
-stream_encoder_update(lzma_coder *coder, const lzma_allocator *allocator,
+stream_encoder_update(void *coder_ptr, const lzma_allocator *allocator,
                 const lzma_filter *filters,
                 const lzma_filter *reversed_filters)
 {
+        lzma_stream_coder *coder = coder_ptr;
+
         if (coder->sequence <= SEQ_BLOCK_INIT) {
                 // There is no incomplete Block waiting to be finished,
@@ -272 +278 @@
                 return LZMA_PROG_ERROR;
 
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_stream_coder *coder = next->coder;
+
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_stream_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &stream_encode;
                 next->end = &stream_encoder_end;
                 next->update = &stream_encoder_update;
 
-                next->coder->filters[0].id = LZMA_VLI_UNKNOWN;
-                next->coder->block_encoder = LZMA_NEXT_CODER_INIT;
-                next->coder->index_encoder = LZMA_NEXT_CODER_INIT;
-                next->coder->index = NULL;
+                coder->filters[0].id = LZMA_VLI_UNKNOWN;
+                coder->block_encoder = LZMA_NEXT_CODER_INIT;
+                coder->index_encoder = LZMA_NEXT_CODER_INIT;
+                coder->index = NULL;
         }
 
         // Basic initializations
-        next->coder->sequence = SEQ_STREAM_HEADER;
-        next->coder->block_options.version = 0;
-        next->coder->block_options.check = check;
+        coder->sequence = SEQ_STREAM_HEADER;
+        coder->block_options.version = 0;
+        coder->block_options.check = check;
 
         // Initialize the Index
-        lzma_index_end(next->coder->index, allocator);
-        next->coder->index = lzma_index_init(allocator);
-        if (next->coder->index == NULL)
+        lzma_index_end(coder->index, allocator);
+        coder->index = lzma_index_init(allocator);
+        if (coder->index == NULL)
                 return LZMA_MEM_ERROR;
 
@@ -304 +313 @@
         };
         return_if_error(lzma_stream_header_encode(
-                        &stream_flags, next->coder->buffer));
-
-        next->coder->buffer_pos = 0;
-        next->coder->buffer_size = LZMA_STREAM_HEADER_SIZE;
+                        &stream_flags, coder->buffer));
+
+        coder->buffer_pos = 0;
+        coder->buffer_size = LZMA_STREAM_HEADER_SIZE;
 
         // Initialize the Block encoder. This way we detect unsupported
         // filter chains when initializing the Stream encoder instead of
         // giving an error after Stream Header has already written out.
-        return stream_encoder_update(
-                        next->coder, allocator, filters, NULL);
+        return stream_encoder_update(coder, allocator, filters, NULL);
 }
 

xz/vendor/current/src/liblzma/common/stream_encoder_mt.c ¶

@@ -45 +45 @@
 } worker_state;
 
+typedef struct lzma_stream_coder_s lzma_stream_coder;
 
 typedef struct worker_thread_s worker_thread;
@@ -66 +67 @@
         /// Pointer to the main structure is needed when putting this
         /// thread back to the stack of free threads.
-        lzma_coder *coder;
+        lzma_stream_coder *coder;
 
         /// The allocator is set by the main thread. Since a copy of the
@@ -97 +98 @@
 
 
-struct lzma_coder_s {
+struct lzma_stream_coder_s {
         enum {
                 SEQ_STREAM_HEADER,
@@ -418 +419 @@
 /// Make the threads stop but not exit. Optionally wait for them to stop.
 static void
-threads_stop(lzma_coder *coder, bool wait_for_threads)
+threads_stop(lzma_stream_coder *coder, bool wait_for_threads)
 {
         // Tell the threads to stop.
@@ -447 +448 @@
 /// Wait until the threads have exited.
 static void
-threads_end(lzma_coder *coder, const lzma_allocator *allocator)
+threads_end(lzma_stream_coder *coder, const lzma_allocator *allocator)
 {
         for (uint32_t i = 0; i < coder->threads_initialized; ++i) {
@@ -469 +470 @@
 /// Initialize a new worker_thread structure and create a new thread.
 static lzma_ret
-initialize_new_thread(lzma_coder *coder, const lzma_allocator *allocator)
+initialize_new_thread(lzma_stream_coder *coder,
+                const lzma_allocator *allocator)
 {
         worker_thread *thr = &coder->threads[coder->threads_initialized];
@@ -511 +513 @@
 
 static lzma_ret
-get_thread(lzma_coder *coder, const lzma_allocator *allocator)
+get_thread(lzma_stream_coder *coder, const lzma_allocator *allocator)
 {
         // If there are no free output subqueues, there is no
@@ -549 +551 @@
 
 static lzma_ret
-stream_encode_in(lzma_coder *coder, const lzma_allocator *allocator,
+stream_encode_in(lzma_stream_coder *coder, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, lzma_action action)
@@ -617 +619 @@
 /// an optional timeout is reached.
 static bool
-wait_for_work(lzma_coder *coder, mythread_condtime *wait_abs,
+wait_for_work(lzma_stream_coder *coder, mythread_condtime *wait_abs,
                 bool *has_blocked, bool has_input)
 {
@@ -663 +665 @@
 
 static lzma_ret
-stream_encode_mt(lzma_coder *coder, const lzma_allocator *allocator,
+stream_encode_mt(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_stream_coder *coder = coder_ptr;
+
         switch (coder->sequence) {
         case SEQ_STREAM_HEADER:
@@ -835 +839 @@
 
 static void
-stream_encoder_mt_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+stream_encoder_mt_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_stream_coder *coder = coder_ptr;
+
         // Threads must be killed before the output queue can be freed.
         threads_end(coder, allocator);
@@ -908 +914 @@
 
 static void
-get_progress(lzma_coder *coder, uint64_t *progress_in, uint64_t *progress_out)
-{
+get_progress(void *coder_ptr, uint64_t *progress_in, uint64_t *progress_out)
+{
+        lzma_stream_coder *coder = coder_ptr;
+
         // Lock coder->mutex to prevent finishing threads from moving their
-        // progress info from the worker_thread structure to lzma_coder.
+        // progress info from the worker_thread structure to lzma_stream_coder.
         mythread_sync(coder->mutex) {
                 *progress_in = coder->progress_in;
@@ -963 +971 @@
 
         // Allocate and initialize the base structure if needed.
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_stream_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_stream_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
+
+                next->coder = coder;
 
                 // For the mutex and condition variable initializations
@@ -972 +983 @@
                 // stream_encoder_mt_end() doesn't know if they have
                 // already been initialized or not.
-                if (mythread_mutex_init(&next->coder->mutex)) {
-                        lzma_free(next->coder, allocator);
+                if (mythread_mutex_init(&coder->mutex)) {
+                        lzma_free(coder, allocator);
                         next->coder = NULL;
                         return LZMA_MEM_ERROR;
                 }
 
-                if (mythread_cond_init(&next->coder->cond)) {
-                        mythread_mutex_destroy(&next->coder->mutex);
-                        lzma_free(next->coder, allocator);
+                if (mythread_cond_init(&coder->cond)) {
+                        mythread_mutex_destroy(&coder->mutex);
+                        lzma_free(coder, allocator);
                         next->coder = NULL;
                         return LZMA_MEM_ERROR;
@@ -990 +1001 @@
 //              next->update = &stream_encoder_mt_update;
 
-                next->coder->filters[0].id = LZMA_VLI_UNKNOWN;
-                next->coder->index_encoder = LZMA_NEXT_CODER_INIT;
-                next->coder->index = NULL;
-                memzero(&next->coder->outq, sizeof(next->coder->outq));
-                next->coder->threads = NULL;
-                next->coder->threads_max = 0;
-                next->coder->threads_initialized = 0;
+                coder->filters[0].id = LZMA_VLI_UNKNOWN;
+                coder->index_encoder = LZMA_NEXT_CODER_INIT;
+                coder->index = NULL;
+                memzero(&coder->outq, sizeof(coder->outq));
+                coder->threads = NULL;
+                coder->threads_max = 0;
+                coder->threads_initialized = 0;
         }
 
         // Basic initializations
-        next->coder->sequence = SEQ_STREAM_HEADER;
-        next->coder->block_size = (size_t)(block_size);
-        next->coder->thread_error = LZMA_OK;
-        next->coder->thr = NULL;
+        coder->sequence = SEQ_STREAM_HEADER;
+        coder->block_size = (size_t)(block_size);
+        coder->thread_error = LZMA_OK;
+        coder->thr = NULL;
 
         // Allocate the thread-specific base structures.
         assert(options->threads > 0);
-        if (next->coder->threads_max != options->threads) {
-                threads_end(next->coder, allocator);
-
-                next->coder->threads = NULL;
-                next->coder->threads_max = 0;
-
-                next->coder->threads_initialized = 0;
-                next->coder->threads_free = NULL;
-
-                next->coder->threads = lzma_alloc(
+        if (coder->threads_max != options->threads) {
+                threads_end(coder, allocator);
+
+                coder->threads = NULL;
+                coder->threads_max = 0;
+
+                coder->threads_initialized = 0;
+                coder->threads_free = NULL;
+
+                coder->threads = lzma_alloc(
                                 options->threads * sizeof(worker_thread),
                                 allocator);
-                if (next->coder->threads == NULL)
+                if (coder->threads == NULL)
                         return LZMA_MEM_ERROR;
 
-                next->coder->threads_max = options->threads;
+                coder->threads_max = options->threads;
         } else {
                 // Reuse the old structures and threads. Tell the running
                 // threads to stop and wait until they have stopped.
-                threads_stop(next->coder, true);
+                threads_stop(coder, true);
         }
 
         // Output queue
-        return_if_error(lzma_outq_init(&next->coder->outq, allocator,
+        return_if_error(lzma_outq_init(&coder->outq, allocator,
                         outbuf_size_max, options->threads));
 
         // Timeout
-        next->coder->timeout = options->timeout;
+        coder->timeout = options->timeout;
 
         // Free the old filter chain and copy the new one.
-        for (size_t i = 0; next->coder->filters[i].id != LZMA_VLI_UNKNOWN; ++i)
-                lzma_free(next->coder->filters[i].options, allocator);
+        for (size_t i = 0; coder->filters[i].id != LZMA_VLI_UNKNOWN; ++i)
+                lzma_free(coder->filters[i].options, allocator);
 
         return_if_error(lzma_filters_copy(
-                        filters, next->coder->filters, allocator));
+                        filters, coder->filters, allocator));
 
         // Index
-        lzma_index_end(next->coder->index, allocator);
-        next->coder->index = lzma_index_init(allocator);
-        if (next->coder->index == NULL)
+        lzma_index_end(coder->index, allocator);
+        coder->index = lzma_index_init(allocator);
+        if (coder->index == NULL)
                 return LZMA_MEM_ERROR;
 
         // Stream Header
-        next->coder->stream_flags.version = 0;
-        next->coder->stream_flags.check = options->check;
+        coder->stream_flags.version = 0;
+        coder->stream_flags.check = options->check;
         return_if_error(lzma_stream_header_encode(
-                        &next->coder->stream_flags, next->coder->header));
-
-        next->coder->header_pos = 0;
+                        &coder->stream_flags, coder->header));
+
+        coder->header_pos = 0;
 
         // Progress info
-        next->coder->progress_in = 0;
-        next->coder->progress_out = LZMA_STREAM_HEADER_SIZE;
+        coder->progress_in = 0;
+        coder->progress_out = LZMA_STREAM_HEADER_SIZE;
 
         return LZMA_OK;
@@ -1112 +1123 @@
 
         // Sum them with overflow checking.
-        uint64_t total_memusage = LZMA_MEMUSAGE_BASE + sizeof(lzma_coder)
+        uint64_t total_memusage = LZMA_MEMUSAGE_BASE
+                        + sizeof(lzma_stream_coder)
                         + options->threads * sizeof(worker_thread);
 

xz/vendor/current/src/liblzma/delta/delta_common.c ¶

@@ -16 +16 @@
 
 static void
-delta_coder_end(lzma_coder *coder, const lzma_allocator *allocator)
+delta_coder_end(void *coder_ptr, const lzma_allocator *allocator)
 {
+        lzma_delta_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder, allocator);
@@ -29 +30 @@
 {
         // Allocate memory for the decoder if needed.
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_delta_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_delta_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
+
+                next->coder = coder;
 
                 // End function is the same for encoder and decoder.
                 next->end = &delta_coder_end;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
@@ -45 +49 @@
         // Set the delta distance.
         const lzma_options_delta *opt = filters[0].options;
-        next->coder->distance = opt->dist;
+        coder->distance = opt->dist;
 
         // Initialize the rest of the variables.
-        next->coder->pos = 0;
-        memzero(next->coder->history, LZMA_DELTA_DIST_MAX);
+        coder->pos = 0;
+        memzero(coder->history, LZMA_DELTA_DIST_MAX);
 
         // Initialize the next decoder in the chain, if any.
-        return lzma_next_filter_init(&next->coder->next,
-                        allocator, filters + 1);
+        return lzma_next_filter_init(&coder->next, allocator, filters + 1);
 }
 
@@ -67 +70 @@
                 return UINT64_MAX;
 
-        return sizeof(lzma_coder);
+        return sizeof(lzma_delta_coder);
 }

xz/vendor/current/src/liblzma/delta/delta_decoder.c ¶

@@ -16 +16 @@
 
 static void
-decode_buffer(lzma_coder *coder, uint8_t *buffer, size_t size)
+decode_buffer(lzma_delta_coder *coder, uint8_t *buffer, size_t size)
 {
         const size_t distance = coder->distance;
@@ -28 +28 @@
 
 static lzma_ret
-delta_decode(lzma_coder *coder, const lzma_allocator *allocator,
+delta_decode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_delta_coder *coder = coder_ptr;
+
         assert(coder->next.code != NULL);
 

xz/vendor/current/src/liblzma/delta/delta_encoder.c ¶

@@ -19 +19 @@
 /// encoder's filter stack).
 static void
-copy_and_encode(lzma_coder *coder,
+copy_and_encode(lzma_delta_coder *coder,
                 const uint8_t *restrict in, uint8_t *restrict out, size_t size)
 {
@@ -36 +36 @@
 /// in the chain (and thus non-last filter in the encoder's filter stack).
 static void
-encode_in_place(lzma_coder *coder, uint8_t *buffer, size_t size)
+encode_in_place(lzma_delta_coder *coder, uint8_t *buffer, size_t size)
 {
         const size_t distance = coder->distance;
@@ -50 +50 @@
 
 static lzma_ret
-delta_encode(lzma_coder *coder, const lzma_allocator *allocator,
+delta_encode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_delta_coder *coder = coder_ptr;
+
         lzma_ret ret;
 
@@ -85 +87 @@
 
 static lzma_ret
-delta_encoder_update(lzma_coder *coder, const lzma_allocator *allocator,
+delta_encoder_update(void *coder_ptr, const lzma_allocator *allocator,
                 const lzma_filter *filters_null lzma_attribute((__unused__)),
                 const lzma_filter *reversed_filters)
 {
+        lzma_delta_coder *coder = coder_ptr;
+
         // Delta doesn't and will never support changing the options in
         // the middle of encoding. If the app tries to change them, we

xz/vendor/current/src/liblzma/delta/delta_private.h ¶

@@ -16 +16 @@
 #include "delta_common.h"
 
-struct lzma_coder_s {
+typedef struct {
         /// Next coder in the chain
         lzma_next_coder next;
@@ -28 +28 @@
         /// Buffer to hold history of the original data
         uint8_t history[LZMA_DELTA_DIST_MAX];
-};
+} lzma_delta_coder;
 
 

xz/vendor/current/src/liblzma/lz/lz_decoder.c ¶

@@ -21 +21 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         /// Dictionary (history buffer)
         lzma_dict dict;
@@ -49 +49 @@
                 uint8_t buffer[LZMA_BUFFER_SIZE];
         } temp;
-};
+} lzma_coder;
 
 
@@ -126 +126 @@
 
 static lzma_ret
-lz_decode(lzma_coder *coder,
+lz_decode(void *coder_ptr,
                 const lzma_allocator *allocator lzma_attribute((__unused__)),
                 const uint8_t *restrict in, size_t *restrict in_pos,
@@ -133 +133 @@
                 lzma_action action)
 {
+        lzma_coder *coder = coder_ptr;
+
         if (coder->next.code == NULL)
                 return decode_buffer(coder, in, in_pos, in_size,
@@ -185 +187 @@
 
 static void
-lz_decoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+lz_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_coder *coder = coder_ptr;
+
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder->dict.buf, allocator);
@@ -208 +212 @@
 {
         // Allocate the base structure if it isn't already allocated.
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &lz_decode;
                 next->end = &lz_decoder_end;
 
-                next->coder->dict.buf = NULL;
-                next->coder->dict.size = 0;
-                next->coder->lz = LZMA_LZ_DECODER_INIT;
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->dict.buf = NULL;
+                coder->dict.size = 0;
+                coder->lz = LZMA_LZ_DECODER_INIT;
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
@@ -225 +231 @@
         // us the dictionary size.
         lzma_lz_options lz_options;
-        return_if_error(lz_init(&next->coder->lz, allocator,
+        return_if_error(lz_init(&coder->lz, allocator,
                         filters[0].options, &lz_options));
 
@@ -249 +255 @@
 
         // Allocate and initialize the dictionary.
-        if (next->coder->dict.size != lz_options.dict_size) {
-                lzma_free(next->coder->dict.buf, allocator);
-                next->coder->dict.buf
+        if (coder->dict.size != lz_options.dict_size) {
+                lzma_free(coder->dict.buf, allocator);
+                coder->dict.buf
                                 = lzma_alloc(lz_options.dict_size, allocator);
-                if (next->coder->dict.buf == NULL)
+                if (coder->dict.buf == NULL)
                         return LZMA_MEM_ERROR;
 
-                next->coder->dict.size = lz_options.dict_size;
+                coder->dict.size = lz_options.dict_size;
         }
 
@@ -269 +275 @@
                                 lz_options.dict_size);
                 const size_t offset = lz_options.preset_dict_size - copy_size;
-                memcpy(next->coder->dict.buf, lz_options.preset_dict + offset,
+                memcpy(coder->dict.buf, lz_options.preset_dict + offset,
                                 copy_size);
-                next->coder->dict.pos = copy_size;
-                next->coder->dict.full = copy_size;
+                coder->dict.pos = copy_size;
+                coder->dict.full = copy_size;
         }
 
         // Miscellaneous initializations
-        next->coder->next_finished = false;
-        next->coder->this_finished = false;
-        next->coder->temp.pos = 0;
-        next->coder->temp.size = 0;
+        coder->next_finished = false;
+        coder->this_finished = false;
+        coder->temp.pos = 0;
+        coder->temp.size = 0;
 
         // Initialize the next filter in the chain, if any.
-        return lzma_next_filter_init(&next->coder->next, allocator,
-                        filters + 1);
+        return lzma_next_filter_init(&coder->next, allocator, filters + 1);
 }
 
@@ -295 +300 @@
 
 extern void
-lzma_lz_decoder_uncompressed(lzma_coder *coder, lzma_vli uncompressed_size)
-{
+lzma_lz_decoder_uncompressed(void *coder_ptr, lzma_vli uncompressed_size)
+{
+        lzma_coder *coder = coder_ptr;
         coder->lz.set_uncompressed(coder->lz.coder, uncompressed_size);
 }

xz/vendor/current/src/liblzma/lz/lz_decoder.h ¶

@@ -54 +54 @@
 typedef struct {
         /// Data specific to the LZ-based decoder
-        lzma_coder *coder;
+        void *coder;
 
         /// Function to decode from in[] to *dict
-        lzma_ret (*code)(lzma_coder *restrict coder,
+        lzma_ret (*code)(void *coder,
                         lzma_dict *restrict dict, const uint8_t *restrict in,
                         size_t *restrict in_pos, size_t in_size);
 
-        void (*reset)(lzma_coder *coder, const void *options);
+        void (*reset)(void *coder, const void *options);
 
         /// Set the uncompressed size
-        void (*set_uncompressed)(lzma_coder *coder,
-                        lzma_vli uncompressed_size);
+        void (*set_uncompressed)(void *coder, lzma_vli uncompressed_size);
 
         /// Free allocated resources
-        void (*end)(lzma_coder *coder, const lzma_allocator *allocator);
+        void (*end)(void *coder, const lzma_allocator *allocator);
 
 } lzma_lz_decoder;
@@ -93 +92 @@
 
 extern void lzma_lz_decoder_uncompressed(
-                lzma_coder *coder, lzma_vli uncompressed_size);
+                void *coder, lzma_vli uncompressed_size);
 
 

xz/vendor/current/src/liblzma/lz/lz_encoder.c ¶

@@ -24 +24 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         /// LZ-based encoder e.g. LZMA
         lzma_lz_encoder lz;
@@ -33 +33 @@
         /// Next coder in the chain
         lzma_next_coder next;
-};
+} lzma_coder;
 
 
@@ -158 +158 @@
 
 static lzma_ret
-lz_encode(lzma_coder *coder, const lzma_allocator *allocator,
+lz_encode(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size,
@@ -164 +164 @@
                 size_t out_size, lzma_action action)
 {
+        lzma_coder *coder = coder_ptr;
+
         while (*out_pos < out_size
                         && (*in_pos < in_size || action != LZMA_RUN)) {
@@ -482 +484 @@
 
 static void
-lz_encoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+lz_encoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_coder *coder = coder_ptr;
+
         lzma_next_end(&coder->next, allocator);
 
@@ -501 +505 @@
 
 static lzma_ret
-lz_encoder_update(lzma_coder *coder, const lzma_allocator *allocator,
+lz_encoder_update(void *coder_ptr, const lzma_allocator *allocator,
                 const lzma_filter *filters_null lzma_attribute((__unused__)),
                 const lzma_filter *reversed_filters)
 {
+        lzma_coder *coder = coder_ptr;
+
         if (coder->lz.options_update == NULL)
                 return LZMA_PROG_ERROR;
@@ -529 +535 @@
 
         // Allocate and initialize the base data structure.
-        if (next->coder == NULL) {
-                next->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (next->coder == NULL)
+        lzma_coder *coder = next->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &lz_encode;
                 next->end = &lz_encoder_end;
                 next->update = &lz_encoder_update;
 
-                next->coder->lz.coder = NULL;
-                next->coder->lz.code = NULL;
-                next->coder->lz.end = NULL;
-
-                next->coder->mf.buffer = NULL;
-                next->coder->mf.hash = NULL;
-                next->coder->mf.son = NULL;
-                next->coder->mf.hash_count = 0;
-                next->coder->mf.sons_count = 0;
-
-                next->coder->next = LZMA_NEXT_CODER_INIT;
+                coder->lz.coder = NULL;
+                coder->lz.code = NULL;
+                coder->lz.end = NULL;
+
+                // mf.size is initialized to silence Valgrind
+                // when used on optimized binaries (GCC may reorder
+                // code in a way that Valgrind gets unhappy).
+                coder->mf.buffer = NULL;
+                coder->mf.size = 0;
+                coder->mf.hash = NULL;
+                coder->mf.son = NULL;
+                coder->mf.hash_count = 0;
+                coder->mf.sons_count = 0;
+
+                coder->next = LZMA_NEXT_CODER_INIT;
         }
 
         // Initialize the LZ-based encoder.
         lzma_lz_options lz_options;
-        return_if_error(lz_init(&next->coder->lz, allocator,
+        return_if_error(lz_init(&coder->lz, allocator,
                         filters[0].options, &lz_options));
 
-        // Setup the size information into next->coder->mf and deallocate
+        // Setup the size information into coder->mf and deallocate
         // old buffers if they have wrong size.
-        if (lz_encoder_prepare(&next->coder->mf, allocator, &lz_options))
+        if (lz_encoder_prepare(&coder->mf, allocator, &lz_options))
                 return LZMA_OPTIONS_ERROR;
 
         // Allocate new buffers if needed, and do the rest of
         // the initialization.
-        if (lz_encoder_init(&next->coder->mf, allocator, &lz_options))
+        if (lz_encoder_init(&coder->mf, allocator, &lz_options))
                 return LZMA_MEM_ERROR;
 
         // Initialize the next filter in the chain, if any.
-        return lzma_next_filter_init(&next->coder->next, allocator,
-                        filters + 1);
+        return lzma_next_filter_init(&coder->next, allocator, filters + 1);
 }
 

xz/vendor/current/src/liblzma/lz/lz_encoder.h ¶

@@ -192 +192 @@
 typedef struct {
         /// Data specific to the LZ-based encoder
-        lzma_coder *coder;
+        void *coder;
 
         /// Function to encode from *dict to out[]
-        lzma_ret (*code)(lzma_coder *restrict coder,
+        lzma_ret (*code)(void *coder,
                         lzma_mf *restrict mf, uint8_t *restrict out,
                         size_t *restrict out_pos, size_t out_size);
 
         /// Free allocated resources
-        void (*end)(lzma_coder *coder, const lzma_allocator *allocator);
+        void (*end)(void *coder, const lzma_allocator *allocator);
 
         /// Update the options in the middle of the encoding.
-        lzma_ret (*options_update)(lzma_coder *coder,
-                        const lzma_filter *filter);
+        lzma_ret (*options_update)(void *coder, const lzma_filter *filter);
 
 } lzma_lz_encoder;

xz/vendor/current/src/liblzma/lzma/Makefile.inc ¶

@@ -10 +10 @@
 liblzma_la_SOURCES += lzma/lzma_common.h
 
+if COND_FILTER_LZMA1
+liblzma_la_SOURCES += \
+        lzma/lzma_encoder_presets.c
+endif
+
 if COND_ENCODER_LZMA1
 liblzma_la_SOURCES += \
@@ -15 +20 @@
         lzma/lzma_encoder.h \
         lzma/lzma_encoder.c \
-        lzma/lzma_encoder_presets.c \
         lzma/lzma_encoder_private.h \
         lzma/lzma_encoder_optimum_fast.c \

xz/vendor/current/src/liblzma/lzma/lzma2_decoder.c ¶

@@ -17 +17 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         enum sequence {
                 SEQ_CONTROL,
@@ -51 +51 @@
 
         lzma_options_lzma options;
-};
+} lzma_lzma2_coder;
 
 
 static lzma_ret
-lzma2_decode(lzma_coder *restrict coder, lzma_dict *restrict dict,
+lzma2_decode(void *coder_ptr, lzma_dict *restrict dict,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size)
 {
+        lzma_lzma2_coder *restrict coder = coder_ptr;
+
         // With SEQ_LZMA it is possible that no new input is needed to do
         // some progress. The rest of the sequences assume that there is
@@ -210 +212 @@
 
 static void
-lzma2_decoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+lzma2_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_lzma2_coder *coder = coder_ptr;
+
         assert(coder->lzma.end == NULL);
         lzma_free(coder->lzma.coder, allocator);
@@ -225 +229 @@
                 const void *opt, lzma_lz_options *lz_options)
 {
-        if (lz->coder == NULL) {
-                lz->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (lz->coder == NULL)
+        lzma_lzma2_coder *coder = lz->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_lzma2_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                lz->coder = coder;
                 lz->code = &lzma2_decode;
                 lz->end = &lzma2_decoder_end;
 
-                lz->coder->lzma = LZMA_LZ_DECODER_INIT;
+                coder->lzma = LZMA_LZ_DECODER_INIT;
         }
 
         const lzma_options_lzma *options = opt;
 
-        lz->coder->sequence = SEQ_CONTROL;
-        lz->coder->need_properties = true;
-        lz->coder->need_dictionary_reset = options->preset_dict == NULL
+        coder->sequence = SEQ_CONTROL;
+        coder->need_properties = true;
+        coder->need_dictionary_reset = options->preset_dict == NULL
                         || options->preset_dict_size == 0;
 
-        return lzma_lzma_decoder_create(&lz->coder->lzma,
+        return lzma_lzma_decoder_create(&coder->lzma,
                         allocator, options, lz_options);
 }
@@ -264 +270 @@
 lzma_lzma2_decoder_memusage(const void *options)
 {
-        return sizeof(lzma_coder)
+        return sizeof(lzma_lzma2_coder)
                         + lzma_lzma_decoder_memusage_nocheck(options);
 }

xz/vendor/current/src/liblzma/lzma/lzma2_encoder.c ¶

@@ -18 +18 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         enum {
                 SEQ_INIT,
@@ -28 +28 @@
 
         /// LZMA encoder
-        lzma_coder *lzma;
+        void *lzma;
 
         /// LZMA options currently in use.
@@ -49 +49 @@
         /// Buffer to hold the chunk header and LZMA compressed data
         uint8_t buf[LZMA2_HEADER_MAX + LZMA2_CHUNK_MAX];
-};
+} lzma_lzma2_coder;
 
 
 static void
-lzma2_header_lzma(lzma_coder *coder)
+lzma2_header_lzma(lzma_lzma2_coder *coder)
 {
         assert(coder->uncompressed_size > 0);
@@ -109 +109 @@
 
 static void
-lzma2_header_uncompressed(lzma_coder *coder)
+lzma2_header_uncompressed(lzma_lzma2_coder *coder)
 {
         assert(coder->uncompressed_size > 0);
@@ -134 +134 @@
 
 static lzma_ret
-lzma2_encode(lzma_coder *restrict coder, lzma_mf *restrict mf,
+lzma2_encode(void *coder_ptr, lzma_mf *restrict mf,
                 uint8_t *restrict out, size_t *restrict out_pos,
                 size_t out_size)
 {
+        lzma_lzma2_coder *restrict coder = coder_ptr;
+
         while (*out_pos < out_size)
         switch (coder->sequence) {
@@ -263 +265 @@
 
 static void
-lzma2_encoder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+lzma2_encoder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_lzma2_coder *coder = coder_ptr;
         lzma_free(coder->lzma, allocator);
         lzma_free(coder, allocator);
@@ -272 +275 @@
 
 static lzma_ret
-lzma2_encoder_options_update(lzma_coder *coder, const lzma_filter *filter)
-{
+lzma2_encoder_options_update(void *coder_ptr, const lzma_filter *filter)
+{
+        lzma_lzma2_coder *coder = coder_ptr;
+
         // New options can be set only when there is no incomplete chunk.
         // This is the case at the beginning of the raw stream and right
@@ -311 +316 @@
                 return LZMA_PROG_ERROR;
 
-        if (lz->coder == NULL) {
-                lz->coder = lzma_alloc(sizeof(lzma_coder), allocator);
-                if (lz->coder == NULL)
+        lzma_lzma2_coder *coder = lz->coder;
+        if (coder == NULL) {
+                coder = lzma_alloc(sizeof(lzma_lzma2_coder), allocator);
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                lz->coder = coder;
                 lz->code = &lzma2_encode;
                 lz->end = &lzma2_encoder_end;
                 lz->options_update = &lzma2_encoder_options_update;
 
-                lz->coder->lzma = NULL;
+                coder->lzma = NULL;
         }
 
-        lz->coder->opt_cur = *(const lzma_options_lzma *)(options);
-
-        lz->coder->sequence = SEQ_INIT;
-        lz->coder->need_properties = true;
-        lz->coder->need_state_reset = false;
-        lz->coder->need_dictionary_reset
-                        = lz->coder->opt_cur.preset_dict == NULL
-                        || lz->coder->opt_cur.preset_dict_size == 0;
+        coder->opt_cur = *(const lzma_options_lzma *)(options);
+
+        coder->sequence = SEQ_INIT;
+        coder->need_properties = true;
+        coder->need_state_reset = false;
+        coder->need_dictionary_reset
+                        = coder->opt_cur.preset_dict == NULL
+                        || coder->opt_cur.preset_dict_size == 0;
 
         // Initialize LZMA encoder
-        return_if_error(lzma_lzma_encoder_create(&lz->coder->lzma, allocator,
-                        &lz->coder->opt_cur, lz_options));
+        return_if_error(lzma_lzma_encoder_create(&coder->lzma, allocator,
+                        &coder->opt_cur, lz_options));
 
         // Make sure that we will always have enough history available in
@@ -365 +372 @@
                 return UINT64_MAX;
 
-        return sizeof(lzma_coder) + lzma_mem;
+        return sizeof(lzma_lzma2_coder) + lzma_mem;
 }
 

xz/vendor/current/src/liblzma/lzma/lzma_decoder.c ¶

@@ -162 +162 @@
 
 
-struct lzma_coder_s {
+typedef struct {
         ///////////////////
         // Probabilities //
@@ -278 +278 @@
         /// If decoding a match: length of the match.
         uint32_t len;
-};
+} lzma_lzma1_decoder;
 
 
 static lzma_ret
-lzma_decode(lzma_coder *restrict coder, lzma_dict *restrict dictptr,
+lzma_decode(void *coder_ptr, lzma_dict *restrict dictptr,
                 const uint8_t *restrict in,
                 size_t *restrict in_pos, size_t in_size)
 {
+        lzma_lzma1_decoder *restrict coder = coder_ptr;
+
         ////////////////////
         // Initialization //
@@ -841 +843 @@
 
 static void
-lzma_decoder_uncompressed(lzma_coder *coder, lzma_vli uncompressed_size)
+lzma_decoder_uncompressed(void *coder_ptr, lzma_vli uncompressed_size)
 {
+        lzma_lzma1_decoder *coder = coder_ptr;
         coder->uncompressed_size = uncompressed_size;
 }
 
-/*
-extern void
-lzma_lzma_decoder_uncompressed(void *coder_ptr, lzma_vli uncompressed_size)
+
+static void
+lzma_decoder_reset(void *coder_ptr, const void *opt)
 {
-        // This is hack.
-        (*(lzma_coder **)(coder))->uncompressed_size = uncompressed_size;
-}
-*/
-
-static void
-lzma_decoder_reset(lzma_coder *coder, const void *opt)
-{
+        lzma_lzma1_decoder *coder = coder_ptr;
         const lzma_options_lzma *options = opt;
 
@@ -942 +938 @@
 {
         if (lz->coder == NULL) {
-                lz->coder = lzma_alloc(sizeof(lzma_coder), allocator);
+                lz->coder = lzma_alloc(sizeof(lzma_lzma1_decoder), allocator);
                 if (lz->coder == NULL)
                         return LZMA_MEM_ERROR;
@@ -1015 +1011 @@
 {
         const lzma_options_lzma *const opt = options;
-        return sizeof(lzma_coder) + lzma_lz_decoder_memusage(opt->dict_size);
+        return sizeof(lzma_lzma1_decoder)
+                        + lzma_lz_decoder_memusage(opt->dict_size);
 }
 

xz/vendor/current/src/liblzma/lzma/lzma_encoder.c ¶

@@ -44 +44 @@
 
 static inline void
-literal(lzma_coder *coder, lzma_mf *mf, uint32_t position)
+literal(lzma_lzma1_encoder *coder, lzma_mf *mf, uint32_t position)
 {
         // Locate the literal byte to be encoded and the subcoder.
@@ -141 +141 @@
 
 static inline void
-match(lzma_coder *coder, const uint32_t pos_state,
+match(lzma_lzma1_encoder *coder, const uint32_t pos_state,
                 const uint32_t distance, const uint32_t len)
 {
@@ -188 +188 @@
 
 static inline void
-rep_match(lzma_coder *coder, const uint32_t pos_state,
+rep_match(lzma_lzma1_encoder *coder, const uint32_t pos_state,
                 const uint32_t rep, const uint32_t len)
 {
@@ -232 +232 @@
 
 static void
-encode_symbol(lzma_coder *coder, lzma_mf *mf,
+encode_symbol(lzma_lzma1_encoder *coder, lzma_mf *mf,
                 uint32_t back, uint32_t len, uint32_t position)
 {
@@ -266 +266 @@
 
 static bool
-encode_init(lzma_coder *coder, lzma_mf *mf)
+encode_init(lzma_lzma1_encoder *coder, lzma_mf *mf)
 {
         assert(mf_position(mf) == 0);
@@ -294 +294 @@
 
 static void
-encode_eopm(lzma_coder *coder, uint32_t position)
+encode_eopm(lzma_lzma1_encoder *coder, uint32_t position)
 {
         const uint32_t pos_state = position & coder->pos_mask;
@@ -310 +310 @@
 
 extern lzma_ret
-lzma_lzma_encode(lzma_coder *restrict coder, lzma_mf *restrict mf,
+lzma_lzma_encode(lzma_lzma1_encoder *restrict coder, lzma_mf *restrict mf,
                 uint8_t *restrict out, size_t *restrict out_pos,
                 size_t out_size, uint32_t limit)
@@ -403 +403 @@
 
 static lzma_ret
-lzma_encode(lzma_coder *restrict coder, lzma_mf *restrict mf,
+lzma_encode(void *coder, lzma_mf *restrict mf,
                 uint8_t *restrict out, size_t *restrict out_pos,
                 size_t out_size)
@@ -474 +474 @@
 
 extern lzma_ret
-lzma_lzma_encoder_reset(lzma_coder *coder, const lzma_options_lzma *options)
+lzma_lzma_encoder_reset(lzma_lzma1_encoder *coder,
+                const lzma_options_lzma *options)
 {
         if (!is_options_valid(options))
@@ -546 +547 @@
 
 extern lzma_ret
-lzma_lzma_encoder_create(lzma_coder **coder_ptr,
+lzma_lzma_encoder_create(void **coder_ptr,
                 const lzma_allocator *allocator,
                 const lzma_options_lzma *options, lzma_lz_options *lz_options)
 {
-        // Allocate lzma_coder if it wasn't already allocated.
+        // Allocate lzma_lzma1_encoder if it wasn't already allocated.
         if (*coder_ptr == NULL) {
-                *coder_ptr = lzma_alloc(sizeof(lzma_coder), allocator);
+                *coder_ptr = lzma_alloc(sizeof(lzma_lzma1_encoder), allocator);
                 if (*coder_ptr == NULL)
                         return LZMA_MEM_ERROR;
         }
 
-        lzma_coder *coder = *coder_ptr;
+        lzma_lzma1_encoder *coder = *coder_ptr;
 
         // Set compression mode. We haven't validates the options yet,
@@ -637 +638 @@
                 return UINT64_MAX;
 
-        return (uint64_t)(sizeof(lzma_coder)) + lz_memusage;
+        return (uint64_t)(sizeof(lzma_lzma1_encoder)) + lz_memusage;
 }
 

xz/vendor/current/src/liblzma/lzma/lzma_encoder.h ¶

@@ -16 +16 @@
 
 #include "common.h"
+
+
+typedef struct lzma_lzma1_encoder_s lzma_lzma1_encoder;
 
 
@@ -37 +40 @@
 /// Initializes raw LZMA encoder; this is used by LZMA2.
 extern lzma_ret lzma_lzma_encoder_create(
-                lzma_coder **coder_ptr, const lzma_allocator *allocator,
+                void **coder_ptr, const lzma_allocator *allocator,
                 const lzma_options_lzma *options, lzma_lz_options *lz_options);
 
@@ -43 +46 @@
 /// Resets an already initialized LZMA encoder; this is used by LZMA2.
 extern lzma_ret lzma_lzma_encoder_reset(
-                lzma_coder *coder, const lzma_options_lzma *options);
+                lzma_lzma1_encoder *coder, const lzma_options_lzma *options);
 
 
-extern lzma_ret lzma_lzma_encode(lzma_coder *restrict coder,
+extern lzma_ret lzma_lzma_encode(lzma_lzma1_encoder *restrict coder,
                 lzma_mf *restrict mf, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size,

xz/vendor/current/src/liblzma/lzma/lzma_encoder_optimum_fast.c ¶

@@ -19 +19 @@
 
 extern void
-lzma_lzma_optimum_fast(lzma_coder *restrict coder, lzma_mf *restrict mf,
+lzma_lzma_optimum_fast(lzma_lzma1_encoder *restrict coder,
+                lzma_mf *restrict mf,
                 uint32_t *restrict back_res, uint32_t *restrict len_res)
 {

xz/vendor/current/src/liblzma/lzma/lzma_encoder_optimum_normal.c ¶

@@ -20 +20 @@
 
 static uint32_t
-get_literal_price(const lzma_coder *const coder, const uint32_t pos,
+get_literal_price(const lzma_lzma1_encoder *const coder, const uint32_t pos,
                 const uint32_t prev_byte, const bool match_mode,
                 uint32_t match_byte, uint32_t symbol)
@@ -66 +66 @@
 
 static inline uint32_t
-get_short_rep_price(const lzma_coder *const coder,
+get_short_rep_price(const lzma_lzma1_encoder *const coder,
                 const lzma_lzma_state state, const uint32_t pos_state)
 {
@@ -75 +75 @@
 
 static inline uint32_t
-get_pure_rep_price(const lzma_coder *const coder, const uint32_t rep_index,
+get_pure_rep_price(const lzma_lzma1_encoder *const coder, const uint32_t rep_index,
                 const lzma_lzma_state state, uint32_t pos_state)
 {
@@ -100 +100 @@
 
 static inline uint32_t
-get_rep_price(const lzma_coder *const coder, const uint32_t rep_index,
+get_rep_price(const lzma_lzma1_encoder *const coder, const uint32_t rep_index,
                 const uint32_t len, const lzma_lzma_state state,
                 const uint32_t pos_state)
@@ -110 +110 @@
 
 static inline uint32_t
-get_dist_len_price(const lzma_coder *const coder, const uint32_t dist,
+get_dist_len_price(const lzma_lzma1_encoder *const coder, const uint32_t dist,
                 const uint32_t len, const uint32_t pos_state)
 {
@@ -131 +131 @@
 
 static void
-fill_dist_prices(lzma_coder *coder)
+fill_dist_prices(lzma_lzma1_encoder *coder)
 {
         for (uint32_t dist_state = 0; dist_state < DIST_STATES; ++dist_state) {
@@ -186 +186 @@
 
 static void
-fill_align_prices(lzma_coder *coder)
+fill_align_prices(lzma_lzma1_encoder *coder)
 {
         for (uint32_t i = 0; i < ALIGN_SIZE; ++i)
@@ -222 +222 @@
 
 static void
-backward(lzma_coder *restrict coder, uint32_t *restrict len_res,
+backward(lzma_lzma1_encoder *restrict coder, uint32_t *restrict len_res,
                 uint32_t *restrict back_res, uint32_t cur)
 {
@@ -270 +270 @@
 
 static inline uint32_t
-helper1(lzma_coder *restrict coder, lzma_mf *restrict mf,
+helper1(lzma_lzma1_encoder *restrict coder, lzma_mf *restrict mf,
                 uint32_t *restrict back_res, uint32_t *restrict len_res,
                 uint32_t position)
@@ -442 +442 @@
 
 static inline uint32_t
-helper2(lzma_coder *coder, uint32_t *reps, const uint8_t *buf,
+helper2(lzma_lzma1_encoder *coder, uint32_t *reps, const uint8_t *buf,
                 uint32_t len_end, uint32_t position, const uint32_t cur,
                 const uint32_t nice_len, const uint32_t buf_avail_full)
@@ -798 +798 @@
 
 extern void
-lzma_lzma_optimum_normal(lzma_coder *restrict coder, lzma_mf *restrict mf,
+lzma_lzma_optimum_normal(lzma_lzma1_encoder *restrict coder,
+                lzma_mf *restrict mf,
                 uint32_t *restrict back_res, uint32_t *restrict len_res,
                 uint32_t position)

xz/vendor/current/src/liblzma/lzma/lzma_encoder_presets.c ¶

@@ -3 +3 @@
 /// \file       lzma_encoder_presets.c
 /// \brief      Encoder presets
+/// \note       xz needs this even when only decoding is enabled.
 //
 //  Author:     Lasse Collin

xz/vendor/current/src/liblzma/lzma/lzma_encoder_private.h ¶

@@ -70 +70 @@
 
 
-struct lzma_coder_s {
+struct lzma_lzma1_encoder_s {
         /// Range encoder
         lzma_range_encoder rc;
@@ -139 +139 @@
 
 extern void lzma_lzma_optimum_fast(
-                lzma_coder *restrict coder, lzma_mf *restrict mf,
+                lzma_lzma1_encoder *restrict coder, lzma_mf *restrict mf,
                 uint32_t *restrict back_res, uint32_t *restrict len_res);
 
-extern void lzma_lzma_optimum_normal(lzma_coder *restrict coder,
+extern void lzma_lzma_optimum_normal(lzma_lzma1_encoder *restrict coder,
                 lzma_mf *restrict mf, uint32_t *restrict back_res,
                 uint32_t *restrict len_res, uint32_t position);

xz/vendor/current/src/liblzma/simple/arm.c ¶

@@ -16 +16 @@
 
 static size_t
-arm_code(lzma_simple *simple lzma_attribute((__unused__)),
+arm_code(void *simple lzma_attribute((__unused__)),
                 uint32_t now_pos, bool is_encoder,
                 uint8_t *buffer, size_t size)

xz/vendor/current/src/liblzma/simple/armthumb.c ¶

@@ -16 +16 @@
 
 static size_t
-armthumb_code(lzma_simple *simple lzma_attribute((__unused__)),
+armthumb_code(void *simple lzma_attribute((__unused__)),
                 uint32_t now_pos, bool is_encoder,
                 uint8_t *buffer, size_t size)

xz/vendor/current/src/liblzma/simple/ia64.c ¶

@@ -16 +16 @@
 
 static size_t
-ia64_code(lzma_simple *simple lzma_attribute((__unused__)),
+ia64_code(void *simple lzma_attribute((__unused__)),
                 uint32_t now_pos, bool is_encoder,
                 uint8_t *buffer, size_t size)

xz/vendor/current/src/liblzma/simple/powerpc.c ¶

@@ -16 +16 @@
 
 static size_t
-powerpc_code(lzma_simple *simple lzma_attribute((__unused__)),
+powerpc_code(void *simple lzma_attribute((__unused__)),
                 uint32_t now_pos, bool is_encoder,
                 uint8_t *buffer, size_t size)

xz/vendor/current/src/liblzma/simple/simple_coder.c ¶

@@ -19 +19 @@
 /// Copied or encodes/decodes more data to out[].
 static lzma_ret
-copy_or_code(lzma_coder *coder, const lzma_allocator *allocator,
+copy_or_code(lzma_simple_coder *coder, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
@@ -56 +56 @@
 
 static size_t
-call_filter(lzma_coder *coder, uint8_t *buffer, size_t size)
+call_filter(lzma_simple_coder *coder, uint8_t *buffer, size_t size)
 {
         const size_t filtered = coder->filter(coder->simple,
@@ -67 +67 @@
 
 static lzma_ret
-simple_code(lzma_coder *coder, const lzma_allocator *allocator,
+simple_code(void *coder_ptr, const lzma_allocator *allocator,
                 const uint8_t *restrict in, size_t *restrict in_pos,
                 size_t in_size, uint8_t *restrict out,
                 size_t *restrict out_pos, size_t out_size, lzma_action action)
 {
+        lzma_simple_coder *coder = coder_ptr;
+
         // TODO: Add partial support for LZMA_SYNC_FLUSH. We can support it
         // in cases when the filter is able to filter everything. With most
@@ -199 +201 @@
 
 static void
-simple_coder_end(lzma_coder *coder, const lzma_allocator *allocator)
-{
+simple_coder_end(void *coder_ptr, const lzma_allocator *allocator)
+{
+        lzma_simple_coder *coder = coder_ptr;
         lzma_next_end(&coder->next, allocator);
         lzma_free(coder->simple, allocator);
@@ -209 +212 @@
 
 static lzma_ret
-simple_coder_update(lzma_coder *coder, const lzma_allocator *allocator,
+simple_coder_update(void *coder_ptr, const lzma_allocator *allocator,
                 const lzma_filter *filters_null lzma_attribute((__unused__)),
                 const lzma_filter *reversed_filters)
 {
+        lzma_simple_coder *coder = coder_ptr;
+
         // No update support, just call the next filter in the chain.
         return lzma_next_filter_update(
@@ -222 +227 @@
 lzma_simple_coder_init(lzma_next_coder *next, const lzma_allocator *allocator,
                 const lzma_filter_info *filters,
-                size_t (*filter)(lzma_simple *simple, uint32_t now_pos,
+                size_t (*filter)(void *simple, uint32_t now_pos,
                         bool is_encoder, uint8_t *buffer, size_t size),
                 size_t simple_size, size_t unfiltered_max,
                 uint32_t alignment, bool is_encoder)
 {
-        // Allocate memory for the lzma_coder structure if needed.
-        if (next->coder == NULL) {
+        // Allocate memory for the lzma_simple_coder structure if needed.
+        lzma_simple_coder *coder = next->coder;
+        if (coder == NULL) {
                 // Here we allocate space also for the temporary buffer. We
                 // need twice the size of unfiltered_max, because then it
                 // is always possible to filter at least unfiltered_max bytes
                 // more data in coder->buffer[] if it can be filled completely.
-                next->coder = lzma_alloc(sizeof(lzma_coder)
+                coder = lzma_alloc(sizeof(lzma_simple_coder)
                                 + 2 * unfiltered_max, allocator);
-                if (next->coder == NULL)
+                if (coder == NULL)
                         return LZMA_MEM_ERROR;
 
+                next->coder = coder;
                 next->code = &simple_code;
                 next->end = &simple_coder_end;
                 next->update = &simple_coder_update;
 
-                next->coder->next = LZMA_NEXT_CODER_INIT;
-                next->coder->filter = filter;
-                next->coder->allocated = 2 * unfiltered_max;
+                coder->next = LZMA_NEXT_CODER_INIT;
+                coder->filter = filter;
+                coder->allocated = 2 * unfiltered_max;
 
                 // Allocate memory for filter-specific data structure.
                 if (simple_size > 0) {
-                        next->coder->simple = lzma_alloc(
-                                        simple_size, allocator);
-                        if (next->coder->simple == NULL)
+                        coder->simple = lzma_alloc(simple_size, allocator);
+                        if (coder->simple == NULL)
                                 return LZMA_MEM_ERROR;
                 } else {
-                        next->coder->simple = NULL;
+                        coder->simple = NULL;
                 }
         }
@@ -259 +265 @@
         if (filters[0].options != NULL) {
                 const lzma_options_bcj *simple = filters[0].options;
-                next->coder->now_pos = simple->start_offset;
-                if (next->coder->now_pos & (alignment - 1))
+                coder->now_pos = simple->start_offset;
+                if (coder->now_pos & (alignment - 1))
                         return LZMA_OPTIONS_ERROR;
         } else {
-                next->coder->now_pos = 0;
+                coder->now_pos = 0;
         }
 
         // Reset variables.
-        next->coder->is_encoder = is_encoder;
-        next->coder->end_was_reached = false;
-        next->coder->pos = 0;
-        next->coder->filtered = 0;
-        next->coder->size = 0;
-
-        return lzma_next_filter_init(
-                        &next->coder->next, allocator, filters + 1);
-}
+        coder->is_encoder = is_encoder;
+        coder->end_was_reached = false;
+        coder->pos = 0;
+        coder->filtered = 0;
+        coder->size = 0;
+
+        return lzma_next_filter_init(&coder->next, allocator, filters + 1);
+}

xz/vendor/current/src/liblzma/simple/simple_private.h ¶

@@ -17 +17 @@
 
 
-typedef struct lzma_simple_s lzma_simple;
-
-struct lzma_coder_s {
+typedef struct {
         /// Next filter in the chain
         lzma_next_coder next;
@@ -34 +32 @@
         /// Pointer to filter-specific function, which does
         /// the actual filtering.
-        size_t (*filter)(lzma_simple *simple, uint32_t now_pos,
+        size_t (*filter)(void *simple, uint32_t now_pos,
                         bool is_encoder, uint8_t *buffer, size_t size);
 
         /// Pointer to filter-specific data, or NULL if filter doesn't need
         /// any extra data.
-        lzma_simple *simple;
+        void *simple;
 
         /// The lowest 32 bits of the current position in the data. Most
@@ -63 +61 @@
         /// Temporary buffer
         uint8_t buffer[];
-};
+} lzma_simple_coder;
 
 
@@ -69 +67 @@
                 const lzma_allocator *allocator,
                 const lzma_filter_info *filters,
-                size_t (*filter)(lzma_simple *simple, uint32_t now_pos,
+                size_t (*filter)(void *simple, uint32_t now_pos,
                         bool is_encoder, uint8_t *buffer, size_t size),
                 size_t simple_size, size_t unfiltered_max,

xz/vendor/current/src/liblzma/simple/sparc.c ¶

@@ -16 +16 @@
 
 static size_t
-sparc_code(lzma_simple *simple lzma_attribute((__unused__)),
+sparc_code(void *simple lzma_attribute((__unused__)),
                 uint32_t now_pos, bool is_encoder,
                 uint8_t *buffer, size_t size)

xz/vendor/current/src/liblzma/simple/x86.c ¶

@@ -18 +18 @@
 
 
-struct lzma_simple_s {
+typedef struct {
         uint32_t prev_mask;
         uint32_t prev_pos;
-};
+} lzma_simple_x86;
 
 
 static size_t
-x86_code(lzma_simple *simple, uint32_t now_pos, bool is_encoder,
+x86_code(void *simple_ptr, uint32_t now_pos, bool is_encoder,
                 uint8_t *buffer, size_t size)
 {
@@ -34 +34 @@
                         = { 0, 1, 2, 2, 3, 3, 3, 3 };
 
+        lzma_simple_x86 *simple = simple_ptr;
         uint32_t prev_mask = simple->prev_mask;
         uint32_t prev_pos = simple->prev_pos;
@@ -128 +129 @@
 {
         const lzma_ret ret = lzma_simple_coder_init(next, allocator, filters,
-                        &x86_code, sizeof(lzma_simple), 5, 1, is_encoder);
+                        &x86_code, sizeof(lzma_simple_x86), 5, 1, is_encoder);
 
         if (ret == LZMA_OK) {
-                next->coder->simple->prev_mask = 0;
-                next->coder->simple->prev_pos = (uint32_t)(-5);
+                lzma_simple_coder *coder = next->coder;
+                lzma_simple_x86 *simple = coder->simple;
+                simple->prev_mask = 0;
+                simple->prev_pos = (uint32_t)(-5);
         }
 

xz/vendor/current/src/lzmainfo/Makefile.in ¶

@@ -94 +94 @@
 subdir = src/lzmainfo
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -236 +236 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/src/scripts/Makefile.in ¶

@@ -100 +100 @@
 subdir = src/scripts
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -189 +189 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/src/xz/Makefile.am ¶

@@ -17 +17 @@
         hardware.c \
         hardware.h \
-        list.c \
-        list.h \
         main.c \
         main.h \
@@ -40 +38 @@
         ../common/tuklib_mbstr_fw.c
 
+if COND_MAIN_DECODER
+xz_SOURCES += \
+        list.c \
+        list.h
+endif
+
 if COND_W32
 xz_SOURCES += xz_w32res.rc
@@ -50 +54 @@
         -I$(top_builddir)/lib
 
-xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la
+xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la $(CAPSICUM_LIB)
 
 if COND_GNULIB

xz/vendor/current/src/xz/Makefile.in ¶

@@ -90 +90 @@
 host_triplet = @host@
 bin_PROGRAMS = xz$(EXEEXT)
-@COND_W32_TRUE@am__append_1 = xz_w32res.rc
-@COND_GNULIB_TRUE@am__append_2 = $(top_builddir)/lib/libgnu.a
-@COND_LZMALINKS_TRUE@am__append_3 = lzma unlzma lzcat
+@COND_MAIN_DECODER_TRUE@am__append_1 = \
+@COND_MAIN_DECODER_TRUE@        list.c \
+@COND_MAIN_DECODER_TRUE@        list.h
+
+@COND_W32_TRUE@am__append_2 = xz_w32res.rc
+@COND_GNULIB_TRUE@am__append_3 = $(top_builddir)/lib/libgnu.a
+@COND_LZMALINKS_TRUE@am__append_4 = lzma unlzma lzcat
 subdir = src/xz
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -121 +125 @@
 PROGRAMS = $(bin_PROGRAMS)
 am__xz_SOURCES_DIST = args.c args.h coder.c coder.h file_io.c \
-        file_io.h hardware.c hardware.h list.c list.h main.c main.h \
-        message.c message.h mytime.c mytime.h options.c options.h \
-        private.h signals.c signals.h suffix.c suffix.h util.c util.h \
+        file_io.h hardware.c hardware.h main.c main.h message.c \
+        message.h mytime.c mytime.h options.c options.h private.h \
+        signals.c signals.h suffix.c suffix.h util.c util.h \
         ../common/tuklib_open_stdxxx.c ../common/tuklib_progname.c \
         ../common/tuklib_exit.c ../common/tuklib_mbstr_width.c \
-        ../common/tuklib_mbstr_fw.c xz_w32res.rc
-@COND_W32_TRUE@am__objects_1 = xz_w32res.$(OBJEXT)
+        ../common/tuklib_mbstr_fw.c list.c list.h xz_w32res.rc
+@COND_MAIN_DECODER_TRUE@am__objects_1 = xz-list.$(OBJEXT)
+@COND_W32_TRUE@am__objects_2 = xz_w32res.$(OBJEXT)
 am_xz_OBJECTS = xz-args.$(OBJEXT) xz-coder.$(OBJEXT) \
-        xz-file_io.$(OBJEXT) xz-hardware.$(OBJEXT) xz-list.$(OBJEXT) \
-        xz-main.$(OBJEXT) xz-message.$(OBJEXT) xz-mytime.$(OBJEXT) \
-        xz-options.$(OBJEXT) xz-signals.$(OBJEXT) xz-suffix.$(OBJEXT) \
-        xz-util.$(OBJEXT) xz-tuklib_open_stdxxx.$(OBJEXT) \
-        xz-tuklib_progname.$(OBJEXT) xz-tuklib_exit.$(OBJEXT) \
-        xz-tuklib_mbstr_width.$(OBJEXT) xz-tuklib_mbstr_fw.$(OBJEXT) \
-        $(am__objects_1)
+        xz-file_io.$(OBJEXT) xz-hardware.$(OBJEXT) xz-main.$(OBJEXT) \
+        xz-message.$(OBJEXT) xz-mytime.$(OBJEXT) xz-options.$(OBJEXT) \
+        xz-signals.$(OBJEXT) xz-suffix.$(OBJEXT) xz-util.$(OBJEXT) \
+        xz-tuklib_open_stdxxx.$(OBJEXT) xz-tuklib_progname.$(OBJEXT) \
+        xz-tuklib_exit.$(OBJEXT) xz-tuklib_mbstr_width.$(OBJEXT) \
+        xz-tuklib_mbstr_fw.$(OBJEXT) $(am__objects_1) $(am__objects_2)
 xz_OBJECTS = $(am_xz_OBJECTS)
 am__DEPENDENCIES_1 =
 xz_DEPENDENCIES = $(top_builddir)/src/liblzma/liblzma.la \
-        $(am__append_2) $(am__DEPENDENCIES_1)
+        $(am__DEPENDENCIES_1) $(am__append_3) $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -247 +251 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@
@@ -387 +392 @@
 xz = @xz@
 xz_SOURCES = args.c args.h coder.c coder.h file_io.c file_io.h \
-        hardware.c hardware.h list.c list.h main.c main.h message.c \
-        message.h mytime.c mytime.h options.c options.h private.h \
-        signals.c signals.h suffix.c suffix.h util.c util.h \
+        hardware.c hardware.h main.c main.h message.c message.h \
+        mytime.c mytime.h options.c options.h private.h signals.c \
+        signals.h suffix.c suffix.h util.c util.h \
         ../common/tuklib_open_stdxxx.c ../common/tuklib_progname.c \
         ../common/tuklib_exit.c ../common/tuklib_mbstr_width.c \
-        ../common/tuklib_mbstr_fw.c $(am__append_1)
+        ../common/tuklib_mbstr_fw.c $(am__append_1) $(am__append_2)
 xz_CPPFLAGS = \
         -DLOCALEDIR=\"$(localedir)\" \
@@ -401 +406 @@
 
 # libgnu.a may need these libs, so this must be after libgnu.a.
-xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la $(am__append_2) \
-        $(LTLIBINTL)
+xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la $(CAPSICUM_LIB) \
+        $(am__append_3) $(LTLIBINTL)
 dist_man_MANS = xz.1
-xzlinks = unxz xzcat $(am__append_3)
+xzlinks = unxz xzcat $(am__append_4)
 all: all-am
 
@@ -593 +598 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-hardware.obj `if test -f 'hardware.c'; then $(CYGPATH_W) 'hardware.c'; else $(CYGPATH_W) '$(srcdir)/hardware.c'; fi`
 
+xz-main.o: main.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.o -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='main.c' object='xz-main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+xz-main.obj: main.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.obj -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='main.c' object='xz-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+xz-message.o: message.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.o -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='message.c' object='xz-message.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c
+
+xz-message.obj: message.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.obj -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='message.c' object='xz-message.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi`
+
+xz-mytime.o: mytime.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-mytime.o -MD -MP -MF $(DEPDIR)/xz-mytime.Tpo -c -o xz-mytime.o `test -f 'mytime.c' || echo '$(srcdir)/'`mytime.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-mytime.Tpo $(DEPDIR)/xz-mytime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='mytime.c' object='xz-mytime.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-mytime.o `test -f 'mytime.c' || echo '$(srcdir)/'`mytime.c
+
+xz-mytime.obj: mytime.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-mytime.obj -MD -MP -MF $(DEPDIR)/xz-mytime.Tpo -c -o xz-mytime.obj `if test -f 'mytime.c'; then $(CYGPATH_W) 'mytime.c'; else $(CYGPATH_W) '$(srcdir)/mytime.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-mytime.Tpo $(DEPDIR)/xz-mytime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='mytime.c' object='xz-mytime.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-mytime.obj `if test -f 'mytime.c'; then $(CYGPATH_W) 'mytime.c'; else $(CYGPATH_W) '$(srcdir)/mytime.c'; fi`
+
+xz-options.o: options.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.o -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='options.c' object='xz-options.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c
+
+xz-options.obj: options.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.obj -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='options.c' object='xz-options.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi`
+
+xz-signals.o: signals.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.o -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='signals.c' object='xz-signals.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c
+
+xz-signals.obj: signals.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.obj -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='signals.c' object='xz-signals.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`
+
+xz-suffix.o: suffix.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.o -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='suffix.c' object='xz-suffix.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c
+
+xz-suffix.obj: suffix.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.obj -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='suffix.c' object='xz-suffix.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi`
+
+xz-util.o: util.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.o -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='util.c' object='xz-util.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
+
+xz-util.obj: util.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.obj -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='util.c' object='xz-util.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
+
+xz-tuklib_open_stdxxx.o: ../common/tuklib_open_stdxxx.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.o -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.o `test -f '../common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`../common/tuklib_open_stdxxx.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.o `test -f '../common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`../common/tuklib_open_stdxxx.c
+
+xz-tuklib_open_stdxxx.obj: ../common/tuklib_open_stdxxx.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.obj `if test -f '../common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '../common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_open_stdxxx.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.obj `if test -f '../common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '../common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_open_stdxxx.c'; fi`
+
+xz-tuklib_progname.o: ../common/tuklib_progname.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.o -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.o `test -f '../common/tuklib_progname.c' || echo '$(srcdir)/'`../common/tuklib_progname.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_progname.c' object='xz-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.o `test -f '../common/tuklib_progname.c' || echo '$(srcdir)/'`../common/tuklib_progname.c
+
+xz-tuklib_progname.obj: ../common/tuklib_progname.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.obj `if test -f '../common/tuklib_progname.c'; then $(CYGPATH_W) '../common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_progname.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_progname.c' object='xz-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.obj `if test -f '../common/tuklib_progname.c'; then $(CYGPATH_W) '../common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_progname.c'; fi`
+
+xz-tuklib_exit.o: ../common/tuklib_exit.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.o -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.o `test -f '../common/tuklib_exit.c' || echo '$(srcdir)/'`../common/tuklib_exit.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_exit.c' object='xz-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.o `test -f '../common/tuklib_exit.c' || echo '$(srcdir)/'`../common/tuklib_exit.c
+
+xz-tuklib_exit.obj: ../common/tuklib_exit.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.obj `if test -f '../common/tuklib_exit.c'; then $(CYGPATH_W) '../common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_exit.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_exit.c' object='xz-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.obj `if test -f '../common/tuklib_exit.c'; then $(CYGPATH_W) '../common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_exit.c'; fi`
+
+xz-tuklib_mbstr_width.o: ../common/tuklib_mbstr_width.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.o `test -f '../common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_width.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.o `test -f '../common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_width.c
+
+xz-tuklib_mbstr_width.obj: ../common/tuklib_mbstr_width.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.obj `if test -f '../common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_width.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.obj `if test -f '../common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_width.c'; fi`
+
+xz-tuklib_mbstr_fw.o: ../common/tuklib_mbstr_fw.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.o `test -f '../common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_fw.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.o `test -f '../common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_fw.c
+
+xz-tuklib_mbstr_fw.obj: ../common/tuklib_mbstr_fw.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.obj `if test -f '../common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_fw.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.obj `if test -f '../common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_fw.c'; fi`
+
 xz-list.o: list.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-list.o -MD -MP -MF $(DEPDIR)/xz-list.Tpo -c -o xz-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c
@@ -606 +779 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi`
-
-xz-main.o: main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.o -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='main.c' object='xz-main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-
-xz-main.obj: main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.obj -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='main.c' object='xz-main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-
-xz-message.o: message.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.o -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='message.c' object='xz-message.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c
-
-xz-message.obj: message.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.obj -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='message.c' object='xz-message.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi`
-
-xz-mytime.o: mytime.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-mytime.o -MD -MP -MF $(DEPDIR)/xz-mytime.Tpo -c -o xz-mytime.o `test -f 'mytime.c' || echo '$(srcdir)/'`mytime.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-mytime.Tpo $(DEPDIR)/xz-mytime.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='mytime.c' object='xz-mytime.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-mytime.o `test -f 'mytime.c' || echo '$(srcdir)/'`mytime.c
-
-xz-mytime.obj: mytime.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-mytime.obj -MD -MP -MF $(DEPDIR)/xz-mytime.Tpo -c -o xz-mytime.obj `if test -f 'mytime.c'; then $(CYGPATH_W) 'mytime.c'; else $(CYGPATH_W) '$(srcdir)/mytime.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-mytime.Tpo $(DEPDIR)/xz-mytime.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='mytime.c' object='xz-mytime.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-mytime.obj `if test -f 'mytime.c'; then $(CYGPATH_W) 'mytime.c'; else $(CYGPATH_W) '$(srcdir)/mytime.c'; fi`
-
-xz-options.o: options.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.o -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='options.c' object='xz-options.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c
-
-xz-options.obj: options.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.obj -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='options.c' object='xz-options.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi`
-
-xz-signals.o: signals.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.o -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='signals.c' object='xz-signals.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c
-
-xz-signals.obj: signals.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.obj -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='signals.c' object='xz-signals.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`
-
-xz-suffix.o: suffix.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.o -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='suffix.c' object='xz-suffix.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c
-
-xz-suffix.obj: suffix.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.obj -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='suffix.c' object='xz-suffix.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi`
-
-xz-util.o: util.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.o -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='util.c' object='xz-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-
-xz-util.obj: util.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.obj -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='util.c' object='xz-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
-
-xz-tuklib_open_stdxxx.o: ../common/tuklib_open_stdxxx.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.o -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.o `test -f '../common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`../common/tuklib_open_stdxxx.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.o `test -f '../common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`../common/tuklib_open_stdxxx.c
-
-xz-tuklib_open_stdxxx.obj: ../common/tuklib_open_stdxxx.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.obj `if test -f '../common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '../common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_open_stdxxx.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.obj `if test -f '../common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '../common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_open_stdxxx.c'; fi`
-
-xz-tuklib_progname.o: ../common/tuklib_progname.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.o -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.o `test -f '../common/tuklib_progname.c' || echo '$(srcdir)/'`../common/tuklib_progname.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_progname.c' object='xz-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.o `test -f '../common/tuklib_progname.c' || echo '$(srcdir)/'`../common/tuklib_progname.c
-
-xz-tuklib_progname.obj: ../common/tuklib_progname.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.obj `if test -f '../common/tuklib_progname.c'; then $(CYGPATH_W) '../common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_progname.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_progname.c' object='xz-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.obj `if test -f '../common/tuklib_progname.c'; then $(CYGPATH_W) '../common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_progname.c'; fi`
-
-xz-tuklib_exit.o: ../common/tuklib_exit.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.o -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.o `test -f '../common/tuklib_exit.c' || echo '$(srcdir)/'`../common/tuklib_exit.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_exit.c' object='xz-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.o `test -f '../common/tuklib_exit.c' || echo '$(srcdir)/'`../common/tuklib_exit.c
-
-xz-tuklib_exit.obj: ../common/tuklib_exit.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.obj `if test -f '../common/tuklib_exit.c'; then $(CYGPATH_W) '../common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_exit.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_exit.c' object='xz-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.obj `if test -f '../common/tuklib_exit.c'; then $(CYGPATH_W) '../common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_exit.c'; fi`
-
-xz-tuklib_mbstr_width.o: ../common/tuklib_mbstr_width.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.o `test -f '../common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_width.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.o `test -f '../common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_width.c
-
-xz-tuklib_mbstr_width.obj: ../common/tuklib_mbstr_width.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.obj `if test -f '../common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_width.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.obj `if test -f '../common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_width.c'; fi`
-
-xz-tuklib_mbstr_fw.o: ../common/tuklib_mbstr_fw.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.o `test -f '../common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_fw.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.o `test -f '../common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`../common/tuklib_mbstr_fw.c
-
-xz-tuklib_mbstr_fw.obj: ../common/tuklib_mbstr_fw.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.obj `if test -f '../common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_fw.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='../common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.obj `if test -f '../common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '../common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/../common/tuklib_mbstr_fw.c'; fi`
 
 mostlyclean-libtool:

xz/vendor/current/src/xz/args.c ¶

@@ -636 +636 @@
         parse_real(args, argc, argv);
 
+        // If encoder or decoder support was omitted at build time,
+        // show an error now so that the rest of the code can rely on
+        // that whatever is in opt_mode is also supported.
+#ifndef HAVE_ENCODERS
+        if (opt_mode == MODE_COMPRESS)
+                message_fatal(_("Compression support was disabled "
+                                "at build time"));
+#endif
+#ifndef HAVE_DECODERS
+        // Even MODE_LIST cannot work without decoder support so MODE_COMPRESS
+        // is the only valid choice.
+        if (opt_mode != MODE_COMPRESS)
+                message_fatal(_("Decompression support was disabled "
+                                "at build time"));
+#endif
+
         // Never remove the source file when the destination is not on disk.
         // In test mode the data is written nowhere, but setting opt_stdout

xz/vendor/current/src/xz/coder.c ¶

@@ -52 +52 @@
 static bool check_default = true;
 
-#ifdef MYTHREAD_ENABLED
+#if defined(HAVE_ENCODERS) && defined(MYTHREAD_ENABLED)
 static lzma_mt mt_options = {
         .flags = 0,
@@ -222 +222 @@
         // we can be decompressing.
         const uint64_t memory_limit = hardware_memlimit_get(opt_mode);
-        uint64_t memory_usage;
+        uint64_t memory_usage = UINT64_MAX;
         if (opt_mode == MODE_COMPRESS) {
-#ifdef MYTHREAD_ENABLED
+#ifdef HAVE_ENCODERS
+#       ifdef MYTHREAD_ENABLED
                 if (opt_format == FORMAT_XZ && hardware_threads_get() > 1) {
                         mt_options.threads = hardware_threads_get();
@@ -236 +237 @@
                                                 mt_options.threads);
                 } else
-#endif
+#       endif
                 {
                         memory_usage = lzma_raw_encoder_memusage(filters);
                 }
+#endif
         } else {
+#ifdef HAVE_DECODERS
                 memory_usage = lzma_raw_decoder_memusage(filters);
+#endif
         }
 
@@ -249 +253 @@
         // Print memory usage info before possible dictionary
         // size auto-adjusting.
+        //
+        // NOTE: If only encoder support was built, we cannot show the
+        // what the decoder memory usage will be.
         message_mem_needed(V_DEBUG, memory_usage);
+#ifdef HAVE_DECODERS
         if (opt_mode == MODE_COMPRESS) {
                 const uint64_t decmem = lzma_raw_decoder_memusage(filters);
@@ -257 +265 @@
                                                 round_up_to_mib(decmem), 0));
         }
+#endif
 
         if (memory_usage <= memory_limit)
@@ -269 +278 @@
         assert(opt_mode == MODE_COMPRESS);
 
-#ifdef MYTHREAD_ENABLED
+#ifdef HAVE_ENCODERS
+#       ifdef MYTHREAD_ENABLED
         if (opt_format == FORMAT_XZ && mt_options.threads > 1) {
                 // Try to reduce the number of threads before
@@ -296 +306 @@
                                 memory_limit), 2));
         }
-#endif
+#       endif
 
         if (memory_usage <= memory_limit)
@@ -350 +360 @@
                         uint64_to_str(opt->dict_size >> 20, 1),
                         uint64_to_str(round_up_to_mib(memory_limit), 2));
+#endif
 
         return;
@@ -355 +366 @@
 
 
+#ifdef HAVE_DECODERS
 /// Return true if the data in in_buf seems to be in the .xz format.
 static bool
@@ -412 +424 @@
         return true;
 }
+#endif
 
 
@@ -425 +438 @@
 
         if (opt_mode == MODE_COMPRESS) {
+#ifdef HAVE_ENCODERS
                 switch (opt_format) {
                 case FORMAT_AUTO:
@@ -432 +446 @@
 
                 case FORMAT_XZ:
-#ifdef MYTHREAD_ENABLED
+#       ifdef MYTHREAD_ENABLED
                         if (hardware_threads_get() > 1)
                                 ret = lzma_stream_encoder_mt(
                                                 &strm, &mt_options);
                         else
-#endif
+#       endif
                                 ret = lzma_stream_encoder(
                                                 &strm, filters, check);
@@ -450 +464 @@
                         break;
                 }
+#endif
         } else {
+#ifdef HAVE_DECODERS
                 uint32_t flags = 0;
 
@@ -532 +548 @@
                         ret = lzma_code(&strm, LZMA_RUN);
                 }
+#endif
         }
 

xz/vendor/current/src/xz/file_io.c ¶

@@ -24 +24 @@
 #if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMES)
 #       include <sys/time.h>
+#elif defined(HAVE__FUTIME)
+#       include <sys/utime.h>
 #elif defined(HAVE_UTIME)
 #       include <utime.h>
 #endif
 
+#ifdef HAVE_CAPSICUM
+#       ifdef HAVE_SYS_CAPSICUM_H
+#               include <sys/capsicum.h>
+#       else
+#               include <sys/capability.h>
+#       endif
+#endif
+
 #include "tuklib_open_stdxxx.h"
 
@@ -36 +46 @@
 #ifndef O_NOCTTY
 #       define O_NOCTTY 0
+#endif
+
+// Using this macro to silence a warning from gcc -Wlogical-op.
+#if EAGAIN == EWOULDBLOCK
+#       define IS_EAGAIN_OR_EWOULDBLOCK(e) ((e) == EAGAIN)
+#else
+#       define IS_EAGAIN_OR_EWOULDBLOCK(e) \
+                ((e) == EAGAIN || (e) == EWOULDBLOCK)
 #endif
 
@@ -48 +66 @@
 /// If true, try to create sparse files when decompressing.
 static bool try_sparse = true;
+
+#ifdef ENABLE_SANDBOX
+/// True if the conditions for sandboxing (described in main()) have been met.
+static bool sandbox_allowed = false;
+#endif
 
 #ifndef TUKLIB_DOSLIKE
@@ -131 +154 @@
         return;
 }
+
+
+#ifdef ENABLE_SANDBOX
+extern void
+io_allow_sandbox(void)
+{
+        sandbox_allowed = true;
+        return;
+}
+
+
+/// Enables operating-system-specific sandbox if it is possible.
+/// src_fd is the file descriptor of the input file.
+static void
+io_sandbox_enter(int src_fd)
+{
+        if (!sandbox_allowed) {
+                message(V_DEBUG, _("Sandbox is disabled due "
+                                "to incompatible command line arguments"));
+                return;
+        }
+
+        const char dummy_str[] = "x";
+
+        // Try to ensure that both libc and xz locale files have been
+        // loaded when NLS is enabled.
+        snprintf(NULL, 0, "%s%s", _(dummy_str), strerror(EINVAL));
+
+        // Try to ensure that iconv data files needed for handling multibyte
+        // characters have been loaded. This is needed at least with glibc.
+        tuklib_mbstr_width(dummy_str, NULL);
+
+#ifdef HAVE_CAPSICUM
+        // Capsicum needs FreeBSD 10.0 or later.
+        cap_rights_t rights;
+
+        if (cap_rights_limit(src_fd, cap_rights_init(&rights,
+                        CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK)))
+                goto error;
+
+        if (cap_rights_limit(STDOUT_FILENO, cap_rights_init(&rights,
+                        CAP_EVENT, CAP_FCNTL, CAP_FSTAT, CAP_LOOKUP,
+                        CAP_WRITE, CAP_SEEK)))
+                goto error;
+
+        if (cap_rights_limit(user_abort_pipe[0], cap_rights_init(&rights,
+                        CAP_EVENT)))
+                goto error;
+
+        if (cap_rights_limit(user_abort_pipe[1], cap_rights_init(&rights,
+                        CAP_WRITE)))
+                goto error;
+
+        if (cap_enter())
+                goto error;
+
+#else
+#       error ENABLE_SANDBOX is defined but no sandboxing method was found.
+#endif
+
+        message(V_DEBUG, _("Sandbox was successfully enabled"));
+        return;
+
+error:
+        message(V_DEBUG, _("Failed to enable the sandbox"));
+}
+#endif // ENABLE_SANDBOX
 
 
@@ -370 +460 @@
 #       endif
 
+#elif defined(HAVE__FUTIME)
+        // Use one-second precision with Windows-specific _futime().
+        // We could use utime() too except that for some reason the
+        // timestamp will get reset at close(). With _futime() it works.
+        // This struct cannot be const as _futime() takes a non-const pointer.
+        struct _utimbuf buf = {
+                .actime = pair->src_st.st_atime,
+                .modtime = pair->src_st.st_mtime,
+        };
+
+        // Avoid warnings.
+        (void)atime_nsec;
+        (void)mtime_nsec;
+
+        (void)_futime(pair->dest_fd, &buf);
+
 #elif defined(HAVE_UTIME)
         // Use one-second precision. utime() doesn't support using file
@@ -650 +756 @@
         signals_unblock();
 
+#ifdef ENABLE_SANDBOX
+        if (!error)
+                io_sandbox_enter(pair.src_fd);
+#endif
+
         return error ? NULL : &pair;
 }
@@ -676 +787 @@
 
         if (pair->src_fd != STDIN_FILENO && pair->src_fd != -1) {
-#ifdef TUKLIB_DOSLIKE
+                // Close the file before possibly unlinking it. On DOS-like
+                // systems this is always required since unlinking will fail
+                // if the file is open. On POSIX systems it usually works
+                // to unlink open files, but in some cases it doesn't and
+                // one gets EBUSY in errno.
+                //
+                // xz 5.2.2 and older unlinked the file before closing it
+                // (except on DOS-like systems). The old code didn't handle
+                // EBUSY and could fail e.g. on some CIFS shares. The
+                // advantage of unlinking before closing is negligible
+                // (avoids a race between close() and stat()/lstat() and
+                // unlink()), so let's keep this simple.
                 (void)close(pair->src_fd);
-#endif
-
-                // If we are going to unlink(), do it before closing the file.
-                // This way there's no risk that someone replaces the file and
-                // happens to get same inode number, which would make us
-                // unlink() wrong file.
-                //
-                // NOTE: DOS-like systems are an exception to this, because
-                // they don't allow unlinking files that are open. *sigh*
+
                 if (success && !opt_keep_original)
                         io_unlink(pair->src_name, &pair->src_st);
-
-#ifndef TUKLIB_DOSLIKE
-                (void)close(pair->src_fd);
-#endif
         }
 
@@ -1019 +1129 @@
 
 #ifndef TUKLIB_DOSLIKE
-                        if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                        if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
                                 const io_wait_ret ret = io_wait(pair,
                                                 mytime_get_flush_timeout(),
@@ -1107 +1217 @@
 
 #ifndef TUKLIB_DOSLIKE
-                        if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                        if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
                                 if (io_wait(pair, -1, false) == IO_WAIT_MORE)
                                         continue;

xz/vendor/current/src/xz/file_io.h ¶

@@ -81 +81 @@
 
 
+#ifdef ENABLE_SANDBOX
+/// \brief      main() calls this if conditions for sandboxing have been met.
+extern void io_allow_sandbox(void);
+#endif
+
+
 /// \brief      Open the source file
 extern file_pair *io_open_src(const char *src_name);

xz/vendor/current/src/xz/main.c ¶

@@ -206 +206 @@
                 signals_init();
 
+#ifdef ENABLE_SANDBOX
+        // Set a flag that sandboxing is allowed if all these are true:
+        //   - --files or --files0 wasn't used.
+        //   - There is exactly one input file or we are reading from stdin.
+        //   - We won't create any files: output goes to stdout or --test
+        //     or --list was used. Note that --test implies opt_stdout = true
+        //     but --list doesn't.
+        //
+        // This is obviously not ideal but it was easy to implement and
+        // it covers the most common use cases.
+        //
+        // TODO: Make sandboxing work for other situations too.
+        if (args.files_name == NULL && args.arg_count == 1
+                        && (opt_stdout || strcmp("-", args.arg_names[0]) == 0
+                                || opt_mode == MODE_LIST))
+                io_allow_sandbox();
+#endif
+
         // coder_run() handles compression, decompression, and testing.
         // list_file() is for --list.
-        void (*run)(const char *filename) = opt_mode == MODE_LIST
-                         ? &list_file : &coder_run;
+        void (*run)(const char *filename) = &coder_run;
+#ifdef HAVE_DECODERS
+        if (opt_mode == MODE_LIST)
+                run = &list_file;
+#endif
 
         // Process the files given on the command line. Note that if no names
@@ -268 +289 @@
         }
 
+#ifdef HAVE_DECODERS
         // All files have now been handled. If in --list mode, display
         // the totals before exiting. We don't have signal handlers
@@ -275 +297 @@
                 list_totals();
         }
+#endif
 
 #ifndef NDEBUG

xz/vendor/current/src/xz/private.h ¶

@@ -46 +46 @@
 #endif
 
+#ifdef HAVE_CAPSICUM
+#       define ENABLE_SANDBOX 1
+#endif
+
 #include "main.h"
 #include "mytime.h"
@@ -57 +61 @@
 #include "suffix.h"
 #include "util.h"
-#include "list.h"
+
+#ifdef HAVE_DECODERS
+#       include "list.h"
+#endif

xz/vendor/current/src/xzdec/Makefile.in ¶

@@ -97 +97 @@
 subdir = src/xzdec
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -254 +254 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/tests/Makefile.in ¶

@@ -100 +100 @@
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \
-        $(top_srcdir)/m4/tuklib_common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \
+        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \
+        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+        $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+        $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \
         $(top_srcdir)/m4/tuklib_cpucores.m4 \
         $(top_srcdir)/m4/tuklib_integer.m4 \
@@ -267 +267 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CAPSICUM_LIB = @CAPSICUM_LIB@
 CC = @CC@
 CCAS = @CCAS@

xz/vendor/current/tests/test_index.c ¶

@@ -631 +631 @@
 
 
+// Allocator that succeeds for the first two allocation but fails the rest.
+static void *
+my_alloc(void *opaque, size_t a, size_t b)
+{
+        (void)opaque;
+
+        static unsigned count = 0;
+        if (++count > 2)
+                return NULL;
+
+        return malloc(a * b);
+}
+
+static const lzma_allocator my_allocator = { &my_alloc, NULL, NULL };
+
+
 int
 main(void)
@@ -656 +672 @@
         test_corrupt();
 
+        // Test for the bug fix 21515d79d778b8730a434f151b07202d52a04611:
+        // liblzma: Fix lzma_index_dup() for empty Streams.
+        i = create_empty();
+        expect(lzma_index_stream_padding(i, 4) == LZMA_OK);
+        test_copy(i);
+        lzma_index_end(i, NULL);
+
+        // Test for the bug fix 3bf857edfef51374f6f3fffae3d817f57d3264a0:
+        // liblzma: Fix a memory leak in error path of lzma_index_dup().
+        // Use Valgrind to see that there are no leaks.
+        i = create_small();
+        expect(lzma_index_dup(i, &my_allocator) == NULL);
+        lzma_index_end(i, NULL);
+
         return 0;
 }

xz/vendor/current/windows/config.h ¶

@@ -15 +15 @@
 /* Define to 1 if sha256 integrity check is enabled. */
 #define HAVE_CHECK_SHA256 1
+
+/* Define to 1 if any of HAVE_DECODER_foo have been defined. */
+#define HAVE_DECODERS 1
 
 /* Define to 1 if arm decoder is enabled. */
@@ -42 +45 @@
 /* Define to 1 if x86 decoder is enabled. */
 #define HAVE_DECODER_X86 1
+
+/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */
+#define HAVE_ENCODERS 1
 
 /* Define to 1 if arm encoder is enabled. */