pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers Changes 3.1.2:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0f586054ccb
branches:  trunk
changeset: 644775:d0f586054ccb
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Jan 17 12:44:47 2015 +0000

description:
Changes 3.1.2:
This is a maintenance update to fix issues with the new RAR seeking
feature. This new release also contains fixes for build failures when
building libarchive using Visual Studio 2012 and MinGW.

diffstat:

 archivers/bsdtar/Makefile                                                                        |     22 +-
 archivers/libarchive/Makefile                                                                    |     21 +-
 archivers/libarchive/Makefile.common                                                             |     18 +
 archivers/libarchive/PLIST                                                                       |     30 +-
 archivers/libarchive/buildlink3.mk                                                               |     10 +-
 archivers/libarchive/files/CMakeLists.txt                                                        |   1116 +-
 archivers/libarchive/files/COPYING                                                               |      4 +-
 archivers/libarchive/files/INSTALL                                                               |      9 +-
 archivers/libarchive/files/Makefile.am                                                           |    525 +-
 archivers/libarchive/files/Makefile.in                                                           |  10852 +++-
 archivers/libarchive/files/NEWS                                                                  |    111 +-
 archivers/libarchive/files/README                                                                |     48 +-
 archivers/libarchive/files/aclocal.m4                                                            |   2481 +-
 archivers/libarchive/files/build/autoconf/compile                                                |    228 +-
 archivers/libarchive/files/build/autoconf/config.guess                                           |    293 +-
 archivers/libarchive/files/build/autoconf/config.rpath                                           |    696 +
 archivers/libarchive/files/build/autoconf/config.sub                                             |    273 +-
 archivers/libarchive/files/build/autoconf/depcomp                                                |    190 +-
 archivers/libarchive/files/build/autoconf/iconv.m4                                               |    268 +
 archivers/libarchive/files/build/autoconf/install-sh                                             |    698 +-
 archivers/libarchive/files/build/autoconf/lib-ld.m4                                              |    109 +
 archivers/libarchive/files/build/autoconf/lib-link.m4                                            |    777 +
 archivers/libarchive/files/build/autoconf/lib-prefix.m4                                          |    224 +
 archivers/libarchive/files/build/autoconf/ltmain.sh                                              |   4097 +-
 archivers/libarchive/files/build/autoconf/missing                                                |     53 +-
 archivers/libarchive/files/build/autogen.sh                                                      |     12 +-
 archivers/libarchive/files/build/bump-version.sh                                                 |      2 +-
 archivers/libarchive/files/build/clean.sh                                                        |     54 +-
 archivers/libarchive/files/build/cmake/CheckFileOffsetBits.cmake                                 |      6 +-
 archivers/libarchive/files/build/cmake/FindLZMA.cmake                                            |      6 +-
 archivers/libarchive/files/build/cmake/FindLibGCC.cmake                                          |     22 +
 archivers/libarchive/files/build/cmake/FindNettle.cmake                                          |     23 +
 archivers/libarchive/files/build/cmake/FindPCREPOSIX.cmake                                       |     34 +
 archivers/libarchive/files/build/cmake/LibarchiveCheckCSourceCompiles.cmake                      |    106 +
 archivers/libarchive/files/build/cmake/LibarchiveCheckCSourceRuns.cmake                          |    102 +
 archivers/libarchive/files/build/cmake/config.h.in                                               |    619 +-
 archivers/libarchive/files/build/pkgconfig/libarchive.pc.in                                      |      3 +-
 archivers/libarchive/files/build/version                                                         |      2 +-
 archivers/libarchive/files/config.h.in                                                           |    415 +-
 archivers/libarchive/files/configure                                                             |   9507 ++-
 archivers/libarchive/files/configure.ac                                                          |    474 +-
 archivers/libarchive/files/contrib/README                                                        |     29 +-
 archivers/libarchive/files/contrib/libarchive.1aix53.spec                                        |     16 +-
 archivers/libarchive/files/contrib/libarchive.spec                                               |     16 +-
 archivers/libarchive/files/contrib/psota-benchmark/results.txt                                   |     16 +-
 archivers/libarchive/files/contrib/psota-benchmark/tcp.sh                                        |     22 +-
 archivers/libarchive/files/contrib/shar/shar.c                                                   |      2 +-
 archivers/libarchive/files/contrib/untar.c                                                       |      6 +-
 archivers/libarchive/files/cpio/CMakeLists.txt                                                   |      4 -
 archivers/libarchive/files/cpio/bsdcpio.1                                                        |     79 +-
 archivers/libarchive/files/cpio/cmdline.c                                                        |     29 +-
 archivers/libarchive/files/cpio/cpio.c                                                           |    285 +-
 archivers/libarchive/files/cpio/cpio.h                                                           |     22 +-
 archivers/libarchive/files/cpio/cpio_windows.c                                                   |      2 +-
 archivers/libarchive/files/cpio/test/CMakeLists.txt                                              |     26 +-
 archivers/libarchive/files/cpio/test/list.h                                                      |     27 +-
 archivers/libarchive/files/cpio/test/main.c                                                      |   1065 +-
 archivers/libarchive/files/cpio/test/test.h                                                      |    132 +-
 archivers/libarchive/files/cpio/test/test_0.c                                                    |     14 +-
 archivers/libarchive/files/cpio/test/test_basic.c                                                |     49 +-
 archivers/libarchive/files/cpio/test/test_extract.cpio.Z.uu                                      |      7 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.bz2.uu                                    |      7 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.grz.uu                                    |      7 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.gz.uu                                     |      7 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.lrz.uu                                    |      8 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.lz.uu                                     |      6 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.lzma.uu                                   |      6 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.lzo.uu                                    |      9 +
 archivers/libarchive/files/cpio/test/test_extract.cpio.xz.uu                                     |      7 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_Z.c                                       |     42 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_bz2.c                                     |     48 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_grz.c                                     |     48 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_gz.c                                      |     48 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_lrz.c                                     |     48 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_lz.c                                      |     48 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_lzma.c                                    |     48 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_lzo.c                                     |     48 +
 archivers/libarchive/files/cpio/test/test_extract_cpio_xz.c                                      |     48 +
 archivers/libarchive/files/cpio/test/test_format_newc.c                                          |     45 +-
 archivers/libarchive/files/cpio/test/test_option_0.c                                             |     92 +
 archivers/libarchive/files/cpio/test/test_option_b64encode.c                                     |     54 +
 archivers/libarchive/files/cpio/test/test_option_c.c                                             |     22 +-
 archivers/libarchive/files/cpio/test/test_option_grzip.c                                         |     52 +
 archivers/libarchive/files/cpio/test/test_option_lrzip.c                                         |     52 +
 archivers/libarchive/files/cpio/test/test_option_lzop.c                                          |     56 +
 archivers/libarchive/files/cpio/test/test_option_t.c                                             |     31 +-
 archivers/libarchive/files/cpio/test/test_option_u.c                                             |      6 +-
 archivers/libarchive/files/cpio/test/test_option_uuencode.c                                      |     54 +
 archivers/libarchive/files/cpio/test/test_option_xz.c                                            |     57 +
 archivers/libarchive/files/cpio/test/test_option_y.c                                             |      5 +-
 archivers/libarchive/files/cpio/test/test_option_z.c                                             |      5 +-
 archivers/libarchive/files/cpio/test/test_owner_parse.c                                          |     11 +-
 archivers/libarchive/files/doc/html/.ignore_me                                                   |      2 +
 archivers/libarchive/files/doc/html/Makefile                                                     |    112 +-
 archivers/libarchive/files/doc/html/archive_entry.3.html                                         |   1253 +-
 archivers/libarchive/files/doc/html/archive_entry_acl.3.html                                     |    270 +
 archivers/libarchive/files/doc/html/archive_entry_linkify.3.html                                 |    212 +
 archivers/libarchive/files/doc/html/archive_entry_paths.3.html                                   |    282 +
 archivers/libarchive/files/doc/html/archive_entry_perms.3.html                                   |    315 +
 archivers/libarchive/files/doc/html/archive_entry_stat.3.html                                    |    381 +
 archivers/libarchive/files/doc/html/archive_entry_time.3.html                                    |    205 +
 archivers/libarchive/files/doc/html/archive_read.3.html                                          |   1743 +-
 archivers/libarchive/files/doc/html/archive_read_data.3.html                                     |    141 +
 archivers/libarchive/files/doc/html/archive_read_disk.3.html                                     |   1121 +-
 archivers/libarchive/files/doc/html/archive_read_extract.3.html                                  |    134 +
 archivers/libarchive/files/doc/html/archive_read_filter.3.html                                   |    163 +
 archivers/libarchive/files/doc/html/archive_read_format.3.html                                   |    227 +
 archivers/libarchive/files/doc/html/archive_read_free.3.html                                     |    107 +
 archivers/libarchive/files/doc/html/archive_read_header.3.html                                   |     98 +
 archivers/libarchive/files/doc/html/archive_read_new.3.html                                      |     68 +
 archivers/libarchive/files/doc/html/archive_read_open.3.html                                     |    239 +
 archivers/libarchive/files/doc/html/archive_read_set_options.3.html                              |    187 +
 archivers/libarchive/files/doc/html/archive_util.3.html                                          |    789 +-
 archivers/libarchive/files/doc/html/archive_write.3.html                                         |   1629 +-
 archivers/libarchive/files/doc/html/archive_write_blocksize.3.html                               |    140 +
 archivers/libarchive/files/doc/html/archive_write_data.3.html                                    |     74 +
 archivers/libarchive/files/doc/html/archive_write_disk.3.html                                    |   1351 +-
 archivers/libarchive/files/doc/html/archive_write_filter.3.html                                  |    136 +
 archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html                            |     83 +
 archivers/libarchive/files/doc/html/archive_write_format.3.html                                  |    120 +
 archivers/libarchive/files/doc/html/archive_write_free.3.html                                    |    115 +
 archivers/libarchive/files/doc/html/archive_write_header.3.html                                  |     79 +
 archivers/libarchive/files/doc/html/archive_write_new.3.html                                     |     67 +
 archivers/libarchive/files/doc/html/archive_write_open.3.html                                    |    231 +
 archivers/libarchive/files/doc/html/archive_write_set_options.3.html                             |    525 +
 archivers/libarchive/files/doc/html/bsdcpio.1.html                                               |   1396 +-
 archivers/libarchive/files/doc/html/bsdtar.1.html                                                |   3081 +-
 archivers/libarchive/files/doc/html/cpio.5.html                                                  |   1184 +-
 archivers/libarchive/files/doc/html/libarchive-formats.5.html                                    |   1342 +-
 archivers/libarchive/files/doc/html/libarchive.3.html                                            |   1119 +-
 archivers/libarchive/files/doc/html/libarchive_changes.3.html                                    |    463 +
 archivers/libarchive/files/doc/html/libarchive_internals.3.html                                  |   1264 +-
 archivers/libarchive/files/doc/html/mtree.5.html                                                 |    952 +-
 archivers/libarchive/files/doc/html/tar.5.html                                                   |   3215 +-
 archivers/libarchive/files/doc/man/.ignore_me                                                    |      2 +
 archivers/libarchive/files/doc/man/Makefile                                                      |     86 +-
 archivers/libarchive/files/doc/man/archive_entry.3                                               |    441 +-
 archivers/libarchive/files/doc/man/archive_entry_acl.3                                           |    209 +
 archivers/libarchive/files/doc/man/archive_entry_linkify.3                                       |    203 +
 archivers/libarchive/files/doc/man/archive_entry_paths.3                                         |    188 +
 archivers/libarchive/files/doc/man/archive_entry_perms.3                                         |    231 +
 archivers/libarchive/files/doc/man/archive_entry_stat.3                                          |    320 +
 archivers/libarchive/files/doc/man/archive_entry_time.3                                          |    146 +
 archivers/libarchive/files/doc/man/archive_read.3                                                |    740 +-
 archivers/libarchive/files/doc/man/archive_read_data.3                                           |    112 +
 archivers/libarchive/files/doc/man/archive_read_disk.3                                           |     60 +-
 archivers/libarchive/files/doc/man/archive_read_extract.3                                        |    112 +
 archivers/libarchive/files/doc/man/archive_read_filter.3                                         |    113 +
 archivers/libarchive/files/doc/man/archive_read_format.3                                         |    185 +
 archivers/libarchive/files/doc/man/archive_read_free.3                                           |     78 +
 archivers/libarchive/files/doc/man/archive_read_header.3                                         |     72 +
 archivers/libarchive/files/doc/man/archive_read_new.3                                            |     37 +
 archivers/libarchive/files/doc/man/archive_read_open.3                                           |    205 +
 archivers/libarchive/files/doc/man/archive_read_set_options.3                                    |    176 +
 archivers/libarchive/files/doc/man/archive_util.3                                                |     91 +-
 archivers/libarchive/files/doc/man/archive_write.3                                               |    614 +-
 archivers/libarchive/files/doc/man/archive_write_blocksize.3                                     |    104 +
 archivers/libarchive/files/doc/man/archive_write_data.3                                          |     41 +
 archivers/libarchive/files/doc/man/archive_write_disk.3                                          |     60 +-
 archivers/libarchive/files/doc/man/archive_write_filter.3                                        |     94 +
 archivers/libarchive/files/doc/man/archive_write_finish_entry.3                                  |     54 +
 archivers/libarchive/files/doc/man/archive_write_format.3                                        |     88 +
 archivers/libarchive/files/doc/man/archive_write_free.3                                          |     84 +
 archivers/libarchive/files/doc/man/archive_write_header.3                                        |     51 +
 archivers/libarchive/files/doc/man/archive_write_new.3                                           |     36 +
 archivers/libarchive/files/doc/man/archive_write_open.3                                          |    211 +
 archivers/libarchive/files/doc/man/archive_write_set_options.3                                   |    455 +
 archivers/libarchive/files/doc/man/bsdcpio.1                                                     |     83 +-
 archivers/libarchive/files/doc/man/bsdtar.1                                                      |    484 +-
 archivers/libarchive/files/doc/man/cpio.5                                                        |     54 +-
 archivers/libarchive/files/doc/man/libarchive-formats.5                                          |    102 +-
 archivers/libarchive/files/doc/man/libarchive.3                                                  |    218 +-
 archivers/libarchive/files/doc/man/libarchive_changes.3                                          |    340 +
 archivers/libarchive/files/doc/man/libarchive_internals.3                                        |      8 +-
 archivers/libarchive/files/doc/man/mtree.5                                                       |      2 +-
 archivers/libarchive/files/doc/man/tar.5                                                         |    225 +-
 archivers/libarchive/files/doc/mdoc2man.awk                                                      |      4 +-
 archivers/libarchive/files/doc/mdoc2wiki.awk                                                     |    109 +-
 archivers/libarchive/files/doc/pdf/.ignore_me                                                    |      2 +
 archivers/libarchive/files/doc/pdf/Makefile                                                      |     86 +-
 archivers/libarchive/files/doc/pdf/archive_entry.3.pdf                                           |    Bin 
 archivers/libarchive/files/doc/pdf/archive_entry_acl.3.pdf                                       |    Bin 
 archivers/libarchive/files/doc/pdf/archive_entry_linkify.3.pdf                                   |    Bin 
 archivers/libarchive/files/doc/pdf/archive_entry_paths.3.pdf                                     |    Bin 
 archivers/libarchive/files/doc/pdf/archive_entry_perms.3.pdf                                     |    Bin 
 archivers/libarchive/files/doc/pdf/archive_entry_stat.3.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/archive_entry_time.3.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read.3.pdf                                            |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_data.3.pdf                                       |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_disk.3.pdf                                       |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_extract.3.pdf                                    |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_filter.3.pdf                                     |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_format.3.pdf                                     |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_free.3.pdf                                       |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_header.3.pdf                                     |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_new.3.pdf                                        |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_open.3.pdf                                       |    Bin 
 archivers/libarchive/files/doc/pdf/archive_read_set_options.3.pdf                                |    Bin 
 archivers/libarchive/files/doc/pdf/archive_util.3.pdf                                            |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write.3.pdf                                           |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_blocksize.3.pdf                                 |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_data.3.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_disk.3.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_filter.3.pdf                                    |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_finish_entry.3.pdf                              |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_format.3.pdf                                    |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_free.3.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_header.3.pdf                                    |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_new.3.pdf                                       |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_open.3.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/archive_write_set_options.3.pdf                               |    Bin 
 archivers/libarchive/files/doc/pdf/bsdcpio.1.pdf                                                 |    Bin 
 archivers/libarchive/files/doc/pdf/bsdtar.1.pdf                                                  |    Bin 
 archivers/libarchive/files/doc/pdf/cpio.5.pdf                                                    |    Bin 
 archivers/libarchive/files/doc/pdf/libarchive-formats.5.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/libarchive.3.pdf                                              |    Bin 
 archivers/libarchive/files/doc/pdf/libarchive_changes.3.pdf                                      |    Bin 
 archivers/libarchive/files/doc/pdf/libarchive_internals.3.pdf                                    |    Bin 
 archivers/libarchive/files/doc/pdf/mtree.5.pdf                                                   |    Bin 
 archivers/libarchive/files/doc/pdf/tar.5.pdf                                                     |    Bin 
 archivers/libarchive/files/doc/text/.ignore_me                                                   |      2 +
 archivers/libarchive/files/doc/text/Makefile                                                     |     86 +-
 archivers/libarchive/files/doc/text/archive_entry.3.txt                                          |    327 +-
 archivers/libarchive/files/doc/text/archive_entry_acl.3.txt                                      |    135 +
 archivers/libarchive/files/doc/text/archive_entry_linkify.3.txt                                  |    113 +
 archivers/libarchive/files/doc/text/archive_entry_paths.3.txt                                    |    136 +
 archivers/libarchive/files/doc/text/archive_entry_perms.3.txt                                    |    169 +
 archivers/libarchive/files/doc/text/archive_entry_stat.3.txt                                     |    190 +
 archivers/libarchive/files/doc/text/archive_entry_time.3.txt                                     |    110 +
 archivers/libarchive/files/doc/text/archive_read.3.txt                                           |    494 +-
 archivers/libarchive/files/doc/text/archive_read_data.3.txt                                      |     74 +
 archivers/libarchive/files/doc/text/archive_read_disk.3.txt                                      |     74 +-
 archivers/libarchive/files/doc/text/archive_read_extract.3.txt                                   |     74 +
 archivers/libarchive/files/doc/text/archive_read_filter.3.txt                                    |     85 +
 archivers/libarchive/files/doc/text/archive_read_format.3.txt                                    |    129 +
 archivers/libarchive/files/doc/text/archive_read_free.3.txt                                      |     52 +
 archivers/libarchive/files/doc/text/archive_read_header.3.txt                                    |     46 +
 archivers/libarchive/files/doc/text/archive_read_new.3.txt                                       |     27 +
 archivers/libarchive/files/doc/text/archive_read_open.3.txt                                      |    129 +
 archivers/libarchive/files/doc/text/archive_read_set_options.3.txt                               |     94 +
 archivers/libarchive/files/doc/text/archive_util.3.txt                                           |     87 +-
 archivers/libarchive/files/doc/text/archive_write.3.txt                                          |    433 +-
 archivers/libarchive/files/doc/text/archive_write_blocksize.3.txt                                |     74 +
 archivers/libarchive/files/doc/text/archive_write_data.3.txt                                     |     30 +
 archivers/libarchive/files/doc/text/archive_write_disk.3.txt                                     |    102 +-
 archivers/libarchive/files/doc/text/archive_write_filter.3.txt                                   |     66 +
 archivers/libarchive/files/doc/text/archive_write_finish_entry.3.txt                             |     36 +
 archivers/libarchive/files/doc/text/archive_write_format.3.txt                                   |     58 +
 archivers/libarchive/files/doc/text/archive_write_free.3.txt                                     |     58 +
 archivers/libarchive/files/doc/text/archive_write_header.3.txt                                   |     35 +
 archivers/libarchive/files/doc/text/archive_write_new.3.txt                                      |     26 +
 archivers/libarchive/files/doc/text/archive_write_open.3.txt                                     |    130 +
 archivers/libarchive/files/doc/text/archive_write_set_options.3.txt                              |    311 +
 archivers/libarchive/files/doc/text/bsdcpio.1.txt                                                |    154 +-
 archivers/libarchive/files/doc/text/bsdtar.1.txt                                                 |    460 +-
 archivers/libarchive/files/doc/text/cpio.5.txt                                                   |    144 +-
 archivers/libarchive/files/doc/text/libarchive-formats.5.txt                                     |    198 +-
 archivers/libarchive/files/doc/text/libarchive.3.txt                                             |    187 +-
 archivers/libarchive/files/doc/text/libarchive_changes.3.txt                                     |    260 +
 archivers/libarchive/files/doc/text/libarchive_internals.3.txt                                   |     68 +-
 archivers/libarchive/files/doc/text/mtree.5.txt                                                  |     56 +-
 archivers/libarchive/files/doc/text/tar.5.txt                                                    |    359 +-
 archivers/libarchive/files/doc/update.sh                                                         |     26 +-
 archivers/libarchive/files/doc/wiki/.ignore_me                                                   |      2 +
 archivers/libarchive/files/doc/wiki/Makefile                                                     |     86 +-
 archivers/libarchive/files/doc/wiki/ManPageArchiveEntry3.wiki                                    |    624 +-
 archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki                                 |    204 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveEntryLinkify3.wiki                             |    197 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPaths3.wiki                               |    175 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPerms3.wiki                               |    222 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveEntryStat3.wiki                                |    308 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveEntryTime3.wiki                                |    138 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki                                     |    818 +-
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadData3.wiki                                 |    101 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki                                 |    525 +-
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadExtract3.wiki                              |    102 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadFilter3.wiki                               |    104 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadFormat3.wiki                               |    174 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadFree3.wiki                                 |     68 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadHeader3.wiki                               |     63 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadNew3.wiki                                  |     32 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadOpen3.wiki                                 |    190 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveReadSetOptions3.wiki                           |    165 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveUtil3.wiki                                     |    364 +-
 archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki                                    |    713 +-
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteBlocksize3.wiki                           |     93 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteData3.wiki                                |     34 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteDisk3.wiki                                |    732 +-
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki                              |     86 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFinishEntry3.wiki                         |     47 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFormat3.wiki                              |     81 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFree3.wiki                                |     73 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteHeader3.wiki                              |     44 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteNew3.wiki                                 |     31 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteOpen3.wiki                                |    197 +
 archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki                          |    393 +
 archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki                                         |    765 +-
 archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki                                          |   2042 +-
 archivers/libarchive/files/doc/wiki/ManPageCpio5.wiki                                            |    492 +-
 archivers/libarchive/files/doc/wiki/ManPageLibarchive3.wiki                                      |    539 +-
 archivers/libarchive/files/doc/wiki/ManPageLibarchiveChanges3.wiki                               |    303 +
 archivers/libarchive/files/doc/wiki/ManPageLibarchiveFormats5.wiki                               |    716 +-
 archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki                             |    650 +-
 archivers/libarchive/files/doc/wiki/ManPageMtree5.wiki                                           |    462 +-
 archivers/libarchive/files/doc/wiki/ManPageTar5.wiki                                             |   1562 +-
 archivers/libarchive/files/examples/minitar/minitar.c                                            |     97 +-
 archivers/libarchive/files/examples/tarfilter.c                                                  |      6 +-
 archivers/libarchive/files/examples/untar.c                                                      |     10 +-
 archivers/libarchive/files/libarchive/CMakeLists.txt                                             |     92 +-
 archivers/libarchive/files/libarchive/archive.h                                                  |    793 +-
 archivers/libarchive/files/libarchive/archive_acl.c                                              |   1278 +
 archivers/libarchive/files/libarchive/archive_acl_private.h                                      |     87 +
 archivers/libarchive/files/libarchive/archive_check_magic.c                                      |     81 +-
 archivers/libarchive/files/libarchive/archive_cmdline.c                                          |    227 +
 archivers/libarchive/files/libarchive/archive_cmdline_private.h                                  |     47 +
 archivers/libarchive/files/libarchive/archive_crc32.h                                            |     12 +
 archivers/libarchive/files/libarchive/archive_crypto.c                                           |   1429 +
 archivers/libarchive/files/libarchive/archive_crypto_private.h                                   |    376 +
 archivers/libarchive/files/libarchive/archive_endian.h                                           |      8 +-
 archivers/libarchive/files/libarchive/archive_entry.3                                            |    343 +-
 archivers/libarchive/files/libarchive/archive_entry.c                                            |   1400 +-
 archivers/libarchive/files/libarchive/archive_entry.h                                            |    279 +-
 archivers/libarchive/files/libarchive/archive_entry_acl.3                                        |    235 +
 archivers/libarchive/files/libarchive/archive_entry_copy_bhfi.c                                  |      9 +-
 archivers/libarchive/files/libarchive/archive_entry_copy_stat.c                                  |      8 +-
 archivers/libarchive/files/libarchive/archive_entry_link_resolver.c                              |    162 +-
 archivers/libarchive/files/libarchive/archive_entry_linkify.3                                    |    224 +
 archivers/libarchive/files/libarchive/archive_entry_locale.h                                     |     88 +
 archivers/libarchive/files/libarchive/archive_entry_paths.3                                      |    153 +
 archivers/libarchive/files/libarchive/archive_entry_perms.3                                      |    209 +
 archivers/libarchive/files/libarchive/archive_entry_private.h                                    |     86 +-
 archivers/libarchive/files/libarchive/archive_entry_sparse.c                                     |    156 +
 archivers/libarchive/files/libarchive/archive_entry_stat.3                                       |    274 +
 archivers/libarchive/files/libarchive/archive_entry_stat.c                                       |     12 +-
 archivers/libarchive/files/libarchive/archive_entry_time.3                                       |    129 +
 archivers/libarchive/files/libarchive/archive_getdate.c                                          |   1037 +
 archivers/libarchive/files/libarchive/archive_match.c                                            |   1841 +
 archivers/libarchive/files/libarchive/archive_options.c                                          |    211 +
 archivers/libarchive/files/libarchive/archive_options_private.h                                  |     47 +
 archivers/libarchive/files/libarchive/archive_pathmatch.c                                        |    459 +
 archivers/libarchive/files/libarchive/archive_pathmatch.h                                        |     52 +
 archivers/libarchive/files/libarchive/archive_platform.h                                         |     10 -
 archivers/libarchive/files/libarchive/archive_ppmd7.c                                            |   1163 +
 archivers/libarchive/files/libarchive/archive_ppmd7_private.h                                    |    119 +
 archivers/libarchive/files/libarchive/archive_ppmd_private.h                                     |    158 +
 archivers/libarchive/files/libarchive/archive_private.h                                          |     52 +-
 archivers/libarchive/files/libarchive/archive_rb.c                                               |    709 +
 archivers/libarchive/files/libarchive/archive_rb.h                                               |    100 +
 archivers/libarchive/files/libarchive/archive_read.3                                             |    708 +-
 archivers/libarchive/files/libarchive/archive_read.c                                             |   1283 +-
 archivers/libarchive/files/libarchive/archive_read_append_filter.c                               |    198 +
 archivers/libarchive/files/libarchive/archive_read_data.3                                        |    130 +
 archivers/libarchive/files/libarchive/archive_read_data_into_fd.c                                |     82 +-
 archivers/libarchive/files/libarchive/archive_read_disk.3                                        |     61 +-
 archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c                        |    880 +-
 archivers/libarchive/files/libarchive/archive_read_disk_posix.c                                  |   2606 +
 archivers/libarchive/files/libarchive/archive_read_disk_private.h                                |     34 +-
 archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c                    |     28 +-
 archivers/libarchive/files/libarchive/archive_read_disk_windows.c                                |   2296 +
 archivers/libarchive/files/libarchive/archive_read_extract.3                                     |    137 +
 archivers/libarchive/files/libarchive/archive_read_extract.c                                     |     21 +-
 archivers/libarchive/files/libarchive/archive_read_filter.3                                      |    129 +
 archivers/libarchive/files/libarchive/archive_read_format.3                                      |    177 +
 archivers/libarchive/files/libarchive/archive_read_free.3                                        |     93 +
 archivers/libarchive/files/libarchive/archive_read_header.3                                      |     91 +
 archivers/libarchive/files/libarchive/archive_read_new.3                                         |     59 +
 archivers/libarchive/files/libarchive/archive_read_open.3                                        |    233 +
 archivers/libarchive/files/libarchive/archive_read_open_fd.c                                     |     96 +-
 archivers/libarchive/files/libarchive/archive_read_open_file.c                                   |     48 +-
 archivers/libarchive/files/libarchive/archive_read_open_filename.c                               |    506 +-
 archivers/libarchive/files/libarchive/archive_read_open_memory.c                                 |     77 +-
 archivers/libarchive/files/libarchive/archive_read_private.h                                     |     95 +-
 archivers/libarchive/files/libarchive/archive_read_set_format.c                                  |    105 +
 archivers/libarchive/files/libarchive/archive_read_set_options.3                                 |    209 +
 archivers/libarchive/files/libarchive/archive_read_set_options.c                                 |    156 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_all.c                          |     81 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_bzip2.c                        |    371 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_compress.c                     |    455 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_grzip.c                        |    121 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_gzip.c                         |    477 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_lrzip.c                        |    132 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_lzop.c                         |    486 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_none.c                         |     52 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_program.c                      |    516 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_rpm.c                          |    289 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c                           |    694 +
 archivers/libarchive/files/libarchive/archive_read_support_filter_xz.c                           |    988 +
 archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c                         |   3748 +
 archivers/libarchive/files/libarchive/archive_read_support_format_all.c                          |     48 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_ar.c                           |    144 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_by_code.c                      |     74 +
 archivers/libarchive/files/libarchive/archive_read_support_format_cab.c                          |   3348 +
 archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c                         |    607 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_empty.c                        |     21 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c                      |   1398 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_lha.c                          |   2748 +
 archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c                        |    819 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_rar.c                          |   2858 +
 archivers/libarchive/files/libarchive/archive_read_support_format_raw.c                          |     61 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_tar.c                          |   1312 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_xar.c                          |    436 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_zip.c                          |   1727 +-
 archivers/libarchive/files/libarchive/archive_string.c                                           |   4322 +-
 archivers/libarchive/files/libarchive/archive_string.h                                           |    183 +-
 archivers/libarchive/files/libarchive/archive_string_composition.h                               |   2292 +
 archivers/libarchive/files/libarchive/archive_string_sprintf.c                                   |     58 +-
 archivers/libarchive/files/libarchive/archive_util.3                                             |     82 +-
 archivers/libarchive/files/libarchive/archive_util.c                                             |    534 +-
 archivers/libarchive/files/libarchive/archive_virtual.c                                          |     96 +-
 archivers/libarchive/files/libarchive/archive_windows.c                                          |    750 +-
 archivers/libarchive/files/libarchive/archive_windows.h                                          |    161 +-
 archivers/libarchive/files/libarchive/archive_write.3                                            |    554 +-
 archivers/libarchive/files/libarchive/archive_write.c                                            |    609 +-
 archivers/libarchive/files/libarchive/archive_write_add_filter.c                                 |     70 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c                       |    314 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c                         |     75 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c                           |    407 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c                        |    455 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_grzip.c                           |    135 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c                            |    442 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_lrzip.c                           |    192 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c                            |    486 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_none.c                            |     43 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_program.c                         |    412 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c                        |    305 +
 archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c                              |    515 +
 archivers/libarchive/files/libarchive/archive_write_blocksize.3                                  |    114 +
 archivers/libarchive/files/libarchive/archive_write_data.3                                       |     62 +
 archivers/libarchive/files/libarchive/archive_write_disk.3                                       |     58 +-
 archivers/libarchive/files/libarchive/archive_write_disk_acl.c                                   |    249 +
 archivers/libarchive/files/libarchive/archive_write_disk_posix.c                                 |   3821 +
 archivers/libarchive/files/libarchive/archive_write_disk_private.h                               |      5 +
 archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c                   |     40 +-
 archivers/libarchive/files/libarchive/archive_write_disk_windows.c                               |   2502 +
 archivers/libarchive/files/libarchive/archive_write_filter.3                                     |    100 +
 archivers/libarchive/files/libarchive/archive_write_finish_entry.3                               |     76 +
 archivers/libarchive/files/libarchive/archive_write_format.3                                     |    100 +
 archivers/libarchive/files/libarchive/archive_write_free.3                                       |     96 +
 archivers/libarchive/files/libarchive/archive_write_header.3                                     |     73 +
 archivers/libarchive/files/libarchive/archive_write_new.3                                        |     58 +
 archivers/libarchive/files/libarchive/archive_write_open.3                                       |    235 +
 archivers/libarchive/files/libarchive/archive_write_open_fd.c                                    |     15 +-
 archivers/libarchive/files/libarchive/archive_write_open_file.c                                  |     14 +-
 archivers/libarchive/files/libarchive/archive_write_open_filename.c                              |    122 +-
 archivers/libarchive/files/libarchive/archive_write_open_memory.c                                |     12 -
 archivers/libarchive/files/libarchive/archive_write_private.h                                    |     75 +-
 archivers/libarchive/files/libarchive/archive_write_set_format.c                                 |      6 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c                            |   2324 +
 archivers/libarchive/files/libarchive/archive_write_set_format_ar.c                              |     62 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_by_name.c                         |     14 +
 archivers/libarchive/files/libarchive/archive_write_set_format_cpio.c                            |    316 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c                       |    343 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c                          |    761 +
 archivers/libarchive/files/libarchive/archive_write_set_format_iso9660.c                         |   8148 +++
 archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c                           |   2095 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_pax.c                             |   1194 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_shar.c                            |     94 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c                           |    353 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c                           |    661 +
 archivers/libarchive/files/libarchive/archive_write_set_format_xar.c                             |   3181 +
 archivers/libarchive/files/libarchive/archive_write_set_format_zip.c                             |    665 +-
 archivers/libarchive/files/libarchive/archive_write_set_options.3                                |    437 +
 archivers/libarchive/files/libarchive/archive_write_set_options.c                                |    130 +
 archivers/libarchive/files/libarchive/config_freebsd.h                                           |      6 +
 archivers/libarchive/files/libarchive/cpio.5                                                     |     54 +-
 archivers/libarchive/files/libarchive/filter_fork.h                                              |      2 +-
 archivers/libarchive/files/libarchive/filter_fork_posix.c                                        |    238 +
 archivers/libarchive/files/libarchive/filter_fork_windows.c                                      |    165 +-
 archivers/libarchive/files/libarchive/libarchive-formats.5                                       |    106 +-
 archivers/libarchive/files/libarchive/libarchive.3                                               |    222 +-
 archivers/libarchive/files/libarchive/libarchive_changes.3                                       |    341 +
 archivers/libarchive/files/libarchive/libarchive_internals.3                                     |     12 +-
 archivers/libarchive/files/libarchive/mtree.5                                                    |      2 +-
 archivers/libarchive/files/libarchive/tar.5                                                      |    204 +-
 archivers/libarchive/files/libarchive/test/CMakeLists.txt                                        |    138 +-
 archivers/libarchive/files/libarchive/test/list.h                                                |    236 +-
 archivers/libarchive/files/libarchive/test/main.c                                                |   1078 +-
 archivers/libarchive/files/libarchive/test/read_open_memory.c                                    |    100 +-
 archivers/libarchive/files/libarchive/test/test.h                                                |    142 +-
 archivers/libarchive/files/libarchive/test/test_acl_freebsd_nfs4.c                               |    547 +
 archivers/libarchive/files/libarchive/test/test_acl_freebsd_posix1e.c                            |    265 +
 archivers/libarchive/files/libarchive/test/test_acl_nfs4.c                                       |    296 +
 archivers/libarchive/files/libarchive/test/test_acl_pax.c                                        |    267 +-
 archivers/libarchive/files/libarchive/test/test_acl_pax.tar.uu                                   |    117 +
 archivers/libarchive/files/libarchive/test/test_acl_posix1e.c                                    |    279 +
 archivers/libarchive/files/libarchive/test/test_archive_api_feature.c                            |     28 +-
 archivers/libarchive/files/libarchive/test/test_archive_clear_error.c                            |     42 +
 archivers/libarchive/files/libarchive/test/test_archive_cmdline.c                                |    141 +
 archivers/libarchive/files/libarchive/test/test_archive_crypto.c                                 |    145 +
 archivers/libarchive/files/libarchive/test/test_archive_getdate.c                                |     81 +
 archivers/libarchive/files/libarchive/test/test_archive_match_owner.c                            |    289 +
 archivers/libarchive/files/libarchive/test/test_archive_match_path.c                             |    450 +
 archivers/libarchive/files/libarchive/test/test_archive_match_time.c                             |   1358 +
 archivers/libarchive/files/libarchive/test/test_archive_pathmatch.c                              |    244 +
 archivers/libarchive/files/libarchive/test/test_archive_read_close_twice.c                       |     43 +
 archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_fd.c               |     47 +
 archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c         |     47 +
 archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c             |    372 +
 archivers/libarchive/files/libarchive/test/test_archive_read_next_header_empty.c                 |    111 +
 archivers/libarchive/files/libarchive/test/test_archive_read_next_header_raw.c                   |     65 +
 archivers/libarchive/files/libarchive/test/test_archive_read_open2.c                             |    109 +
 archivers/libarchive/files/libarchive/test/test_archive_read_set_filter_option.c                 |     55 +
 archivers/libarchive/files/libarchive/test/test_archive_read_set_format_option.c                 |     67 +
 archivers/libarchive/files/libarchive/test/test_archive_read_set_option.c                        |     69 +
 archivers/libarchive/files/libarchive/test/test_archive_read_set_options.c                       |    126 +
 archivers/libarchive/files/libarchive/test/test_archive_read_support.c                           |     98 +
 archivers/libarchive/files/libarchive/test/test_archive_set_error.c                              |     51 +
 archivers/libarchive/files/libarchive/test/test_archive_string.c                                 |    344 +
 archivers/libarchive/files/libarchive/test/test_archive_string_conversion.c                      |    810 +
 archivers/libarchive/files/libarchive/test/test_archive_string_conversion.txt.Z.uu               |   2605 +
 archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c               |    194 +
 archivers/libarchive/files/libarchive/test/test_archive_write_set_filter_option.c                |     55 +
 archivers/libarchive/files/libarchive/test/test_archive_write_set_format_by_name.c               |    285 +
 archivers/libarchive/files/libarchive/test/test_archive_write_set_format_option.c                |     67 +
 archivers/libarchive/files/libarchive/test/test_archive_write_set_option.c                       |     69 +
 archivers/libarchive/files/libarchive/test/test_archive_write_set_options.c                      |    126 +
 archivers/libarchive/files/libarchive/test/test_bad_fd.c                                         |     10 +-
 archivers/libarchive/files/libarchive/test/test_compat_bzip2.c                                   |     14 +-
 archivers/libarchive/files/libarchive/test/test_compat_cpio.c                                    |      6 +-
 archivers/libarchive/files/libarchive/test/test_compat_gtar.c                                    |     14 +-
 archivers/libarchive/files/libarchive/test/test_compat_gzip.c                                    |     12 +-
 archivers/libarchive/files/libarchive/test/test_compat_lzip.c                                    |    141 +
 archivers/libarchive/files/libarchive/test/test_compat_lzip_1.tlz.uu                             |     10 +
 archivers/libarchive/files/libarchive/test/test_compat_lzip_2.tlz.uu                             |      9 +
 archivers/libarchive/files/libarchive/test/test_compat_lzma.c                                    |     12 +-
 archivers/libarchive/files/libarchive/test/test_compat_lzop.c                                    |    131 +
 archivers/libarchive/files/libarchive/test/test_compat_lzop_1.tar.lzo.uu                         |     30 +
 archivers/libarchive/files/libarchive/test/test_compat_lzop_2.tar.lzo.uu                         |     39 +
 archivers/libarchive/files/libarchive/test/test_compat_lzop_3.tar.lzo.uu                         |     32 +
 archivers/libarchive/files/libarchive/test/test_compat_mac-1.tar.Z.uu                            |     38 +
 archivers/libarchive/files/libarchive/test/test_compat_mac-2.tar.Z.uu                            |     19 +
 archivers/libarchive/files/libarchive/test/test_compat_mac.c                                     |    212 +
 archivers/libarchive/files/libarchive/test/test_compat_pax_libarchive_2x.c                       |    146 +
 archivers/libarchive/files/libarchive/test/test_compat_pax_libarchive_2x.tar.Z.uu                |     15 +
 archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse.c                      |    188 +
 archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse_1.pax.Z.uu             |     53 +
 archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse_2.pax.Z.uu             |     53 +
 archivers/libarchive/files/libarchive/test/test_compat_solaris_tar_acl.c                         |      4 +-
 archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink.c                            |     10 +-
 archivers/libarchive/files/libarchive/test/test_compat_uudecode.c                                |     63 +
 archivers/libarchive/files/libarchive/test/test_compat_xz.c                                      |     12 +-
 archivers/libarchive/files/libarchive/test/test_compat_zip.c                                     |    400 +-
 archivers/libarchive/files/libarchive/test/test_compat_zip_2.zip.uu                              |      8 +
 archivers/libarchive/files/libarchive/test/test_compat_zip_3.zip.uu                              |     18 +
 archivers/libarchive/files/libarchive/test/test_compat_zip_4.zip.uu                              |     25 +
 archivers/libarchive/files/libarchive/test/test_compat_zip_5.zip.uu                              |    242 +
 archivers/libarchive/files/libarchive/test/test_compat_zip_6.zip.uu                              |     10 +
 archivers/libarchive/files/libarchive/test/test_compat_zip_7.xps.uu                              |    357 +
 archivers/libarchive/files/libarchive/test/test_empty_write.c                                    |     32 +-
 archivers/libarchive/files/libarchive/test/test_entry.c                                          |    179 +-
 archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c                                |      5 +-
 archivers/libarchive/files/libarchive/test/test_filter_count.c                                   |     80 +
 archivers/libarchive/files/libarchive/test/test_fuzz.c                                           |    336 +-
 archivers/libarchive/files/libarchive/test/test_fuzz.cab.uu                                      |     49 +
 archivers/libarchive/files/libarchive/test/test_fuzz.lzh.uu                                      |    152 +
 archivers/libarchive/files/libarchive/test/test_gnutar_filename_encoding.c                       |    414 +
 archivers/libarchive/files/libarchive/test/test_open_failure.c                                   |    218 +
 archivers/libarchive/files/libarchive/test/test_open_fd.c                                        |     15 +-
 archivers/libarchive/files/libarchive/test/test_open_file.c                                      |      8 +-
 archivers/libarchive/files/libarchive/test/test_open_filename.c                                  |    105 +-
 archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c                          |    300 +-
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu      |    163 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu      |    163 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu      |    163 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu      |    163 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu      |    163 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu      |    117 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu         |    159 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu         |    159 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu         |    146 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu |    299 +
 archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu |     75 +
 archivers/libarchive/files/libarchive/test/test_read_data_large.c                                |     34 +-
 archivers/libarchive/files/libarchive/test/test_read_disk.c                                      |      9 +-
 archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c                 |   1577 +
 archivers/libarchive/files/libarchive/test/test_read_disk_entry_from_file.c                      |      8 +-
 archivers/libarchive/files/libarchive/test/test_read_extract.c                                   |     12 +-
 archivers/libarchive/files/libarchive/test/test_read_file_nonexistent.c                          |      2 +-
 archivers/libarchive/files/libarchive/test/test_read_filter_grzip.c                              |     67 +
 archivers/libarchive/files/libarchive/test/test_read_filter_grzip.tar.grz.uu                     |      8 +
 archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.c                              |     67 +
 archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.tar.lrz.uu                     |     10 +
 archivers/libarchive/files/libarchive/test/test_read_filter_lzop.c                               |     74 +
 archivers/libarchive/files/libarchive/test/test_read_filter_lzop.tar.lzo.uu                      |     11 +
 archivers/libarchive/files/libarchive/test/test_read_filter_lzop_multiple_parts.c                |     72 +
 archivers/libarchive/files/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu       |     89 +
 archivers/libarchive/files/libarchive/test/test_read_filter_program.c                            |     83 +
 archivers/libarchive/files/libarchive/test/test_read_filter_program_signature.c                  |    103 +
 archivers/libarchive/files/libarchive/test/test_read_filter_uudecode.c                           |    178 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip.c                               |    760 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_bzip2.7z.uu                |    319 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_copy_1.7z.uu               |    614 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_copy_2.7z.uu               |    615 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_copy_lzma.7z.uu            |    568 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_deflate.7z.uu              |    313 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_lzma1_1.7z.uu              |    287 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_lzma1_2.7z.uu              |    240 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_lzma2_1.7z.uu              |    287 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj2_lzma2_2.7z.uu              |    240 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj_bzip2.7z.uu                 |    281 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj_copy.7z.uu                  |    613 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj_deflate.7z.uu               |    275 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj_lzma1.7z.uu                 |    245 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bcj_lzma2.7z.uu                 |    245 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_bzip2.7z.uu                     |     37 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy.7z.uu                      |      7 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy_2.7z.uu                    |     11 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_deflate.7z.uu                   |     36 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_delta_lzma1.7z.uu               |    280 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_delta_lzma2.7z.uu               |    280 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_empty_archive.7z.uu             |      4 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_empty_file.7z.uu                |      5 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_lzma1.7z.uu                     |     37 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_lzma1_2.7z.uu                   |      8 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_lzma1_lzma2.7z.uu               |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_lzma2.7z.uu                     |     37 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_ppmd.7z.uu                      |    235 +
 archivers/libarchive/files/libarchive/test/test_read_format_7zip_symbolic_name.7z.uu             |      8 +
 archivers/libarchive/files/libarchive/test/test_read_format_ar.c                                 |     15 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cab.c                                |    394 +
 archivers/libarchive/files/libarchive/test/test_read_format_cab_1.cab.uu                         |      9 +
 archivers/libarchive/files/libarchive/test/test_read_format_cab_2.cab.uu                         |      9 +
 archivers/libarchive/files/libarchive/test/test_read_format_cab_3.cab.uu                         |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_cab_filename.c                       |    164 +
 archivers/libarchive/files/libarchive/test/test_read_format_cab_filename_cp932.cab.uu            |      7 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_afio.c                          |    116 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin.c                           |     21 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_Z.c                         |     17 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_be.c                        |      6 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_bz2.c                       |      8 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_gz.c                        |     14 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzip.c                      |     61 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzma.c                      |     10 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_xz.c                        |     10 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename.c                      |    874 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu          |     15 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu          |     15 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu          |     15 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu        |     15 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu        |     15 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c                           |     12 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c                |     14 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip.c                     |     12 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c                 |     14 +-
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4c_Z.c                       |     14 +-
 archivers/libarchive/files/libarchive/test/test_read_format_empty.c                              |     12 +-
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename.c                      |    512 +
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu         |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu         |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu         |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_gz.c                            |     13 +-
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_lzma.c                          |     14 +-
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c                        |     26 +-
 archivers/libarchive/files/libarchive/test/test_read_format_iso_2.iso.Z.uu                       |     35 +
 archivers/libarchive/files/libarchive/test/test_read_format_iso_Z.c                              |     99 +
 archivers/libarchive/files/libarchive/test/test_read_format_iso_joliet_by_nero.iso.Z.uu          |     64 +
 archivers/libarchive/files/libarchive/test/test_read_format_iso_multi_extent.c                   |     10 +-
 archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.c                        |    213 +
 archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.iso.Z.uu                 |     61 +
 archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_bz2.c                      |     21 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_long.c                     |     18 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_rr.c                       |     19 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_versioned.c                |     83 +
 archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c                          |     20 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isorr_ce.c                           |     10 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isorr_new_bz2.c                      |     20 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c                     |     10 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isozisofs_bz2.c                      |     22 +-
 archivers/libarchive/files/libarchive/test/test_read_format_lha.c                                |    278 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_filename.c                       |    218 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu            |      7 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_header0.lzh.uu                   |     11 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_header1.lzh.uu                   |     13 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_header2.lzh.uu                   |     13 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_header3.lzh.uu                   |     16 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_lh0.lzh.uu                       |     13 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_lh6.lzh.uu                       |     13 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_lh7.lzh.uu                       |     13 +
 archivers/libarchive/files/libarchive/test/test_read_format_lha_withjunk.lzh.uu                  |     13 +
 archivers/libarchive/files/libarchive/test/test_read_format_mtree.c                              |    497 +-
 archivers/libarchive/files/libarchive/test/test_read_format_mtree.mtree.uu                       |     11 +-
 archivers/libarchive/files/libarchive/test/test_read_format_mtree_nomagic.mtree.uu               |     11 +
 archivers/libarchive/files/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu              |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu              |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_pax_bz2.c                            |      7 +-
 archivers/libarchive/files/libarchive/test/test_read_format_rar.c                                |   3586 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar.rar.uu                           |     11 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_binary_data.rar.uu               |  24041 ++++++++++
 archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_best.rar.uu             |    274 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_normal.rar.uu           |    328 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu         |    444 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu      |   1337 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu      |   1337 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu      |   1337 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu      |    208 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_noeof.rar.uu                     |      5 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu      |   3930 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_sfx.exe.uu                       |   2215 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_subblock.rar.uu                  |      7 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_unicode.rar.uu                   |     18 +
 archivers/libarchive/files/libarchive/test/test_read_format_rar_windows.rar.uu                   |     22 +
 archivers/libarchive/files/libarchive/test/test_read_format_raw.c                                |     12 +-
 archivers/libarchive/files/libarchive/test/test_read_format_tar.c                                |     42 +-
 archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c                 |     10 +-
 archivers/libarchive/files/libarchive/test/test_read_format_tar_filename.c                       |    363 +
 archivers/libarchive/files/libarchive/test/test_read_format_tar_filename_koi8r.tar.Z.uu          |     14 +
 archivers/libarchive/files/libarchive/test/test_read_format_tbz.c                                |      9 +-
 archivers/libarchive/files/libarchive/test/test_read_format_tgz.c                                |     13 +-
 archivers/libarchive/files/libarchive/test/test_read_format_tlz.c                                |     11 +-
 archivers/libarchive/files/libarchive/test/test_read_format_txz.c                                |     11 +-
 archivers/libarchive/files/libarchive/test/test_read_format_tz.c                                 |     15 +-
 archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename.c                     |    512 +
 archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename_cp866.tar.Z.uu        |      8 +
 archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu        |      9 +
 archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu        |      8 +
 archivers/libarchive/files/libarchive/test/test_read_format_xar.c                                |     23 +-
 archivers/libarchive/files/libarchive/test/test_read_format_zip.c                                |    283 +-
 archivers/libarchive/files/libarchive/test/test_read_format_zip.zip.uu                           |      3 +-
 archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c                 |     66 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu          |     12 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu          |    548 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_filename.c                       |   1162 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp866.zip.uu            |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp932.zip.uu            |      9 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu            |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu          |     15 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu          |     11 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu         |     11 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_length_at_end.zip.uu             |      8 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c                   |    118 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.zip.uu              |     17 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c                            |     59 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.uu                           |     34 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_symlink.zip.uu                   |     10 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip_ux.zip.uu                        |      7 +
 archivers/libarchive/files/libarchive/test/test_read_large.c                                     |     17 +-
 archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_aa.uu                    |    892 +
 archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ab.uu                    |    892 +
 archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ac.uu                    |    892 +
 archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ad.uu                    |    892 +
 archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ae.uu                    |    375 +
 archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c                             |    166 +-
 archivers/libarchive/files/libarchive/test/test_read_position.c                                  |     84 +-
 archivers/libarchive/files/libarchive/test/test_read_set_format.c                                |    220 +
 archivers/libarchive/files/libarchive/test/test_read_splitted_rar_aa.uu                          |      6 +
 archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ab.uu                          |      6 +
 archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ac.uu                          |      6 +
 archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ad.uu                          |      4 +
 archivers/libarchive/files/libarchive/test/test_read_truncated.c                                 |     72 +-
 archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c                          |    173 +
 archivers/libarchive/files/libarchive/test/test_sparse_basic.c                                   |    442 +
 archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_aa.uu                  |    159 +
 archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ab.uu                  |    159 +
 archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ac.uu                  |    141 +
 archivers/libarchive/files/libarchive/test/test_tar_filenames.c                                  |     32 +-
 archivers/libarchive/files/libarchive/test/test_tar_large.c                                      |     37 +-
 archivers/libarchive/files/libarchive/test/test_ustar_filename_encoding.c                        |    414 +
 archivers/libarchive/files/libarchive/test/test_ustar_filenames.c                                |     20 +-
 archivers/libarchive/files/libarchive/test/test_write_disk.c                                     |    107 +-
 archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c                         |    212 +
 archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.cpio.gz.uu                |     12 +
 archivers/libarchive/files/libarchive/test/test_write_disk_failures.c                            |     13 +-
 archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c                            |     12 +-
 archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.c                     |    278 +
 archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.tgz.uu                |   1800 +
 archivers/libarchive/files/libarchive/test/test_write_disk_lookup.c                              |    156 +
 archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.c                        |    194 +
 archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu                |     14 +
 archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.c                  |    231 +
 archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu             |   1765 +
 archivers/libarchive/files/libarchive/test/test_write_disk_perms.c                               |     10 +-
 archivers/libarchive/files/libarchive/test/test_write_disk_secure.c                              |      8 +-
 archivers/libarchive/files/libarchive/test/test_write_disk_sparse.c                              |     18 +-
 archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c                             |      2 +-
 archivers/libarchive/files/libarchive/test/test_write_disk_times.c                               |      2 +-
 archivers/libarchive/files/libarchive/test/test_write_filter_b64encode.c                         |    173 +
 archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c                             |    276 +
 archivers/libarchive/files/libarchive/test/test_write_filter_compress.c                          |     97 +
 archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c                              |    272 +
 archivers/libarchive/files/libarchive/test/test_write_filter_gzip_timestamp.c                    |    118 +
 archivers/libarchive/files/libarchive/test/test_write_filter_lrzip.c                             |    131 +
 archivers/libarchive/files/libarchive/test/test_write_filter_lzip.c                              |    255 +
 archivers/libarchive/files/libarchive/test/test_write_filter_lzma.c                              |    259 +
 archivers/libarchive/files/libarchive/test/test_write_filter_lzop.c                              |    267 +
 archivers/libarchive/files/libarchive/test/test_write_filter_program.c                           |    124 +
 archivers/libarchive/files/libarchive/test/test_write_filter_uuencode.c                          |    173 +
 archivers/libarchive/files/libarchive/test/test_write_filter_xz.c                                |    265 +
 archivers/libarchive/files/libarchive/test/test_write_format_7zip.c                              |    570 +
 archivers/libarchive/files/libarchive/test/test_write_format_7zip_empty.c                        |    299 +
 archivers/libarchive/files/libarchive/test/test_write_format_7zip_large.c                        |    174 +
 archivers/libarchive/files/libarchive/test/test_write_format_ar.c                                |     51 +-
 archivers/libarchive/files/libarchive/test/test_write_format_cpio.c                              |    124 +-
 archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c                        |     10 +-
 archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c                         |      9 +-
 archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c                          |      8 +-
 archivers/libarchive/files/libarchive/test/test_write_format_gnutar.c                            |    236 +
 archivers/libarchive/files/libarchive/test/test_write_format_iso9660.c                           |    937 +
 archivers/libarchive/files/libarchive/test/test_write_format_iso9660_boot.c                      |    276 +
 archivers/libarchive/files/libarchive/test/test_write_format_iso9660_empty.c                     |    204 +
 archivers/libarchive/files/libarchive/test/test_write_format_iso9660_filename.c                  |    474 +
 archivers/libarchive/files/libarchive/test/test_write_format_iso9660_zisofs.c                    |    828 +
 archivers/libarchive/files/libarchive/test/test_write_format_mtree.c                             |     34 +-
 archivers/libarchive/files/libarchive/test/test_write_format_mtree_absolute_path.c               |     99 +
 archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic.c                     |    194 +
 archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic_indent.c              |    196 +
 archivers/libarchive/files/libarchive/test/test_write_format_mtree_fflags.c                      |    135 +
 archivers/libarchive/files/libarchive/test/test_write_format_mtree_no_separator.c                |    103 +
 archivers/libarchive/files/libarchive/test/test_write_format_mtree_quoted_filename.c             |     86 +
 archivers/libarchive/files/libarchive/test/test_write_format_pax.c                               |     61 +-
 archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c                        |     10 +-
 archivers/libarchive/files/libarchive/test/test_write_format_tar.c                               |     87 +-
 archivers/libarchive/files/libarchive/test/test_write_format_tar_empty.c                         |     30 +-
 archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c                        |    305 +
 archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c                         |     37 +-
 archivers/libarchive/files/libarchive/test/test_write_format_tar_v7tar.c                         |    259 +
 archivers/libarchive/files/libarchive/test/test_write_format_xar.c                               |    312 +
 archivers/libarchive/files/libarchive/test/test_write_format_xar_empty.c                         |    120 +
 archivers/libarchive/files/libarchive/test/test_write_format_zip.c                               |    193 +-
 archivers/libarchive/files/libarchive/test/test_write_format_zip_empty.c                         |     36 +-
 archivers/libarchive/files/libarchive/test/test_write_format_zip_no_compression.c                |     50 +-
 archivers/libarchive/files/libarchive/test/test_write_open_memory.c                              |     42 +-
 archivers/libarchive/files/libarchive/test/test_write_zip_set_compression_store.c                |    308 +
 archivers/libarchive/files/libarchive/test/test_zip_filename_encoding.c                          |    543 +
 archivers/libarchive/files/libarchive_fe/err.c                                                   |      2 +
 archivers/libarchive/files/libarchive_fe/err.h                                                   |     12 +-
 archivers/libarchive/files/libarchive_fe/line_reader.c                                           |     60 +-
 archivers/libarchive/files/tar/CMakeLists.txt                                                    |     10 +-
 archivers/libarchive/files/tar/bsdtar.1                                                          |    442 +-
 archivers/libarchive/files/tar/bsdtar.c                                                          |    387 +-
 archivers/libarchive/files/tar/bsdtar.h                                                          |     75 +-
 archivers/libarchive/files/tar/bsdtar_platform.h                                                 |      4 +-
 archivers/libarchive/files/tar/bsdtar_windows.c                                                  |      2 +-
 archivers/libarchive/files/tar/bsdtar_windows.h                                                  |     18 +-
 archivers/libarchive/files/tar/cmdline.c                                                         |    120 +-
 archivers/libarchive/files/tar/creation_set.c                                                    |    314 +
 archivers/libarchive/files/tar/read.c                                                            |    152 +-
 archivers/libarchive/files/tar/subst.c                                                           |     61 +-
 archivers/libarchive/files/tar/test/CMakeLists.txt                                               |     50 +-
 archivers/libarchive/files/tar/test/list.h                                                       |     40 +-
 archivers/libarchive/files/tar/test/main.c                                                       |    992 +-
 archivers/libarchive/files/tar/test/test.h                                                       |    133 +-
 archivers/libarchive/files/tar/test/test_0.c                                                     |     14 +-
 archivers/libarchive/files/tar/test/test_basic.c                                                 |    120 +-
 archivers/libarchive/files/tar/test/test_copy.c                                                  |      7 +-
 archivers/libarchive/files/tar/test/test_extract.tar.Z.uu                                        |      9 +
 archivers/libarchive/files/tar/test/test_extract.tar.bz2.uu                                      |      7 +
 archivers/libarchive/files/tar/test/test_extract.tar.grz.uu                                      |      7 +
 archivers/libarchive/files/tar/test/test_extract.tar.gz.uu                                       |      7 +
 archivers/libarchive/files/tar/test/test_extract.tar.lrz.uu                                      |      9 +
 archivers/libarchive/files/tar/test/test_extract.tar.lz.uu                                       |      7 +
 archivers/libarchive/files/tar/test/test_extract.tar.lzma.uu                                     |      7 +
 archivers/libarchive/files/tar/test/test_extract.tar.lzo.uu                                      |      9 +
 archivers/libarchive/files/tar/test/test_extract.tar.xz.uu                                       |      8 +
 archivers/libarchive/files/tar/test/test_extract_tar_Z.c                                         |     42 +
 archivers/libarchive/files/tar/test/test_extract_tar_bz2.c                                       |     48 +
 archivers/libarchive/files/tar/test/test_extract_tar_grz.c                                       |     48 +
 archivers/libarchive/files/tar/test/test_extract_tar_gz.c                                        |     48 +
 archivers/libarchive/files/tar/test/test_extract_tar_lrz.c                                       |     48 +
 archivers/libarchive/files/tar/test/test_extract_tar_lz.c                                        |     48 +
 archivers/libarchive/files/tar/test/test_extract_tar_lzma.c                                      |     48 +
 archivers/libarchive/files/tar/test/test_extract_tar_lzo.c                                       |     48 +
 archivers/libarchive/files/tar/test/test_extract_tar_xz.c                                        |     48 +
 archivers/libarchive/files/tar/test/test_format_newc.c                                           |     64 +
 archivers/libarchive/files/tar/test/test_option_C_upper.c                                        |    149 +
 archivers/libarchive/files/tar/test/test_option_H_upper.c                                        |     92 +
 archivers/libarchive/files/tar/test/test_option_L_upper.c                                        |     92 +
 archivers/libarchive/files/tar/test/test_option_O_upper.c                                        |     87 +
 archivers/libarchive/files/tar/test/test_option_T_upper.c                                        |     62 +-
 archivers/libarchive/files/tar/test/test_option_U_upper.c                                        |    159 +
 archivers/libarchive/files/tar/test/test_option_X_upper.c                                        |    145 +
 archivers/libarchive/files/tar/test/test_option_a.c                                              |    110 +
 archivers/libarchive/files/tar/test/test_option_b.c                                              |     74 +
 archivers/libarchive/files/tar/test/test_option_b64encode.c                                      |     54 +
 archivers/libarchive/files/tar/test/test_option_exclude.c                                        |    142 +
 archivers/libarchive/files/tar/test/test_option_gid_gname.c                                      |     88 +
 archivers/libarchive/files/tar/test/test_option_grzip.c                                          |     52 +
 archivers/libarchive/files/tar/test/test_option_j.c                                              |     56 +
 archivers/libarchive/files/tar/test/test_option_k.c                                              |    107 +
 archivers/libarchive/files/tar/test/test_option_keep_newer_files.c                               |     56 +
 archivers/libarchive/files/tar/test/test_option_keep_newer_files.tar.Z.uu                        |      7 +
 archivers/libarchive/files/tar/test/test_option_lrzip.c                                          |     52 +
 archivers/libarchive/files/tar/test/test_option_lzma.c                                           |     57 +
 archivers/libarchive/files/tar/test/test_option_lzop.c                                           |     55 +
 archivers/libarchive/files/tar/test/test_option_n.c                                              |     61 +
 archivers/libarchive/files/tar/test/test_option_newer_than.c                                     |     78 +
 archivers/libarchive/files/tar/test/test_option_nodump.c                                         |     68 +
 archivers/libarchive/files/tar/test/test_option_older_than.c                                     |     85 +
 archivers/libarchive/files/tar/test/test_option_q.c                                              |     26 +-
 archivers/libarchive/files/tar/test/test_option_r.c                                              |     96 +-
 archivers/libarchive/files/tar/test/test_option_s.c                                              |    214 +-
 archivers/libarchive/files/tar/test/test_option_s.tar.Z.uu                                       |     16 +
 archivers/libarchive/files/tar/test/test_option_uid_uname.c                                      |     80 +
 archivers/libarchive/files/tar/test/test_option_uuencode.c                                       |     54 +
 archivers/libarchive/files/tar/test/test_option_xz.c                                             |     57 +
 archivers/libarchive/files/tar/test/test_option_z.c                                              |     55 +
 archivers/libarchive/files/tar/test/test_patterns.c                                              |     10 +-
 archivers/libarchive/files/tar/test/test_print_longpath.c                                        |     54 +
 archivers/libarchive/files/tar/test/test_print_longpath.tar.Z.uu                                 |     24 +
 archivers/libarchive/files/tar/test/test_stdio.c                                                 |      2 +-
 archivers/libarchive/files/tar/test/test_strip_components.c                                      |     80 +-
 archivers/libarchive/files/tar/test/test_symlink_dir.c                                           |     34 +-
 archivers/libarchive/files/tar/test/test_windows.c                                               |     19 +-
 archivers/libarchive/files/tar/util.c                                                            |     62 +-
 archivers/libarchive/files/tar/write.c                                                           |    941 +-
 archivers/libarchive/files/test_utils/test_utils.c                                               |    124 +
 archivers/libarchive/files/test_utils/test_utils.h                                               |     39 +
 914 files changed, 242973 insertions(+), 46351 deletions(-)

