external: Update libarchive to v3.7.1

3 files changed, 41 insertions, 18 deletions

diff --git a/etc/defaults/CC/TARGETS.archive b/etc/defaults/CC/TARGETS.archive
index a5b1cd4c..f5a792a8 100644
--- a/etc/defaults/CC/TARGETS.archive
+++ b/etc/defaults/CC/TARGETS.archive
@@ -84,7 +84,9 @@
                   ]
                 }
               ]
-            , ["mingw", ["-D__USE_MINGW_ANSI_STDIO"]]
+            , [ "mingw"
+              , ["-D__USE_MINGW_ANSI_STDIO", "-D__MINGW_USE_VC2005_COMPAT"]
+              ]
             ]
           }
         , { "type": "case*"
diff --git a/etc/import/libarchive/TARGETS.archive b/etc/import/libarchive/TARGETS.archive
index cc4de4f2..de471234 100644
--- a/etc/import/libarchive/TARGETS.archive
+++ b/etc/import/libarchive/TARGETS.archive
@@ -58,6 +58,7 @@
           , "errno.h"
           , "ext2fs/ext2_fs.h"
           , "fcntl.h"
+          , "fnmatch.h"
           , "grp.h"
           , "inttypes.h"
           , "io.h"
@@ -92,6 +93,7 @@
           , "sys/mount.h"
           , "sys/param.h"
           , "sys/poll.h"
+          , "sys/queue.h"
           , "sys/richacl.h"
           , "sys/select.h"
           , "sys/stat.h"
@@ -112,7 +114,7 @@
           , "windows.h"
           , "wincrypt.h"
           , "winioctl.h"
-          , "Bcrypt.h"
+          , "bcrypt.h"
           , "mbedtls/aes.h"
           , "mbedtls/md.h"
           , "mbedtls/pkcs5.h"
@@ -141,6 +143,7 @@
           , "libxml/xmlwriter.h"
           , "assert.h"
           , "sys/richacl.h"
+          , "getopt.h"
           ]
         ]
       , [ "defines1"
@@ -259,6 +262,7 @@
               , ["HAVE_ERRNO_H", "errno.h"]
               , ["HAVE_EXT2FS_EXT2_FS_H", "ext2fs/ext2_fs.h"]
               , ["HAVE_FCNTL_H", "fcntl.h"]
+              , ["HAVE_FNMATCH_H", "fnmatch.h"]
               , ["HAVE_GRP_H", "grp.h"]
               , ["HAVE_INTTYPES_H", "inttypes.h"]
               , ["HAVE_IO_H", "io.h"]
@@ -293,6 +297,7 @@
               , ["HAVE_SYS_MOUNT_H", "sys/mount.h"]
               , ["HAVE_SYS_PARAM_H", "sys/param.h"]
               , ["HAVE_SYS_POLL_H", "sys/poll.h"]
+              , ["HAVE_SYS_QUEUE_H", "sys/queue.h"]
               , ["HAVE_SYS_RICHACL_H", "sys/richacl.h"]
               , ["HAVE_SYS_SELECT_H", "sys/select.h"]
               , ["HAVE_SYS_STAT_H", "sys/stat.h"]
@@ -319,6 +324,10 @@
               , "then": [["HAVE_ZLIB_H", "zlib.h"]]
               }
             , { "type": "if"
+              , "cond": {"type": "var", "name": "ENABLE_OPENSSL"}
+              , "then": [["HAVE_OPENSSL_EVP_H", "openssl/evp.h"]]
+              }
+            , { "type": "if"
               , "cond": {"type": "var", "name": "ENABLE_BZip2"}
               , "then": [["HAVE_BZLIB_H", "bzlib.h"]]
               }