diffs (truncated from 330065 to 300 lines):

diff -r b30dcfa3495f -r d0f586054ccb archivers/bsdtar/Makefile
--- a/archivers/bsdtar/Makefile Sat Jan 17 12:33:34 2015 +0000
+++ b/archivers/bsdtar/Makefile Sat Jan 17 12:44:47 2015 +0000
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.21 2014/07/18 11:08:29 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.22 2015/01/17 12:44:51 adam Exp $
 
-DISTNAME=      bsdtar-2.8.4
-PKGREVISION=   1
-CATEGORIES=    archivers
-MASTER_SITES=  # empty
-DISTFILES=     # empty
+.include "../../archivers/libarchive/Makefile.common"
 
-MAINTAINER=    joerg%NetBSD.org@localhost
-HOMEPAGE=      http://code.google.com/p/libarchive/
+PKGNAME=       ${DISTNAME:S/libarchive/bsdtar/}
 COMMENT=       Fast multi-format tape archiver
 
-GNU_CONFIGURE= yes
 # Explicitly do not depend on libtool as this can be used
 # as bootstrap dependency.
-#
 #USE_LIBTOOL=  yes
+CONFIGURE_ARGS+=       --enable-bsdtar=static
+CONFIGURE_ARGS+=       --disable-bsdcpio
+CONFIGURE_ARGS+=       --disable-shared
 
 .include "../../archivers/bzip2/builtin.mk"
 .include "../../devel/zlib/builtin.mk"
@@ -39,14 +34,11 @@
 FILESDIR.libarchive?=  ${.CURDIR}/../../archivers/libarchive/files
 FILESDIR.zlib?=                ${.CURDIR}/../../devel/zlib/files
 
-CONFIGURE_ARGS+=       --enable-bsdtar=static --disable-cpio \
-                       --disable-shared --without-xml2 --without-expat
-
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OS_VARIANT} == "SCOOSR5"
-# SCO OpenServer 5.0.7/3.2 has windows.h, and configure expacts it for MS Windows.
+# SCO OpenServer 5.0.7/3.2 has windows.h, and configure expects it for MS Windows.
 CONFIGURE_ENV+=                ac_cv_header_windows_h=no
 .endif
 
diff -r b30dcfa3495f -r d0f586054ccb archivers/libarchive/Makefile
--- a/archivers/libarchive/Makefile     Sat Jan 17 12:33:34 2015 +0000
+++ b/archivers/libarchive/Makefile     Sat Jan 17 12:44:47 2015 +0000
@@ -1,21 +1,12 @@
-# $NetBSD: Makefile,v 1.40 2014/04/03 13:05:14 he Exp $
-#
+# $NetBSD: Makefile,v 1.41 2015/01/17 12:44:47 adam Exp $
 
-DISTNAME=      libarchive-2.8.4
-PKGREVISION=   4
-CATEGORIES=    archivers
-MASTER_SITES=  # empty
-DISTFILES=     # empty
+.include "Makefile.common"
 