@@ -347,7 +356,7 @@
               }
             , { "type": "if"
               , "cond": {"type": "var", "name": "ENABLE_CNG"}
-              , "then": [["HAVE_BCRYPT_H", "Bcrypt.h"]]
+              , "then": [["HAVE_BCRYPT_H", "bcrypt.h"]]
               }
             , { "type": "if"
               , "cond": {"type": "var", "name": "ENABLE_MBEDTLS"}
@@ -475,6 +484,9 @@
               , [ "HAVE_FDOPENDIR"
                 , ["fdopendir", {"type": "var", "name": "sys_hdrs"}]
                 ]
+              , [ "HAVE_FNMATCH"
+                , ["fnmatch", {"type": "var", "name": "sys_hdrs"}]
+                ]
               , ["HAVE_FORK", ["fork", {"type": "var", "name": "sys_hdrs"}]]
               , ["HAVE_FSTAT", ["fstat", {"type": "var", "name": "sys_hdrs"}]]
               , [ "HAVE_FSTATAT"
@@ -507,6 +519,9 @@
               , [ "HAVE_GETGRNAM_R"
                 , ["getgrnam_r", {"type": "var", "name": "sys_hdrs"}]
                 ]
+              , [ "HAVE_GETGRNAM_R"
+                , ["getgrnam_r", {"type": "var", "name": "sys_hdrs"}]
+                ]
               , [ "HAVE_GETPWNAM_R"
                 , ["getpwnam_r", {"type": "var", "name": "sys_hdrs"}]
                 ]
@@ -654,15 +669,10 @@
               , [ "HAVE__GET_TIMEZONE"
                 , ["_get_timezone", {"type": "var", "name": "sys_hdrs"}]
                 ]
-              , [ "HAVE__GMTIME64_S"
-                , ["_gmtime64_s", {"type": "var", "name": "sys_hdrs"}]
-                ]
-              , [ "HAVE__LOCALTIME64_S"
-                , ["_localtime64_s", {"type": "var", "name": "sys_hdrs"}]
-                ]
-              , [ "HAVE__MKGMTIME64"
-                , ["_mkgmtime64", {"type": "var", "name": "sys_hdrs"}]
-                ]
+              , ["HAVE_CTIME_S", ["ctime_s", ["time.h"]]]
+              , ["HAVE_GMTIME_S", ["gmtime_s", ["time.h"]]]
+              , ["HAVE_LOCALTIME_S", ["localtime_s", ["time.h"]]]
+              , ["HAVE__MKGMTIME", ["_mkgmtime", ["time.h"]]]
               ]
             , { "type": "if"
               , "cond":
@@ -717,6 +727,7 @@
               , ["HAVE_READDIR_R", ["readdir_r", ["dirent.h"]]]
               , ["HAVE_DIRFD", ["dirfd", ["dirent.h"]]]
               , ["HAVE_READLINKAT", ["readlinkat", ["fcntl.h", "unistd.h"]]]
+              , ["HAVE_GETOPT_OPTRESET", ["optreset", ["getopt.h"]]]
               , ["MAJOR_IN_MKDEV", ["major", ["sys/mkdev.h"]]]
               , ["MAJOR_IN_SYSMACROS", ["major", ["sys/sysmacros.h"]]]
               ]
@@ -825,13 +836,23 @@
                   , {"type": "var", "name": "sys_hdrs"}
                   ]
                 ]
-              , [ "TIME_WITH_SYS_TIME"
+              , [ "HAVE_SYS_TIME_H"
                 , [ "((struct tm*)NULL)->tm_sec"
                   , {"type": "var", "name": "sys_hdrs"}
                   ]
                 ]
               ]
             , { "type": "if"
+              , "cond": {"type": "var", "name": "ENABLE_OPENSSL"}
+              , "then":
+                [ [ "HAVE_PKCS5_PBKDF2_HMAC_SHA1"
+                  , [ "PKCS5_PBKDF2_HMAC_SHA1"
+                    , {"type": "var", "name": "sys_hdrs"}
+                    ]
+                  ]
+                ]
+              }
+            , { "type": "if"
               , "cond": {"type": "var", "name": "ENABLE_LZMA"}
               , "then":
                 [ [ "HAVE_LZMA_STREAM_ENCODER_MT"
diff --git a/etc/repos.json b/etc/repos.json
index 5207e3b6..47634286 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -456,11 +456,11 @@
   , "com_github_libarchive_libarchive":
     { "repository":
       { "type": "archive"
-      , "content": "2dafab016d6338086925fd04dbaa6a18bd24cb31"
-      , "fetch": "https://github.com/libarchive/libarchive/releases/download/v3.6.2/libarchive-3.6.2.tar.gz"
-      , "sha256": "ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3"
-      , "sha512": "24e476465054a29a2d48adf3c197a171b5361fa5038729a1f14d578c6701424de4e5dd6a2b20a6b697969ab43bdd8afc1585f8de0465c266f455d7eaa19e5048"
-      , "subdir": "libarchive-3.6.2"
+      , "content": "922b6c729d391c010ffa6228134c164886bac0f1"
+      , "fetch": "https://github.com/libarchive/libarchive/releases/download/v3.7.1/libarchive-3.7.1.tar.gz"
+      , "sha256": "5d24e40819768f74daf846b99837fc53a3a9dcdf3ce1c2003fe0596db850f0f0"
+      , "sha512": "ccd36fc5e24e5feaad15b08496c4f6373f1bbb6ba657af5dc633b9d1454c98aba9a59ccffc48b41afc1219119d46c15d4db09c5855950422946e4dc058f17b88"
+      , "subdir": "libarchive-3.7.1"
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.archive"