-MAINTAINER=    joerg%NetBSD.org@localhost
-HOMEPAGE=      http://www.libarchive.org/
 COMMENT=       Library to read/create different archive formats
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-
-CONFIGURE_ARGS+=       --disable-bsdtar --without-expat --without-xml2 \
-                       --disable-bsdcpio
+USE_LIBTOOL=           yes
+CONFIGURE_ARGS+=       --disable-bsdcpio
+CONFIGURE_ARGS+=       --disable-bsdtar
 
 do-extract:
        ${CP} -r ${FILESDIR} ${WRKSRC}
@@ -24,7 +15,7 @@
 
 .if ${OPSYS} == SunOS
 # workaround for pkg/45491
-CONFIGURE_ENV+=        ac_cv_header_ext2fs_ext2_fs_h=no
+CONFIGURE_ENV+=                ac_cv_header_ext2fs_ext2_fs_h=no
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff -r b30dcfa3495f -r d0f586054ccb archivers/libarchive/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/libarchive/Makefile.common      Sat Jan 17 12:44:47 2015 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile.common,v 1.1 2015/01/17 12:44:47 adam Exp $
+# used by archivers/bsdtar/Makefile
+# used by archivers/libarchive/Makefile
+
+DISTNAME=      libarchive-3.1.2
+CATEGORIES=    archivers
+MASTER_SITES=  http://www.libarchive.org/downloads/
+DISTFILES=     # empty
+
+MAINTAINER?=   joerg%NetBSD.org@localhost
+HOMEPAGE=      http://www.libarchive.org/
+LICENSE=       2-clause-bsd
+
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --without-expat
+CONFIGURE_ARGS+=       --without-lzo2
+CONFIGURE_ARGS+=       --without-nettle
+CONFIGURE_ARGS+=       --without-xml2
diff -r b30dcfa3495f -r d0f586054ccb archivers/libarchive/PLIST
--- a/archivers/libarchive/PLIST        Sat Jan 17 12:33:34 2015 +0000
+++ b/archivers/libarchive/PLIST        Sat Jan 17 12:44:47 2015 +0000
@@ -1,16 +1,42 @@
-@comment $NetBSD: PLIST,v 1.7 2010/02/20 03:56:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/01/17 12:44:47 adam Exp $
 include/archive.h
 include/archive_entry.h
 lib/libarchive.la
 lib/pkgconfig/libarchive.pc
 man/man3/archive_entry.3
+man/man3/archive_entry_acl.3
+man/man3/archive_entry_linkify.3
+man/man3/archive_entry_paths.3
+man/man3/archive_entry_perms.3
+man/man3/archive_entry_stat.3
+man/man3/archive_entry_time.3
 man/man3/archive_read.3
+man/man3/archive_read_data.3
 man/man3/archive_read_disk.3
+man/man3/archive_read_extract.3
+man/man3/archive_read_filter.3
+man/man3/archive_read_format.3
+man/man3/archive_read_free.3
+man/man3/archive_read_header.3
+man/man3/archive_read_new.3
+man/man3/archive_read_open.3
+man/man3/archive_read_set_options.3
 man/man3/archive_util.3
 man/man3/archive_write.3
+man/man3/archive_write_blocksize.3
+man/man3/archive_write_data.3
 man/man3/archive_write_disk.3
+man/man3/archive_write_filter.3
+man/man3/archive_write_finish_entry.3
+man/man3/archive_write_format.3
+man/man3/archive_write_free.3
+man/man3/archive_write_header.3
+man/man3/archive_write_new.3
+man/man3/archive_write_open.3
+man/man3/archive_write_set_options.3
+man/man3/libarchive.3
+man/man3/libarchive_changes.3
 man/man3/libarchive_internals.3
-man/man3/libarchive.3
 man/man5/cpio.5
 man/man5/libarchive-formats.5
 man/man5/mtree.5
diff -r b30dcfa3495f -r d0f586054ccb archivers/libarchive/buildlink3.mk
--- a/archivers/libarchive/buildlink3.mk        Sat Jan 17 12:33:34 2015 +0000
+++ b/archivers/libarchive/buildlink3.mk        Sat Jan 17 12:44:47 2015 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/05/07 01:53:12 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/01/17 12:44:47 adam Exp $
 
 BUILDLINK_TREE+=       libarchive
 
 .if !defined(LIBARCHIVE_BUILDLINK3_MK)
 LIBARCHIVE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libarchive+=     libarchive>=2.2
-BUILDLINK_ABI_DEPENDS.libarchive+=     libarchive>=2.8.4nb1
+BUILDLINK_API_DEPENDS.libarchive+=     libarchive>=3.1
+BUILDLINK_ABI_DEPENDS.libarchive+=     libarchive>=3.1.2
 BUILDLINK_PKGSRCDIR.libarchive?=       ../../archivers/libarchive
 
-CHECK_BUILTIN.libarchive:=     yes
+CHECK_BUILTIN.libarchive:=     yes
 .include "../../archivers/libarchive/builtin.mk"
-CHECK_BUILTIN.libarchive:=     no
+CHECK_BUILTIN.libarchive:=     no
 
 # A built-in libarchive is always using built-in zlib, bzip2, and xz.
 .if empty(USE_BUILTIN.libarchive:M[yY][eE][sS])
diff -r b30dcfa3495f -r d0f586054ccb archivers/libarchive/files/CMakeLists.txt
--- a/archivers/libarchive/files/CMakeLists.txt Sat Jan 17 12:33:34 2015 +0000
+++ b/archivers/libarchive/files/CMakeLists.txt Sat Jan 17 12:44:47 2015 +0000
@@ -1,12 +1,40 @@
 #
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6 FATAL_ERROR)
 #
 PROJECT(libarchive C)
 #
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
 endif()
+#
+# Set the Build type for make based generators.
+# You can choose following types:
+#   Debug          : Debug build
+#   Release        : Release build
+#   RelWithDebInfo : Release build with Debug Info
+#   MinSizeRel     : Release Min Size build
+IF(NOT CMAKE_BUILD_TYPE)
+  SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
+ENDIF(NOT CMAKE_BUILD_TYPE)
+# Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the
+# value type is "UNINITIALIZED".
+GET_PROPERTY(cached_type CACHE CMAKE_BUILD_TYPE PROPERTY TYPE)
+IF("${cached_type}" STREQUAL "UNINITIALIZED")
+  SET(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Build Type" FORCE)
+ENDIF("${cached_type}" STREQUAL "UNINITIALIZED")
+# Check the Build Type.
+IF(NOT "${CMAKE_BUILD_TYPE}"
+       MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)\$")
+  MESSAGE(FATAL_ERROR
+          "Unknown keyword for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
+          "Acceptable keywords: Debug,Release,RelWithDebInfo,MinSizeRel")
+ENDIF(NOT "${CMAKE_BUILD_TYPE}"
+          MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)\$")
+
+# On MacOS, prefer MacPorts libraries to system libraries.
+# I haven't come up with a compelling argument for this to be conditional.
+list(APPEND CMAKE_PREFIX_PATH /opt/local)
 
 #
 # Version - read from 'version' file.
@@ -21,49 +49,157 @@
 STRING(REGEX REPLACE
  "^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]([a-z]?)$" "\\1" _quality ${_version})
 SET(_version_number ${_major}${_minor}${_revision})
-STRING(REGEX REPLACE "[0]*([^0][0-9]*)$" "\\1" _minor ${_minor})
-STRING(REGEX REPLACE "[0]*([^0][0-9]*)$" "\\1" _revision ${_revision})
+STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_minor ${_minor})
+STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_revision ${_revision})
 #
-SET(VERSION                    "${_major}.${_minor}.${_revision}${_quality}")
+SET(VERSION                    "${_major}.${_trimmed_minor}.${_trimmed_revision}${_quality}")
 SET(BSDCPIO_VERSION_STRING     "${VERSION}")
 SET(BSDTAR_VERSION_STRING      "${VERSION}")
 SET(LIBARCHIVE_VERSION_NUMBER  "${_version_number}")
 SET(LIBARCHIVE_VERSION_STRING  "${VERSION}")
-# Shared library number
-SET(SOVERSION                   8)
+
+# INTERFACE_VERSION increments with every release
+# libarchive 2.7 == interface version 9 = 2 + 7 
+# libarchive 2.8 == interface version 10 = 2 + 8
+# libarchive 2.9 == interface version 11 = 2 + 9
+# libarchive 3.0 == interface version 12
+# libarchive 3.1 == interface version 13
+math(EXPR INTERFACE_VERSION  "13 + ${_minor}")
+
+# Set SOVERSION == Interface version
+# ?? Should there be more here ??
+SET(SOVERSION "${INTERFACE_VERSION}")
+
+# Enalbe CMAKE_PUSH_CHECK_STATE() and CMAKE_POP_CHECK_STATE() macros
+# saving and restoring the state of the variables.
+INCLUDE(CMakePushCheckState)
+
+# Initialize the state of the variables. This initialization is not
+# necessary but this shows you what value the variables initially have.
+SET(CMAKE_REQUIRED_DEFINITIONS)
+SET(CMAKE_REQUIRED_INCLUDES)
+SET(CMAKE_REQUIRED_LIBRARIES)
+SET(CMAKE_REQUIRED_FLAGS)
+
+# Especially for early development, we want to be a little
+# aggressive about diagnosing build problems; this can get
+# relaxed somewhat in final shipping versions.
+IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+  SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security")
+  #################################################################
+  # Set compile flags for all build types.
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security")
+  #################################################################
+  # Set compile flags for debug build.
+  # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -Wextra -Wunused")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual")
+ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+IF (MSVC)
+  #################################################################
+  # Set compile flags for debug build.
+  # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+  # Enable level 4 C4061: The enumerate has no associated handler in a switch
+  #                       statement.
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4061")
+  # Enable level 4 C4254: A larger bit field was assigned to a smaller bit
+  #                       field.
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4254")
+  # Enable level 4 C4295: An array was initialized but the last character in
+  #                       the array is not a null; accessing the array may
+  #                       produce unexpected results.
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4295")
+  # Enable level 4 C4296: An unsigned variable was used in a comparison
+  #                       operation with zero.



Home | Main Index | Thread Index | Old Index