diff --git a/website/data/security/advisories.toml b/website/data/security/advisories.toml
index 103be4c068..298db59a39 100644
--- a/website/data/security/advisories.toml
+++ b/website/data/security/advisories.toml
@@ -1,2795 +1,2799 @@
# Sort advisories by year, month and day
# $FreeBSD$
+[[advisories]]
+name = "FreeBSD-SA-25:07.libarchive"
+date = "2025-08-08"
+
[[advisories]]
name = "FreeBSD-SA-25:06.xz"
date = "2025-07-02"
[[advisories]]
name = "FreeBSD-SA-25:05.openssh"
date = "2025-02-21"
[[advisories]]
name = "FreeBSD-SA-25:04.ktrace"
date = "2025-01-29"
[[advisories]]
name = "FreeBSD-SA-25:03.etcupdate"
date = "2025-01-29"
[[advisories]]
name = "FreeBSD-SA-25:02.fs"
date = "2025-01-29"
[[advisories]]
name = "FreeBSD-SA-25:01.openssh"
date = "2025-01-29"
[[advisories]]
name = "FreeBSD-SA-24:19.fetch"
date = "2024-10-29"
[[advisories]]
name = "FreeBSD-SA-24:18.ctl"
date = "2024-10-29"
[[advisories]]
name = "FreeBSD-SA-24:17.bhyve"
date = "2024-10-29"
[[advisories]]
name = "FreeBSD-SA-24:16.libnv"
date = "2024-09-19"
[[advisories]]
name = "FreeBSD-SA-24:15.bhyve"
date = "2024-09-19"
[[advisories]]
name = "FreeBSD-SA-24:14.umtx"
date = "2024-09-04"
[[advisories]]
name = "FreeBSD-SA-24:13.openssl"
date = "2024-09-04"
[[advisories]]
name = "FreeBSD-SA-24:12.bhyve"
date = "2024-09-04"
[[advisories]]
name = "FreeBSD-SA-24:11.ctl"
date = "2024-09-04"
[[advisories]]
name = "FreeBSD-SA-24:10.bhyve"
date = "2024-09-04"
[[advisories]]
name = "FreeBSD-SA-24:09.libnv"
date = "2024-09-04"
[[advisories]]
name = "FreeBSD-SA-24:08.openssh"
date = "2024-08-07"
[[advisories]]
name = "FreeBSD-SA-24:07.nfsclient"
date = "2024-08-07"
[[advisories]]
name = "FreeBSD-SA-24:06.ktrace"
date = "2024-08-07"
[[advisories]]
name = "FreeBSD-SA-24:05.pf"
date = "2024-08-07"
[[advisories]]
name = "FreeBSD-SA-24:04.openssh"
date = "2024-07-01"
[[advisories]]
name = "FreeBSD-SA-24:03.unbound"
date = "2024-03-28"
[[advisories]]
name = "FreeBSD-SA-24:02.tty"
date = "2024-02-14"
[[advisories]]
name = "FreeBSD-SA-24:01.bhyveload"
date = "2024-02-14"
[[advisories]]
name = "FreeBSD-SA-23:19.openssh"
date = "2023-12-19"
[[advisories]]
name = "FreeBSD-SA-23:18.nfsclient"
date = "2023-12-12"
[[advisories]]
name = "FreeBSD-SA-23:17.pf"
date = "2023-12-05"
[[advisories]]
name = "FreeBSD-SA-23:16.cap_net"
date = "2023-11-08"
[[advisories]]
name = "FreeBSD-SA-23:15.stdio"
date = "2023-11-08"
[[advisories]]
name = "FreeBSD-SA-23:14.smccc"
date = "2023-10-03"
[[advisories]]
name = "FreeBSD-SA-23:13.capsicum"
date = "2023-10-03"
[[advisories]]
name = "FreeBSD-SA-23:12.msdosfs"
date = "2023-10-03"
[[advisories]]
name = "FreeBSD-SA-23:11.wifi"
date = "2023-09-06"
[[advisories]]
name = "FreeBSD-SA-23:10.pf"
date = "2023-09-06"
[[advisories]]
name = "FreeBSD-SA-23:09.pam_krb5"
date = "2023-08-01"
[[advisories]]
name = "FreeBSD-SA-23:08.ssh"
date = "2023-08-01"
[[advisories]]
name = "FreeBSD-SA-23:07.bhyve"
date = "2023-08-01"
[[advisories]]
name = "FreeBSD-SA-23:06.ipv6"
date = "2023-08-01"
[[advisories]]
name = "FreeBSD-SA-23:05.openssh"
date = "2023-06-21"
[[advisories]]
name = "FreeBSD-SA-23:04.pam_krb5"
date = "2023-06-21"
[[advisories]]
name = "FreeBSD-SA-23:03.openssl"
date = "2023-02-16"
[[advisories]]
name = "FreeBSD-SA-23:02.openssh"
date = "2023-02-16"
[[advisories]]
name = "FreeBSD-SA-23:01.geli"
date = "2023-02-08"
[[advisories]]
name = "FreeBSD-SA-22:15.ping"
date = "2022-11-29"
[[advisories]]
name = "FreeBSD-SA-22:14.heimdal"
date = "2022-11-15"
[[advisories]]
name = "FreeBSD-SA-22:13.zlib"
date = "2022-08-30"
[[advisories]]
name = "FreeBSD-SA-22:12.lib9p"
date = "2022-08-09"
[[advisories]]
name = "FreeBSD-SA-22:11.vm"
date = "2022-08-09"
[[advisories]]
name = "FreeBSD-SA-22:10.aio"
date = "2022-08-09"
[[advisories]]
name = "FreeBSD-SA-22:09.elf"
date = "2022-08-09"
[[advisories]]
name = "FreeBSD-SA-22:08.zlib"
date = "2022-04-06"
[[advisories]]
name = "FreeBSD-SA-22:07.wifi_meshid"
date = "2022-04-06"
[[advisories]]
name = "FreeBSD-SA-22:06.ioctl"
date = "2022-04-06"
[[advisories]]
name = "FreeBSD-SA-22:05.bhyve"
date = "2022-04-06"
[[advisories]]
name = "FreeBSD-SA-22:04.netmap"
date = "2022-04-06"
[[advisories]]
name = "FreeBSD-SA-22:03.openssl"
date = "2022-03-15"
[[advisories]]
name = "FreeBSD-SA-22:02.wifi"
date = "2022-03-15"
[[advisories]]
name = "FreeBSD-SA-22:01.vt"
date = "2022-01-11"
[[advisories]]
name = "FreeBSD-SA-21:17.openssl"
date = "2021-08-24"
[[advisories]]
name = "FreeBSD-SA-21:16.openssl"
date = "2021-08-24"
[[advisories]]
name = "FreeBSD-SA-21:15.libfetch"
date = "2021-08-24"
[[advisories]]
name = "FreeBSD-SA-21:14.ggatec"
date = "2021-08-24"
[[advisories]]
name = "FreeBSD-SA-21:13.bhyve"
date = "2021-08-24"
[[advisories]]
name = "FreeBSD-SA-21:12.libradius"
date = "2021-05-26"
[[advisories]]
name = "FreeBSD-SA-21:11.smap"
date = "2021-05-26"
[[advisories]]
name = "FreeBSD-SA-21:10.jail_mount"
date = "2021-04-06"
[[advisories]]
name = "FreeBSD-SA-21:09.accept_filter"
date = "2021-04-06"
[[advisories]]
name = "FreeBSD-SA-21:08.vm"
date = "2021-04-06"
[[advisories]]
name = "FreeBSD-SA-21:07.openssl"
date = "2021-03-25"
[[advisories]]
name = "FreeBSD-SA-21:06.xen"
date = "2021-02-24"
[[advisories]]
name = "FreeBSD-SA-21:05.jail_chdir"
date = "2021-02-24"
[[advisories]]
name = "FreeBSD-SA-21:04.jail_remove"
date = "2021-02-24"
[[advisories]]
name = "FreeBSD-SA-21:03.pam_login_access"
date = "2021-02-24"
[[advisories]]
name = "FreeBSD-SA-21:02.xenoom"
date = "2021-01-29"
[[advisories]]
name = "FreeBSD-SA-21:01.fsdisclosure"
date = "2021-01-29"
[[advisories]]
name = "FreeBSD-SA-20:33.openssl"
date = "2020-12-08"
[[advisories]]
name = "FreeBSD-SA-20:32.rtsold"
date = "2020-12-01"
[[advisories]]
name = "FreeBSD-SA-20:31.icmp6"
date = "2020-12-01"
[[advisories]]
name = "FreeBSD-SA-20:30.ftpd"
date = "2020-09-15"
[[advisories]]
name = "FreeBSD-SA-20:29.bhyve_svm"
date = "2020-09-15"
[[advisories]]
name = "FreeBSD-SA-20:28.bhyve_vmcs"
date = "2020-09-15"
[[advisories]]
name = "FreeBSD-SA-20:27.ure"
date = "2020-09-15"
[[advisories]]
name = "FreeBSD-SA-20:26.dhclient"
date = "2020-09-02"
[[advisories]]
name = "FreeBSD-SA-20:25.sctp"
date = "2020-09-02"
[[advisories]]
name = "FreeBSD-SA-20:24.ipv6"
date = "2020-09-02"
[[advisories]]
name = "FreeBSD-SA-20:23.sendmsg"
date = "2020-08-05"
[[advisories]]
name = "FreeBSD-SA-20:22.sqlite"
date = "2020-08-05"
[[advisories]]
name = "FreeBSD-SA-20:21.usb_net"
date = "2020-08-05"
[[advisories]]
name = "FreeBSD-SA-20:20.ipv6"
date = "2020-07-08"
[[advisories]]
name = "FreeBSD-SA-20:19.unbound"
date = "2020-07-08"
[[advisories]]
name = "FreeBSD-SA-20:18.posix_spawnp"
date = "2020-07-08"
[[advisories]]
name = "FreeBSD-SA-20:17.usb"
date = "2020-06-09"
[[advisories]]
name = "FreeBSD-SA-20:16.cryptodev"
date = "2020-05-12"
[[advisories]]
name = "FreeBSD-SA-20:15.cryptodev"
date = "2020-05-12"
[[advisories]]
name = "FreeBSD-SA-20:14.sctp"
date = "2020-05-12"
[[advisories]]
name = "FreeBSD-SA-20:13.libalias"
date = "2020-05-12"
[[advisories]]
name = "FreeBSD-SA-20:12.libalias"
date = "2020-05-12"
[[advisories]]
name = "FreeBSD-SA-20:11.openssl"
date = "2020-04-21"
[[advisories]]
name = "FreeBSD-SA-20:10.ipfw"
date = "2020-04-21"
[[advisories]]
name = "FreeBSD-SA-20:09.ntp"
date = "2020-03-19"
[[advisories]]
name = "FreeBSD-SA-20:08.jail"
date = "2020-03-19"
[[advisories]]
name = "FreeBSD-SA-20:07.epair"
date = "2020-03-19"
[[advisories]]
name = "FreeBSD-SA-20:06.if_ixl_ioctl"
date = "2020-03-19"
[[advisories]]
name = "FreeBSD-SA-20:05.if_oce_ioctl"
date = "2020-03-19"
[[advisories]]
name = "FreeBSD-SA-20:04.tcp"
date = "2020-03-19"
[[advisories]]
name = "FreeBSD-SA-20:03.thrmisc"
date = "2020-01-28"
[[advisories]]
name = "FreeBSD-SA-20:02.ipsec"
date = "2020-01-28"
[[advisories]]
name = "FreeBSD-SA-20:01.libfetch"
date = "2020-01-28"
[[advisories]]
name = "FreeBSD-SA-19:26.mcu"
date = "2019-11-12"
[[advisories]]
name = "FreeBSD-SA-19:25.mcepsc"
date = "2019-11-12"
[[advisories]]
name = "FreeBSD-SA-19:24.mqueuefs"
date = "2019-08-20"
[[advisories]]
name = "FreeBSD-SA-19:23.midi"
date = "2019-08-20"
[[advisories]]
name = "FreeBSD-SA-19:22.mbuf"
date = "2019-08-20"
[[advisories]]
name = "FreeBSD-SA-19:21.bhyve"
date = "2019-08-06"
[[advisories]]
name = "FreeBSD-SA-19:20.bsnmp"
date = "2019-08-06"
[[advisories]]
name = "FreeBSD-SA-19:19.mldv2"
date = "2019-08-06"
[[advisories]]
name = "FreeBSD-SA-19:18.bzip2"
date = "2019-08-06"
[[advisories]]
name = "FreeBSD-SA-19:17.fd"
date = "2019-07-24"
[[advisories]]
name = "FreeBSD-SA-19:16.bhyve"
date = "2019-07-24"
[[advisories]]
name = "FreeBSD-SA-19:15.mqueuefs"
date = "2019-07-24"
[[advisories]]
name = "FreeBSD-SA-19:14.freebsd32"
date = "2019-07-24"
[[advisories]]
name = "FreeBSD-SA-19:13.pts"
date = "2019-07-24"
[[advisories]]
name = "FreeBSD-SA-19:12.telnet"
date = "2019-07-24"
[[advisories]]
name = "FreeBSD-SA-19:11.cd_ioctl"
date = "2019-07-02"
[[advisories]]
name = "FreeBSD-SA-19:10.ufs"
date = "2019-07-02"
[[advisories]]
name = "FreeBSD-SA-19:09.iconv"
date = "2019-07-02"
[[advisories]]
name = "FreeBSD-SA-19:08.rack"
date = "2019-06-19"
[[advisories]]
name = "FreeBSD-SA-19:07.mds"
date = "2019-05-14"
[[advisories]]
name = "FreeBSD-SA-19:06.pf"
date = "2019-05-14"
[[advisories]]
name = "FreeBSD-SA-19:05.pf"
date = "2019-05-14"
[[advisories]]
name = "FreeBSD-SA-19:04.ntp"
date = "2019-05-14"
[[advisories]]
name = "FreeBSD-SA-19:03.wpa"
date = "2019-05-14"
[[advisories]]
name = "FreeBSD-SA-19:02.fd"
date = "2019-02-05"
[[advisories]]
name = "FreeBSD-SA-19:01.syscall"
date = "2019-02-05"
[[advisories]]
name = "FreeBSD-SA-18:15.bootpd"
date = "2018-12-19"
[[advisories]]
name = "FreeBSD-SA-18:14.bhyve"
date = "2018-12-04"
[[advisories]]
name = "FreeBSD-SA-18:13.nfs"
date = "2018-11-27"
[[advisories]]
name = "FreeBSD-SA-18:12.elf"
date = "2018-09-12"
[[advisories]]
name = "FreeBSD-SA-18:11.hostapd"
date = "2018-08-14"
[[advisories]]
name = "FreeBSD-SA-18:10.ip"
date = "2018-08-14"
[[advisories]]
name = "FreeBSD-SA-18:09.l1tf"
date = "2018-08-14"
[[advisories]]
name = "FreeBSD-SA-18:08.tcp"
date = "2018-08-06"
[[advisories]]
name = "FreeBSD-SA-18:07.lazyfpu"
date = "2018-06-21"
[[advisories]]
name = "FreeBSD-SA-18:06.debugreg"
date = "2018-05-08"
[[advisories]]
name = "FreeBSD-SA-18:05.ipsec"
date = "2018-04-04"
[[advisories]]
name = "FreeBSD-SA-18:04.vt"
date = "2018-04-04"
[[advisories]]
name = "FreeBSD-SA-18:03.speculative_execution"
date = "2018-03-14"
[[advisories]]
name = "FreeBSD-SA-18:02.ntp"
date = "2018-03-07"
[[advisories]]
name = "FreeBSD-SA-18:01.ipsec"
date = "2018-03-07"
[[advisories]]
name = "FreeBSD-SA-17:12.openssl"
date = "2017-12-09"
[[advisories]]
name = "FreeBSD-SA-17:11.openssl"
date = "2017-11-29"
[[advisories]]
name = "FreeBSD-SA-17:10.kldstat"
date = "2017-11-15"
[[advisories]]
name = "FreeBSD-SA-17:09.shm"
date = "2017-11-15"
[[advisories]]
name = "FreeBSD-SA-17:08.ptrace"
date = "2017-11-15"
[[advisories]]
name = "FreeBSD-SA-17:07.wpa"
date = "2017-10-17"
[[advisories]]
name = "FreeBSD-SA-17:06.openssh"
date = "2017-08-10"
[[advisories]]
name = "FreeBSD-SA-17:05.heimdal"
date = "2017-07-12"
[[advisories]]
name = "FreeBSD-SA-17:04.ipfilter"
date = "2017-04-27"
[[advisories]]
name = "FreeBSD-SA-17:03.ntp"
date = "2017-04-12"
[[advisories]]
name = "FreeBSD-SA-17:02.openssl"
date = "2017-02-23"
[[advisories]]
name = "FreeBSD-SA-17:01.openssh"
date = "2017-01-11"
[[advisories]]
name = "FreeBSD-SA-16:39.ntp"
date = "2016-12-22"
[[advisories]]
name = "FreeBSD-SA-16:38.bhyve"
date = "2016-12-06"
[[advisories]]
name = "FreeBSD-SA-16:37.libc"
date = "2016-12-06"
[[advisories]]
name = "FreeBSD-SA-16:36.telnetd"
date = "2016-12-06"
[[advisories]]
name = "FreeBSD-SA-16:35.openssl"
date = "2016-11-02"
[[advisories]]
name = "FreeBSD-SA-16:34.bind"
date = "2016-11-02"
[[advisories]]
name = "FreeBSD-SA-16:33.openssh"
date = "2016-11-02"
[[advisories]]
name = "FreeBSD-SA-16:32.bhyve"
date = "2016-10-25"
[[advisories]]
name = "FreeBSD-SA-16:31.libarchive"
date = "2016-10-10"
[[advisories]]
name = "FreeBSD-SA-16:30.portsnap"
date = "2016-10-10"
[[advisories]]
name = "FreeBSD-SA-16:29.bspatch"
date = "2016-10-10"
[[advisories]]
name = "FreeBSD-SA-16:28.bind"
date = "2016-10-10"
[[advisories]]
name = "FreeBSD-SA-16:27.openssl"
date = "2016-10-10"
[[advisories]]
name = "FreeBSD-SA-16:26.openssl"
date = "2016-09-23"
[[advisories]]
name = "FreeBSD-SA-16:25.bspatch"
date = "2016-07-25"
[[advisories]]
name = "FreeBSD-SA-16:24.ntp"
date = "2016-06-04"
[[advisories]]
name = "FreeBSD-SA-16:23.libarchive"
date = "2016-05-31"
[[advisories]]
name = "FreeBSD-SA-16:22.libarchive"
date = "2016-05-31"
[[advisories]]
name = "FreeBSD-SA-16:21.43bsd"
date = "2016-05-31"
[[advisories]]
name = "FreeBSD-SA-16:20.linux"
date = "2016-05-31"
[[advisories]]
name = "FreeBSD-SA-16:19.sendmsg"
date = "2016-05-17"
[[advisories]]
name = "FreeBSD-SA-16:18.atkbd"
date = "2016-05-17"
[[advisories]]
name = "FreeBSD-SA-16:17.openssl"
date = "2016-05-04"
[[advisories]]
name = "FreeBSD-SA-16:16.ntp"
date = "2016-04-29"
[[advisories]]
name = "FreeBSD-SA-16:15.sysarch"
date = "2016-03-16"
[[advisories]]
name = "FreeBSD-SA-16:14.openssh"
date = "2016-03-16"
[[advisories]]
name = "FreeBSD-SA-16:13.bind"
date = "2016-03-10"
[[advisories]]
name = "FreeBSD-SA-16:12.openssl"
date = "2016-03-10"
[[advisories]]
name = "FreeBSD-SA-16:11.openssl"
date = "2016-01-30"
[[advisories]]
name = "FreeBSD-SA-16:10.linux"
date = "2016-01-27"
[[advisories]]
name = "FreeBSD-SA-16:09.ntp"
date = "2016-01-27"
[[advisories]]
name = "FreeBSD-SA-16:08.bind"
date = "2016-01-27"
[[advisories]]
name = "FreeBSD-SA-16:07.openssh"
date = "2016-01-14"
[[advisories]]
name = "FreeBSD-SA-16:06.bsnmpd"
date = "2016-01-14"
[[advisories]]
name = "FreeBSD-SA-16:05.tcp"
date = "2016-01-14"
[[advisories]]
name = "FreeBSD-SA-16:04.linux"
date = "2016-01-14"
[[advisories]]
name = "FreeBSD-SA-16:03.linux"
date = "2016-01-14"
[[advisories]]
name = "FreeBSD-SA-16:02.ntp"
date = "2016-01-14"
[[advisories]]
name = "FreeBSD-SA-16:01.sctp"
date = "2016-01-14"
[[advisories]]
name = "FreeBSD-SA-15:27.bind"
date = "2015-12-16"
[[advisories]]
name = "FreeBSD-SA-15:26.openssl"
date = "2015-12-06"
[[advisories]]
name = "FreeBSD-SA-15:25.ntp"
date = "2015-10-26"
[[advisories]]
name = "FreeBSD-SA-15:24.rpcbind"
date = "2015-09-29"
[[advisories]]
name = "FreeBSD-SA-15:23.bind"
date = "2015-09-02"
[[advisories]]
name = "FreeBSD-SA-15:22.openssh"
date = "2015-08-25"
[[advisories]]
name = "FreeBSD-SA-15:21.amd64"
date = "2015-08-25"
[[advisories]]
name = "FreeBSD-SA-15:20.expat"
date = "2015-08-18"
[[advisories]]
name = "FreeBSD-SA-15:19.routed"
date = "2015-08-05"
[[advisories]]
name = "FreeBSD-SA-15:18.bsdpatch"
date = "2015-08-05"
[[advisories]]
name = "FreeBSD-SA-15:17.bind"
date = "2015-07-28"
[[advisories]]
name = "FreeBSD-SA-15:16.openssh"
date = "2015-07-28"
[[advisories]]
name = "FreeBSD-SA-15:15.tcp"
date = "2015-07-28"
[[advisories]]
name = "FreeBSD-SA-15:14.bsdpatch"
date = "2015-07-28"
[[advisories]]
name = "FreeBSD-SA-15:13.tcp"
date = "2015-07-21"
[[advisories]]
name = "FreeBSD-SA-15:12.openssl"
date = "2015-07-09"
[[advisories]]
name = "FreeBSD-SA-15:11.bind"
date = "2015-07-07"
[[advisories]]
name = "FreeBSD-SA-15:10.openssl"
date = "2015-06-12"
[[advisories]]
name = "FreeBSD-SA-15:09.ipv6"
date = "2015-04-07"
[[advisories]]
name = "FreeBSD-SA-15:08.bsdinstall"
date = "2015-04-07"
[[advisories]]
name = "FreeBSD-SA-15:07.ntp"
date = "2015-04-07"
[[advisories]]
name = "FreeBSD-SA-15:06.openssl"
date = "2015-03-19"
[[advisories]]
name = "FreeBSD-SA-15:05.bind"
date = "2015-02-25"
[[advisories]]
name = "FreeBSD-SA-15:04.igmp"
date = "2015-02-25"
[[advisories]]
name = "FreeBSD-SA-15:03.sctp"
date = "2015-01-27"
[[advisories]]
name = "FreeBSD-SA-15:02.kmem"
date = "2015-01-27"
[[advisories]]
name = "FreeBSD-SA-15:01.openssl"
date = "2015-01-14"
[[advisories]]
name = "FreeBSD-SA-14:31.ntp"
date = "2014-12-23"
[[advisories]]
name = "FreeBSD-SA-14:30.unbound"
date = "2014-12-17"
[[advisories]]
name = "FreeBSD-SA-14:29.bind"
date = "2014-12-10"
[[advisories]]
name = "FreeBSD-SA-14:28.file"
date = "2014-12-10"
[[advisories]]
name = "FreeBSD-SA-14:27.stdio"
date = "2014-12-10"
[[advisories]]
name = "FreeBSD-SA-14:26.ftp"
date = "2014-11-04"
[[advisories]]
name = "FreeBSD-SA-14:25.setlogin"
date = "2014-11-04"
[[advisories]]
name = "FreeBSD-SA-14:24.sshd"
date = "2014-11-04"
[[advisories]]
name = "FreeBSD-SA-14:23.openssl"
date = "2014-10-21"
[[advisories]]
name = "FreeBSD-SA-14:22.namei"
date = "2014-10-21"
[[advisories]]
name = "FreeBSD-SA-14:21.routed"
date = "2014-10-21"
[[advisories]]
name = "FreeBSD-SA-14:20.rtsold"
date = "2014-10-21"
[[advisories]]
name = "FreeBSD-SA-14:19.tcp"
date = "2014-09-16"
[[advisories]]
name = "FreeBSD-SA-14:18.openssl"
date = "2014-09-09"
[[advisories]]
name = "FreeBSD-SA-14:17.kmem"
date = "2014-07-08"
[[advisories]]
name = "FreeBSD-SA-14:16.file"
date = "2014-06-24"
[[advisories]]
name = "FreeBSD-SA-14:15.iconv"
date = "2014-06-24"
[[advisories]]
name = "FreeBSD-SA-14:14.openssl"
date = "2014-06-05"
[[advisories]]
name = "FreeBSD-SA-14:13.pam"
date = "2014-06-03"
[[advisories]]
name = "FreeBSD-SA-14:12.ktrace"
date = "2014-06-03"
[[advisories]]
name = "FreeBSD-SA-14:11.sendmail"
date = "2014-06-03"
[[advisories]]
name = "FreeBSD-SA-14:10.openssl"
date = "2014-05-13"
[[advisories]]
name = "FreeBSD-SA-14:09.openssl"
date = "2014-04-30"
[[advisories]]
name = "FreeBSD-SA-14:08.tcp"
date = "2014-04-30"
[[advisories]]
name = "FreeBSD-SA-14:07.devfs"
date = "2014-04-30"
[[advisories]]
name = "FreeBSD-SA-14:06.openssl"
date = "2014-04-08"
[[advisories]]
name = "FreeBSD-SA-14:05.nfsserver"
date = "2014-04-08"
[[advisories]]
name = "FreeBSD-SA-14:04.bind"
date = "2014-01-14"
[[advisories]]
name = "FreeBSD-SA-14:03.openssl"
date = "2014-01-14"
[[advisories]]
name = "FreeBSD-SA-14:02.ntpd"
date = "2014-01-14"
[[advisories]]
name = "FreeBSD-SA-14:01.bsnmpd"
date = "2014-01-14"
[[advisories]]
name = "FreeBSD-SA-13:14.openssh"
date = "2013-11-19"
[[advisories]]
name = "FreeBSD-SA-13:13.nullfs"
date = "2013-09-10"
[[advisories]]
name = "FreeBSD-SA-13:12.ifioctl"
date = "2013-09-10"
[[advisories]]
name = "FreeBSD-SA-13:11.sendfile"
date = "2013-09-10"
[[advisories]]
name = "FreeBSD-SA-13:10.sctp"
date = "2013-08-22"
[[advisories]]
name = "FreeBSD-SA-13:09.ip_multicast"
date = "2013-08-22"
[[advisories]]
name = "FreeBSD-SA-13:08.nfsserver"
date = "2013-07-26"
[[advisories]]
name = "FreeBSD-SA-13:07.bind"
date = "2013-07-26"
[[advisories]]
name = "FreeBSD-SA-13:06.mmap"
date = "2013-06-18"
[[advisories]]
name = "FreeBSD-SA-13:05.nfsserver"
date = "2013-04-29"
[[advisories]]
name = "FreeBSD-SA-13:04.bind"
date = "2013-04-02"
[[advisories]]
name = "FreeBSD-SA-13:03.openssl"
date = "2013-04-02"
[[advisories]]
name = "FreeBSD-SA-13:02.libc"
date = "2013-02-19"
[[advisories]]
name = "FreeBSD-SA-13:01.bind"
date = "2013-02-19"
[[advisories]]
name = "FreeBSD-SA-12:08.linux"
date = "2012-11-22"
[[advisories]]
name = "FreeBSD-SA-12:07.hostapd"
date = "2012-11-22"
[[advisories]]
name = "FreeBSD-SA-12:06.bind"
date = "2012-11-22"
[[advisories]]
name = "FreeBSD-SA-12:05.bind"
date = "2012-08-06"
[[advisories]]
name = "FreeBSD-SA-12:04.sysret"
date = "2012-06-12"
[[advisories]]
name = "FreeBSD-SA-12:03.bind"
date = "2012-06-12"
[[advisories]]
name = "FreeBSD-SA-12:02.crypt"
date = "2012-05-30"
[[advisories]]
name = "FreeBSD-SA-12:01.openssl"
date = "2012-05-30"
[[advisories]]
name = "FreeBSD-SA-11:10.pam"
date = "2011-12-23"
[[advisories]]
name = "FreeBSD-SA-11:09.pam_ssh"
date = "2011-12-23"
[[advisories]]
name = "FreeBSD-SA-11:08.telnetd"
date = "2011-12-23"
[[advisories]]
name = "FreeBSD-SA-11:07.chroot"
date = "2011-12-23"
[[advisories]]
name = "FreeBSD-SA-11:06.bind"
date = "2011-12-23"
[[advisories]]
name = "FreeBSD-SA-11:05.unix"
date = "2011-09-28"
[[advisories]]
name = "FreeBSD-SA-11:04.compress"
date = "2011-09-28"
[[advisories]]
name = "FreeBSD-SA-11:03.bind"
date = "2011-09-28"
[[advisories]]
name = "FreeBSD-SA-11:02.bind"
date = "2011-05-28"
[[advisories]]
name = "FreeBSD-SA-11:01.mountd"
date = "2011-04-20"
[[advisories]]
name = "FreeBSD-SA-10:10.openssl"
date = "2010-11-29"
[[advisories]]
name = "FreeBSD-SA-10:09.pseudofs"
date = "2010-11-10"
[[advisories]]
name = "FreeBSD-SA-10:08.bzip2"
date = "2010-09-20"
[[advisories]]
name = "FreeBSD-SA-10:07.mbuf"
date = "2010-07-13"
[[advisories]]
name = "FreeBSD-SA-10:06.nfsclient"
date = "2010-05-27"
[[advisories]]
name = "FreeBSD-SA-10:05.opie"
date = "2010-05-27"
[[advisories]]
name = "FreeBSD-SA-10:04.jail"
date = "2010-05-27"
[[advisories]]
name = "FreeBSD-SA-10:03.zfs"
date = "2010-01-06"
[[advisories]]
name = "FreeBSD-SA-10:02.ntpd"
date = "2010-01-06"
[[advisories]]
name = "FreeBSD-SA-10:01.bind"
date = "2010-01-06"
[[advisories]]
name = "FreeBSD-SA-09:17.freebsd-update"
date = "2009-12-03"
[[advisories]]
name = "FreeBSD-SA-09:16.rtld"
date = "2009-12-03"
[[advisories]]
name = "FreeBSD-SA-09:15.ssl"
date = "2009-12-03"
[[advisories]]
name = "FreeBSD-SA-09:14.devfs"
date = "2009-10-02"
[[advisories]]
name = "FreeBSD-SA-09:13.pipe"
date = "2009-10-02"
[[advisories]]
name = "FreeBSD-SA-09:12.bind"
date = "2009-07-29"
[[advisories]]
name = "FreeBSD-SA-09:11.ntpd"
date = "2009-06-10"
[[advisories]]
name = "FreeBSD-SA-09:10.ipv6"
date = "2009-06-10"
[[advisories]]
name = "FreeBSD-SA-09:09.pipe"
date = "2009-06-10"
[[advisories]]
name = "FreeBSD-SA-09:08.openssl"
date = "2009-04-22"
[[advisories]]
name = "FreeBSD-SA-09:07.libc"
date = "2009-04-22"
[[advisories]]
name = "FreeBSD-SA-09:06.ktimer"
date = "2009-03-23"
[[advisories]]
name = "FreeBSD-SA-09:05.telnetd"
date = "2009-02-16"
[[advisories]]
name = "FreeBSD-SA-09:04.bind"
date = "2009-01-13"
[[advisories]]
name = "FreeBSD-SA-09:03.ntpd"
date = "2009-01-13"
[[advisories]]
name = "FreeBSD-SA-09:02.openssl"
date = "2009-01-07"
[[advisories]]
name = "FreeBSD-SA-09:01.lukemftpd"
date = "2009-01-07"
[[advisories]]
name = "FreeBSD-SA-08:13.protosw"
date = "2008-12-23"
[[advisories]]
name = "FreeBSD-SA-08:12.ftpd"
date = "2008-12-23"
[[advisories]]
name = "FreeBSD-SA-08:11.arc4random"
date = "2008-11-24"
[[advisories]]
name = "FreeBSD-SA-08:10.nd6"
date = "2008-10-02"
[[advisories]]
name = "FreeBSD-SA-08:09.icmp6"
date = "2008-09-03"
[[advisories]]
name = "FreeBSD-SA-08:08.nmount"
date = "2008-09-03"
[[advisories]]
name = "FreeBSD-SA-08:07.amd64"
date = "2008-09-03"
[[advisories]]
name = "FreeBSD-SA-08:06.bind"
date = "2008-07-13"
[[advisories]]
name = "FreeBSD-SA-08:05.openssh"
date = "2008-04-17"
[[advisories]]
name = "FreeBSD-SA-08:04.ipsec"
date = "2008-02-14"
[[advisories]]
name = "FreeBSD-SA-08:03.sendfile"
date = "2008-02-14"
[[advisories]]
name = "FreeBSD-SA-08:02.libc"
date = "2008-01-14"
[[advisories]]
name = "FreeBSD-SA-08:01.pty"
date = "2008-01-14"
[[advisories]]
name = "FreeBSD-SA-07:10.gtar"
date = "2007-11-29"
[[advisories]]
name = "FreeBSD-SA-07:09.random"
date = "2007-11-29"
[[advisories]]
name = "FreeBSD-SA-07:08.openssl"
date = "2007-10-03"
[[advisories]]
name = "FreeBSD-SA-07:07.bind"
date = "2007-08-01"
[[advisories]]
name = "FreeBSD-SA-07:06.tcpdump"
date = "2007-08-01"
[[advisories]]
name = "FreeBSD-SA-07:05.libarchive"
date = "2007-07-12"
[[advisories]]
name = "FreeBSD-SA-07:04.file"
date = "2007-05-23"
[[advisories]]
name = "FreeBSD-SA-07:03.ipv6"
date = "2007-04-26"
[[advisories]]
name = "FreeBSD-SA-07:02.bind"
date = "2007-02-09"
[[advisories]]
name = "FreeBSD-SA-07:01.jail"
date = "2007-01-11"
[[advisories]]
name = "FreeBSD-SA-06:26.gtar"
date = "2006-12-06"
[[advisories]]
name = "FreeBSD-SA-06:25.kmem"
date = "2006-12-06"
[[advisories]]
name = "FreeBSD-SA-06:24.libarchive"
date = "2006-11-08"
[[advisories]]
name = "FreeBSD-SA-06:22.openssh"
date = "2006-09-30"
[[advisories]]
name = "FreeBSD-SA-06:23.openssl"
date = "2006-09-28"
[[advisories]]
name = "FreeBSD-SA-06:21.gzip"
date = "2006-09-19"
[[advisories]]
name = "FreeBSD-SA-06:20.bind"
date = "2006-09-06"
[[advisories]]
name = "FreeBSD-SA-06:19.openssl"
date = "2006-09-06"
[[advisories]]
name = "FreeBSD-SA-06:18.ppp"
date = "2006-08-23"
[[advisories]]
name = "FreeBSD-SA-06:17.sendmail"
date = "2006-06-14"
[[advisories]]
name = "FreeBSD-SA-06:16.smbfs"
date = "2006-05-31"
[[advisories]]
name = "FreeBSD-SA-06:15.ypserv"
date = "2006-05-31"
[[advisories]]
name = "FreeBSD-SA-06:14.fpu"
date = "2006-04-19"
[[advisories]]
name = "FreeBSD-SA-06:13.sendmail"
date = "2006-03-22"
[[advisories]]
name = "FreeBSD-SA-06:12.opie"
date = "2006-03-22"
[[advisories]]
name = "FreeBSD-SA-06:11.ipsec"
date = "2006-03-22"
[[advisories]]
name = "FreeBSD-SA-06:10.nfs"
date = "2006-03-01"
[[advisories]]
name = "FreeBSD-SA-06:09.openssh"
date = "2006-03-01"
[[advisories]]
name = "FreeBSD-SA-06:08.sack"
date = "2006-02-01"
[[advisories]]
name = "FreeBSD-SA-06:07.pf"
date = "2006-01-25"
[[advisories]]
name = "FreeBSD-SA-06:06.kmem"
date = "2006-01-25"
[[advisories]]
name = "FreeBSD-SA-06:05.80211"
date = "2006-01-18"
[[advisories]]
name = "FreeBSD-SA-06:04.ipfw"
date = "2006-01-11"
[[advisories]]
name = "FreeBSD-SA-06:03.cpio"
date = "2006-01-11"
[[advisories]]
name = "FreeBSD-SA-06:02.ee"
date = "2006-01-11"
[[advisories]]
name = "FreeBSD-SA-06:01.texindex"
date = "2006-01-11"
[[advisories]]
name = "FreeBSD-SA-05:21.openssl"
date = "2005-10-11"
[[advisories]]
name = "FreeBSD-SA-05:20.cvsbug"
date = "2005-09-07"
[[advisories]]
name = "FreeBSD-SA-05:19.ipsec"
date = "2005-07-27"
[[advisories]]
name = "FreeBSD-SA-05:18.zlib"
date = "2005-07-27"
[[advisories]]
name = "FreeBSD-SA-05:17.devfs"
date = "2005-07-20"
[[advisories]]
name = "FreeBSD-SA-05:16.zlib"
date = "2005-07-06"
[[advisories]]
name = "FreeBSD-SA-05:15.tcp"
date = "2005-06-29"
[[advisories]]
name = "FreeBSD-SA-05:14.bzip2"
date = "2005-06-29"
[[advisories]]
name = "FreeBSD-SA-05:13.ipfw"
date = "2005-06-29"
[[advisories]]
name = "FreeBSD-SA-05:12.bind9"
date = "2005-06-09"
[[advisories]]
name = "FreeBSD-SA-05:11.gzip"
date = "2005-06-09"
[[advisories]]
name = "FreeBSD-SA-05:10.tcpdump"
date = "2005-06-09"
[[advisories]]
name = "FreeBSD-SA-05:09.htt"
date = "2005-05-13"
[[advisories]]
name = "FreeBSD-SA-05:08.kmem"
date = "2005-05-06"
[[advisories]]
name = "FreeBSD-SA-05:07.ldt"
date = "2005-05-06"
[[advisories]]
name = "FreeBSD-SA-05:06.iir"
date = "2005-05-06"
[[advisories]]
name = "FreeBSD-SA-05:05.cvs"
date = "2005-04-22"
[[advisories]]
name = "FreeBSD-SA-05:04.ifconf"
date = "2005-04-15"
[[advisories]]
name = "FreeBSD-SA-05:03.amd64"
date = "2005-04-06"
[[advisories]]
name = "FreeBSD-SA-05:02.sendfile"
date = "2005-04-04"
[[advisories]]
name = "FreeBSD-SA-05:01.telnet"
date = "2005-03-28"
[[advisories]]
name = "FreeBSD-SA-04:17.procfs"
date = "2004-12-01"
[[advisories]]
name = "FreeBSD-SA-04:16.fetch"
date = "2004-11-18"
[[advisories]]
name = "FreeBSD-SA-04:15.syscons"
date = "2004-10-04"
[[advisories]]
name = "FreeBSD-SA-04:14.cvs"
date = "2004-09-19"
[[advisories]]
name = "FreeBSD-SA-04:13.linux"
date = "2004-06-30"
[[advisories]]
name = "FreeBSD-SA-04:12.jailroute"
date = "2004-06-07"
[[advisories]]
name = "FreeBSD-SA-04:11.msync"
date = "2004-05-19"
[[advisories]]
name = "FreeBSD-SA-04:10.cvs"
date = "2004-05-19"
[[advisories]]
name = "FreeBSD-SA-04:09.kadmind"
date = "2004-05-05"
[[advisories]]
name = "FreeBSD-SA-04:08.heimdal"
date = "2004-05-05"
[[advisories]]
name = "FreeBSD-SA-04:07.cvs"
date = "2004-04-15"
[[advisories]]
name = "FreeBSD-SA-04:06.ipv6"
date = "2004-03-29"
[[advisories]]
name = "FreeBSD-SA-04:05.openssl"
date = "2004-03-17"
[[advisories]]
name = "FreeBSD-SA-04:04.tcp"
date = "2004-03-02"
[[advisories]]
name = "FreeBSD-SA-04:03.jail"
date = "2004-02-25"
[[advisories]]
name = "FreeBSD-SA-04:02.shmat"
date = "2004-02-05"
[[advisories]]
name = "FreeBSD-SA-04:01.mksnap_ffs"
date = "2004-01-30"
[[advisories]]
name = "FreeBSD-SA-03:19.bind"
date = "2003-11-28"
[[advisories]]
name = "FreeBSD-SA-03:15.openssh"
date = "2003-10-05"
[[advisories]]
name = "FreeBSD-SA-03:18.openssl"
date = "2003-10-03"
[[advisories]]
name = "FreeBSD-SA-03:17.procfs"
date = "2003-10-03"
[[advisories]]
name = "FreeBSD-SA-03:16.filedesc"
date = "2003-10-02"
[[advisories]]
name = "FreeBSD-SA-03:14.arp"
date = "2003-09-23"
[[advisories]]
name = "FreeBSD-SA-03:13.sendmail"
date = "2003-09-17"
[[advisories]]
name = "FreeBSD-SA-03:12.openssh"
date = "2003-09-16"
[[advisories]]
name = "FreeBSD-SA-03:11.sendmail"
date = "2003-08-26"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1170"
[[advisories]]
name = "FreeBSD-SA-03:10.ibcs2"
date = "2003-08-10"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1164"
[[advisories]]
name = "FreeBSD-SA-03:09.signal"
date = "2003-08-10"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1163"
[[advisories]]
name = "FreeBSD-SA-03:08.realpath"
date = "2003-08-03"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1158"
[[advisories]]
name = "FreeBSD-SN-03:02"
date = "2003-04-08"
[[advisories]]
name = "FreeBSD-SN-03:01"
date = "2003-04-07"
[[advisories]]
name = "FreeBSD-SA-03:07.sendmail"
date = "2003-03-30"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1122"
[[advisories]]
name = "FreeBSD-SA-03:06.openssl"
date = "2003-03-21"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1118"
[[advisories]]
name = "FreeBSD-SA-03:05.xdr"
date = "2003-03-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1117"
[[advisories]]
name = "FreeBSD-SA-03:04.sendmail"
date = "2003-03-03"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1112"
[[advisories]]
name = "FreeBSD-SA-03:03.syncookies"
date = "2003-02-24"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1106"
[[advisories]]
name = "FreeBSD-SA-03:02.openssl"
date = "2003-02-24"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1105"
[[advisories]]
name = "FreeBSD-SA-03:01.cvs"
date = "2003-02-04"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1100"
[[advisories]]
name = "FreeBSD-SA-02:44.filedesc"
date = "2003-01-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1090"
[[advisories]]
name = "FreeBSD-SA-02:43.bind"
date = "2002-11-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1084"
[[advisories]]
name = "FreeBSD-SA-02:41.smrsh"
date = "2002-11-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1082"
[[advisories]]
name = "FreeBSD-SA-02:42.resolv"
date = "2002-11-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1083"
[[advisories]]
name = "FreeBSD-SA-02:40.kadmind"
date = "2002-11-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1081"
[[advisories]]
name = "FreeBSD-SN-02:06"
date = "2002-10-10"
[[advisories]]
name = "FreeBSD-SA-02:39.libkvm"
date = "2002-09-16"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1051"
[[advisories]]
name = "FreeBSD-SN-02:05"
date = "2002-08-28"
[[advisories]]
name = "FreeBSD-SA-02:38.signed-error"
date = "2002-08-19"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1041"
[[advisories]]
name = "FreeBSD-SA-02:37.kqueue"
date = "2002-08-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1033"
[[advisories]]
name = "FreeBSD-SA-02:36.nfs"
date = "2002-08-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1032"
[[advisories]]
name = "FreeBSD-SA-02:35.ffs"
date = "2002-08-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1031"
[[advisories]]
name = "FreeBSD-SA-02:33.openssl"
date = "2002-08-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1023"
[[advisories]]
name = "FreeBSD-SA-02:34.rpc"
date = "2002-08-01"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1024"
[[advisories]]
name = "FreeBSD-SA-02:32.pppd"
date = "2002-07-31"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1022"
[[advisories]]
name = "FreeBSD-SA-02:31.openssh"
date = "2002-07-15"
[[advisories]]
name = "FreeBSD-SA-02:30.ktrace"
date = "2002-07-12"
[[advisories]]
name = "FreeBSD-SA-02:29.tcpdump"
date = "2002-07-12"
[[advisories]]
name = "FreeBSD-SA-02:28.resolv"
date = "2002-06-26"
[[advisories]]
name = "FreeBSD-SN-02:04"
date = "2002-06-19"
[[advisories]]
name = "FreeBSD-SA-02:27.rc"
date = "2002-05-29"
[[advisories]]
name = "FreeBSD-SA-02:26.accept"
date = "2002-05-29"
[[advisories]]
name = "FreeBSD-SN-02:03"
date = "2002-05-28"
[[advisories]]
name = "FreeBSD-SA-02:25.bzip2"
date = "2002-05-20"
[[advisories]]
name = "FreeBSD-SA-02:24.k5su"
date = "2002-05-20"
[[advisories]]
name = "FreeBSD-SN-02:02"
date = "2002-05-13"
[[advisories]]
name = "FreeBSD-SA-02:23.stdio"
date = "2002-04-22"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1021"
[[advisories]]
name = "FreeBSD-SA-02:22.mmap"
date = "2002-04-18"
[[advisories]]
name = "FreeBSD-SA-02:21.tcpip"
date = "2002-04-17"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/980"
[[advisories]]
name = "FreeBSD-SA-02:20.syncache"
date = "2002-04-16"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/979"
[[advisories]]
name = "FreeBSD-SN-02:01"
date = "2002-03-30"
[[advisories]]
name = "FreeBSD-SA-02:19.squid"
date = "2002-03-26"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/960"
[[advisories]]
name = "FreeBSD-SA-02:18.zlib"
date = "2002-03-18"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/978"
[[advisories]]
name = "FreeBSD-SA-02:17.mod_frontpage"
date = "2002-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/954"
[[advisories]]
name = "FreeBSD-SA-02:16.netscape"
date = "2002-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/953"
[[advisories]]
name = "FreeBSD-SA-02:15.cyrus-sasl"
date = "2002-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/952"
[[advisories]]
name = "FreeBSD-SA-02:14.pam-pgsql"
date = "2002-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/951"
[[advisories]]
name = "FreeBSD-SA-02:13.openssh"
date = "2002-03-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/945"
[[advisories]]
name = "FreeBSD-SA-02:12.squid"
date = "2002-02-21"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/938"
[[advisories]]
name = "FreeBSD-SA-02:11.snmp"
date = "2002-02-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/936"
[[advisories]]
name = "FreeBSD-SA-02:10.rsync"
date = "2002-02-06"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/928"
[[advisories]]
name = "FreeBSD-SA-02:09.fstatfs"
date = "2002-02-06"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/927"
[[advisories]]
name = "FreeBSD-SA-02:08.exec"
date = "2002-01-24"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/923"
[[advisories]]
name = "FreeBSD-SA-02:07.k5su"
date = "2002-01-18"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/912"
[[advisories]]
name = "FreeBSD-SA-02:06.sudo"
date = "2002-01-16"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/909"
[[advisories]]
name = "FreeBSD-SA-02:05.pine"
date = "2002-01-04"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/894"
[[advisories]]
name = "FreeBSD-SA-02:04.mutt"
date = "2002-01-04"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/893"
[[advisories]]
name = "FreeBSD-SA-02:03.mod_auth_pgsql"
date = "2002-01-04"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/892"
[[advisories]]
name = "FreeBSD-SA-02:02.pw"
date = "2002-01-04"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/891"
[[advisories]]
name = "FreeBSD-SA-02:01.pkg_add"
date = "2002-01-04"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/898"
[[advisories]]
name = "FreeBSD-SA-01:64.wu-ftpd"
date = "2001-12-04"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/870"
[[advisories]]
name = "FreeBSD-SA-01:63.openssh"
date = "2001-12-02"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/871"
[[advisories]]
name = "FreeBSD-SA-01:62.uucp"
date = "2001-10-08"
[[advisories]]
name = "FreeBSD-SA-01:61.squid"
date = "2001-10-08"
[[advisories]]
name = "FreeBSD-SA-01:60.procmail"
date = "2001-09-24"
[[advisories]]
name = "FreeBSD-SA-01:59.rmuser"
date = "2001-09-04"
[[advisories]]
name = "FreeBSD-SA-01:58.lpd"
date = "2001-08-30"
[[advisories]]
name = "FreeBSD-SA-01:57.sendmail"
date = "2001-08-27"
[[advisories]]
name = "FreeBSD-SA-01:56.tcp_wrappers"
date = "2001-08-23"
[[advisories]]
name = "FreeBSD-SA-01:55.procfs"
date = "2001-08-21"
[[advisories]]
name = "FreeBSD-SA-01:54.ports-telnetd"
date = "2001-08-20"
[[advisories]]
name = "FreeBSD-SA-01:53.ipfw"
date = "2001-08-17"
[[advisories]]
name = "FreeBSD-SA-01:52.fragment"
date = "2001-08-06"
[[advisories]]
name = "FreeBSD-SA-01:51.openssl"
date = "2001-07-30"
[[advisories]]
name = "FreeBSD-SA-01:50.windowmaker"
date = "2001-07-27"
[[advisories]]
name = "FreeBSD-SA-01:49.telnetd"
date = "2001-07-23"
[[advisories]]
name = "FreeBSD-SA-01:48.tcpdump"
date = "2001-07-17"
[[advisories]]
name = "FreeBSD-SA-01:47.xinetd"
date = "2001-07-10"
[[advisories]]
name = "FreeBSD-SA-01:46.w3m"
date = "2001-07-10"
[[advisories]]
name = "FreeBSD-SA-01:45.samba"
date = "2001-07-10"
[[advisories]]
name = "FreeBSD-SA-01:44.gnupg"
date = "2001-07-10"
[[advisories]]
name = "FreeBSD-SA-01:43.fetchmail"
date = "2001-07-10"
[[advisories]]
name = "FreeBSD-SA-01:42.signal"
date = "2001-07-10"
[[advisories]]
name = "FreeBSD-SA-01:41.hanterm"
date = "2001-07-09"
[[advisories]]
name = "FreeBSD-SA-01:40.fts"
date = "2001-06-04"
[[advisories]]
name = "FreeBSD-SA-01:39.tcp-isn"
date = "2001-05-02"
[[advisories]]
name = "FreeBSD-SA-01:38.sudo"
date = "2001-04-23"
[[advisories]]
name = "FreeBSD-SA-01:37.slrn"
date = "2001-04-23"
[[advisories]]
name = "FreeBSD-SA-01:36.samba"
date = "2001-04-23"
[[advisories]]
name = "FreeBSD-SA-01:35.licq"
date = "2001-04-23"
[[advisories]]
name = "FreeBSD-SA-01:34.hylafax"
date = "2001-04-23"
[[advisories]]
name = "FreeBSD-SA-01:33.ftpd-glob"
date = "2001-04-17"
[[advisories]]
name = "FreeBSD-SA-01:32.ipfilter"
date = "2001-04-16"
[[advisories]]
name = "FreeBSD-SA-01:31.ntpd"
date = "2001-04-06"
[[advisories]]
name = "FreeBSD-SA-01:30.ufs-ext2fs"
date = "2001-03-22"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/738"
[[advisories]]
name = "FreeBSD-SA-01:29.rwhod"
date = "2001-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/732"
[[advisories]]
name = "FreeBSD-SA-01:28.timed"
date = "2001-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/731"
[[advisories]]
name = "FreeBSD-SA-01:27.cfengine"
date = "2001-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/730"
[[advisories]]
name = "FreeBSD-SA-01:26.interbase"
date = "2001-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/729"
[[advisories]]
name = "FreeBSD-SA-01:23.icecast"
date = "2001-03-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/728"
[[advisories]]
name = "FreeBSD-SA-01:25.kerberosIV"
date = "2001-02-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/716"
[[advisories]]
name = "FreeBSD-SA-01:24.ssh"
date = "2001-02-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/715"
[[advisories]]
name = "FreeBSD-SA-01:22.dc20ctrl"
date = "2001-02-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/714"
[[advisories]]
name = "FreeBSD-SA-01:21.ja-elvis"
date = "2001-02-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/713"
[[advisories]]
name = "FreeBSD-SA-01:20.mars_nwe"
date = "2001-02-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/712"
[[advisories]]
name = "FreeBSD-SA-01:19.ja-klock"
date = "2001-02-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/707"
[[advisories]]
name = "FreeBSD-SA-01:18.bind"
date = "2001-01-31"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/706"
[[advisories]]
name = "FreeBSD-SA-01:17.exmh"
date = "2001-01-29"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/705"
[[advisories]]
name = "FreeBSD-SA-01:16.mysql"
date = "2001-01-29"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/704"
[[advisories]]
name = "FreeBSD-SA-01:15.tinyproxy"
date = "2001-01-29"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/703"
[[advisories]]
name = "FreeBSD-SA-01:14.micq"
date = "2001-01-29"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/702"
[[advisories]]
name = "FreeBSD-SA-01:13.sort"
date = "2001-01-29"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/701"
[[advisories]]
name = "FreeBSD-SA-01:12.periodic"
date = "2001-01-29"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/700"
[[advisories]]
name = "FreeBSD-SA-01:11.inetd"
date = "2001-01-29"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/699"
[[advisories]]
name = "FreeBSD-SA-01:10.bind"
date = "2001-01-23"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/698"
[[advisories]]
name = "FreeBSD-SA-01:09.crontab"
date = "2001-01-23"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/697"
[[advisories]]
name = "FreeBSD-SA-01:08.ipfw"
date = "2001-01-23"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/696"
[[advisories]]
name = "FreeBSD-SA-01:07.xfree86"
date = "2001-01-23"
[[advisories]]
name = "FreeBSD-SA-01:06.zope"
date = "2001-01-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/669"
[[advisories]]
name = "FreeBSD-SA-01:05.stunnel"
date = "2001-01-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/668"
[[advisories]]
name = "FreeBSD-SA-01:04.joe"
date = "2001-01-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/667"
[[advisories]]
name = "FreeBSD-SA-01:03.bash1"
date = "2001-01-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/666"
[[advisories]]
name = "FreeBSD-SA-01:02.syslog-ng"
date = "2001-01-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/665"
[[advisories]]
name = "FreeBSD-SA-01:01.openssh"
date = "2001-01-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/664"
[[advisories]]
name = "FreeBSD-SA-00:81.ethereal"
date = "2000-12-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/651"
[[advisories]]
name = "FreeBSD-SA-00:80.halflifeserver"
date = "2000-12-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/650"
[[advisories]]
name = "FreeBSD-SA-00:79.oops"
date = "2000-12-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/649"
[[advisories]]
name = "FreeBSD-SA-00:78.bitchx"
date = "2000-12-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/648"
[[advisories]]
name = "FreeBSD-SA-00:77.procfs"
date = "2000-12-18"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/647"
[[advisories]]
name = "FreeBSD-SA-00:76.tcsh-csh"
date = "2000-11-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/628"
[[advisories]]
name = "FreeBSD-SA-00:75.php"
date = "2000-11-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/627"
[[advisories]]
name = "FreeBSD-SA-00:74.gaim"
date = "2000-11-20"
[[advisories]]
name = "FreeBSD-SA-00:73.thttpd"
date = "2000-11-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/626"
[[advisories]]
name = "FreeBSD-SA-00:72.curl"
date = "2000-11-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/625"
[[advisories]]
name = "FreeBSD-SA-00:71.mgetty"
date = "2000-11-20"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/624"
[[advisories]]
name = "FreeBSD-SA-00:70.ppp-nat"
date = "2000-11-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/623"
[[advisories]]
name = "FreeBSD-SA-00:69.telnetd"
date = "2000-11-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/622"
[[advisories]]
name = "FreeBSD-SA-00:68.ncurses"
date = "2000-11-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/621"
[[advisories]]
name = "FreeBSD-SA-00:67.gnupg"
date = "2000-11-10"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/620"
[[advisories]]
name = "FreeBSD-SA-00:66.netscape"
date = "2000-11-06"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/619"
[[advisories]]
name = "FreeBSD-SA-00:65.xfce"
date = "2000-11-06"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/618"
[[advisories]]
name = "FreeBSD-SA-00:64.global"
date = "2000-11-06"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/617"
[[advisories]]
name = "FreeBSD-SA-00:63.getnameinfo"
date = "2000-11-01"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/589"
[[advisories]]
name = "FreeBSD-SA-00:62.top"
date = "2000-11-01"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/616"
[[advisories]]
name = "FreeBSD-SA-00:61.tcpdump"
date = "2000-10-31"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/615"
[[advisories]]
name = "FreeBSD-SA-00:60.boa"
date = "2000-10-30"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/586"
[[advisories]]
name = "FreeBSD-SA-00:59.pine"
date = "2000-10-30"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/585"
[[advisories]]
name = "FreeBSD-SA-00:58.chpass"
date = "2000-10-30"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/584"
[[advisories]]
name = "FreeBSD-SA-00:57.muh"
date = "2000-10-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/570"
[[advisories]]
name = "FreeBSD-SA-00:56.lprng"
date = "2000-10-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/569"
[[advisories]]
name = "FreeBSD-SA-00:55.xpdf"
date = "2000-10-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/568"
[[advisories]]
name = "FreeBSD-SA-00:54.fingerd"
date = "2000-10-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/567"
[[advisories]]
name = "FreeBSD-SA-00:52.tcp-iss"
date = "2000-10-06"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/561"
[[advisories]]
name = "FreeBSD-SA-00:53.catopen"
date = "2000-09-27"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/562"
[[advisories]]
name = "FreeBSD-SA-00:51.mailman"
date = "2000-09-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/550"
[[advisories]]
name = "FreeBSD-SA-00:50.listmanager"
date = "2000-09-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/549"
[[advisories]]
name = "FreeBSD-SA-00:49.eject"
date = "2000-09-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/548"
[[advisories]]
name = "FreeBSD-SA-00:48.xchat"
date = "2000-09-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/547"
[[advisories]]
name = "FreeBSD-SA-00:47.pine"
date = "2000-09-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/546"
[[advisories]]
name = "FreeBSD-SA-00:46.screen"
date = "2000-09-13"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/545"
[[advisories]]
name = "FreeBSD-SA-00:45.esound"
date = "2000-08-31"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/526"
[[advisories]]
name = "FreeBSD-SA-00:44.xlock"
date = "2000-08-28"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/523"
[[advisories]]
name = "FreeBSD-SA-00:43.brouted"
date = "2000-08-28"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/520"
[[advisories]]
name = "FreeBSD-SA-00:42.linux"
date = "2000-08-28"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/530"
[[advisories]]
name = "FreeBSD-SA-00:41.elf"
date = "2000-08-28"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/527"
[[advisories]]
name = "FreeBSD-SA-00:40.mopd"
date = "2000-08-28"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/521"
[[advisories]]
name = "FreeBSD-SA-00:39.netscape"
date = "2000-08-28"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/528"
[[advisories]]
name = "FreeBSD-SA-00:38.zope"
date = "2000-08-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/525"
[[advisories]]
name = "FreeBSD-SA-00:37.cvsweb"
date = "2000-08-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/524"
[[advisories]]
name = "FreeBSD-SA-00:36.ntop"
date = "2000-08-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/531"
[[advisories]]
name = "FreeBSD-SA-00:35.proftpd"
date = "2000-08-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/522"
[[advisories]]
name = "FreeBSD-SA-00:34.dhclient"
date = "2000-08-14"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/529"
[[advisories]]
name = "FreeBSD-SA-00:33.kerberosIV"
date = "2000-07-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/488"
[[advisories]]
name = "FreeBSD-SA-00:32.bitchx"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/487"
[[advisories]]
name = "FreeBSD-SA-00:31.canna"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/486"
[[advisories]]
name = "FreeBSD-SA-00:30.openssh"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/485"
[[advisories]]
name = "FreeBSD-SA-00:29.wu-ftpd"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/489"
[[advisories]]
name = "FreeBSD-SA-00:28.majordomo"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/484"
[[advisories]]
name = "FreeBSD-SA-00:27.XFree86-4"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/483"
[[advisories]]
name = "FreeBSD-SA-00:26.popper"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/482"
[[advisories]]
name = "FreeBSD-SA-00:24.libedit"
date = "2000-07-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/481"
[[advisories]]
name = "FreeBSD-SA-00:23.ip-options"
date = "2000-06-19"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/480"
[[advisories]]
name = "FreeBSD-SA-00:25.alpha-random"
date = "2000-06-12"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/473"
[[advisories]]
name = "FreeBSD-SA-00:22.apsfilter"
date = "2000-06-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/461"
[[advisories]]
name = "FreeBSD-SA-00:21.ssh"
date = "2000-06-07"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/459"
[[advisories]]
name = "FreeBSD-SA-00:20.krb5"
date = "2000-05-26"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/452"
[[advisories]]
name = "FreeBSD-SA-00:19.semconfig"
date = "2000-05-23"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/451"
[[advisories]]
name = "FreeBSD-SA-00:18.gnapster.knapster"
date = "2000-05-09"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/429"
[[advisories]]
name = "FreeBSD-SA-00:17.libmytinfo"
date = "2000-05-09"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/442"
[[advisories]]
name = "FreeBSD-SA-00:16.golddig"
date = "2000-05-09"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/439"
[[advisories]]
name = "FreeBSD-SA-00:15.imap-uw"
date = "2000-04-24"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/438"
[[advisories]]
name = "FreeBSD-SA-00:14.imap-uw"
date = "2000-04-24"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/441"
[[advisories]]
name = "FreeBSD-SA-00:13.generic-nqs"
date = "2000-04-19"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/437"
[[advisories]]
name = "FreeBSD-SA-00:12.healthd"
date = "2000-04-10"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/436"
[[advisories]]
name = "FreeBSD-SA-00:11.ircii"
date = "2000-04-10"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/440"
[[advisories]]
name = "FreeBSD-SA-00:10.orville-write"
date = "2000-03-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/408"
[[advisories]]
name = "FreeBSD-SA-00:09.mtr"
date = "2000-03-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/408"
[[advisories]]
name = "FreeBSD-SA-00:08.lynx"
date = "2000-03-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/407"
[[advisories]]
name = "FreeBSD-SA-00:07.mh"
date = "2000-03-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/411"
[[advisories]]
name = "FreeBSD-SA-00:06.htdig"
date = "2000-03-01"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/403"
[[advisories]]
name = "FreeBSD-SA-00:05.mysql"
date = "2000-02-28"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/402"
[[advisories]]
name = "FreeBSD-SA-00:04.delegate"
date = "2000-02-19"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/392"
[[advisories]]
name = "FreeBSD-SA-00:03.asmon"
date = "2000-02-19"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/391"
[[advisories]]
name = "FreeBSD-SA-00:02.procfs"
date = "2000-01-24"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/380"
[[advisories]]
name = "FreeBSD-SA-00:01.make"
date = "2000-01-19"
[[advisories]]
name = "FreeBSD-SA-99:06.amd"
date = "1999-09-16"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/318"
[[advisories]]
name = "FreeBSD-SA-99:05.fts"
date = "1999-09-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/313"
[[advisories]]
name = "FreeBSD-SA-99:04.core"
date = "1999-09-15"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/312"
[[advisories]]
name = "FreeBSD-SA-99:03.ftpd"
date = "1999-09-05"
link = "http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/311"
[[advisories]]
name = "FreeBSD-SA-99:02.profil"
date = "1999-09-04"
[[advisories]]
name = "FreeBSD-SA-99:01.chflags"
date = "1999-09-04"
[[advisories]]
name = "FreeBSD-SA-98:08.fragment"
date = "1998-11-04"
[[advisories]]
name = "FreeBSD-SA-98:07.rst"
date = "1998-10-13"
[[advisories]]
name = "FreeBSD-SA-98:06.icmp"
date = "1998-06-10"
[[advisories]]
name = "FreeBSD-SA-98:05.nfs"
date = "1998-06-04"
[[advisories]]
name = "FreeBSD-SA-98:04.mmap"
date = "1998-06-02"
[[advisories]]
name = "FreeBSD-SA-98:03.ttcp"
date = "1998-05-14"
[[advisories]]
name = "FreeBSD-SA-98:02.mmap"
date = "1998-03-12"
[[advisories]]
name = "FreeBSD-SA-97:06.f00f"
date = "1997-12-09"
[[advisories]]
name = "FreeBSD-SA-98:01.land"
date = "1997-12-01"
[[advisories]]
name = "FreeBSD-SA-97:05.open"
date = "1997-10-29"
[[advisories]]
name = "FreeBSD-SA-97:04.procfs"
date = "1997-08-19"
[[advisories]]
name = "FreeBSD-SA-97:03.sysinstall"
date = "1997-04-07"
[[advisories]]
name = "FreeBSD-SA-97:02.lpd"
date = "1997-03-26"
[[advisories]]
name = "FreeBSD-SA-97:01.setlocale"
date = "1997-02-05"
[[advisories]]
name = "FreeBSD-SA-96:21.talkd"
date = "1997-01-18"
[[advisories]]
name = "FreeBSD-SA-96:20.stack-overflow"
date = "1996-12-16"
[[advisories]]
name = "FreeBSD-SA-96:19.modstat"
date = "1996-12-10"
[[advisories]]
name = "FreeBSD-SA-96:18.lpr"
date = "1996-11-25"
[[advisories]]
name = "FreeBSD-SA-96:17.rzsz"
date = "1996-07-16"
[[advisories]]
name = "FreeBSD-SA-96:16.rdist"
date = "1996-07-12"
[[advisories]]
name = "FreeBSD-SA-96:15.ppp"
date = "1996-07-04"
[[advisories]]
name = "FreeBSD-SA-96:12.perl"
date = "1996-06-28"
[[advisories]]
name = "FreeBSD-SA-96:14.ipfw"
date = "1996-06-24"
[[advisories]]
name = "FreeBSD-SA-96:13.comsat"
date = "1996-06-05"
[[advisories]]
name = "FreeBSD-SA-96:11.man"
date = "1996-05-21"
[[advisories]]
name = "FreeBSD-SA-96:10.mount_union"
date = "1996-05-17"
[[advisories]]
name = "FreeBSD-SA-96:09.vfsload"
date = "1996-05-17"
[[advisories]]
name = "FreeBSD-SA-96:02.apache"
date = "1996-04-22"
[[advisories]]
name = "FreeBSD-SA-96:08.syslog"
date = "1996-04-21"
[[advisories]]
name = "FreeBSD-SA-96:01.sliplogin"
date = "1996-04-21"
[[advisories]]
name = "FreeBSD-SA-96:03.sendmail-suggestion"
date = "1996-04-20"
diff --git a/website/data/security/errata.toml b/website/data/security/errata.toml
index c58cf02825..6f9ce70d62 100644
--- a/website/data/security/errata.toml
+++ b/website/data/security/errata.toml
@@ -1,1031 +1,1043 @@
# Sort errata notices by year, month and day
# $FreeBSD$
+[[notices]]
+name = "FreeBSD-EN-25:14.route"
+date = "2025-08-08"
+
+[[notices]]
+name = "FreeBSD-EN-25:13.wlan_tkip"
+date = "2025-08-08"
+
+[[notices]]
+name = "FreeBSD-EN-25:12.efi"
+date = "2025-08-08"
+
[[notices]]
name = "FreeBSD-EN-25:11.ena"
date = "2025-07-02"
[[notices]]
name = "FreeBSD-EN-25:10.zfs"
date = "2025-07-02"
[[notices]]
name = "FreeBSD-EN-25:09.libc"
date = "2025-07-02"
[[notices]]
name = "FreeBSD-EN-25:08.caroot"
date = "2025-04-10"
[[notices]]
name = "FreeBSD-EN-25:07.openssl"
date = "2025-04-10"
[[notices]]
name = "FreeBSD-EN-25:06.daemon"
date = "2025-04-10"
[[notices]]
name = "FreeBSD-EN-25:05.expat"
date = "2025-04-10"
[[notices]]
name = "FreeBSD-EN-25:04.tzdata"
date = "2025-04-10"
[[notices]]
name = "FreeBSD-EN-25:03.tzdata"
date = "2025-01-29"
[[notices]]
name = "FreeBSD-EN-25:02.audit"
date = "2025-01-29"
[[notices]]
name = "FreeBSD-EN-25:01.rpc"
date = "2025-01-29"
[[notices]]
name = "FreeBSD-EN-24:17.pam_xdg"
date = "2024-10-29"
[[notices]]
name = "FreeBSD-EN-24:16.pf"
date = "2024-09-19"
[[notices]]
name = "FreeBSD-EN-24:15.calendar"
date = "2024-09-04"
[[notices]]
name = "FreeBSD-EN-24:14.ifconfig"
date = "2024-08-07"
[[notices]]
name = "FreeBSD-EN-24:13.libc++"
date = "2024-06-19"
[[notices]]
name = "FreeBSD-EN-24:12.killpg"
date = "2024-06-19"
[[notices]]
name = "FreeBSD-EN-24:11.ldns"
date = "2024-06-19"
[[notices]]
name = "FreeBSD-EN-24:10.zfs"
date = "2024-06-19"
[[notices]]
name = "FreeBSD-EN-24:09.zfs"
date = "2024-04-24"
[[notices]]
name = "FreeBSD-EN-24:08.kerberos"
date = "2024-03-28"
[[notices]]
name = "FreeBSD-EN-24:07.clang"
date = "2024-03-28"
[[notices]]
name = "FreeBSD-EN-24:06.wireguard"
date = "2024-03-28"
[[notices]]
name = "FreeBSD-EN-24:05.tty"
date = "2024-03-28"
[[notices]]
name = "FreeBSD-EN-24:04.ip"
date = "2024-02-14"
[[notices]]
name = "FreeBSD-EN-24:03.kqueue"
date = "2024-02-14"
[[notices]]
name = "FreeBSD-EN-24:02.libutil"
date = "2024-02-14"
[[notices]]
name = "FreeBSD-EN-24:01.tzdata"
date = "2024-02-14"
[[notices]]
name = "FreeBSD-EN-23:22.vfs"
date = "2023-12-05"
[[notices]]
name = "FreeBSD-EN-23:21.tty"
date = "2023-12-05"
[[notices]]
name = "FreeBSD-EN-23:20.vm"
date = "2023-12-05"
[[notices]]
name = "FreeBSD-EN-23:19.pkgbase"
date = "2023-12-05"
[[notices]]
name = "FreeBSD-EN-23:18.openzfs"
date = "2023-12-05"
[[notices]]
name = "FreeBSD-EN-23:17.ossl"
date = "2023-12-05"
[[notices]]
name = "FreeBSD-EN-23:16.openzfs"
date = "2023-12-01"
[[notices]]
name = "FreeBSD-EN-23:15.sanitizer"
date = "2023-12-01"
[[notices]]
name = "FreeBSD-EN-23:14.regcomp"
date = "2023-11-08"
[[notices]]
name = "FreeBSD-EN-23:13.freebsd-update"
date = "2023-11-08"
[[notices]]
name = "FreeBSD-EN-23:12.freebsd-update"
date = "2023-10-03"
[[notices]]
name = "FreeBSD-EN-23:11.caroot"
date = "2023-09-06"
[[notices]]
name = "FreeBSD-EN-23:10.pci"
date = "2023-09-06"
[[notices]]
name = "FreeBSD-EN-23:09.freebsd-update"
date = "2023-09-06"
[[notices]]
name = "FreeBSD-EN-23:08.vnet"
date = "2023-08-01"
[[notices]]
name = "FreeBSD-EN-23:07.mpr"
date = "2023-06-21"
[[notices]]
name = "FreeBSD-EN-23:06.loader"
date = "2023-06-21"
[[notices]]
name = "FreeBSD-EN-23:05.tzdata"
date = "2023-06-21"
[[notices]]
name = "FreeBSD-EN-23:04.ixgbe"
date = "2023-02-08"
[[notices]]
name = "FreeBSD-EN-23:03.ena"
date = "2023-02-08"
[[notices]]
name = "FreeBSD-EN-23:02.sdhci"
date = "2023-02-08"
[[notices]]
name = "FreeBSD-EN-23:01.tzdata"
date = "2023-02-08"
[[notices]]
name = "FreeBSD-EN-22:28.heimdal"
date = "2022-11-29"
[[notices]]
name = "FreeBSD-EN-22:27.loader"
date = "2022-11-01"
[[notices]]
name = "FreeBSD-EN-22:26.cam"
date = "2022-11-01"
[[notices]]
name = "FreeBSD-EN-22:25.tcp"
date = "2022-11-01"
[[notices]]
name = "FreeBSD-EN-22:24.zfs"
date = "2022-11-01"
[[notices]]
name = "FreeBSD-EN-22:23.vm"
date = "2022-11-01"
[[notices]]
name = "FreeBSD-EN-22:22.tzdata"
date = "2022-11-01"
[[notices]]
name = "FreeBSD-EN-22:21.zfs"
date = "2022-11-01"
[[notices]]
name = "FreeBSD-EN-22:20.tzdata"
date = "2022-08-30"
[[notices]]
name = "FreeBSD-EN-22:19.pam_exec"
date = "2022-08-09"
[[notices]]
name = "FreeBSD-EN-22:18.wifi"
date = "2022-08-09"
[[notices]]
name = "FreeBSD-EN-22:17.cam"
date = "2022-08-09"
[[notices]]
name = "FreeBSD-EN-22:16.kqueue"
date = "2022-08-09"
[[notices]]
name = "FreeBSD-EN-22:15.pf"
date = "2022-04-06"
[[notices]]
name = "FreeBSD-EN-22:14.tzdata"
date = "2022-03-22"
[[notices]]
name = "FreeBSD-EN-22:13.zfs"
date = "2022-03-21"
[[notices]]
name = "FreeBSD-EN-22:12.zfs"
date = "2022-03-15"
[[notices]]
name = "FreeBSD-EN-22:11.zfs"
date = "2022-03-15"
[[notices]]
name = "FreeBSD-EN-22:10.zfs"
date = "2022-03-15"
[[notices]]
name = "FreeBSD-EN-22:09.freebsd-update"
date = "2022-03-15"
[[notices]]
name = "FreeBSD-EN-22:08.i386"
date = "2022-02-01"
[[notices]]
name = "FreeBSD-EN-22:07.la57"
date = "2022-02-01"
[[notices]]
name = "FreeBSD-EN-22:06.libalias"
date = "2022-01-11"
[[notices]]
name = "FreeBSD-EN-22:05.tail"
date = "2022-01-11"
[[notices]]
name = "FreeBSD-EN-22:04.pcid"
date = "2022-01-11"
[[notices]]
name = "FreeBSD-EN-22:03.hyperv"
date = "2022-01-11"
[[notices]]
name = "FreeBSD-EN-22:02.xsave"
date = "2022-01-11"
[[notices]]
name = "FreeBSD-EN-22:01.fsck_ffs"
date = "2022-01-11"
[[notices]]
name = "FreeBSD-EN-21:29.tzdata"
date = "2021-11-03"
[[notices]]
name = "FreeBSD-EN-21:28.vmci"
date = "2021-11-03"
[[notices]]
name = "FreeBSD-EN-21:27.caroot"
date = "2021-11-03"
[[notices]]
name = "FreeBSD-EN-21:26.libevent"
date = "2021-11-03"
[[notices]]
name = "FreeBSD-EN-21:25.bhyve"
date = "2021-08-24"
[[notices]]
name = "FreeBSD-EN-21:24.libcrypto"
date = "2021-08-24"
[[notices]]
name = "FreeBSD-EN-21:23.virtio_blk"
date = "2021-08-24"
[[notices]]
name = "FreeBSD-EN-21:22.linux_futex"
date = "2021-06-29"
[[notices]]
name = "FreeBSD-EN-21:21.ipfw"
date = "2021-06-29"
[[notices]]
name = "FreeBSD-EN-21:20.vlan"
date = "2021-06-29"
[[notices]]
name = "FreeBSD-EN-21:19.libcasper"
date = "2021-06-29"
[[notices]]
name = "FreeBSD-EN-21:18.libc++"
date = "2021-06-29"
[[notices]]
name = "FreeBSD-EN-21:17.libradius"
date = "2021-06-01"
[[notices]]
name = "FreeBSD-EN-21:16.bc"
date = "2021-05-26"
[[notices]]
name = "FreeBSD-EN-21:15.virtio"
date = "2021-05-26"
[[notices]]
name = "FreeBSD-EN-21:14.pms"
date = "2021-05-26"
[[notices]]
name = "FreeBSD-EN-21:13.mpt"
date = "2021-05-26"
[[notices]]
name = "FreeBSD-EN-21:12.divert"
date = "2021-05-26"
[[notices]]
name = "FreeBSD-EN-21:11.aesni"
date = "2021-05-26"
[[notices]]
name = "FreeBSD-EN-21:10.lldb"
date = "2021-04-06"
[[notices]]
name = "FreeBSD-EN-21:09.pf"
date = "2021-04-06"
[[notices]]
name = "FreeBSD-EN-21:08.freebsd-update"
date = "2021-02-24"
[[notices]]
name = "FreeBSD-EN-21:07.caroot"
date = "2021-02-24"
[[notices]]
name = "FreeBSD-EN-21:06.microcode"
date = "2021-02-24"
[[notices]]
name = "FreeBSD-EN-21:05.libatomic"
date = "2021-01-29"
[[notices]]
name = "FreeBSD-EN-21:04.zfs"
date = "2021-01-29"
[[notices]]
name = "FreeBSD-EN-21:03.vnet"
date = "2021-01-29"
[[notices]]
name = "FreeBSD-EN-21:02.extattr"
date = "2021-01-29"
[[notices]]
name = "FreeBSD-EN-21:01.tzdata"
date = "2021-01-29"
[[notices]]
name = "FreeBSD-EN-20:22.callout"
date = "2020-12-01"
[[notices]]
name = "FreeBSD-EN-20:21.ipfw"
date = "2020-12-01"
[[notices]]
name = "FreeBSD-EN-20:20.tzdata"
date = "2020-12-01"
[[notices]]
name = "FreeBSD-EN-20:19.audit"
date = "2020-12-01"
[[notices]]
name = "FreeBSD-EN-20:18.getfsstat"
date = "2020-09-02"
[[notices]]
name = "FreeBSD-EN-20:17.linuxthread"
date = "2020-09-02"
[[notices]]
name = "FreeBSD-EN-20:16.vmx"
date = "2020-08-05"
[[notices]]
name = "FreeBSD-EN-20:15.mps"
date = "2020-07-08"
[[notices]]
name = "FreeBSD-EN-20:14.linuxkpi"
date = "2020-07-08"
[[notices]]
name = "FreeBSD-EN-20:13.bhyve"
date = "2020-07-08"
[[notices]]
name = "FreeBSD-EN-20:12.iflib"
date = "2020-06-09"
[[notices]]
name = "FreeBSD-EN-20:11.ena"
date = "2020-06-09"
[[notices]]
name = "FreeBSD-EN-20:10.build"
date = "2020-05-12"
[[notices]]
name = "FreeBSD-EN-20:09.igb"
date = "2020-05-12"
[[notices]]
name = "FreeBSD-EN-20:08.tzdata"
date = "2020-05-12"
[[notices]]
name = "FreeBSD-EN-20:07.quotad"
date = "2020-04-21"
[[notices]]
name = "FreeBSD-EN-20:06.ipv6"
date = "2020-03-19"
[[notices]]
name = "FreeBSD-EN-20:05.mlx5en"
date = "2020-03-19"
[[notices]]
name = "FreeBSD-EN-20:04.pfctl"
date = "2020-03-19"
[[notices]]
name = "FreeBSD-EN-20:03.sshd"
date = "2020-03-19"
[[notices]]
name = "FreeBSD-EN-20:02.nmount"
date = "2020-01-28"
[[notices]]
name = "FreeBSD-EN-20:01.ssp"
date = "2020-01-28"
[[notices]]
name = "FreeBSD-EN-19:19.loader"
date = "2019-11-12"
[[notices]]
name = "FreeBSD-EN-19:18.tzdata"
date = "2019-10-23"
[[notices]]
name = "FreeBSD-EN-19:17.ipfw"
date = "2019-08-20"
[[notices]]
name = "FreeBSD-EN-19:16.bhyve"
date = "2019-08-20"
[[notices]]
name = "FreeBSD-EN-19:15.libunwind"
date = "2019-08-06"
[[notices]]
name = "FreeBSD-EN-19:14.epoch"
date = "2019-08-06"
[[notices]]
name = "FreeBSD-EN-19:13.mds"
date = "2019-07-24"
[[notices]]
name = "FreeBSD-EN-19:12.tzdata"
date = "2019-07-02"
[[notices]]
name = "FreeBSD-EN-19:11.net"
date = "2019-06-19"
[[notices]]
name = "FreeBSD-EN-19:10.scp"
date = "2019-05-14"
[[notices]]
name = "FreeBSD-EN-19:09.xinstall"
date = "2019-05-14"
[[notices]]
name = "FreeBSD-EN-19:08.tzdata"
date = "2019-05-14"
[[notices]]
name = "FreeBSD-EN-19:07.lle"
date = "2019-02-05"
[[notices]]
name = "FreeBSD-EN-19:06.dtrace"
date = "2019-02-05"
[[notices]]
name = "FreeBSD-EN-19:05.kqueue"
date = "2019-01-09"
[[notices]]
name = "FreeBSD-EN-19:04.tzdata"
date = "2019-01-09"
[[notices]]
name = "FreeBSD-EN-19:03.sqlite"
date = "2019-01-09"
[[notices]]
name = "FreeBSD-EN-19:02.tcp"
date = "2019-01-09"
[[notices]]
name = "FreeBSD-EN-19:01.cc_cubic"
date = "2019-01-09"
[[notices]]
name = "FreeBSD-EN-18:18.zfs"
date = "2018-12-19"
[[notices]]
name = "FreeBSD-EN-18:17.vm"
date = "2018-12-19"
[[notices]]
name = "FreeBSD-EN-18:16.ptrace"
date = "2018-12-19"
[[notices]]
name = "FreeBSD-EN-18:15.loader"
date = "2018-11-27"
[[notices]]
name = "FreeBSD-EN-18:14.tzdata"
date = "2018-11-27"
[[notices]]
name = "FreeBSD-EN-18:13.icmp"
date = "2018-11-27"
[[notices]]
name = "FreeBSD-EN-18:12.mem"
date = "2018-09-27"
[[notices]]
name = "FreeBSD-EN-18:11.listen"
date = "2018-09-27"
[[notices]]
name = "FreeBSD-EN-18:10.syscall"
date = "2018-09-27"
[[notices]]
name = "FreeBSD-EN-18:09.ip"
date = "2018-09-27"
[[notices]]
name = "FreeBSD-EN-18:08.lazyfpu"
date = "2018-09-12"
[[notices]]
name = "FreeBSD-EN-18:07.pmap"
date = "2018-06-21"
[[notices]]
name = "FreeBSD-EN-18:06.tzdata"
date = "2018-05-08"
[[notices]]
name = "FreeBSD-EN-18:05.mem"
date = "2018-05-08"
[[notices]]
name = "FreeBSD-EN-18:04.mem"
date = "2018-04-04"
[[notices]]
name = "FreeBSD-EN-18:03.tzdata"
date = "2018-04-04"
[[notices]]
name = "FreeBSD-EN-18:02.file"
date = "2018-03-07"
[[notices]]
name = "FreeBSD-EN-18:01.tzdata"
date = "2018-03-07"
[[notices]]
name = "FreeBSD-EN-17:09.tzdata"
date = "2017-11-02"
[[notices]]
name = "FreeBSD-EN-17:08.pf"
date = "2017-08-10"
[[notices]]
name = "FreeBSD-EN-17:07.vnet"
date = "2017-08-10"
[[notices]]
name = "FreeBSD-EN-17:06.hyperv"
date = "2017-07-12"
[[notices]]
name = "FreeBSD-EN-17:05.xen"
date = "2017-04-12"
[[notices]]
name = "FreeBSD-EN-17:04.mandoc"
date = "2017-02-23"
[[notices]]
name = "FreeBSD-EN-17:03.hyperv"
date = "2017-02-23"
[[notices]]
name = "FreeBSD-EN-17:02.yp"
date = "2017-02-23"
[[notices]]
name = "FreeBSD-EN-17:01.pcie"
date = "2017-02-23"
[[notices]]
name = "FreeBSD-EN-16:21.localedef"
date = "2016-12-06"
[[notices]]
name = "FreeBSD-EN-16:20.tzdata"
date = "2016-12-06"
[[notices]]
name = "FreeBSD-EN-16:19.tzcode"
date = "2016-12-06"
[[notices]]
name = "FreeBSD-EN-16:18.loader"
date = "2016-10-25"
[[notices]]
name = "FreeBSD-EN-16:17.vm"
date = "2016-10-25"
[[notices]]
name = "FreeBSD-EN-16:16.hv_storvsc"
date = "2016-08-12"
[[notices]]
name = "FreeBSD-EN-16:15.vmbus"
date = "2016-08-12"
[[notices]]
name = "FreeBSD-EN-16:14.hv_storvsc"
date = "2016-08-12"
[[notices]]
name = "FreeBSD-EN-16:13.vmbus"
date = "2016-08-12"
[[notices]]
name = "FreeBSD-EN-16:12.hv_storvsc"
date = "2016-08-12"
[[notices]]
name = "FreeBSD-EN-16:11.vmbus"
date = "2016-08-12"
[[notices]]
name = "FreeBSD-EN-16:10.dhclient"
date = "2016-08-12"
[[notices]]
name = "FreeBSD-EN-16:09.freebsd-update"
date = "2016-07-25"
[[notices]]
name = "FreeBSD-EN-16:08.zfs"
date = "2016-05-04"
[[notices]]
name = "FreeBSD-EN-16:07.ipi"
date = "2016-05-04"
[[notices]]
name = "FreeBSD-EN-16:06.libc"
date = "2016-05-04"
[[notices]]
name = "FreeBSD-EN-16:05.hv_netvsc"
date = "2016-03-16"
[[notices]]
name = "FreeBSD-EN-16:04.hyperv"
date = "2016-03-16"
[[notices]]
name = "FreeBSD-EN-16:03.yplib"
date = "2016-01-14"
[[notices]]
name = "FreeBSD-EN-16:02.pf"
date = "2016-01-14"
[[notices]]
name = "FreeBSD-EN-16:01.filemon"
date = "2016-01-14"
[[notices]]
name = "FreeBSD-EN-15:20.vm"
date = "2015-11-04"
[[notices]]
name = "FreeBSD-EN-15:19.kqueue"
date = "2015-11-04"
[[notices]]
name = "FreeBSD-EN-15:18.pkg"
date = "2015-09-16"
[[notices]]
name = "FreeBSD-EN-15:17.libc"
date = "2015-09-16"
[[notices]]
name = "FreeBSD-EN-15:16.pw"
date = "2015-09-16"
[[notices]]
name = "FreeBSD-EN-15:15.pkg"
date = "2015-08-25"
[[notices]]
name = "FreeBSD-EN-15:14.ixgbe"
date = "2015-08-25"
[[notices]]
name = "FreeBSD-EN-15:13.vidcontrol"
date = "2015-08-18"
[[notices]]
name = "FreeBSD-EN-15:12.netstat"
date = "2015-08-18"
[[notices]]
name = "FreeBSD-EN-15:11.toolchain"
date = "2015-08-18"
[[notices]]
name = "FreeBSD-EN-15:10.iconv"
date = "2015-06-30"
[[notices]]
name = "FreeBSD-EN-15:09.xlocale"
date = "2015-06-30"
[[notices]]
name = "FreeBSD-EN-15:08.sendmail"
date = "2015-06-18"
[[notices]]
name = "FreeBSD-EN-15:07.zfs"
date = "2015-06-09"
[[notices]]
name = "FreeBSD-EN-15:06.file"
date = "2015-06-09"
[[notices]]
name = "FreeBSD-EN-15:05.ufs"
date = "2015-05-13"
[[notices]]
name = "FreeBSD-EN-15:04.freebsd-update"
date = "2015-05-13"
[[notices]]
name = "FreeBSD-EN-15:03.freebsd-update"
date = "2015-02-25"
[[notices]]
name = "FreeBSD-EN-15:02.openssl"
date = "2015-02-25"
[[notices]]
name = "FreeBSD-EN-15:01.vt"
date = "2015-02-25"
[[notices]]
name = "FreeBSD-EN-14:13.freebsd-update"
date = "2014-12-23"
[[notices]]
name = "FreeBSD-EN-14:12.zfs"
date = "2014-11-04"
[[notices]]
name = "FreeBSD-EN-14:11.crypt"
date = "2014-10-22"
[[notices]]
name = "FreeBSD-EN-14:10.tzdata"
date = "2014-10-22"
[[notices]]
name = "FreeBSD-EN-14:09.jail"
date = "2014-07-08"
[[notices]]
name = "FreeBSD-EN-14:08.heimdal"
date = "2014-06-24"
[[notices]]
name = "FreeBSD-EN-14:07.pmap"
date = "2014-06-24"
[[notices]]
name = "FreeBSD-EN-14:06.exec"
date = "2014-06-03"
[[notices]]
name = "FreeBSD-EN-14:05.ciss"
date = "2014-05-13"
[[notices]]
name = "FreeBSD-EN-14:04.kldxref"
date = "2014-05-13"
[[notices]]
name = "FreeBSD-EN-14:03.pkg"
date = "2014-05-13"
[[notices]]
name = "FreeBSD-EN-14:02.mmap"
date = "2014-01-14"
[[notices]]
name = "FreeBSD-EN-14:01.random"
date = "2014-01-14"
[[notices]]
name = "FreeBSD-EN-13:05.freebsd-update"
date = "2013-11-28"
[[notices]]
name = "FreeBSD-EN-13:04.freebsd-update"
date = "2013-10-26"
[[notices]]
name = "FreeBSD-EN-13:03.mfi"
date = "2013-08-22"
[[notices]]
name = "FreeBSD-EN-13:01.fxp"
date = "2013-06-28"
[[notices]]
name = "FreeBSD-EN-13:02.vtnet"
date = "2013-06-28"
[[notices]]
name = "FreeBSD-EN-12:02.ipv6refcount"
date = "2012-06-12"
[[notices]]
name = "FreeBSD-EN-12:01.freebsd-update"
date = "2012-01-04"
[[notices]]
name = "FreeBSD-EN-10:02.sched_ule"
date = "2010-02-27"
[[notices]]
name = "FreeBSD-EN-10:01.freebsd"
date = "2010-01-06"
[[notices]]
name = "FreeBSD-EN-09:05.null"
date = "2009-10-02"
[[notices]]
name = "FreeBSD-EN-09:04.fork"
date = "2009-06-24"
[[notices]]
name = "FreeBSD-EN-09:03.fxp"
date = "2009-06-24"
[[notices]]
name = "FreeBSD-EN-09:02.bce"
date = "2009-06-24"
[[notices]]
name = "FreeBSD-EN-09:01.kenv"
date = "2009-03-23"
[[notices]]
name = "FreeBSD-EN-08:02.tcp"
date = "2008-06-19"
[[notices]]
name = "FreeBSD-EN-08:01.libpthread"
date = "2008-04-17"
[[notices]]
name = "FreeBSD-EN-07:05.freebsd-update"
date = "2007-03-15"
[[notices]]
name = "FreeBSD-EN-07:04.zoneinfo"
date = "2007-02-28"
[[notices]]
name = "FreeBSD-EN-07:03.rc.d_jail"
date = "2007-02-28"
[[notices]]
name = "FreeBSD-EN-07:02.net"
date = "2007-02-28"
[[notices]]
name = "FreeBSD-EN-07:01.nfs"
date = "2007-02-14"
[[notices]]
name = "FreeBSD-EN-06:02.net"
date = "2006-08-28"
[[notices]]
name = "FreeBSD-EN-06:01.jail"
date = "2006-07-07"
[[notices]]
name = "FreeBSD-EN-05:04.nfs"
date = "2005-12-19"
[[notices]]
name = "FreeBSD-EN-05:03.ipi"
date = "2005-01-16"
[[notices]]
name = "FreeBSD-EN-05:02.sk"
date = "2005-01-06"
[[notices]]
name = "FreeBSD-EN-05:01.nfs"
date = "2005-01-05"
[[notices]]
name = "FreeBSD-EN-04:01.twe"
date = "2004-06-28"
diff --git a/website/static/security/advisories/FreeBSD-EN-25:12.efi.asc b/website/static/security/advisories/FreeBSD-EN-25:12.efi.asc
new file mode 100644
index 0000000000..d33b44ce3a
--- /dev/null
+++ b/website/static/security/advisories/FreeBSD-EN-25:12.efi.asc
@@ -0,0 +1,130 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-25:12.efi Errata Notice
+ The FreeBSD Project
+
+Topic: bsdinstall(8) not copying the correct loader on systems with
+ IA32 UEFI firmware.
+
+Category: core
+Module: efi
+Announced: 2025-08-08
+Affects: FreeBSD 14.3
+Corrected: 2025-06-16 23:07:25 UTC (stable/14, 14.3-STABLE)
+ 2025-08-08 00:39:02 UTC (releng/14.3, 14.3-RELEASE-p2)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+.
+
+I. Background
+
+bsdinstall(8) checks the machdep.efi_arch sysctl and depending on its value,
+it either copies loader.efi or loader_ia32.efi.
+
+II. Problem Description
+
+The commit that added the machdep.efi_arch sysctl was not MFCed in time for
+releng/14.3, however, the commit that added support for loader_ia32.efi in
+bsdinstall(8) was. The result is that bsdinstall(8) always copies loader.efi.
+
+III. Impact
+
+bsdinstall(8) copying loader.efi regardless of the firmware's architecture
+results in an unbootable system after install for systems which expect a
+32-bit UEFI loader.
+
+IV. Workaround
+
+loader_ia32.efi can be manually copied to /boot/efi/efi/boot/bootia32.efi
+where the EFI boot partition is mounted at /boot/efi.
+
+Systems which have 64-bit UEFI firmware are unaffected. Non x86 systems are
+likewise unaffected.
+
+V. Solution
+
+Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date and reboot the system.
+
+Perform one of the following:
+
+1) To update your system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the amd64 or arm64 platforms,
+or the i386 platform on FreeBSD 13, can be updated via the freebsd-update(8)
+utility:
+
+# freebsd-update fetch
+# freebsd-update install
+# reboot
+
+2) To update your system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/EN-25:12/efi.patch
+# fetch https://security.FreeBSD.org/patches/EN-25:12/efi.patch.asc
+# gpg --verify efi.patch.asc
+
+b) Apply the patch. Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile your kernel as described in
+ and reboot the
+system.
+
+VI. Correction details
+
+This issue is corrected as of the corresponding Git commit hash in the
+following stable and release branches:
+
+Branch/path Hash Revision
+- -------------------------------------------------------------------------
+stable/14/ 0e8890a425bc stable/14-n271710
+releng/14.3/ ce4fe4c4bfcd releng/14.3-n271435
+- -------------------------------------------------------------------------
+
+Run the following command to see which files were modified by a
+particular commit:
+
+# git show --stat
+
+Or visit the following URL, replacing NNNNNN with the hash:
+
+
+
+To determine the commit count in a working tree (for comparison against
+nNNNNNN in the table above), run:
+
+# git rev-list --count --first-parent HEAD
+
+VII. References
+
+The latest revision of this advisory is available at
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmiVShUACgkQbljekB8A
+Gu/B+xAAy3AcOLVmDr4YNs0PXwENZ5Xqg00TYgSXSRl/iA+wk4h7XFcaytdVUgk5
+nX0dLZGTyZoQpmdiX8HsVht95XONfdhwoPxUtWFTY9SWBYh859IjFHTpr8E/MXHH
+lAmbs7H0W/lw4Fqm6xs6+esXitaBE2Q3rgl0LFI0BbEfHdGiNz/qWYXR2U+qVAPY
+5aiC9tcvRU3pNLLN7XGIophVjL10k1iuwzQeKGDopzBx7qVFklRSDb1oe1BawDYh
+jkn+mqzpkgqEIVdgsZSKGO5lpEMCtDwgyA7uIik/QE525oNVpsWfJ/aHbDapB+1P
+pFYH/yWpI/eT3DVMnTiNhCBkBcm0pCWJZlLTKcLU19fm8wMxq01H5FqqueBLrh39
+LztN/xnmdpAoG1AytICoV86gbRy4fnCbbbhLOLWhPVfc6q2UyJUHa1LjR3LtSeNG
+0f+evVM81IfG0Niynqcy/DEIem0aamFUJhqU6aJISj+aVGd9PRp2JhVllbkiR7H/
+xd3dnEHtLt6wCJh1PlK+3Sa2WuSDDRWo1WCmx1xvUI+5VWl4HL8f+YoQl8aOu0DR
+XnpxyAqD+4uTXiQOhf+9HuteoTq9aePbUef5qkSQXXxOtohUL6xvq62Zb1HU6Jbs
+ZpGd15oa4o4yJXTu1lEE/D/dSZhtX2rACh+GzEW9vt6lIUZENe0=
+=7zQB
+-----END PGP SIGNATURE-----
diff --git a/website/static/security/advisories/FreeBSD-EN-25:13.wlan_tkip.asc b/website/static/security/advisories/FreeBSD-EN-25:13.wlan_tkip.asc
new file mode 100644
index 0000000000..4dfd91e244
--- /dev/null
+++ b/website/static/security/advisories/FreeBSD-EN-25:13.wlan_tkip.asc
@@ -0,0 +1,131 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-25:13.wlan_tkip Errata Notice
+ The FreeBSD Project
+
+Topic: net80211 TKIP crypto support fails for some drivers
+
+Category: core
+Module: wlan_tkip
+Announced: 2025-08-08
+Credits: Adrian Chadd
+Affects: FreeBSD 14.3
+Corrected: 2025-06-10 23:45:16 UTC (stable/14, 14.3-STABLE)
+ 2025-08-08 00:39:03 UTC (releng/14.3, 14.3-RELEASE-p2)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+.
+
+I. Background
+
+In order to support Temporal Key Integrity Protocol (TKIP) on modern wireless
+chipsets, the net80211 wireless stack was adjusted to skip certain crypto
+operations if a driver indicated that they were already done by hardware.
+
+II. Problem Description
+
+One adjustment erroneously changed a default for an operation from opt-in
+to opt-out.
+
+III. Impact
+
+Older drivers may not pass flags to either opt-in or opt-out and thus
+one TKIP operations is no longer executed for them given the changed
+default. This leads to non-working wireless connections.
+
+IV. Workaround
+
+Users still using TKIP are highly advised to change their Cipher Suite
+to CCMP as TKIP is no longer considered secure and has been deprecated
+since 2012.
+
+No other workaround is available. Systems using CCMP are unaffected.
+
+V. Solution
+
+Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date and reboot.
+
+Perform one of the following:
+
+1) To update your system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the amd64 or arm64 platforms,
+can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+# shutdown -r +10min "Rebooting for erratum update"
+
+2) To update your system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/EN-25:13/wlan_tkip.patch
+# fetch https://security.FreeBSD.org/patches/EN-25:13/wlan_tkip.patch.asc
+# gpg --verify wlan_tkip.patch.asc
+
+b) Apply the patch. Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile your kernel as described in
+ and reboot the
+system.
+
+VI. Correction details
+
+This issue is corrected as of the corresponding Git commit hash in the
+following stable and release branches:
+
+Branch/path Hash Revision
+- -------------------------------------------------------------------------
+stable/14/ 950343a170f0 stable/14-n271651
+releng/14.3/ a3bd81ddfe29 releng/14.3-n271436
+- -------------------------------------------------------------------------
+
+Run the following command to see which files were modified by a
+particular commit:
+
+# git show --stat
+
+Or visit the following URL, replacing NNNNNN with the hash:
+
+
+
+To determine the commit count in a working tree (for comparison against
+nNNNNNN in the table above), run:
+
+# git rev-list --count --first-parent HEAD
+
+VII. References
+
+
+
+The latest revision of this advisory is available at
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmiVSh0ACgkQbljekB8A
+Gu9d9BAAhaBGWImVR+mFeKhvJFJ01a47YpxVTyyfJR+Rd+4wF1Z9YZu1OcoZyMMQ
+0vSkumjR98NeMFGpH9rZg2D6dJ4JQfvF+MbFlKlQ0QCdD8El++KM3T/S3h9WVXGp
+Rs5in2XMxGj36LKNZ43Okmszh/JO6AiSLkfqkt708JiV+8Fff00JugFnU9ulQeDP
+k3e5hw68ohS6DS5xrlmuY3yLzySl3PcI8vAp/8fY7cLchhJsPBmoWv87mParj6AG
+uIlzJoQMFCVdlv2+e8p6be2Ua68f/qp6i1wgwUzLqLrirPUe74RlnU/+hkGRMYL+
++tkaPI/Bwdhn1xyybueBuGAJMiHi6iqlvmbORwxaTvuRZr2UTX/piCAMlWaiOlsu
+REsVHc3d2bF6GkY7xx1TGYMI/+jx5Y5xrgXrpWZwcf8xzJxkMu+FOpOkzJEmqG3L
+oDsvoCAOlck3/8+1R9nWMj36Q8HqhnJTr6axKNi7yRs5KC8BcTxjqM98eNSfurAe
+pg818lA6xCEwgbc1M7kcVTAtQbaZUwSCaTbryr9EBBSIudVnsn7ZnrtT/yr/MLk8
+/F4KDaPKXcbWYEPIFwIV0GKkMXVltD4O4cUPO1SSXmxcrMV+9mJ0xlKmQzbCD56y
+6eFZsADV0l9mGYMv3LtODycbwAiL36F2JgTiNGLrPJbkAmy9foc=
+=uFgf
+-----END PGP SIGNATURE-----
diff --git a/website/static/security/advisories/FreeBSD-EN-25:14.route.asc b/website/static/security/advisories/FreeBSD-EN-25:14.route.asc
new file mode 100644
index 0000000000..8f3a13f3bc
--- /dev/null
+++ b/website/static/security/advisories/FreeBSD-EN-25:14.route.asc
@@ -0,0 +1,133 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-25:14.route Errata Notice
+ The FreeBSD Project
+
+Topic: route(8) monitor buffers too much when redirected to a file
+
+Category: core
+Module: route
+Announced: 2025-08-08
+Affects: FreeBSD 14.x
+Corrected: 2025-07-21 02:13:16 UTC (stable/14, 14.3-STABLE)
+ 2025-08-08 00:39:04 UTC (releng/14.3, 14.3-RELEASE-p2)
+ 2025-08-08 00:39:17 UTC (releng/14.2, 14.2-RELEASE-p5)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+.
+
+I. Background
+
+route(8)'s `monitor` command continuously reports routing changes on the system,
+which may be used interactively or by other tooling. When a command's output
+is redirected to a file, its standard output becomes fully buffered.
+
+II. Problem Description
+
+In FreeBSD 14.x, route(8) does not flush its standard output at distinct message
+boundaries as it previously did in FreeBSD 13.x and before. As such, it could
+appear that no changes are happening on the system when its output has been
+redirected to a file.
+
+III. Impact
+
+Other programs that rely on `route monitor` are likely to miss changes that
+they are expecting to see, unless routing tables/information are changing at
+a high frequency.
+
+IV. Workaround
+
+Use `stdbuf -oL route monitor` to force the output of `route monitor` to be
+line-buffered. See stdbuf(1). Programs watching `route monitor` output are
+not incredibly common.
+
+V. Solution
+
+Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date, and restart any affected
+services.
+
+Perform one of the following:
+
+1) To update your system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the amd64 or arm64 platforms,
+or the i386 platform on FreeBSD 13, can be updated via the freebsd-update(8)
+utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+2) To update your system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/EN-25:14/route.patch
+# fetch https://security.FreeBSD.org/patches/EN-25:14/route.patch.asc
+# gpg --verify route.patch.asc
+
+b) Apply the patch. Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in .
+
+VI. Correction details
+
+This issue is corrected as of the corresponding Git commit hash in the
+following stable and release branches:
+
+Branch/path Hash Revision
+- -------------------------------------------------------------------------
+stable/14/ dd695839efd8 stable/14-n271995
+releng/14.3/ 97f34921d77b releng/14.3-n271437
+releng/14.2/ 168703212b61 releng/14.2-n269531
+- -------------------------------------------------------------------------
+
+Run the following command to see which files were modified by a
+particular commit:
+
+# git show --stat
+
+Or visit the following URL, replacing NNNNNN with the hash:
+
+
+
+To determine the commit count in a working tree (for comparison against
+nNNNNNN in the table above), run:
+
+# git rev-list --count --first-parent HEAD
+
+VII. References
+
+
+
+
+The latest revision of this advisory is available at
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmiVSh8ACgkQbljekB8A
+Gu9SKxAAwfW3Ql0ZaqG5aIYJ1FOUBMY/F0p22E9RmO1L8xGpX6m0vzjQUrrCycHq
+3Lc+QWg4IpDq9WUvfg3yuslZpRnRa679EVjeR7R/Bo7qgfAEVYVZK52g5L7kukAq
+ta9Ufqltrp5UZUkYdfj1k5nROM/SfSROj8opvlwDxdwjzgr0shiY5WUfYTxkTFOA
+WNSzxnjB95VLgT9PCRXv2oUvs/4N/vZtLwzxFPkfBsbLOyz0+lDZ/ub5q1tllBfi
+QMRrsJ+bxAfjZtD0VutmL1kY0BaialP6/hOqTka+DuGVi3C73mk6+/xlu/ig7RUk
+xsaAigN5pdfQpa2UDx+vEVp5OYHIja6rgzlZeIELv1sZLridp8kySygQ7W3k9PED
+nQM6rZe4d/sp7REv/wSCK0sC6BEQ5KgZ1l89ChR8BtCb7gVj69A/OU1KoSyUkuAV
+Qn8vCVr0zOBXrwlGIgP94R2qhl4smWylynKajjqT6Hgh3k4KRZMJKfFxDAQlUxWf
+5m1aHD41O7h92L6IixoVAHQ0E/MtnuV9Pos5lDlDewRvUdSSfT02UahcIOoch860
+NtsFyurxnBOVPtpr92gg1aVx/u4EnP3/2NnMDWwLIM80QvsXOXZ+e6WigBJ3bJxB
+FAMdoiMJyi3orwDfxnCuUBOwnnwLtxjd3iw5frZXEa5xJfmKpsA=
+=YgHt
+-----END PGP SIGNATURE-----
diff --git a/website/static/security/advisories/FreeBSD-SA-25:07.libarchive.asc b/website/static/security/advisories/FreeBSD-SA-25:07.libarchive.asc
new file mode 100644
index 0000000000..f1242dd39a
--- /dev/null
+++ b/website/static/security/advisories/FreeBSD-SA-25:07.libarchive.asc
@@ -0,0 +1,136 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-SA-25:07.libarchive Security Advisory
+ The FreeBSD Project
+
+Topic: Integer overflow in libarchive leading to double free
+
+Category: contrib
+Module: libarchive
+Announced: 2025-08-08
+Affects: All supported versions of FreeBSD.
+Corrected: 2025-06-19 22:47:34 UTC (stable/14, 14.3-STABLE)
+ 2025-08-08 00:39:05 UTC (releng/14.3, 14.3-RELEASE-p2)
+ 2025-08-08 00:39:19 UTC (releng/14.2, 14.2-RELEASE-p5)
+ 2025-06-20 20:43:32 UTC (stable/13, 13.5-STABLE)
+ 2025-08-08 00:39:29 UTC (releng/13.5, 13.5-RELEASE-p3)
+CVE Name: CVE-2025-5914
+
+For general information regarding FreeBSD Security Advisories,
+including descriptions of the fields above, security branches, and the
+following sections, please visit .
+
+I. Background
+
+The libarchive(3) library provides a flexible interface for reading and
+writing streaming archive files such as tar(1) and cpio(1), and has been the
+basis for the FreeBSD implementation of the tar(1) and cpio(1) utilities
+since FreeBSD 5.3.
+
+II. Problem Description
+
+An integer overflow in the archive_read_format_rar_seek_data() function may
+lead to a double free problem.
+
+III. Impact
+
+Exploiting a double free vulnerability can cause memory corruption. This in
+turn could enable a threat actor to execute arbitrary code. It might also
+result in denial of service.
+
+IV. Workaround
+
+No workaround is available.
+
+V. Solution
+
+Upgrade your vulnerable system to a supported FreeBSD stable or
+release / security branch (releng) dated after the correction date.
+
+Perform one of the following:
+
+1) To update your vulnerable system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the amd64 or arm64 platforms,
+or the i386 platform on FreeBSD 13, can be updated via the freebsd-update(8)
+utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+2) To update your vulnerable system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/SA-25:07/libarchive.patch
+# fetch https://security.FreeBSD.org/patches/SA-25:07/libarchive.patch.asc
+# gpg --verify libarchive.patch.asc
+
+b) Apply the patch. Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in .
+
+Restart all daemons that use the library, or reboot the system.
+
+VI. Correction details
+
+This issue is corrected as of the corresponding Git commit hash in the
+following stable and release branches:
+
+Branch/path Hash Revision
+- -------------------------------------------------------------------------
+stable/14/ 6dad4525a291 stable/14-n271728
+releng/14.3/ fb780a82dfbd releng/14.3-n271438
+releng/14.2/ c0979bd2734f releng/14.2-n269532
+stable/13/ f47afeb2ce1e stable/13-n259312
+releng/13.5/ 798b7b161a71 releng/13.5-n259173
+- -------------------------------------------------------------------------
+
+Run the following command to see which files were modified by a
+particular commit:
+
+# git show --stat
+
+Or visit the following URL, replacing NNNNNN with the hash:
+
+
+
+To determine the commit count in a working tree (for comparison against
+nNNNNNN in the table above), run:
+
+# git rev-list --count --first-parent HEAD
+
+VII. References
+
+
+
+
+
+The latest revision of this advisory is available at
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmiVSiEACgkQbljekB8A
+Gu9QGg/9Gri16tBoEsU57UcI3MlbHYGHSXb3Bqs+EgAfxeLjSB58GH1zDUjgjVmT
+js6QN6scVbyX4SHQyM4nBw1zn5D7Ejhr/1nrnkbr98YWJn6OZzadp9ANNO2joclx
+QBD6Gztk9bCPMPtSyMCTe7yOtvcYWoNzHQfaIU+xdfRmlRFNv/VzaUL/vfGdTF1a
++yJ0BEB0oNLlRpCFayDXpFquxe72Uwc2qaYKd5cuEHNrXoo54KZC7fSH1lJR5ZiH
+puPz/mxp3sY/zdWwNvmuFxZTuAIgfLiovV1Hr/UbzyoOfhqtZUuPuXkSS1JQAfuo
+9lSd71E8ZB11MSUZ23kfUMO8KMAgt+d47UGHC2v/uU2t9CcSpc7IpO7khZpRGisE
+DjwQ0XgMu5Csa7YBB++tulOsESlNqlcVaredBqRaT8h7ClTQ4pNguhkJy+mRm0m1
+3nRYKoG7xejJIArrg+aTu5HboAPGINwbX1m2dOIhI/P6hKCMxoZm4P5ubgxDIXIM
+Ofv19plmhEVACSPb+uzEvIke82R51aGyCnVAjORL6fNX5SkZoLZb5VDJTr5F3BdL
+90ZOgWpKCwD6r7K65unDA7BuHz/VntNNR0QdxO3+fJk/Bmqo8mykAAU5LO0JmWUw
+H4mgUonPalkZag2pYFJpixqV/BPa9tad2xXRfKiFzsRsawfzrJA=
+=fwMp
+-----END PGP SIGNATURE-----
diff --git a/website/static/security/patches/EN-25:12/efi.patch b/website/static/security/patches/EN-25:12/efi.patch
new file mode 100644
index 0000000000..cd15bf1b89
--- /dev/null
+++ b/website/static/security/patches/EN-25:12/efi.patch
@@ -0,0 +1,59 @@
+--- stand/efi/loader/bootinfo.c.orig
++++ stand/efi/loader/bootinfo.c
+@@ -447,9 +447,15 @@
+ module = *modulep;
+ file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module);
+ #endif
+-#if defined(EFI) && !defined(__i386__)
++#ifdef EFI
++#ifndef __i386__
+ file_addmetadata(kfp, MODINFOMD_FW_HANDLE, sizeof(ST), &ST);
+ #endif
++#if defined(__amd64__) || defined(__i386__)
++ file_addmetadata(kfp, MODINFOMD_EFI_ARCH, sizeof(MACHINE_ARCH),
++ MACHINE_ARCH);
++#endif
++#endif
+ #ifdef LOADER_GELI_SUPPORT
+ geli_export_key_metadata(kfp);
+ #endif
+--- sys/amd64/amd64/machdep.c.orig
++++ sys/amd64/amd64/machdep.c
+@@ -1691,6 +1691,27 @@
+ efi_map_sysctl_handler, "S,efi_map_header",
+ "Raw EFI Memory Map");
+
++static int
++efi_arch_sysctl_handler(SYSCTL_HANDLER_ARGS)
++{
++ char *arch;
++ caddr_t kmdp;
++
++ kmdp = preload_search_by_type("elf kernel");
++ if (kmdp == NULL)
++ kmdp = preload_search_by_type("elf64 kernel");
++
++ arch = (char *)preload_search_info(kmdp,
++ MODINFO_METADATA | MODINFOMD_EFI_ARCH);
++ if (arch == NULL)
++ return (0);
++
++ return (SYSCTL_OUT_STR(req, arch));
++}
++SYSCTL_PROC(_machdep, OID_AUTO, efi_arch,
++ CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
++ efi_arch_sysctl_handler, "A", "EFI Firmware Architecture");
++
+ void
+ spinlock_enter(void)
+ {
+--- sys/x86/include/metadata.h.orig
++++ sys/x86/include/metadata.h
+@@ -34,6 +34,7 @@
+ #define MODINFOMD_EFI_FB 0x1005
+ #define MODINFOMD_MODULEP 0x1006
+ #define MODINFOMD_VBE_FB 0x1007
++#define MODINFOMD_EFI_ARCH 0x1008
+
+ struct efi_map_header {
+ uint64_t memory_size;
diff --git a/website/static/security/patches/EN-25:12/efi.patch.asc b/website/static/security/patches/EN-25:12/efi.patch.asc
new file mode 100644
index 0000000000..ac25268b3a
--- /dev/null
+++ b/website/static/security/patches/EN-25:12/efi.patch.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmiVShwACgkQbljekB8A
+Gu96qRAAw0SdIOM6CoKh6R91MNsbA4wBL4TtrlBG8pPBDkhP8N1zn3hYOFu10MA8
+hEMB08WdHm6ruLG8Hlb7toVIvs2xM83CUZnywDvAHryuCZ81/JrzPU7MKJCAhz8/
+wqhGN56qsn9R7jSNYS4KgGSZlK+742OJD9hRgbUQ57ZRlpN0/VLRovTPQ9KPVPEG
+OaNKZh4vcAKjIYHpLmKdtKnM7BY7Ep4r9ZUfIck147PiV1T6b4eC/k4ZjIXnKLX5
+EfxB93r7DaOYSsyBI8IDMMyJFD7JcsWWzacoOoLqak0YciuaJAFFObJ8r5EpOIH/
+YfC0r+siD4tL+RYd4DlSNdB9xLhLA9tGQ4x1IMJspMj0vXb2QY+docgUG6QUzqCI
+cUaZSm7kWnyELir4NfYHocpRZP8dTQzB0kLkXCz8DY8crhhhMEwfLBKoz7j7mMTL
+d+M5cSNqwbHRrSC1DG9BrC8r4LWmZ7Rtbj90sTtcTCv9Ue5K4TOW9+h8p08LpSHk
+p93Jp7SQxy8qniaANnciXgjXS48HlReWL1GbFXI372M01qNAxdP3ZysvUpm9OKuV
+KEyYsyhe+324fKKtEhq5hSJD3eyCycih3eN9/VCDOQqKEnfG4Y9+Mch7MiQt3Z3i
+1Nc+Ri9sUgpE3fXMa/OEapu6CX9QLUSkLwsscP/wIRvasbX1qQw=
+=rniG
+-----END PGP SIGNATURE-----
diff --git a/website/static/security/patches/EN-25:13/wlan_tkip.patch b/website/static/security/patches/EN-25:13/wlan_tkip.patch
new file mode 100644
index 0000000000..b26adf8fb6
--- /dev/null
+++ b/website/static/security/patches/EN-25:13/wlan_tkip.patch
@@ -0,0 +1,13 @@
+ sys/net80211/ieee80211_crypto_tkip.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+--- sys/net80211/ieee80211_crypto_tkip.c.orig
++++ sys/net80211/ieee80211_crypto_tkip.c
+@@ -370,7 +370,7 @@
+ /*
+ * Strip the ICV if hardware has not done so already.
+ */
+- if (rxs != NULL && (rxs->c_pktflags & IEEE80211_RX_F_ICV_STRIP) == 0)
++ if ((rxs == NULL) || (rxs->c_pktflags & IEEE80211_RX_F_ICV_STRIP) == 0)
+ m_adj(m, -tkip.ic_trailer);
+
+ return 1;
diff --git a/website/static/security/patches/EN-25:13/wlan_tkip.patch.asc b/website/static/security/patches/EN-25:13/wlan_tkip.patch.asc
new file mode 100644
index 0000000000..a757c7505d
--- /dev/null
+++ b/website/static/security/patches/EN-25:13/wlan_tkip.patch.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmiVSh4ACgkQbljekB8A
+Gu/8XxAAyLbpO5IQL14hklDvN8E6jJb3+71TG5cH7e8mTPMQ0hFVer9CrWIxm8JC
+QqWYHOxV+ahuopQOcQz8Km1jJGB88gLTPNsyD1V8KF37HIfsXpuM8pKV2UuJaU9w
+TzlYflsfL4OTgKhqgplPG4rdo5na1G+UoslScpX+0rm8EhpZCtd4w5TNOKOuQI5f
+nnNPjGboFfudzlTJF19bZlZzJJoHSeQHpqNYi/ZBeRMzhHYlKLvpDATW3j31tklL
+GM04iT2Rlrco2BB7WBiftn2te6Ok/3Zv7UVyqSUPdi/v+pNmn5BuXE2+8bNrKP84
+OomUsh5dfw1E/J2cb+Wh0J7nExUa9RtbSFXqVlZgLyos5DIDQ6wDuuMNTcOFhPnJ
+mvIkDrfBLPS8pWWSPEuajaPvtG3BkKy5JiK0pxfJlvx6MA7DA0myhBAjm27n5sxb
+r+18h2ra9umZzvIxBzs3qTnxo/1V//J2C/B1EuoR2oBU532mk5CooZQuBbzUQ+5P
+EsqzMGBUf2Q+h9V6Jr87hdLgMCc33yNlNgQSpNq4QIKx42l0SSNaQhc4RRfs8fR/
+gRCC+Xx9Fdzx7FNvnQMJV8F6TxDDfetM4oh6FaGlCFBosVJJxPMlz8XFecgwi0q4
+rKhYthBbfc5wCGIWhnYvP7xWB/dZ9nbNcU6RKGhNu8UJi0Luf/c=
+=np7v
+-----END PGP SIGNATURE-----
diff --git a/website/static/security/patches/EN-25:14/route.patch b/website/static/security/patches/EN-25:14/route.patch
new file mode 100644
index 0000000000..fcdde605ba
--- /dev/null
+++ b/website/static/security/patches/EN-25:14/route.patch
@@ -0,0 +1,10 @@
+--- sbin/route/route_netlink.c.orig
++++ sbin/route/route_netlink.c
+@@ -733,6 +733,7 @@
+ print_nlmsg_generic(h, hdr, cinfo);
+ }
+
++ fflush(stdout);
+ snl_clear_lb(&h->ss_cmd);
+ }
+
diff --git a/website/static/security/patches/EN-25:14/route.patch.asc b/website/static/security/patches/EN-25:14/route.patch.asc
new file mode 100644
index 0000000000..2921d98028
--- /dev/null
+++ b/website/static/security/patches/EN-25:14/route.patch.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmiVSiAACgkQbljekB8A
+Gu+bhQ//VsSVSQD09d5QSCn36S0WaBsCDN2NbeROFoh59GBgj2PJtErMd7FhISpA
+eAKk55yJ42irIRCPRZtozWg2UWoiBKb43kHzZqdmW1SAPKHP4BQOmTiM7X033qiD
+yzap8t2R2kniBta8fzfYnC+m2V5wXc9ObQnsQCk1kNV6+b/9fFjQBrsLGRrRmM0S
+t8gI+tpG5peIKnTs+SyCqHNaTu+GzHJY2ZfEMylrTK+IU1JMR1taw+a8TAPKVhth
+REciSl3Pj3X9v8rsuATkW+V0RFnRwd8XOBWJoZt+sgK61B9pwcIvC5yiXZcYiPUJ
+vmAkSiDJDisgmB+T1o/ZHAuxBz8CbifP4rHC0h9HJubLzsu1NCFelKPaFhJrVvkl
+1YZzN+Oi2mJiKHfg4gNTKjcdMtTSA/AAUt2ZhFk94/oNpxnivs33os+uIg2PNWH3
+iH3Pt6ihEr77gJZ2AYot8RShsQivKRAX3HSsefj7uusLys8ZO8vbrgs/CgBtj/cl
+fWCvCIRwq0EOL5WqNQ9YIck3jIASbSAJSkmEhKSw+3c1zSewVirrqONXIvxvGJ5Y
+BV4G3LJBQ9EThr03mIuI4clYz6rUHYBIAp5/G1CrYhRUVb0WC4TRGTlGYR0ReuKe
+cVLrbVEFJIFy6e9yOMutcMTTyFvGsW86llDLR8oNWoxqP4jyohg=
+=f+CH
+-----END PGP SIGNATURE-----
diff --git a/website/static/security/patches/SA-25:07/libarchive.patch b/website/static/security/patches/SA-25:07/libarchive.patch
new file mode 100644
index 0000000000..30d2e8d1df
--- /dev/null
+++ b/website/static/security/patches/SA-25:07/libarchive.patch
@@ -0,0 +1,38022 @@
+--- contrib/libarchive/COPYING.orig
++++ contrib/libarchive/COPYING
+@@ -20,7 +20,7 @@
+ libarchive/mtree.5
+
+ * The following source files are in the public domain:
+- libarchive/archive_getdate.c
++ libarchive/archive_parse_date.c
+
+ * The following source files are triple-licensed with the ability to choose
+ from CC0 1.0 Universal, OpenSSL or Apache 2.0 licenses:
+--- contrib/libarchive/NEWS.orig
++++ contrib/libarchive/NEWS
+@@ -1,3 +1,11 @@
++Jun 01, 2026: libarchive 3.8.1 released
++
++May 20, 2025: libarchive 3.8.0 released
++
++Mar 30, 2025: libarchive 3.7.9 released
++
++Mar 20, 2025: libarchive 3.7.8 released
++
+ Oct 13, 2024: libarchive 3.7.7 released
+
+ Sep 23, 2024: libarchive 3.7.6 released
+--- contrib/libarchive/README.md.orig
++++ contrib/libarchive/README.md
+@@ -85,13 +85,14 @@
+ * PWB binary cpio
+ * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
+ * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives)
+- * ZIPX archives (with support for bzip2, ppmd8, lzma and xz compressed entries)
++ * ZIPX archives (with support for bzip2, zstd, ppmd8, lzma and xz compressed entries)
+ * GNU and BSD 'ar' archives
+ * 'mtree' format
+ * 7-Zip archives (including archives that use zstandard compression)
+ * Microsoft CAB format
+ * LHA and LZH archives
+ * RAR and RAR 5.0 archives (with some limitations due to RAR's proprietary status)
++ * WARC archives
+ * XAR archives
+
+ The library also detects and handles any of the following before evaluating the archive:
+@@ -120,15 +121,18 @@
+ * PWB binary cpio
+ * shar archives
+ * ZIP archives (with uncompressed or "deflate" compressed entries)
++ * ZIPX archives (with bzip2, zstd, lzma or xz compressed entries)
+ * GNU and BSD 'ar' archives
+ * 'mtree' format
+ * ISO9660 format
+- * 7-Zip archives
++ * 7-Zip archives (including archives that use zstandard compression)
++ * WARC archives
+ * XAR archives
+
+ When creating archives, the result can be filtered with any of the following:
+
+ * uuencode
++ * base64
+ * gzip compression
+ * bzip2 compression
+ * compress/LZW compression
+@@ -241,4 +245,3 @@
+ appropriate. It has many advantages over other tar formats
+ (including the legacy GNU tar format) and is widely supported by
+ current tar implementations.
+-
+--- /dev/null
++++ contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh
+@@ -0,0 +1,19 @@
++#!/bin/sh
++set -eux
++
++# Uncommenting these adds a full minute to the CI time
++#brew update > /dev/null
++#brew upgrade > /dev/null
++
++# This does an upgrade if the package is already installed
++brew install \
++ autoconf \
++ automake \
++ libtool \
++ pkg-config \
++ cmake \
++ xz \
++ lz4 \
++ zstd \
++ libxml2 \
++ openssl
+--- contrib/libarchive/cpio/cpio.c.orig
++++ contrib/libarchive/cpio/cpio.c
+@@ -1206,7 +1206,7 @@
+ else
+ strcpy(date, "invalid mtime");
+
+- fprintf(out, "%s%3d %-8s %-8s %8s %12s %s",
++ fprintf(out, "%s%3u %-8s %-8s %8s %12s %s",
+ archive_entry_strmode(entry),
+ archive_entry_nlink(entry),
+ uname, gname, size, date,
+--- contrib/libarchive/cpio/test/test_format_newc.c.orig
++++ contrib/libarchive/cpio/test/test_format_newc.c
+@@ -189,10 +189,10 @@
+ gid = from_hex(e + 30, 8); /* gid */
+ assertEqualMem(e + 38, "00000003", 8); /* nlink */
+ t = from_hex(e + 46, 8); /* mtime */
+- failure("t=%#08jx now=%#08jx=%jd", (intmax_t)t, (intmax_t)now,
++ failure("t=%#08jx now=%#08jx=%jd", (uintmax_t)t, (uintmax_t)now,
+ (intmax_t)now);
+ assert(t <= now); /* File wasn't created in future. */
+- failure("t=%#08jx now - 2=%#08jx=%jd", (intmax_t)t, (intmax_t)now - 2,
++ failure("t=%#08jx now - 2=%#08jx=%jd", (uintmax_t)t, (uintmax_t)now - 2,
+ (intmax_t)now - 2);
+ assert(t >= now - 2); /* File was created w/in last 2 secs. */
+ failure("newc format stores body only with last appearance of a link\n"
+@@ -219,7 +219,7 @@
+ assert(is_hex(e, 110));
+ assertEqualMem(e + 0, "070701", 6); /* Magic */
+ assert(is_hex(e + 6, 8)); /* ino */
+-#if defined(_WIN32) && !defined(CYGWIN)
++#if defined(_WIN32) && !defined(__CYGWIN__)
+ /* Mode: Group members bits and others bits do not work. */
+ assertEqualInt(0xa180, from_hex(e + 14, 8) & 0xffc0);
+ #else
+@@ -230,7 +230,7 @@
+ assertEqualMem(e + 38, "00000001", 8); /* nlink */
+ t2 = from_hex(e + 46, 8); /* mtime */
+ failure("First entry created at t=%#08jx this entry created"
+- " at t2=%#08jx", (intmax_t)t, (intmax_t)t2);
++ " at t2=%#08jx", (uintmax_t)t, (uintmax_t)t2);
+ assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */
+ assertEqualMem(e + 54, "00000005", 8); /* File size */
+ fs = (uint64_t)from_hex(e + 54, 8);
+@@ -266,7 +266,7 @@
+ #endif
+ t2 = from_hex(e + 46, 8); /* mtime */
+ failure("First entry created at t=%#08jx this entry created at"
+- "t2=%#08jx", (intmax_t)t, (intmax_t)t2);
++ "t2=%#08jx", (uintmax_t)t, (uintmax_t)t2);
+ assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */
+ assertEqualMem(e + 54, "00000000", 8); /* File size */
+ fs = (uint64_t)from_hex(e + 54, 8);
+@@ -300,7 +300,7 @@
+ assertEqualMem(e + 38, "00000003", 8); /* nlink */
+ t2 = from_hex(e + 46, 8); /* mtime */
+ failure("First entry created at t=%#08jx this entry created at"
+- "t2=%#08jx", (intmax_t)t, (intmax_t)t2);
++ "t2=%#08jx", (uintmax_t)t, (uintmax_t)t2);
+ assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */
+ assertEqualInt(10, from_hex(e + 54, 8)); /* File size */
+ fs = (uint64_t)from_hex(e + 54, 8);
+--- contrib/libarchive/cpio/test/test_option_a.c.orig
++++ contrib/libarchive/cpio/test/test_option_a.c
+@@ -52,7 +52,7 @@
+ * #ifdef this section out. Most of the test below is
+ * still valid. */
+ memset(×, 0, sizeof(times));
+-#if defined(_WIN32) && !defined(CYGWIN)
++#if defined(_WIN32) && !defined(__CYGWIN__)
+ times.actime = 86400;
+ times.modtime = 86400;
+ #else
+--- contrib/libarchive/cpio/test/test_option_c.c.orig
++++ contrib/libarchive/cpio/test/test_option_c.c
+@@ -18,7 +18,7 @@
+ return (1);
+ }
+
+-static long long int
++static unsigned long long int
+ from_octal(const char *p, size_t l)
+ {
+ long long int r = 0;
+@@ -117,7 +117,7 @@
+ gid = (int)from_octal(e + 30, 6);
+ assertEqualMem(e + 36, "000001", 6); /* nlink */
+ failure("file entries should not have rdev set (dev field was 0%o)",
+- dev);
++ (unsigned int)dev);
+ assertEqualMem(e + 42, "000000", 6); /* rdev */
+ t = from_octal(e + 48, 11); /* mtime */
+ assert(t <= now); /* File wasn't created in future. */
+@@ -133,7 +133,7 @@
+ assert(is_octal(e, 76)); /* Entire header is octal digits. */
+ assertEqualMem(e + 0, "070707", 6); /* Magic */
+ assertEqualInt(dev, from_octal(e + 6, 6)); /* dev */
+- assert(ino != from_octal(e + 12, 6)); /* ino */
++ assert(ino != (int)from_octal(e + 12, 6)); /* ino */
+ #if !defined(_WIN32) || defined(__CYGWIN__)
+ /* On Windows, symbolic link and group members bits and
+ * others bits do not work. */
+@@ -163,7 +163,7 @@
+ assertEqualInt(dev, from_octal(e + 6, 6));
+ /* Ino must be different from first entry. */
+ assert(is_octal(e + 12, 6)); /* ino */
+- assert(ino != from_octal(e + 12, 6));
++ assert(ino != (int)from_octal(e + 12, 6));
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ /* Group members bits and others bits do not work. */
+ assertEqualMem(e + 18, "040777", 6); /* Mode */
+--- contrib/libarchive/libarchive/archive.h.orig
++++ contrib/libarchive/libarchive/archive.h
+@@ -34,12 +34,15 @@
+ * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
+ */
+ /* Note: Compiler will complain if this does not match archive_entry.h! */
+-#define ARCHIVE_VERSION_NUMBER 3007007
++#define ARCHIVE_VERSION_NUMBER 3008001
+
+ #include
+ #include /* for wchar_t */
+ #include /* For FILE * */
++#if ARCHIVE_VERSION_NUMBER < 4000000
++/* time_t is slated to be removed from public includes in 4.0 */
+ #include /* For time_t */
++#endif
+
+ /*
+ * Note: archive.h is for use outside of libarchive; the configuration
+@@ -63,12 +66,15 @@
+ #define __LA_INT64_T_DEFINED
+ # if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
+ typedef __int64 la_int64_t;
++typedef unsigned __int64 la_uint64_t;
+ # else
+ # include /* ssize_t */
+ # if defined(_SCO_DS) || defined(__osf__)
+ typedef long long la_int64_t;
++typedef unsigned long long la_uint64_t;
+ # else
+ typedef int64_t la_int64_t;
++typedef uint64_t la_uint64_t;
+ # endif
+ # endif
+ #endif
+@@ -94,6 +100,22 @@
+ # endif
+ #endif
+
++#if ARCHIVE_VERSION_NUMBER < 4000000
++/* Use the platform types for time_t */
++#define __LA_TIME_T time_t
++#else
++/* Use 64-bits integer types for time_t */
++#define __LA_TIME_T la_int64_t
++#endif
++
++#if ARCHIVE_VERSION_NUMBER < 4000000
++/* Use the platform types for dev_t */
++#define __LA_DEV_T dev_t
++#else
++/* Use 64-bits integer types for dev_t */
++#define __LA_DEV_T la_int64_t
++#endif
++
+ /* Large file support for Android */
+ #if defined(__LIBARCHIVE_BUILD) && defined(__ANDROID__)
+ #include "android_lf.h"
+@@ -132,7 +154,7 @@
+ #define __LA_PRINTF(fmtarg, firstvararg) /* nothing */
+ #endif
+
+-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
++#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+ # define __LA_DEPRECATED __attribute__((deprecated))
+ #else
+ # define __LA_DEPRECATED
+@@ -155,7 +177,7 @@
+ /*
+ * Textual name/version of the library, useful for version displays.
+ */
+-#define ARCHIVE_VERSION_ONLY_STRING "3.7.7"
++#define ARCHIVE_VERSION_ONLY_STRING "3.8.1"
+ #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
+ __LA_DECL const char * archive_version_string(void);
+
+@@ -178,6 +200,23 @@
+ __LA_DECL const char * archive_bzlib_version(void);
+ __LA_DECL const char * archive_liblz4_version(void);
+ __LA_DECL const char * archive_libzstd_version(void);
++__LA_DECL const char * archive_liblzo2_version(void);
++__LA_DECL const char * archive_libexpat_version(void);
++__LA_DECL const char * archive_libbsdxml_version(void);
++__LA_DECL const char * archive_libxml2_version(void);
++__LA_DECL const char * archive_mbedtls_version(void);
++__LA_DECL const char * archive_nettle_version(void);
++__LA_DECL const char * archive_openssl_version(void);
++__LA_DECL const char * archive_libmd_version(void);
++__LA_DECL const char * archive_commoncrypto_version(void);
++__LA_DECL const char * archive_cng_version(void);
++__LA_DECL const char * archive_wincrypt_version(void);
++__LA_DECL const char * archive_librichacl_version(void);
++__LA_DECL const char * archive_libacl_version(void);
++__LA_DECL const char * archive_libattr_version(void);
++__LA_DECL const char * archive_libiconv_version(void);
++__LA_DECL const char * archive_libpcre_version(void);
++__LA_DECL const char * archive_libpcre2_version(void);
+
+ /* Declare our basic types. */
+ struct archive;
+@@ -449,6 +488,8 @@
+ __LA_DECL int archive_read_support_format_cab(struct archive *);
+ __LA_DECL int archive_read_support_format_cpio(struct archive *);
+ __LA_DECL int archive_read_support_format_empty(struct archive *);
++/* archive_read_support_format_gnutar() is an alias for historical reasons
++ * of archive_read_support_format_tar(). */
+ __LA_DECL int archive_read_support_format_gnutar(struct archive *);
+ __LA_DECL int archive_read_support_format_iso9660(struct archive *);
+ __LA_DECL int archive_read_support_format_lha(struct archive *);
+@@ -828,6 +869,10 @@
+ __LA_DECL int archive_write_set_format_filter_by_ext_def(struct archive *a, const char *filename, const char * def_ext);
+ __LA_DECL int archive_write_zip_set_compression_deflate(struct archive *);
+ __LA_DECL int archive_write_zip_set_compression_store(struct archive *);
++__LA_DECL int archive_write_zip_set_compression_lzma(struct archive *);
++__LA_DECL int archive_write_zip_set_compression_xz(struct archive *);
++__LA_DECL int archive_write_zip_set_compression_bzip2(struct archive *);
++__LA_DECL int archive_write_zip_set_compression_zstd(struct archive *);
+ /* Deprecated; use archive_write_open2 instead */
+ __LA_DECL int archive_write_open(struct archive *, void *,
+ archive_open_callback *, archive_write_callback *,
+@@ -1083,6 +1128,10 @@
+ __LA_DEPRECATED;
+ #endif
+
++/* Parses a date string relative to the current time.
++ * NOTE: This is not intended for general date parsing, and the resulting timestamp should only be used for libarchive. */
++__LA_DECL time_t archive_parse_date(time_t now, const char *datestr);
++
+ __LA_DECL int archive_errno(struct archive *);
+ __LA_DECL const char *archive_error_string(struct archive *);
+ __LA_DECL const char *archive_format_name(struct archive *);
+@@ -1201,8 +1250,10 @@
+ const wchar_t *);
+
+ /* Utility functions */
++#if ARCHIVE_VERSION_NUMBER < 4000000
+ /* Convenience function to sort a NULL terminated list of strings */
+ __LA_DECL int archive_utility_string_sort(char **);
++#endif
+
+ #ifdef __cplusplus
+ }
+--- contrib/libarchive/libarchive/archive_acl.c.orig
++++ contrib/libarchive/libarchive/archive_acl.c
+@@ -1185,8 +1185,13 @@
+ /* Set remaining fields to blank. */
+ for (n = fields; n < numfields; ++n)
+ field[n].start = field[n].end = NULL;
++
++ if (field[0].start == NULL || field[0].end == NULL) {
++ /* This should never happen */
++ return (ARCHIVE_FATAL);
++ }
+
+- if (field[0].start != NULL && *(field[0].start) == L'#') {
++ if (*(field[0].start) == L'#') {
+ /* Comment, skip entry */
+ continue;
+ }
+@@ -1676,7 +1681,12 @@
+ for (n = fields; n < numfields; ++n)
+ field[n].start = field[n].end = NULL;
+
+- if (field[0].start != NULL && *(field[0].start) == '#') {
++ if (field[0].start == NULL || field[0].end == NULL) {
++ /* This should never happen */
++ return (ARCHIVE_FATAL);
++ }
++
++ if (*(field[0].start) == '#') {
+ /* Comment, skip entry */
+ continue;
+ }
+--- contrib/libarchive/libarchive/archive_acl_private.h.orig
++++ contrib/libarchive/libarchive/archive_acl_private.h
+@@ -80,4 +80,4 @@
+ int archive_acl_from_text_nl(struct archive_acl *, const char * /* text */,
+ size_t /* size of text */, int /* type */, struct archive_string_conv *);
+
+-#endif /* ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
++#endif /* !ARCHIVE_ACL_PRIVATE_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_cmdline.c.orig
++++ contrib/libarchive/libarchive/archive_cmdline.c
+@@ -71,7 +71,7 @@
+ archive_string_empty(as);
+
+ /* Skip beginning space characters. */
+- while (*s != '\0' && *s == ' ')
++ while (*s == ' ')
+ s++;
+ /* Copy non-space characters. */
+ while (*s != '\0' && *s != ' ') {
+--- contrib/libarchive/libarchive/archive_cryptor_private.h.orig
++++ contrib/libarchive/libarchive/archive_cryptor_private.h
+@@ -64,6 +64,7 @@
+
+ #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+ #include
++#define ARCHIVE_CRYPTOR_USE_CNG 1
+
+ /* Common in other bcrypt implementations, but missing from VS2008. */
+ #ifndef BCRYPT_SUCCESS
+@@ -86,6 +87,7 @@
+ #include
+ #include
+ #include
++#define ARCHIVE_CRYPTOR_USE_MBED 1
+
+ #define AES_MAX_KEY_SIZE 32
+ #define AES_BLOCK_SIZE 16
+@@ -105,6 +107,7 @@
+ #endif
+ #include
+ #include
++#define ARCHIVE_CRYPTOR_USE_NETTLE 1
+
+ typedef struct {
+ #if NETTLE_VERSION_MAJOR < 3
+@@ -125,6 +128,7 @@
+
+ #elif defined(HAVE_LIBCRYPTO)
+ #include "archive_openssl_evp_private.h"
++#define ARCHIVE_CRYPTOR_USE_OPENSSL 1
+ #define AES_BLOCK_SIZE 16
+ #define AES_MAX_KEY_SIZE 32
+
+@@ -140,6 +144,10 @@
+
+ #else
+
++#if defined(_WIN32) && !defined(__CYGWIN__) && !(defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA)
++#define ARCHIVE_CRYPTOR_USE_WINCRYPT 1
++#endif
++
+ #define AES_BLOCK_SIZE 16
+ #define AES_MAX_KEY_SIZE 32
+ typedef int archive_crypto_ctx;
+--- contrib/libarchive/libarchive/archive_digest.c.orig
++++ contrib/libarchive/libarchive/archive_digest.c
+@@ -196,6 +196,13 @@
+
+ #elif defined(ARCHIVE_CRYPTO_MD5_LIBSYSTEM)
+
++// These functions are available in macOS 10.4 and later, but deprecated from 10.15 onwards.
++// We need to continue supporting this feature regardless, so suppress the warnings.
++#if defined(__clang__)
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++#endif
++
+ static int
+ __archive_md5init(archive_md5_ctx *ctx)
+ {
+@@ -218,13 +225,46 @@
+ return (ARCHIVE_OK);
+ }
+
++#if defined(__clang__)
++#pragma clang diagnostic pop
++#endif
++
++#elif defined(ARCHIVE_CRYPTO_MD5_WIN)
++
++static int
++__archive_md5init(archive_md5_ctx *ctx)
++{
++#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++ return (win_crypto_init(ctx, BCRYPT_MD5_ALGORITHM));
++#else
++ return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_MD5));
++#endif
++}
++
++static int
++__archive_md5update(archive_md5_ctx *ctx, const void *indata,
++ size_t insize)
++{
++ return (win_crypto_Update(ctx, indata, insize));
++}
++
++static int
++__archive_md5final(archive_md5_ctx *ctx, void *md)
++{
++ return (win_crypto_Final(md, 16, ctx));
++}
++
+ #elif defined(ARCHIVE_CRYPTO_MD5_MBEDTLS)
+
+ static int
+ __archive_md5init(archive_md5_ctx *ctx)
+ {
+ mbedtls_md5_init(ctx);
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_md5_starts(ctx) == 0)
++#else
+ if (mbedtls_md5_starts_ret(ctx) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -234,7 +274,11 @@
+ __archive_md5update(archive_md5_ctx *ctx, const void *indata,
+ size_t insize)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_md5_update(ctx, indata, insize) == 0)
++#else
+ if (mbedtls_md5_update_ret(ctx, indata, insize) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -243,7 +287,11 @@
+ static int
+ __archive_md5final(archive_md5_ctx *ctx, void *md)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_md5_finish(ctx, md) == 0) {
++#else
+ if (mbedtls_md5_finish_ret(ctx, md) == 0) {
++#endif
+ mbedtls_md5_free(ctx);
+ return (ARCHIVE_OK);
+ } else {
+@@ -311,31 +359,6 @@
+ return (ARCHIVE_OK);
+ }
+
+-#elif defined(ARCHIVE_CRYPTO_MD5_WIN)
+-
+-static int
+-__archive_md5init(archive_md5_ctx *ctx)
+-{
+-#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+- return (win_crypto_init(ctx, BCRYPT_MD5_ALGORITHM));
+-#else
+- return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_MD5));
+-#endif
+-}
+-
+-static int
+-__archive_md5update(archive_md5_ctx *ctx, const void *indata,
+- size_t insize)
+-{
+- return (win_crypto_Update(ctx, indata, insize));
+-}
+-
+-static int
+-__archive_md5final(archive_md5_ctx *ctx, void *md)
+-{
+- return (win_crypto_Final(md, 16, ctx));
+-}
+-
+ #else
+
+ static int
+@@ -420,7 +443,11 @@
+ __archive_ripemd160init(archive_rmd160_ctx *ctx)
+ {
+ mbedtls_ripemd160_init(ctx);
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_ripemd160_starts(ctx) == 0)
++#else
+ if (mbedtls_ripemd160_starts_ret(ctx) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -430,7 +457,11 @@
+ __archive_ripemd160update(archive_rmd160_ctx *ctx, const void *indata,
+ size_t insize)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_ripemd160_update(ctx, indata, insize) == 0)
++#else
+ if (mbedtls_ripemd160_update_ret(ctx, indata, insize) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -439,7 +470,11 @@
+ static int
+ __archive_ripemd160final(archive_rmd160_ctx *ctx, void *md)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_ripemd160_finish(ctx, md) == 0) {
++#else
+ if (mbedtls_ripemd160_finish_ret(ctx, md) == 0) {
++#endif
+ mbedtls_ripemd160_free(ctx);
+ return (ARCHIVE_OK);
+ } else {
+@@ -605,13 +640,42 @@
+ return (ARCHIVE_OK);
+ }
+
++#elif defined(ARCHIVE_CRYPTO_SHA1_WIN)
++
++static int
++__archive_sha1init(archive_sha1_ctx *ctx)
++{
++#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++ return (win_crypto_init(ctx, BCRYPT_SHA1_ALGORITHM));
++#else
++ return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_SHA1));
++#endif
++}
++
++static int
++__archive_sha1update(archive_sha1_ctx *ctx, const void *indata,
++ size_t insize)
++{
++ return (win_crypto_Update(ctx, indata, insize));
++}
++
++static int
++__archive_sha1final(archive_sha1_ctx *ctx, void *md)
++{
++ return (win_crypto_Final(md, 20, ctx));
++}
++
+ #elif defined(ARCHIVE_CRYPTO_SHA1_MBEDTLS)
+
+ static int
+ __archive_sha1init(archive_sha1_ctx *ctx)
+ {
+ mbedtls_sha1_init(ctx);
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha1_starts(ctx) == 0)
++#else
+ if (mbedtls_sha1_starts_ret(ctx) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -621,7 +685,11 @@
+ __archive_sha1update(archive_sha1_ctx *ctx, const void *indata,
+ size_t insize)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha1_update(ctx, indata, insize) == 0)
++#else
+ if (mbedtls_sha1_update_ret(ctx, indata, insize) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -630,7 +698,11 @@
+ static int
+ __archive_sha1final(archive_sha1_ctx *ctx, void *md)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha1_finish(ctx, md) == 0) {
++#else
+ if (mbedtls_sha1_finish_ret(ctx, md) == 0) {
++#endif
+ mbedtls_sha1_free(ctx);
+ return (ARCHIVE_OK);
+ } else {
+@@ -698,31 +770,6 @@
+ return (ARCHIVE_OK);
+ }
+
+-#elif defined(ARCHIVE_CRYPTO_SHA1_WIN)
+-
+-static int
+-__archive_sha1init(archive_sha1_ctx *ctx)
+-{
+-#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+- return (win_crypto_init(ctx, BCRYPT_SHA1_ALGORITHM));
+-#else
+- return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_SHA1));
+-#endif
+-}
+-
+-static int
+-__archive_sha1update(archive_sha1_ctx *ctx, const void *indata,
+- size_t insize)
+-{
+- return (win_crypto_Update(ctx, indata, insize));
+-}
+-
+-static int
+-__archive_sha1final(archive_sha1_ctx *ctx, void *md)
+-{
+- return (win_crypto_Final(md, 20, ctx));
+-}
+-
+ #else
+
+ static int
+@@ -873,13 +920,42 @@
+ return (ARCHIVE_OK);
+ }
+
++#elif defined(ARCHIVE_CRYPTO_SHA256_WIN)
++
++static int
++__archive_sha256init(archive_sha256_ctx *ctx)
++{
++#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++ return (win_crypto_init(ctx, BCRYPT_SHA256_ALGORITHM));
++#else
++ return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_256));
++#endif
++}
++
++static int
++__archive_sha256update(archive_sha256_ctx *ctx, const void *indata,
++ size_t insize)
++{
++ return (win_crypto_Update(ctx, indata, insize));
++}
++
++static int
++__archive_sha256final(archive_sha256_ctx *ctx, void *md)
++{
++ return (win_crypto_Final(md, 32, ctx));
++}
++
+ #elif defined(ARCHIVE_CRYPTO_SHA256_MBEDTLS)
+
+ static int
+ __archive_sha256init(archive_sha256_ctx *ctx)
+ {
+ mbedtls_sha256_init(ctx);
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha256_starts(ctx, 0) == 0)
++#else
+ if (mbedtls_sha256_starts_ret(ctx, 0) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -889,7 +965,11 @@
+ __archive_sha256update(archive_sha256_ctx *ctx, const void *indata,
+ size_t insize)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha256_update(ctx, indata, insize) == 0)
++#else
+ if (mbedtls_sha256_update_ret(ctx, indata, insize) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -898,7 +978,11 @@
+ static int
+ __archive_sha256final(archive_sha256_ctx *ctx, void *md)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha256_finish(ctx, md) == 0) {
++#else
+ if (mbedtls_sha256_finish_ret(ctx, md) == 0) {
++#endif
+ mbedtls_sha256_free(ctx);
+ return (ARCHIVE_OK);
+ } else {
+@@ -962,31 +1046,6 @@
+ return (ARCHIVE_OK);
+ }
+
+-#elif defined(ARCHIVE_CRYPTO_SHA256_WIN)
+-
+-static int
+-__archive_sha256init(archive_sha256_ctx *ctx)
+-{
+-#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+- return (win_crypto_init(ctx, BCRYPT_SHA256_ALGORITHM));
+-#else
+- return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_256));
+-#endif
+-}
+-
+-static int
+-__archive_sha256update(archive_sha256_ctx *ctx, const void *indata,
+- size_t insize)
+-{
+- return (win_crypto_Update(ctx, indata, insize));
+-}
+-
+-static int
+-__archive_sha256final(archive_sha256_ctx *ctx, void *md)
+-{
+- return (win_crypto_Final(md, 32, ctx));
+-}
+-
+ #else
+
+ static int
+@@ -1113,13 +1172,42 @@
+ return (ARCHIVE_OK);
+ }
+
++#elif defined(ARCHIVE_CRYPTO_SHA384_WIN)
++
++static int
++__archive_sha384init(archive_sha384_ctx *ctx)
++{
++#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++ return (win_crypto_init(ctx, BCRYPT_SHA384_ALGORITHM));
++#else
++ return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_384));
++#endif
++}
++
++static int
++__archive_sha384update(archive_sha384_ctx *ctx, const void *indata,
++ size_t insize)
++{
++ return (win_crypto_Update(ctx, indata, insize));
++}
++
++static int
++__archive_sha384final(archive_sha384_ctx *ctx, void *md)
++{
++ return (win_crypto_Final(md, 48, ctx));
++}
++
+ #elif defined(ARCHIVE_CRYPTO_SHA384_MBEDTLS)
+
+ static int
+ __archive_sha384init(archive_sha384_ctx *ctx)
+ {
+ mbedtls_sha512_init(ctx);
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha512_starts(ctx, 1) == 0)
++#else
+ if (mbedtls_sha512_starts_ret(ctx, 1) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -1129,7 +1217,11 @@
+ __archive_sha384update(archive_sha384_ctx *ctx, const void *indata,
+ size_t insize)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha512_update(ctx, indata, insize) == 0)
++#else
+ if (mbedtls_sha512_update_ret(ctx, indata, insize) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -1138,7 +1230,11 @@
+ static int
+ __archive_sha384final(archive_sha384_ctx *ctx, void *md)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha512_finish(ctx, md) == 0) {
++#else
+ if (mbedtls_sha512_finish_ret(ctx, md) == 0) {
++#endif
+ mbedtls_sha512_free(ctx);
+ return (ARCHIVE_OK);
+ } else {
+@@ -1202,31 +1298,6 @@
+ return (ARCHIVE_OK);
+ }
+
+-#elif defined(ARCHIVE_CRYPTO_SHA384_WIN)
+-
+-static int
+-__archive_sha384init(archive_sha384_ctx *ctx)
+-{
+-#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+- return (win_crypto_init(ctx, BCRYPT_SHA384_ALGORITHM));
+-#else
+- return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_384));
+-#endif
+-}
+-
+-static int
+-__archive_sha384update(archive_sha384_ctx *ctx, const void *indata,
+- size_t insize)
+-{
+- return (win_crypto_Update(ctx, indata, insize));
+-}
+-
+-static int
+-__archive_sha384final(archive_sha384_ctx *ctx, void *md)
+-{
+- return (win_crypto_Final(md, 48, ctx));
+-}
+-
+ #else
+
+ static int
+@@ -1377,13 +1448,42 @@
+ return (ARCHIVE_OK);
+ }
+
++#elif defined(ARCHIVE_CRYPTO_SHA512_WIN)
++
++static int
++__archive_sha512init(archive_sha512_ctx *ctx)
++{
++#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++ return (win_crypto_init(ctx, BCRYPT_SHA512_ALGORITHM));
++#else
++ return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_512));
++#endif
++}
++
++static int
++__archive_sha512update(archive_sha512_ctx *ctx, const void *indata,
++ size_t insize)
++{
++ return (win_crypto_Update(ctx, indata, insize));
++}
++
++static int
++__archive_sha512final(archive_sha512_ctx *ctx, void *md)
++{
++ return (win_crypto_Final(md, 64, ctx));
++}
++
+ #elif defined(ARCHIVE_CRYPTO_SHA512_MBEDTLS)
+
+ static int
+ __archive_sha512init(archive_sha512_ctx *ctx)
+ {
+ mbedtls_sha512_init(ctx);
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha512_starts(ctx, 0) == 0)
++#else
+ if (mbedtls_sha512_starts_ret(ctx, 0) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -1393,7 +1493,11 @@
+ __archive_sha512update(archive_sha512_ctx *ctx, const void *indata,
+ size_t insize)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha512_update(ctx, indata, insize) == 0)
++#else
+ if (mbedtls_sha512_update_ret(ctx, indata, insize) == 0)
++#endif
+ return (ARCHIVE_OK);
+ else
+ return (ARCHIVE_FATAL);
+@@ -1402,7 +1506,11 @@
+ static int
+ __archive_sha512final(archive_sha512_ctx *ctx, void *md)
+ {
++#if MBEDTLS_VERSION_NUMBER > 0x03000000
++ if (mbedtls_sha512_finish(ctx, md) == 0) {
++#else
+ if (mbedtls_sha512_finish_ret(ctx, md) == 0) {
++#endif
+ mbedtls_sha512_free(ctx);
+ return (ARCHIVE_OK);
+ } else {
+@@ -1466,31 +1574,6 @@
+ return (ARCHIVE_OK);
+ }
+
+-#elif defined(ARCHIVE_CRYPTO_SHA512_WIN)
+-
+-static int
+-__archive_sha512init(archive_sha512_ctx *ctx)
+-{
+-#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+- return (win_crypto_init(ctx, BCRYPT_SHA512_ALGORITHM));
+-#else
+- return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_512));
+-#endif
+-}
+-
+-static int
+-__archive_sha512update(archive_sha512_ctx *ctx, const void *indata,
+- size_t insize)
+-{
+- return (win_crypto_Update(ctx, indata, insize));
+-}
+-
+-static int
+-__archive_sha512final(archive_sha512_ctx *ctx, void *md)
+-{
+- return (win_crypto_Final(md, 64, ctx));
+-}
+-
+ #else
+
+ static int
+@@ -1525,11 +1608,12 @@
+ * 1. libc
+ * 2. libc2
+ * 3. libc3
+- * 4. libSystem
+- * 5. Nettle
+- * 6. OpenSSL
+- * 7. libmd
+- * 8. Windows API
++ * 4. libmd
++ * 5. libSystem
++ * 6. Windows API
++ * 7. mbedTLS
++ * 8. Nettle
++ * 9. OpenSSL
+ */
+ const struct archive_digest __archive_digest =
+ {
+--- contrib/libarchive/libarchive/archive_digest_private.h.orig
++++ contrib/libarchive/libarchive/archive_digest_private.h
+@@ -113,6 +113,7 @@
+ defined(ARCHIVE_CRYPTO_SHA384_LIBSYSTEM) ||\
+ defined(ARCHIVE_CRYPTO_SHA512_LIBSYSTEM)
+ #include
++#define ARCHIVE_CRYPTO_CommonCrypto 1
+ #endif
+
+ /* mbed TLS crypto headers */
+@@ -167,6 +168,7 @@
+ #if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+ /* don't use bcrypt when XP needs to be supported */
+ #include
++#define ARCHIVE_CRYPTO_CNG 1
+ typedef struct {
+ int valid;
+ BCRYPT_ALG_HANDLE hAlg;
+@@ -175,6 +177,7 @@
+ #else
+ #include
+ #include
++#define ARCHIVE_CRYPTO_WINCRYPT 1
+ typedef struct {
+ int valid;
+ HCRYPTPROV cryptProv;
+@@ -190,14 +193,16 @@
+ typedef MD5_CTX archive_md5_ctx;
+ #elif defined(ARCHIVE_CRYPTO_MD5_LIBSYSTEM)
+ typedef CC_MD5_CTX archive_md5_ctx;
++#elif defined(ARCHIVE_CRYPTO_MD5_WIN)
++typedef Digest_CTX archive_md5_ctx;
+ #elif defined(ARCHIVE_CRYPTO_MD5_MBEDTLS)
++#define ARCHIVE_CRYPTO_MBED 1
+ typedef mbedtls_md5_context archive_md5_ctx;
+ #elif defined(ARCHIVE_CRYPTO_MD5_NETTLE)
++#define ARCHIVE_CRYPTO_NETTLE 1
+ typedef struct md5_ctx archive_md5_ctx;
+ #elif defined(ARCHIVE_CRYPTO_MD5_OPENSSL)
+ typedef EVP_MD_CTX *archive_md5_ctx;
+-#elif defined(ARCHIVE_CRYPTO_MD5_WIN)
+-typedef Digest_CTX archive_md5_ctx;
+ #else
+ typedef unsigned char archive_md5_ctx;
+ #endif
+@@ -207,8 +212,10 @@
+ #elif defined(ARCHIVE_CRYPTO_RMD160_LIBMD)
+ typedef RIPEMD160_CTX archive_rmd160_ctx;
+ #elif defined(ARCHIVE_CRYPTO_RMD160_MBEDTLS)
++#define ARCHIVE_CRYPTO_MBED 1
+ typedef mbedtls_ripemd160_context archive_rmd160_ctx;
+ #elif defined(ARCHIVE_CRYPTO_RMD160_NETTLE)
++#define ARCHIVE_CRYPTO_NETTLE 1
+ typedef struct ripemd160_ctx archive_rmd160_ctx;
+ #elif defined(ARCHIVE_CRYPTO_RMD160_OPENSSL)
+ typedef EVP_MD_CTX *archive_rmd160_ctx;
+@@ -222,14 +229,16 @@
+ typedef SHA1_CTX archive_sha1_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA1_LIBSYSTEM)
+ typedef CC_SHA1_CTX archive_sha1_ctx;
++#elif defined(ARCHIVE_CRYPTO_SHA1_WIN)
++typedef Digest_CTX archive_sha1_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA1_MBEDTLS)
++#define ARCHIVE_CRYPTO_MBED 1
+ typedef mbedtls_sha1_context archive_sha1_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA1_NETTLE)
++#define ARCHIVE_CRYPTO_NETTLE 1
+ typedef struct sha1_ctx archive_sha1_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA1_OPENSSL)
+ typedef EVP_MD_CTX *archive_sha1_ctx;
+-#elif defined(ARCHIVE_CRYPTO_SHA1_WIN)
+-typedef Digest_CTX archive_sha1_ctx;
+ #else
+ typedef unsigned char archive_sha1_ctx;
+ #endif
+@@ -244,14 +253,16 @@
+ typedef SHA256_CTX archive_sha256_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA256_LIBSYSTEM)
+ typedef CC_SHA256_CTX archive_sha256_ctx;
++#elif defined(ARCHIVE_CRYPTO_SHA256_WIN)
++typedef Digest_CTX archive_sha256_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA256_MBEDTLS)
++#define ARCHIVE_CRYPTO_MBED 1
+ typedef mbedtls_sha256_context archive_sha256_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA256_NETTLE)
++#define ARCHIVE_CRYPTO_NETTLE 1
+ typedef struct sha256_ctx archive_sha256_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA256_OPENSSL)
+ typedef EVP_MD_CTX *archive_sha256_ctx;
+-#elif defined(ARCHIVE_CRYPTO_SHA256_WIN)
+-typedef Digest_CTX archive_sha256_ctx;
+ #else
+ typedef unsigned char archive_sha256_ctx;
+ #endif
+@@ -264,14 +275,16 @@
+ typedef SHA2_CTX archive_sha384_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA384_LIBSYSTEM)
+ typedef CC_SHA512_CTX archive_sha384_ctx;
++#elif defined(ARCHIVE_CRYPTO_SHA384_WIN)
++typedef Digest_CTX archive_sha384_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA384_MBEDTLS)
++#define ARCHIVE_CRYPTO_MBED 1
+ typedef mbedtls_sha512_context archive_sha384_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA384_NETTLE)
++#define ARCHIVE_CRYPTO_NETTLE 1
+ typedef struct sha384_ctx archive_sha384_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA384_OPENSSL)
+ typedef EVP_MD_CTX *archive_sha384_ctx;
+-#elif defined(ARCHIVE_CRYPTO_SHA384_WIN)
+-typedef Digest_CTX archive_sha384_ctx;
+ #else
+ typedef unsigned char archive_sha384_ctx;
+ #endif
+@@ -286,14 +299,16 @@
+ typedef SHA512_CTX archive_sha512_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA512_LIBSYSTEM)
+ typedef CC_SHA512_CTX archive_sha512_ctx;
++#elif defined(ARCHIVE_CRYPTO_SHA512_WIN)
++typedef Digest_CTX archive_sha512_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA512_MBEDTLS)
++#define ARCHIVE_CRYPTO_MBED 1
+ typedef mbedtls_sha512_context archive_sha512_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA512_NETTLE)
++#define ARCHIVE_CRYPTO_NETTLE 1
+ typedef struct sha512_ctx archive_sha512_ctx;
+ #elif defined(ARCHIVE_CRYPTO_SHA512_OPENSSL)
+ typedef EVP_MD_CTX *archive_sha512_ctx;
+-#elif defined(ARCHIVE_CRYPTO_SHA512_WIN)
+-typedef Digest_CTX archive_sha512_ctx;
+ #else
+ typedef unsigned char archive_sha512_ctx;
+ #endif
+--- contrib/libarchive/libarchive/archive_disk_acl_freebsd.c.orig
++++ contrib/libarchive/libarchive/archive_disk_acl_freebsd.c
+@@ -262,7 +262,7 @@
+ }
+ for (i = 0; i < acl_nfs4_flag_map_size; ++i) {
+ r = acl_get_flag_np(acl_flagset,
+- acl_nfs4_flag_map[i].p_perm);
++ (acl_flag_t)acl_nfs4_flag_map[i].p_perm);
+ if (r == -1) {
+ archive_set_error(&a->archive, errno,
+ "Failed to check flag in a NFSv4 "
+@@ -517,7 +517,7 @@
+ for (i = 0; i < acl_nfs4_flag_map_size; ++i) {
+ if (ae_permset & acl_nfs4_flag_map[i].a_perm) {
+ if (acl_add_flag_np(acl_flagset,
+- acl_nfs4_flag_map[i].p_perm) != 0) {
++ (acl_flag_t)acl_nfs4_flag_map[i].p_perm) != 0) {
+ archive_set_error(a, errno,
+ "Failed to add flag to "
+ "NFSv4 ACL flagset");
+--- contrib/libarchive/libarchive/archive_entry.c.orig
++++ contrib/libarchive/libarchive/archive_entry.c
+@@ -275,7 +275,7 @@
+ * Functions for reading fields from an archive_entry.
+ */
+
+-time_t
++__LA_TIME_T
+ archive_entry_atime(struct archive_entry *entry)
+ {
+ return (entry->ae_stat.aest_atime);
+@@ -293,7 +293,7 @@
+ return (entry->ae_set & AE_SET_ATIME);
+ }
+
+-time_t
++__LA_TIME_T
+ archive_entry_birthtime(struct archive_entry *entry)
+ {
+ return (entry->ae_stat.aest_birthtime);
+@@ -311,7 +311,7 @@
+ return (entry->ae_set & AE_SET_BIRTHTIME);
+ }
+
+-time_t
++__LA_TIME_T
+ archive_entry_ctime(struct archive_entry *entry)
+ {
+ return (entry->ae_stat.aest_ctime);
+@@ -329,7 +329,7 @@
+ return (entry->ae_stat.aest_ctime_nsec);
+ }
+
+-dev_t
++__LA_DEV_T
+ archive_entry_dev(struct archive_entry *entry)
+ {
+ if (entry->ae_stat.aest_dev_is_broken_down)
+@@ -345,7 +345,7 @@
+ return (entry->ae_set & AE_SET_DEV);
+ }
+
+-dev_t
++__LA_DEV_T
+ archive_entry_devmajor(struct archive_entry *entry)
+ {
+ if (entry->ae_stat.aest_dev_is_broken_down)
+@@ -354,7 +354,7 @@
+ return major(entry->ae_stat.aest_dev);
+ }
+
+-dev_t
++__LA_DEV_T
+ archive_entry_devminor(struct archive_entry *entry)
+ {
+ if (entry->ae_stat.aest_dev_is_broken_down)
+@@ -568,7 +568,7 @@
+ return (entry->acl.mode);
+ }
+
+-time_t
++__LA_TIME_T
+ archive_entry_mtime(struct archive_entry *entry)
+ {
+ return (entry->ae_stat.aest_mtime);
+@@ -667,7 +667,7 @@
+ return (entry->ae_set & AE_SET_RDEV);
+ }
+
+-dev_t
++__LA_DEV_T
+ archive_entry_rdev(struct archive_entry *entry)
+ {
+ if (archive_entry_rdev_is_set(entry)) {
+@@ -681,7 +681,7 @@
+ }
+ }
+
+-dev_t
++__LA_DEV_T
+ archive_entry_rdevmajor(struct archive_entry *entry)
+ {
+ if (archive_entry_rdev_is_set(entry)) {
+@@ -694,7 +694,7 @@
+ }
+ }
+
+-dev_t
++__LA_DEV_T
+ archive_entry_rdevminor(struct archive_entry *entry)
+ {
+ if (archive_entry_rdev_is_set(entry)) {
+@@ -984,7 +984,9 @@
+ archive_entry_set_ino(struct archive_entry *entry, la_int64_t ino)
+ {
+ if (ino < 0) {
+- ino = 0;
++ entry->stat_valid = 0;
++ entry->ae_set &= ~AE_SET_INO;
++ return;
+ }
+ entry->stat_valid = 0;
+ entry->ae_set |= AE_SET_INO;
+@@ -995,7 +997,9 @@
+ archive_entry_set_ino64(struct archive_entry *entry, la_int64_t ino)
+ {
+ if (ino < 0) {
+- ino = 0;
++ entry->stat_valid = 0;
++ entry->ae_set &= ~AE_SET_INO;
++ return;
+ }
+ entry->stat_valid = 0;
+ entry->ae_set |= AE_SET_INO;
+@@ -1088,7 +1092,7 @@
+ }
+
+ void
+-archive_entry_set_atime(struct archive_entry *entry, time_t t, long ns)
++archive_entry_set_atime(struct archive_entry *entry, __LA_TIME_T t, long ns)
+ {
+ FIX_NS(t, ns);
+ entry->stat_valid = 0;
+@@ -1105,7 +1109,7 @@
+ }
+
+ void
+-archive_entry_set_birthtime(struct archive_entry *entry, time_t t, long ns)
++archive_entry_set_birthtime(struct archive_entry *entry, __LA_TIME_T t, long ns)
+ {
+ FIX_NS(t, ns);
+ entry->stat_valid = 0;
+@@ -1122,7 +1126,7 @@
+ }
+
+ void
+-archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns)
++archive_entry_set_ctime(struct archive_entry *entry, __LA_TIME_T t, long ns)
+ {
+ FIX_NS(t, ns);
+ entry->stat_valid = 0;
+@@ -1139,7 +1143,7 @@
+ }
+
+ void
+-archive_entry_set_dev(struct archive_entry *entry, dev_t d)
++archive_entry_set_dev(struct archive_entry *entry, __LA_DEV_T d)
+ {
+ entry->stat_valid = 0;
+ entry->ae_set |= AE_SET_DEV;
+@@ -1148,7 +1152,7 @@
+ }
+
+ void
+-archive_entry_set_devmajor(struct archive_entry *entry, dev_t m)
++archive_entry_set_devmajor(struct archive_entry *entry, __LA_DEV_T m)
+ {
+ entry->stat_valid = 0;
+ entry->ae_set |= AE_SET_DEV;
+@@ -1157,7 +1161,7 @@
+ }
+
+ void
+-archive_entry_set_devminor(struct archive_entry *entry, dev_t m)
++archive_entry_set_devminor(struct archive_entry *entry, __LA_DEV_T m)
+ {
+ entry->stat_valid = 0;
+ entry->ae_set |= AE_SET_DEV;
+@@ -1243,7 +1247,7 @@
+ }
+
+ void
+-archive_entry_set_mtime(struct archive_entry *entry, time_t t, long ns)
++archive_entry_set_mtime(struct archive_entry *entry, __LA_TIME_T t, long ns)
+ {
+ FIX_NS(t, ns);
+ entry->stat_valid = 0;
+@@ -1319,7 +1323,7 @@
+ }
+
+ void
+-archive_entry_set_rdev(struct archive_entry *entry, dev_t m)
++archive_entry_set_rdev(struct archive_entry *entry, __LA_DEV_T m)
+ {
+ entry->stat_valid = 0;
+ entry->ae_stat.aest_rdev = m;
+@@ -1330,7 +1334,7 @@
+ }
+
+ void
+-archive_entry_set_rdevmajor(struct archive_entry *entry, dev_t m)
++archive_entry_set_rdevmajor(struct archive_entry *entry, __LA_DEV_T m)
+ {
+ entry->stat_valid = 0;
+ entry->ae_stat.aest_rdev_is_broken_down = 1;
+@@ -1340,7 +1344,7 @@
+ }
+
+ void
+-archive_entry_set_rdevminor(struct archive_entry *entry, dev_t m)
++archive_entry_set_rdevminor(struct archive_entry *entry, __LA_DEV_T m)
+ {
+ entry->stat_valid = 0;
+ entry->ae_stat.aest_rdev_is_broken_down = 1;
+@@ -1603,21 +1607,27 @@
+ switch (type) {
+ case ARCHIVE_ENTRY_DIGEST_MD5:
+ copy_digest(entry, md5, digest);
++ entry->mset_digest |= AE_MSET_DIGEST_MD5;
+ break;
+ case ARCHIVE_ENTRY_DIGEST_RMD160:
+ copy_digest(entry, rmd160, digest);
++ entry->mset_digest |= AE_MSET_DIGEST_RMD160;
+ break;
+ case ARCHIVE_ENTRY_DIGEST_SHA1:
+ copy_digest(entry, sha1, digest);
++ entry->mset_digest |= AE_MSET_DIGEST_SHA1;
+ break;
+ case ARCHIVE_ENTRY_DIGEST_SHA256:
+ copy_digest(entry, sha256, digest);
++ entry->mset_digest |= AE_MSET_DIGEST_SHA256;
+ break;
+ case ARCHIVE_ENTRY_DIGEST_SHA384:
+ copy_digest(entry, sha384, digest);
++ entry->mset_digest |= AE_MSET_DIGEST_SHA384;
+ break;
+ case ARCHIVE_ENTRY_DIGEST_SHA512:
+ copy_digest(entry, sha512, digest);
++ entry->mset_digest |= AE_MSET_DIGEST_SHA512;
+ break;
+ default:
+ return ARCHIVE_WARN;
+--- contrib/libarchive/libarchive/archive_entry.h.orig
++++ contrib/libarchive/libarchive/archive_entry.h
+@@ -28,7 +28,7 @@
+ #define ARCHIVE_ENTRY_H_INCLUDED
+
+ /* Note: Compiler will complain if this does not match archive.h! */
+-#define ARCHIVE_VERSION_NUMBER 3007007
++#define ARCHIVE_VERSION_NUMBER 3008001
+
+ /*
+ * Note: archive_entry.h is for use outside of libarchive; the
+@@ -40,8 +40,11 @@
+
+ #include
+ #include /* for wchar_t */
+-#include
++#include /* for C99 int64_t, etc. */
++#if ARCHIVE_VERSION_NUMBER < 4000000
++/* time_t is slated to be removed from public includes in 4.0 */
+ #include
++#endif
+
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ #include
+@@ -55,12 +58,15 @@
+ #define __LA_INT64_T_DEFINED
+ # if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
+ typedef __int64 la_int64_t;
++typedef unsigned __int64 la_uint64_t;
+ # else
+ #include
+ # if defined(_SCO_DS) || defined(__osf__)
+ typedef long long la_int64_t;
++typedef unsigned long long la_uint64_t;
+ # else
+ typedef int64_t la_int64_t;
++typedef uint64_t la_uint64_t;
+ # endif
+ # endif
+ #endif
+@@ -96,6 +102,30 @@
+ # define __LA_MODE_T mode_t
+ #endif
+
++#if ARCHIVE_VERSION_NUMBER < 4000000
++/* Use the platform types for time_t */
++#define __LA_TIME_T time_t
++#else
++/* Use 64-bits integer types for time_t */
++#define __LA_TIME_T la_int64_t
++#endif
++
++#if ARCHIVE_VERSION_NUMBER < 4000000
++/* Use the platform types for dev_t */
++#define __LA_DEV_T dev_t
++#else
++/* Use 64-bits integer types for dev_t */
++#define __LA_DEV_T la_int64_t
++#endif
++
++#if ARCHIVE_VERSION_NUMBER < 4000000
++/* Libarchive 3.x used signed int64 for inode numbers */
++#define __LA_INO_T la_int64_t
++#else
++/* Switch to unsigned for libarchive 4.0 */
++#define __LA_INO_T la_uint64_t
++#endif
++
+ /* Large file support for Android */
+ #if defined(__LIBARCHIVE_BUILD) && defined(__ANDROID__)
+ #include "android_lf.h"
+@@ -127,7 +157,8 @@
+ # define __LA_DECL
+ #endif
+
+-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
++#if defined(__GNUC__) && (__GNUC__ > 3 || \
++ (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+ # define __LA_DEPRECATED __attribute__((deprecated))
+ #else
+ # define __LA_DEPRECATED
+@@ -235,19 +266,19 @@
+ * also return NULL when implicit character set conversions fail.
+ * This is usually what you want.
+ */
+-__LA_DECL time_t archive_entry_atime(struct archive_entry *);
++__LA_DECL __LA_TIME_T archive_entry_atime(struct archive_entry *);
+ __LA_DECL long archive_entry_atime_nsec(struct archive_entry *);
+ __LA_DECL int archive_entry_atime_is_set(struct archive_entry *);
+-__LA_DECL time_t archive_entry_birthtime(struct archive_entry *);
++__LA_DECL __LA_TIME_T archive_entry_birthtime(struct archive_entry *);
+ __LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *);
+ __LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *);
+-__LA_DECL time_t archive_entry_ctime(struct archive_entry *);
++__LA_DECL __LA_TIME_T archive_entry_ctime(struct archive_entry *);
+ __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *);
+ __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *);
+-__LA_DECL dev_t archive_entry_dev(struct archive_entry *);
++__LA_DECL __LA_DEV_T archive_entry_dev(struct archive_entry *);
+ __LA_DECL int archive_entry_dev_is_set(struct archive_entry *);
+-__LA_DECL dev_t archive_entry_devmajor(struct archive_entry *);
+-__LA_DECL dev_t archive_entry_devminor(struct archive_entry *);
++__LA_DECL __LA_DEV_T archive_entry_devmajor(struct archive_entry *);
++__LA_DECL __LA_DEV_T archive_entry_devminor(struct archive_entry *);
+ __LA_DECL __LA_MODE_T archive_entry_filetype(struct archive_entry *);
+ __LA_DECL int archive_entry_filetype_is_set(struct archive_entry *);
+ __LA_DECL void archive_entry_fflags(struct archive_entry *,
+@@ -264,8 +295,8 @@
+ __LA_DECL const char *archive_entry_hardlink_utf8(struct archive_entry *);
+ __LA_DECL const wchar_t *archive_entry_hardlink_w(struct archive_entry *);
+ __LA_DECL int archive_entry_hardlink_is_set(struct archive_entry *);
+-__LA_DECL la_int64_t archive_entry_ino(struct archive_entry *);
+-__LA_DECL la_int64_t archive_entry_ino64(struct archive_entry *);
++__LA_DECL __LA_INO_T archive_entry_ino(struct archive_entry *);
++__LA_DECL __LA_INO_T archive_entry_ino64(struct archive_entry *);
+ __LA_DECL int archive_entry_ino_is_set(struct archive_entry *);
+ __LA_DECL __LA_MODE_T archive_entry_mode(struct archive_entry *);
+ __LA_DECL time_t archive_entry_mtime(struct archive_entry *);
+@@ -278,9 +309,9 @@
+ __LA_DECL __LA_MODE_T archive_entry_perm(struct archive_entry *);
+ __LA_DECL int archive_entry_perm_is_set(struct archive_entry *);
+ __LA_DECL int archive_entry_rdev_is_set(struct archive_entry *);
+-__LA_DECL dev_t archive_entry_rdev(struct archive_entry *);
+-__LA_DECL dev_t archive_entry_rdevmajor(struct archive_entry *);
+-__LA_DECL dev_t archive_entry_rdevminor(struct archive_entry *);
++__LA_DECL __LA_DEV_T archive_entry_rdev(struct archive_entry *);
++__LA_DECL __LA_DEV_T archive_entry_rdevmajor(struct archive_entry *);
++__LA_DECL __LA_DEV_T archive_entry_rdevminor(struct archive_entry *);
+ __LA_DECL const char *archive_entry_sourcepath(struct archive_entry *);
+ __LA_DECL const wchar_t *archive_entry_sourcepath_w(struct archive_entry *);
+ __LA_DECL la_int64_t archive_entry_size(struct archive_entry *);
+@@ -309,18 +340,18 @@
+ * always copied.
+ */
+
+-__LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long);
++__LA_DECL void archive_entry_set_atime(struct archive_entry *, __LA_TIME_T, long);
+ __LA_DECL void archive_entry_unset_atime(struct archive_entry *);
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ __LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, BY_HANDLE_FILE_INFORMATION *);
+ #endif
+-__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long);
++__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, __LA_TIME_T, long);
+ __LA_DECL void archive_entry_unset_birthtime(struct archive_entry *);
+-__LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long);
++__LA_DECL void archive_entry_set_ctime(struct archive_entry *, __LA_TIME_T, long);
+ __LA_DECL void archive_entry_unset_ctime(struct archive_entry *);
+-__LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t);
+-__LA_DECL void archive_entry_set_devmajor(struct archive_entry *, dev_t);
+-__LA_DECL void archive_entry_set_devminor(struct archive_entry *, dev_t);
++__LA_DECL void archive_entry_set_dev(struct archive_entry *, __LA_DEV_T);
++__LA_DECL void archive_entry_set_devmajor(struct archive_entry *, __LA_DEV_T);
++__LA_DECL void archive_entry_set_devminor(struct archive_entry *, __LA_DEV_T);
+ __LA_DECL void archive_entry_set_filetype(struct archive_entry *, unsigned int);
+ __LA_DECL void archive_entry_set_fflags(struct archive_entry *,
+ unsigned long /* set */, unsigned long /* clear */);
+@@ -343,15 +374,15 @@
+ __LA_DECL void archive_entry_copy_hardlink(struct archive_entry *, const char *);
+ __LA_DECL void archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *);
+ __LA_DECL int archive_entry_update_hardlink_utf8(struct archive_entry *, const char *);
+-__LA_DECL void archive_entry_set_ino(struct archive_entry *, la_int64_t);
+-__LA_DECL void archive_entry_set_ino64(struct archive_entry *, la_int64_t);
++__LA_DECL void archive_entry_set_ino(struct archive_entry *, __LA_INO_T);
++__LA_DECL void archive_entry_set_ino64(struct archive_entry *, __LA_INO_T);
+ __LA_DECL void archive_entry_set_link(struct archive_entry *, const char *);
+ __LA_DECL void archive_entry_set_link_utf8(struct archive_entry *, const char *);
+ __LA_DECL void archive_entry_copy_link(struct archive_entry *, const char *);
+ __LA_DECL void archive_entry_copy_link_w(struct archive_entry *, const wchar_t *);
+ __LA_DECL int archive_entry_update_link_utf8(struct archive_entry *, const char *);
+ __LA_DECL void archive_entry_set_mode(struct archive_entry *, __LA_MODE_T);
+-__LA_DECL void archive_entry_set_mtime(struct archive_entry *, time_t, long);
++__LA_DECL void archive_entry_set_mtime(struct archive_entry *, __LA_TIME_T, long);
+ __LA_DECL void archive_entry_unset_mtime(struct archive_entry *);
+ __LA_DECL void archive_entry_set_nlink(struct archive_entry *, unsigned int);
+ __LA_DECL void archive_entry_set_pathname(struct archive_entry *, const char *);
+@@ -360,9 +391,9 @@
+ __LA_DECL void archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *);
+ __LA_DECL int archive_entry_update_pathname_utf8(struct archive_entry *, const char *);
+ __LA_DECL void archive_entry_set_perm(struct archive_entry *, __LA_MODE_T);
+-__LA_DECL void archive_entry_set_rdev(struct archive_entry *, dev_t);
+-__LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
+-__LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, dev_t);
++__LA_DECL void archive_entry_set_rdev(struct archive_entry *, __LA_DEV_T);
++__LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, __LA_DEV_T);
++__LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, __LA_DEV_T);
+ __LA_DECL void archive_entry_set_size(struct archive_entry *, la_int64_t);
+ __LA_DECL void archive_entry_unset_size(struct archive_entry *);
+ __LA_DECL void archive_entry_copy_sourcepath(struct archive_entry *, const char *);
+@@ -418,6 +449,7 @@
+ #define ARCHIVE_ENTRY_DIGEST_SHA512 0x00000006
+
+ __LA_DECL const unsigned char * archive_entry_digest(struct archive_entry *, int /* type */);
++__LA_DECL int archive_entry_set_digest(struct archive_entry *, int, const unsigned char *);
+
+ /*
+ * ACL routines. This used to simply store and return text-format ACL
+--- contrib/libarchive/libarchive/archive_entry_link_resolver.c.orig
++++ contrib/libarchive/libarchive/archive_entry_link_resolver.c
+@@ -280,6 +280,10 @@
+ dev_t dev;
+ int64_t ino;
+
++ if (!archive_entry_ino_is_set(entry) || !archive_entry_dev_is_set(entry)) {
++ return (NULL);
++ }
++
+ /* Free a held entry. */
+ if (res->spare != NULL) {
+ archive_entry_free(res->spare->canonical);
+@@ -369,6 +373,10 @@
+ struct links_entry *le;
+ size_t hash, bucket;
+
++ if (!archive_entry_ino_is_set(entry) || !archive_entry_dev_is_set(entry)) {
++ return (NULL);
++ }
++
+ /* Add this entry to the links cache. */
+ le = calloc(1, sizeof(struct links_entry));
+ if (le == NULL)
+--- contrib/libarchive/libarchive/archive_entry_locale.h.orig
++++ contrib/libarchive/libarchive/archive_entry_locale.h
+@@ -87,4 +87,4 @@
+ int _archive_entry_copy_uname_l(struct archive_entry *,
+ const char *, size_t, struct archive_string_conv *);
+
+-#endif /* ARCHIVE_ENTRY_LOCALE_H_INCLUDED */
++#endif /* !ARCHIVE_ENTRY_LOCALE_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_entry_private.h.orig
++++ contrib/libarchive/libarchive/archive_entry_private.h
+@@ -174,6 +174,13 @@
+ size_t mac_metadata_size;
+
+ /* Digest support. */
++#define AE_MSET_DIGEST_MD5 1
++#define AE_MSET_DIGEST_RMD160 2
++#define AE_MSET_DIGEST_SHA1 4
++#define AE_MSET_DIGEST_SHA256 8
++#define AE_MSET_DIGEST_SHA384 16
++#define AE_MSET_DIGEST_SHA512 32
++ uint_least32_t mset_digest;
+ struct ae_digest digest;
+
+ /* ACL support. */
+@@ -195,8 +202,4 @@
+ int ae_symlink_type;
+ };
+
+-int
+-archive_entry_set_digest(struct archive_entry *entry, int type,
+- const unsigned char *digest);
+-
+-#endif /* ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
++#endif /* !ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_getdate.c.orig
++++ contrib/libarchive/libarchive/archive_getdate.c
+@@ -1,1100 +0,0 @@
+-/*
+- * This code is in the public domain and has no copyright.
+- *
+- * This is a plain C recursive-descent translation of an old
+- * public-domain YACC grammar that has been used for parsing dates in
+- * very many open-source projects.
+- *
+- * Since the original authors were generous enough to donate their
+- * work to the public domain, I feel compelled to match their
+- * generosity.
+- *
+- * Tim Kientzle, February 2009.
+- */
+-
+-/*
+- * Header comment from original getdate.y:
+- */
+-
+-/*
+-** Originally written by Steven M. Bellovin while
+-** at the University of North Carolina at Chapel Hill. Later tweaked by
+-** a couple of people on Usenet. Completely overhauled by Rich $alz
+-** and Jim Berets in August, 1990;
+-**
+-** This grammar has 10 shift/reduce conflicts.
+-**
+-** This code is in the public domain and has no copyright.
+-*/
+-
+-#include "archive_platform.h"
+-
+-#include
+-#include
+-#include
+-#include
+-#include
+-
+-#define __LIBARCHIVE_BUILD 1
+-#include "archive_getdate.h"
+-
+-/* Basic time units. */
+-#define EPOCH 1970
+-#define MINUTE (60L)
+-#define HOUR (60L * MINUTE)
+-#define DAY (24L * HOUR)
+-
+-/* Daylight-savings mode: on, off, or not yet known. */
+-enum DSTMODE { DSTon, DSToff, DSTmaybe };
+-/* Meridian: am or pm. */
+-enum { tAM, tPM };
+-/* Token types returned by nexttoken() */
+-enum { tAGO = 260, tDAY, tDAYZONE, tAMPM, tMONTH, tMONTH_UNIT, tSEC_UNIT,
+- tUNUMBER, tZONE, tDST };
+-struct token { int token; time_t value; };
+-
+-/*
+- * Parser state.
+- */
+-struct gdstate {
+- struct token *tokenp; /* Pointer to next token. */
+- /* HaveXxxx counts how many of this kind of phrase we've seen;
+- * it's a fatal error to have more than one time, zone, day,
+- * or date phrase. */
+- int HaveYear;
+- int HaveMonth;
+- int HaveDay;
+- int HaveWeekDay; /* Day of week */
+- int HaveTime; /* Hour/minute/second */
+- int HaveZone; /* timezone and/or DST info */
+- int HaveRel; /* time offset; we can have more than one */
+- /* Absolute time values. */
+- time_t Timezone; /* Seconds offset from GMT */
+- time_t Day;
+- time_t Hour;
+- time_t Minutes;
+- time_t Month;
+- time_t Seconds;
+- time_t Year;
+- /* DST selection */
+- enum DSTMODE DSTmode;
+- /* Day of week accounting, e.g., "3rd Tuesday" */
+- time_t DayOrdinal; /* "3" in "3rd Tuesday" */
+- time_t DayNumber; /* "Tuesday" in "3rd Tuesday" */
+- /* Relative time values: hour/day/week offsets are measured in
+- * seconds, month/year are counted in months. */
+- time_t RelMonth;
+- time_t RelSeconds;
+-};
+-
+-/*
+- * A series of functions that recognize certain common time phrases.
+- * Each function returns 1 if it managed to make sense of some of the
+- * tokens, zero otherwise.
+- */
+-
+-/*
+- * hour:minute or hour:minute:second with optional AM, PM, or numeric
+- * timezone offset
+- */
+-static int
+-timephrase(struct gdstate *gds)
+-{
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == ':'
+- && gds->tokenp[2].token == tUNUMBER
+- && gds->tokenp[3].token == ':'
+- && gds->tokenp[4].token == tUNUMBER) {
+- /* "12:14:18" or "22:08:07" */
+- ++gds->HaveTime;
+- gds->Hour = gds->tokenp[0].value;
+- gds->Minutes = gds->tokenp[2].value;
+- gds->Seconds = gds->tokenp[4].value;
+- gds->tokenp += 5;
+- }
+- else if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == ':'
+- && gds->tokenp[2].token == tUNUMBER) {
+- /* "12:14" or "22:08" */
+- ++gds->HaveTime;
+- gds->Hour = gds->tokenp[0].value;
+- gds->Minutes = gds->tokenp[2].value;
+- gds->Seconds = 0;
+- gds->tokenp += 3;
+- }
+- else if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == tAMPM) {
+- /* "7" is a time if it's followed by "am" or "pm" */
+- ++gds->HaveTime;
+- gds->Hour = gds->tokenp[0].value;
+- gds->Minutes = gds->Seconds = 0;
+- /* We'll handle the AM/PM below. */
+- gds->tokenp += 1;
+- } else {
+- /* We can't handle this. */
+- return 0;
+- }
+-
+- if (gds->tokenp[0].token == tAMPM) {
+- /* "7:12pm", "12:20:13am" */
+- if (gds->Hour == 12)
+- gds->Hour = 0;
+- if (gds->tokenp[0].value == tPM)
+- gds->Hour += 12;
+- gds->tokenp += 1;
+- }
+- if (gds->tokenp[0].token == '+'
+- && gds->tokenp[1].token == tUNUMBER) {
+- /* "7:14+0700" */
+- gds->HaveZone++;
+- gds->DSTmode = DSToff;
+- gds->Timezone = - ((gds->tokenp[1].value / 100) * HOUR
+- + (gds->tokenp[1].value % 100) * MINUTE);
+- gds->tokenp += 2;
+- }
+- if (gds->tokenp[0].token == '-'
+- && gds->tokenp[1].token == tUNUMBER) {
+- /* "19:14:12-0530" */
+- gds->HaveZone++;
+- gds->DSTmode = DSToff;
+- gds->Timezone = + ((gds->tokenp[1].value / 100) * HOUR
+- + (gds->tokenp[1].value % 100) * MINUTE);
+- gds->tokenp += 2;
+- }
+- return 1;
+-}
+-
+-/*
+- * Timezone name, possibly including DST.
+- */
+-static int
+-zonephrase(struct gdstate *gds)
+-{
+- if (gds->tokenp[0].token == tZONE
+- && gds->tokenp[1].token == tDST) {
+- gds->HaveZone++;
+- gds->Timezone = gds->tokenp[0].value;
+- gds->DSTmode = DSTon;
+- gds->tokenp += 1;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tZONE) {
+- gds->HaveZone++;
+- gds->Timezone = gds->tokenp[0].value;
+- gds->DSTmode = DSToff;
+- gds->tokenp += 1;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tDAYZONE) {
+- gds->HaveZone++;
+- gds->Timezone = gds->tokenp[0].value;
+- gds->DSTmode = DSTon;
+- gds->tokenp += 1;
+- return 1;
+- }
+- return 0;
+-}
+-
+-/*
+- * Year/month/day in various combinations.
+- */
+-static int
+-datephrase(struct gdstate *gds)
+-{
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == '/'
+- && gds->tokenp[2].token == tUNUMBER
+- && gds->tokenp[3].token == '/'
+- && gds->tokenp[4].token == tUNUMBER) {
+- gds->HaveYear++;
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- if (gds->tokenp[0].value >= 13) {
+- /* First number is big: 2004/01/29, 99/02/17 */
+- gds->Year = gds->tokenp[0].value;
+- gds->Month = gds->tokenp[2].value;
+- gds->Day = gds->tokenp[4].value;
+- } else if ((gds->tokenp[4].value >= 13)
+- || (gds->tokenp[2].value >= 13)) {
+- /* Last number is big: 01/07/98 */
+- /* Middle number is big: 01/29/04 */
+- gds->Month = gds->tokenp[0].value;
+- gds->Day = gds->tokenp[2].value;
+- gds->Year = gds->tokenp[4].value;
+- } else {
+- /* No significant clues: 02/03/04 */
+- gds->Month = gds->tokenp[0].value;
+- gds->Day = gds->tokenp[2].value;
+- gds->Year = gds->tokenp[4].value;
+- }
+- gds->tokenp += 5;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == '/'
+- && gds->tokenp[2].token == tUNUMBER) {
+- /* "1/15" */
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- gds->Month = gds->tokenp[0].value;
+- gds->Day = gds->tokenp[2].value;
+- gds->tokenp += 3;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == '-'
+- && gds->tokenp[2].token == tUNUMBER
+- && gds->tokenp[3].token == '-'
+- && gds->tokenp[4].token == tUNUMBER) {
+- /* ISO 8601 format. yyyy-mm-dd. */
+- gds->HaveYear++;
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- gds->Year = gds->tokenp[0].value;
+- gds->Month = gds->tokenp[2].value;
+- gds->Day = gds->tokenp[4].value;
+- gds->tokenp += 5;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == '-'
+- && gds->tokenp[2].token == tMONTH
+- && gds->tokenp[3].token == '-'
+- && gds->tokenp[4].token == tUNUMBER) {
+- gds->HaveYear++;
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- if (gds->tokenp[0].value > 31) {
+- /* e.g. 1992-Jun-17 */
+- gds->Year = gds->tokenp[0].value;
+- gds->Month = gds->tokenp[2].value;
+- gds->Day = gds->tokenp[4].value;
+- } else {
+- /* e.g. 17-JUN-1992. */
+- gds->Day = gds->tokenp[0].value;
+- gds->Month = gds->tokenp[2].value;
+- gds->Year = gds->tokenp[4].value;
+- }
+- gds->tokenp += 5;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tMONTH
+- && gds->tokenp[1].token == tUNUMBER
+- && gds->tokenp[2].token == ','
+- && gds->tokenp[3].token == tUNUMBER) {
+- /* "June 17, 2001" */
+- gds->HaveYear++;
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- gds->Month = gds->tokenp[0].value;
+- gds->Day = gds->tokenp[1].value;
+- gds->Year = gds->tokenp[3].value;
+- gds->tokenp += 4;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tMONTH
+- && gds->tokenp[1].token == tUNUMBER) {
+- /* "May 3" */
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- gds->Month = gds->tokenp[0].value;
+- gds->Day = gds->tokenp[1].value;
+- gds->tokenp += 2;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == tMONTH
+- && gds->tokenp[2].token == tUNUMBER) {
+- /* "12 Sept 1997" */
+- gds->HaveYear++;
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- gds->Day = gds->tokenp[0].value;
+- gds->Month = gds->tokenp[1].value;
+- gds->Year = gds->tokenp[2].value;
+- gds->tokenp += 3;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == tMONTH) {
+- /* "12 Sept" */
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- gds->Day = gds->tokenp[0].value;
+- gds->Month = gds->tokenp[1].value;
+- gds->tokenp += 2;
+- return 1;
+- }
+-
+- return 0;
+-}
+-
+-/*
+- * Relative time phrase: "tomorrow", "yesterday", "+1 hour", etc.
+- */
+-static int
+-relunitphrase(struct gdstate *gds)
+-{
+- if (gds->tokenp[0].token == '-'
+- && gds->tokenp[1].token == tUNUMBER
+- && gds->tokenp[2].token == tSEC_UNIT) {
+- /* "-3 hours" */
+- gds->HaveRel++;
+- gds->RelSeconds -= gds->tokenp[1].value * gds->tokenp[2].value;
+- gds->tokenp += 3;
+- return 1;
+- }
+- if (gds->tokenp[0].token == '+'
+- && gds->tokenp[1].token == tUNUMBER
+- && gds->tokenp[2].token == tSEC_UNIT) {
+- /* "+1 minute" */
+- gds->HaveRel++;
+- gds->RelSeconds += gds->tokenp[1].value * gds->tokenp[2].value;
+- gds->tokenp += 3;
+- return 1;
+- }
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == tSEC_UNIT) {
+- /* "1 day" */
+- gds->HaveRel++;
+- gds->RelSeconds += gds->tokenp[0].value * gds->tokenp[1].value;
+- gds->tokenp += 2;
+- return 1;
+- }
+- if (gds->tokenp[0].token == '-'
+- && gds->tokenp[1].token == tUNUMBER
+- && gds->tokenp[2].token == tMONTH_UNIT) {
+- /* "-3 months" */
+- gds->HaveRel++;
+- gds->RelMonth -= gds->tokenp[1].value * gds->tokenp[2].value;
+- gds->tokenp += 3;
+- return 1;
+- }
+- if (gds->tokenp[0].token == '+'
+- && gds->tokenp[1].token == tUNUMBER
+- && gds->tokenp[2].token == tMONTH_UNIT) {
+- /* "+5 years" */
+- gds->HaveRel++;
+- gds->RelMonth += gds->tokenp[1].value * gds->tokenp[2].value;
+- gds->tokenp += 3;
+- return 1;
+- }
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == tMONTH_UNIT) {
+- /* "2 years" */
+- gds->HaveRel++;
+- gds->RelMonth += gds->tokenp[0].value * gds->tokenp[1].value;
+- gds->tokenp += 2;
+- return 1;
+- }
+- if (gds->tokenp[0].token == tSEC_UNIT) {
+- /* "now", "tomorrow" */
+- gds->HaveRel++;
+- gds->RelSeconds += gds->tokenp[0].value;
+- gds->tokenp += 1;
+- return 1;
+- }
+- if (gds->tokenp[0].token == tMONTH_UNIT) {
+- /* "month" */
+- gds->HaveRel++;
+- gds->RelMonth += gds->tokenp[0].value;
+- gds->tokenp += 1;
+- return 1;
+- }
+- return 0;
+-}
+-
+-/*
+- * Day of the week specification.
+- */
+-static int
+-dayphrase(struct gdstate *gds)
+-{
+- if (gds->tokenp[0].token == tDAY) {
+- /* "tues", "wednesday," */
+- gds->HaveWeekDay++;
+- gds->DayOrdinal = 1;
+- gds->DayNumber = gds->tokenp[0].value;
+- gds->tokenp += 1;
+- if (gds->tokenp[0].token == ',')
+- gds->tokenp += 1;
+- return 1;
+- }
+- if (gds->tokenp[0].token == tUNUMBER
+- && gds->tokenp[1].token == tDAY) {
+- /* "second tues" "3 wed" */
+- gds->HaveWeekDay++;
+- gds->DayOrdinal = gds->tokenp[0].value;
+- gds->DayNumber = gds->tokenp[1].value;
+- gds->tokenp += 2;
+- return 1;
+- }
+- return 0;
+-}
+-
+-/*
+- * Try to match a phrase using one of the above functions.
+- * This layer also deals with a couple of generic issues.
+- */
+-static int
+-phrase(struct gdstate *gds)
+-{
+- if (timephrase(gds))
+- return 1;
+- if (zonephrase(gds))
+- return 1;
+- if (datephrase(gds))
+- return 1;
+- if (dayphrase(gds))
+- return 1;
+- if (relunitphrase(gds)) {
+- if (gds->tokenp[0].token == tAGO) {
+- gds->RelSeconds = -gds->RelSeconds;
+- gds->RelMonth = -gds->RelMonth;
+- gds->tokenp += 1;
+- }
+- return 1;
+- }
+-
+- /* Bare numbers sometimes have meaning. */
+- if (gds->tokenp[0].token == tUNUMBER) {
+- if (gds->HaveTime && !gds->HaveYear && !gds->HaveRel) {
+- gds->HaveYear++;
+- gds->Year = gds->tokenp[0].value;
+- gds->tokenp += 1;
+- return 1;
+- }
+-
+- if(gds->tokenp[0].value > 10000) {
+- /* "20040301" */
+- gds->HaveYear++;
+- gds->HaveMonth++;
+- gds->HaveDay++;
+- gds->Day= (gds->tokenp[0].value)%100;
+- gds->Month= (gds->tokenp[0].value/100)%100;
+- gds->Year = gds->tokenp[0].value/10000;
+- gds->tokenp += 1;
+- return 1;
+- }
+-
+- if (gds->tokenp[0].value < 24) {
+- gds->HaveTime++;
+- gds->Hour = gds->tokenp[0].value;
+- gds->Minutes = 0;
+- gds->Seconds = 0;
+- gds->tokenp += 1;
+- return 1;
+- }
+-
+- if ((gds->tokenp[0].value / 100 < 24)
+- && (gds->tokenp[0].value % 100 < 60)) {
+- /* "513" is same as "5:13" */
+- gds->Hour = gds->tokenp[0].value / 100;
+- gds->Minutes = gds->tokenp[0].value % 100;
+- gds->Seconds = 0;
+- gds->tokenp += 1;
+- return 1;
+- }
+- }
+-
+- return 0;
+-}
+-
+-/*
+- * A dictionary of time words.
+- */
+-static struct LEXICON {
+- size_t abbrev;
+- const char *name;
+- int type;
+- time_t value;
+-} const TimeWords[] = {
+- /* am/pm */
+- { 0, "am", tAMPM, tAM },
+- { 0, "pm", tAMPM, tPM },
+-
+- /* Month names. */
+- { 3, "january", tMONTH, 1 },
+- { 3, "february", tMONTH, 2 },
+- { 3, "march", tMONTH, 3 },
+- { 3, "april", tMONTH, 4 },
+- { 3, "may", tMONTH, 5 },
+- { 3, "june", tMONTH, 6 },
+- { 3, "july", tMONTH, 7 },
+- { 3, "august", tMONTH, 8 },
+- { 3, "september", tMONTH, 9 },
+- { 3, "october", tMONTH, 10 },
+- { 3, "november", tMONTH, 11 },
+- { 3, "december", tMONTH, 12 },
+-
+- /* Days of the week. */
+- { 2, "sunday", tDAY, 0 },
+- { 3, "monday", tDAY, 1 },
+- { 2, "tuesday", tDAY, 2 },
+- { 3, "wednesday", tDAY, 3 },
+- { 2, "thursday", tDAY, 4 },
+- { 2, "friday", tDAY, 5 },
+- { 2, "saturday", tDAY, 6 },
+-
+- /* Timezones: Offsets are in seconds. */
+- { 0, "gmt", tZONE, 0*HOUR }, /* Greenwich Mean */
+- { 0, "ut", tZONE, 0*HOUR }, /* Universal (Coordinated) */
+- { 0, "utc", tZONE, 0*HOUR },
+- { 0, "wet", tZONE, 0*HOUR }, /* Western European */
+- { 0, "bst", tDAYZONE, 0*HOUR }, /* British Summer */
+- { 0, "wat", tZONE, 1*HOUR }, /* West Africa */
+- { 0, "at", tZONE, 2*HOUR }, /* Azores */
+- /* { 0, "bst", tZONE, 3*HOUR }, */ /* Brazil Standard: Conflict */
+- /* { 0, "gst", tZONE, 3*HOUR }, */ /* Greenland Standard: Conflict*/
+- { 0, "nft", tZONE, 3*HOUR+30*MINUTE }, /* Newfoundland */
+- { 0, "nst", tZONE, 3*HOUR+30*MINUTE }, /* Newfoundland Standard */
+- { 0, "ndt", tDAYZONE, 3*HOUR+30*MINUTE }, /* Newfoundland Daylight */
+- { 0, "ast", tZONE, 4*HOUR }, /* Atlantic Standard */
+- { 0, "adt", tDAYZONE, 4*HOUR }, /* Atlantic Daylight */
+- { 0, "est", tZONE, 5*HOUR }, /* Eastern Standard */
+- { 0, "edt", tDAYZONE, 5*HOUR }, /* Eastern Daylight */
+- { 0, "cst", tZONE, 6*HOUR }, /* Central Standard */
+- { 0, "cdt", tDAYZONE, 6*HOUR }, /* Central Daylight */
+- { 0, "mst", tZONE, 7*HOUR }, /* Mountain Standard */
+- { 0, "mdt", tDAYZONE, 7*HOUR }, /* Mountain Daylight */
+- { 0, "pst", tZONE, 8*HOUR }, /* Pacific Standard */
+- { 0, "pdt", tDAYZONE, 8*HOUR }, /* Pacific Daylight */
+- { 0, "yst", tZONE, 9*HOUR }, /* Yukon Standard */
+- { 0, "ydt", tDAYZONE, 9*HOUR }, /* Yukon Daylight */
+- { 0, "hst", tZONE, 10*HOUR }, /* Hawaii Standard */
+- { 0, "hdt", tDAYZONE, 10*HOUR }, /* Hawaii Daylight */
+- { 0, "cat", tZONE, 10*HOUR }, /* Central Alaska */
+- { 0, "ahst", tZONE, 10*HOUR }, /* Alaska-Hawaii Standard */
+- { 0, "nt", tZONE, 11*HOUR }, /* Nome */
+- { 0, "idlw", tZONE, 12*HOUR }, /* Intl Date Line West */
+- { 0, "cet", tZONE, -1*HOUR }, /* Central European */
+- { 0, "met", tZONE, -1*HOUR }, /* Middle European */
+- { 0, "mewt", tZONE, -1*HOUR }, /* Middle European Winter */
+- { 0, "mest", tDAYZONE, -1*HOUR }, /* Middle European Summer */
+- { 0, "swt", tZONE, -1*HOUR }, /* Swedish Winter */
+- { 0, "sst", tDAYZONE, -1*HOUR }, /* Swedish Summer */
+- { 0, "fwt", tZONE, -1*HOUR }, /* French Winter */
+- { 0, "fst", tDAYZONE, -1*HOUR }, /* French Summer */
+- { 0, "eet", tZONE, -2*HOUR }, /* Eastern Eur, USSR Zone 1 */
+- { 0, "bt", tZONE, -3*HOUR }, /* Baghdad, USSR Zone 2 */
+- { 0, "it", tZONE, -3*HOUR-30*MINUTE },/* Iran */
+- { 0, "zp4", tZONE, -4*HOUR }, /* USSR Zone 3 */
+- { 0, "zp5", tZONE, -5*HOUR }, /* USSR Zone 4 */
+- { 0, "ist", tZONE, -5*HOUR-30*MINUTE },/* Indian Standard */
+- { 0, "zp6", tZONE, -6*HOUR }, /* USSR Zone 5 */
+- /* { 0, "nst", tZONE, -6.5*HOUR }, */ /* North Sumatra: Conflict */
+- /* { 0, "sst", tZONE, -7*HOUR }, */ /* So Sumatra, USSR 6: Conflict */
+- { 0, "wast", tZONE, -7*HOUR }, /* West Australian Standard */
+- { 0, "wadt", tDAYZONE, -7*HOUR }, /* West Australian Daylight */
+- { 0, "jt", tZONE, -7*HOUR-30*MINUTE },/* Java (3pm in Cronusland!)*/
+- { 0, "cct", tZONE, -8*HOUR }, /* China Coast, USSR Zone 7 */
+- { 0, "jst", tZONE, -9*HOUR }, /* Japan Std, USSR Zone 8 */
+- { 0, "cast", tZONE, -9*HOUR-30*MINUTE },/* Ctrl Australian Std */
+- { 0, "cadt", tDAYZONE, -9*HOUR-30*MINUTE },/* Ctrl Australian Daylt */
+- { 0, "east", tZONE, -10*HOUR }, /* Eastern Australian Std */
+- { 0, "eadt", tDAYZONE, -10*HOUR }, /* Eastern Australian Daylt */
+- { 0, "gst", tZONE, -10*HOUR }, /* Guam Std, USSR Zone 9 */
+- { 0, "nzt", tZONE, -12*HOUR }, /* New Zealand */
+- { 0, "nzst", tZONE, -12*HOUR }, /* New Zealand Standard */
+- { 0, "nzdt", tDAYZONE, -12*HOUR }, /* New Zealand Daylight */
+- { 0, "idle", tZONE, -12*HOUR }, /* Intl Date Line East */
+-
+- { 0, "dst", tDST, 0 },
+-
+- /* Time units. */
+- { 4, "years", tMONTH_UNIT, 12 },
+- { 5, "months", tMONTH_UNIT, 1 },
+- { 9, "fortnights", tSEC_UNIT, 14 * DAY },
+- { 4, "weeks", tSEC_UNIT, 7 * DAY },
+- { 3, "days", tSEC_UNIT, DAY },
+- { 4, "hours", tSEC_UNIT, HOUR },
+- { 3, "minutes", tSEC_UNIT, MINUTE },
+- { 3, "seconds", tSEC_UNIT, 1 },
+-
+- /* Relative-time words. */
+- { 0, "tomorrow", tSEC_UNIT, DAY },
+- { 0, "yesterday", tSEC_UNIT, -DAY },
+- { 0, "today", tSEC_UNIT, 0 },
+- { 0, "now", tSEC_UNIT, 0 },
+- { 0, "last", tUNUMBER, -1 },
+- { 0, "this", tSEC_UNIT, 0 },
+- { 0, "next", tUNUMBER, 2 },
+- { 0, "first", tUNUMBER, 1 },
+- { 0, "1st", tUNUMBER, 1 },
+-/* { 0, "second", tUNUMBER, 2 }, */
+- { 0, "2nd", tUNUMBER, 2 },
+- { 0, "third", tUNUMBER, 3 },
+- { 0, "3rd", tUNUMBER, 3 },
+- { 0, "fourth", tUNUMBER, 4 },
+- { 0, "4th", tUNUMBER, 4 },
+- { 0, "fifth", tUNUMBER, 5 },
+- { 0, "5th", tUNUMBER, 5 },
+- { 0, "sixth", tUNUMBER, 6 },
+- { 0, "seventh", tUNUMBER, 7 },
+- { 0, "eighth", tUNUMBER, 8 },
+- { 0, "ninth", tUNUMBER, 9 },
+- { 0, "tenth", tUNUMBER, 10 },
+- { 0, "eleventh", tUNUMBER, 11 },
+- { 0, "twelfth", tUNUMBER, 12 },
+- { 0, "ago", tAGO, 1 },
+-
+- /* Military timezones. */
+- { 0, "a", tZONE, 1*HOUR },
+- { 0, "b", tZONE, 2*HOUR },
+- { 0, "c", tZONE, 3*HOUR },
+- { 0, "d", tZONE, 4*HOUR },
+- { 0, "e", tZONE, 5*HOUR },
+- { 0, "f", tZONE, 6*HOUR },
+- { 0, "g", tZONE, 7*HOUR },
+- { 0, "h", tZONE, 8*HOUR },
+- { 0, "i", tZONE, 9*HOUR },
+- { 0, "k", tZONE, 10*HOUR },
+- { 0, "l", tZONE, 11*HOUR },
+- { 0, "m", tZONE, 12*HOUR },
+- { 0, "n", tZONE, -1*HOUR },
+- { 0, "o", tZONE, -2*HOUR },
+- { 0, "p", tZONE, -3*HOUR },
+- { 0, "q", tZONE, -4*HOUR },
+- { 0, "r", tZONE, -5*HOUR },
+- { 0, "s", tZONE, -6*HOUR },
+- { 0, "t", tZONE, -7*HOUR },
+- { 0, "u", tZONE, -8*HOUR },
+- { 0, "v", tZONE, -9*HOUR },
+- { 0, "w", tZONE, -10*HOUR },
+- { 0, "x", tZONE, -11*HOUR },
+- { 0, "y", tZONE, -12*HOUR },
+- { 0, "z", tZONE, 0*HOUR },
+-
+- /* End of table. */
+- { 0, NULL, 0, 0 }
+-};
+-
+-/*
+- * Year is either:
+- * = A number from 0 to 99, which means a year from 1970 to 2069, or
+- * = The actual year (>=100).
+- */
+-static time_t
+-Convert(time_t Month, time_t Day, time_t Year,
+- time_t Hours, time_t Minutes, time_t Seconds,
+- time_t Timezone, enum DSTMODE DSTmode)
+-{
+- signed char DaysInMonth[12] = {
+- 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+- };
+- time_t Julian;
+- int i;
+- struct tm *ltime;
+-#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
+- struct tm tmbuf;
+-#endif
+-
+- if (Year < 69)
+- Year += 2000;
+- else if (Year < 100)
+- Year += 1900;
+- DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
+- ? 29 : 28;
+- /* Checking for 2038 bogusly assumes that time_t is 32 bits. But
+- I'm too lazy to try to check for time_t overflow in another way. */
+- if (Year < EPOCH || Year >= 2038
+- || Month < 1 || Month > 12
+- /* Lint fluff: "conversion from long may lose accuracy" */
+- || Day < 1 || Day > DaysInMonth[(int)--Month]
+- || Hours < 0 || Hours > 23
+- || Minutes < 0 || Minutes > 59
+- || Seconds < 0 || Seconds > 59)
+- return -1;
+-
+- Julian = Day - 1;
+- for (i = 0; i < Month; i++)
+- Julian += DaysInMonth[i];
+- for (i = EPOCH; i < Year; i++)
+- Julian += 365 + (i % 4 == 0);
+- Julian *= DAY;
+- Julian += Timezone;
+- Julian += Hours * HOUR + Minutes * MINUTE + Seconds;
+-#if defined(HAVE_LOCALTIME_S)
+- ltime = localtime_s(&tmbuf, &Julian) ? NULL : &tmbuf;
+-#elif defined(HAVE_LOCALTIME_R)
+- ltime = localtime_r(&Julian, &tmbuf);
+-#else
+- ltime = localtime(&Julian);
+-#endif
+- if (DSTmode == DSTon
+- || (DSTmode == DSTmaybe && ltime->tm_isdst))
+- Julian -= HOUR;
+- return Julian;
+-}
+-
+-static time_t
+-DSTcorrect(time_t Start, time_t Future)
+-{
+- time_t StartDay;
+- time_t FutureDay;
+- struct tm *ltime;
+-#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
+- struct tm tmbuf;
+-#endif
+-#if defined(HAVE_LOCALTIME_S)
+- ltime = localtime_s(&tmbuf, &Start) ? NULL : &tmbuf;
+-#elif defined(HAVE_LOCALTIME_R)
+- ltime = localtime_r(&Start, &tmbuf);
+-#else
+- ltime = localtime(&Start);
+-#endif
+- StartDay = (ltime->tm_hour + 1) % 24;
+-#if defined(HAVE_LOCALTIME_S)
+- ltime = localtime_s(&tmbuf, &Future) ? NULL : &tmbuf;
+-#elif defined(HAVE_LOCALTIME_R)
+- ltime = localtime_r(&Future, &tmbuf);
+-#else
+- ltime = localtime(&Future);
+-#endif
+- FutureDay = (ltime->tm_hour + 1) % 24;
+- return (Future - Start) + (StartDay - FutureDay) * HOUR;
+-}
+-
+-
+-static time_t
+-RelativeDate(time_t Start, time_t zone, int dstmode,
+- time_t DayOrdinal, time_t DayNumber)
+-{
+- struct tm *tm;
+- time_t t, now;
+-#if defined(HAVE_GMTIME_R) || defined(HAVE_GMTIME_S)
+- struct tm tmbuf;
+-#endif
+-
+- t = Start - zone;
+-#if defined(HAVE_GMTIME_S)
+- tm = gmtime_s(&tmbuf, &t) ? NULL : &tmbuf;
+-#elif defined(HAVE_GMTIME_R)
+- tm = gmtime_r(&t, &tmbuf);
+-#else
+- tm = gmtime(&t);
+-#endif
+- now = Start;
+- now += DAY * ((DayNumber - tm->tm_wday + 7) % 7);
+- now += 7 * DAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
+- if (dstmode == DSTmaybe)
+- return DSTcorrect(Start, now);
+- return now - Start;
+-}
+-
+-
+-static time_t
+-RelativeMonth(time_t Start, time_t Timezone, time_t RelMonth)
+-{
+- struct tm *tm;
+- time_t Month;
+- time_t Year;
+-#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
+- struct tm tmbuf;
+-#endif
+-
+- if (RelMonth == 0)
+- return 0;
+-#if defined(HAVE_LOCALTIME_S)
+- tm = localtime_s(&tmbuf, &Start) ? NULL : &tmbuf;
+-#elif defined(HAVE_LOCALTIME_R)
+- tm = localtime_r(&Start, &tmbuf);
+-#else
+- tm = localtime(&Start);
+-#endif
+- Month = 12 * (tm->tm_year + 1900) + tm->tm_mon + RelMonth;
+- Year = Month / 12;
+- Month = Month % 12 + 1;
+- return DSTcorrect(Start,
+- Convert(Month, (time_t)tm->tm_mday, Year,
+- (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
+- Timezone, DSTmaybe));
+-}
+-
+-/*
+- * Tokenizer.
+- */
+-static int
+-nexttoken(const char **in, time_t *value)
+-{
+- char c;
+- char buff[64];
+-
+- for ( ; ; ) {
+- while (isspace((unsigned char)**in))
+- ++*in;
+-
+- /* Skip parenthesized comments. */
+- if (**in == '(') {
+- int Count = 0;
+- do {
+- c = *(*in)++;
+- if (c == '\0')
+- return c;
+- if (c == '(')
+- Count++;
+- else if (c == ')')
+- Count--;
+- } while (Count > 0);
+- continue;
+- }
+-
+- /* Try the next token in the word table first. */
+- /* This allows us to match "2nd", for example. */
+- {
+- const char *src = *in;
+- const struct LEXICON *tp;
+- unsigned i = 0;
+-
+- /* Force to lowercase and strip '.' characters. */
+- while (*src != '\0'
+- && (isalnum((unsigned char)*src) || *src == '.')
+- && i < sizeof(buff)-1) {
+- if (*src != '.') {
+- if (isupper((unsigned char)*src))
+- buff[i++] = tolower((unsigned char)*src);
+- else
+- buff[i++] = *src;
+- }
+- src++;
+- }
+- buff[i] = '\0';
+-
+- /*
+- * Find the first match. If the word can be
+- * abbreviated, make sure we match at least
+- * the minimum abbreviation.
+- */
+- for (tp = TimeWords; tp->name; tp++) {
+- size_t abbrev = tp->abbrev;
+- if (abbrev == 0)
+- abbrev = strlen(tp->name);
+- if (strlen(buff) >= abbrev
+- && strncmp(tp->name, buff, strlen(buff))
+- == 0) {
+- /* Skip over token. */
+- *in = src;
+- /* Return the match. */
+- *value = tp->value;
+- return tp->type;
+- }
+- }
+- }
+-
+- /*
+- * Not in the word table, maybe it's a number. Note:
+- * Because '-' and '+' have other special meanings, I
+- * don't deal with signed numbers here.
+- */
+- if (isdigit((unsigned char)(c = **in))) {
+- for (*value = 0; isdigit((unsigned char)(c = *(*in)++)); )
+- *value = 10 * *value + c - '0';
+- (*in)--;
+- return (tUNUMBER);
+- }
+-
+- return *(*in)++;
+- }
+-}
+-
+-#define TM_YEAR_ORIGIN 1900
+-
+-/* Yield A - B, measured in seconds. */
+-static long
+-difftm (struct tm *a, struct tm *b)
+-{
+- int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
+- int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
+- int days = (
+- /* difference in day of year */
+- a->tm_yday - b->tm_yday
+- /* + intervening leap days */
+- + ((ay >> 2) - (by >> 2))
+- - (ay/100 - by/100)
+- + ((ay/100 >> 2) - (by/100 >> 2))
+- /* + difference in years * 365 */
+- + (long)(ay-by) * 365
+- );
+- return (days * DAY + (a->tm_hour - b->tm_hour) * HOUR
+- + (a->tm_min - b->tm_min) * MINUTE
+- + (a->tm_sec - b->tm_sec));
+-}
+-
+-/*
+- *
+- * The public function.
+- *
+- * TODO: tokens[] array should be dynamically sized.
+- */
+-time_t
+-__archive_get_date(time_t now, const char *p)
+-{
+- struct token tokens[256];
+- struct gdstate _gds;
+- struct token *lasttoken;
+- struct gdstate *gds;
+- struct tm local, *tm;
+- struct tm gmt, *gmt_ptr;
+- time_t Start;
+- time_t tod;
+- long tzone;
+-
+- /* Clear out the parsed token array. */
+- memset(tokens, 0, sizeof(tokens));
+- /* Initialize the parser state. */
+- memset(&_gds, 0, sizeof(_gds));
+- gds = &_gds;
+-
+- /* Look up the current time. */
+-#if defined(HAVE_LOCALTIME_S)
+- tm = localtime_s(&local, &now) ? NULL : &local;
+-#elif defined(HAVE_LOCALTIME_R)
+- tm = localtime_r(&now, &local);
+-#else
+- memset(&local, 0, sizeof(local));
+- tm = localtime(&now);
+-#endif
+- if (tm == NULL)
+- return -1;
+-#if !defined(HAVE_LOCALTIME_R) && !defined(HAVE_LOCALTIME_S)
+- local = *tm;
+-#endif
+-
+- /* Look up UTC if we can and use that to determine the current
+- * timezone offset. */
+-#if defined(HAVE_GMTIME_S)
+- gmt_ptr = gmtime_s(&gmt, &now) ? NULL : &gmt;
+-#elif defined(HAVE_GMTIME_R)
+- gmt_ptr = gmtime_r(&now, &gmt);
+-#else
+- memset(&gmt, 0, sizeof(gmt));
+- gmt_ptr = gmtime(&now);
+- if (gmt_ptr != NULL) {
+- /* Copy, in case localtime and gmtime use the same buffer. */
+- gmt = *gmt_ptr;
+- }
+-#endif
+- if (gmt_ptr != NULL)
+- tzone = difftm (&gmt, &local);
+- else
+- /* This system doesn't understand timezones; fake it. */
+- tzone = 0;
+- if(local.tm_isdst)
+- tzone += HOUR;
+-
+- /* Tokenize the input string. */
+- lasttoken = tokens;
+- while ((lasttoken->token = nexttoken(&p, &lasttoken->value)) != 0) {
+- ++lasttoken;
+- if (lasttoken > tokens + 255)
+- return -1;
+- }
+- gds->tokenp = tokens;
+-
+- /* Match phrases until we run out of input tokens. */
+- while (gds->tokenp < lasttoken) {
+- if (!phrase(gds))
+- return -1;
+- }
+-
+- /* Use current local timezone if none was specified. */
+- if (!gds->HaveZone) {
+- gds->Timezone = tzone;
+- gds->DSTmode = DSTmaybe;
+- }
+-
+- /* If a timezone was specified, use that for generating the default
+- * time components instead of the local timezone. */
+- if (gds->HaveZone && gmt_ptr != NULL) {
+- now -= gds->Timezone;
+-#if defined(HAVE_GMTIME_S)
+- gmt_ptr = gmtime_s(&gmt, &now) ? NULL : &gmt;
+-#elif defined(HAVE_GMTIME_R)
+- gmt_ptr = gmtime_r(&now, &gmt);
+-#else
+- gmt_ptr = gmtime(&now);
+-#endif
+- if (gmt_ptr != NULL)
+- local = *gmt_ptr;
+- now += gds->Timezone;
+- }
+-
+- if (!gds->HaveYear)
+- gds->Year = local.tm_year + 1900;
+- if (!gds->HaveMonth)
+- gds->Month = local.tm_mon + 1;
+- if (!gds->HaveDay)
+- gds->Day = local.tm_mday;
+- /* Note: No default for hour/min/sec; a specifier that just
+- * gives date always refers to 00:00 on that date. */
+-
+- /* If we saw more than one time, timezone, weekday, year, month,
+- * or day, then give up. */
+- if (gds->HaveTime > 1 || gds->HaveZone > 1 || gds->HaveWeekDay > 1
+- || gds->HaveYear > 1 || gds->HaveMonth > 1 || gds->HaveDay > 1)
+- return -1;
+-
+- /* Compute an absolute time based on whatever absolute information
+- * we collected. */
+- if (gds->HaveYear || gds->HaveMonth || gds->HaveDay
+- || gds->HaveTime || gds->HaveWeekDay) {
+- Start = Convert(gds->Month, gds->Day, gds->Year,
+- gds->Hour, gds->Minutes, gds->Seconds,
+- gds->Timezone, gds->DSTmode);
+- if (Start < 0)
+- return -1;
+- } else {
+- Start = now;
+- if (!gds->HaveRel)
+- Start -= local.tm_hour * HOUR + local.tm_min * MINUTE
+- + local.tm_sec;
+- }
+-
+- /* Add the relative offset. */
+- Start += gds->RelSeconds;
+- Start += RelativeMonth(Start, gds->Timezone, gds->RelMonth);
+-
+- /* Adjust for day-of-week offsets. */
+- if (gds->HaveWeekDay
+- && !(gds->HaveYear || gds->HaveMonth || gds->HaveDay)) {
+- tod = RelativeDate(Start, gds->Timezone,
+- gds->DSTmode, gds->DayOrdinal, gds->DayNumber);
+- Start += tod;
+- }
+-
+- /* -1 is an error indicator, so return 0 instead of -1 if
+- * that's the actual time. */
+- return Start == -1 ? 0 : Start;
+-}
+-
+-
+-#if defined(TEST)
+-
+-/* ARGSUSED */
+-int
+-main(int argc, char **argv)
+-{
+- time_t d;
+- time_t now = time(NULL);
+-
+- while (*++argv != NULL) {
+- (void)printf("Input: %s\n", *argv);
+- d = get_date(now, *argv);
+- if (d == -1)
+- (void)printf("Bad format - couldn't convert.\n");
+- else
+- (void)printf("Output: %s\n", ctime(&d));
+- }
+- exit(0);
+- /* NOTREACHED */
+-}
+-#endif /* defined(TEST) */
+--- contrib/libarchive/libarchive/archive_getdate.h.orig
++++ contrib/libarchive/libarchive/archive_getdate.h
+@@ -1,37 +0,0 @@
+-/*-
+- * Copyright (c) 2003-2015 Tim Kientzle
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#ifndef ARCHIVE_GETDATE_H_INCLUDED
+-#define ARCHIVE_GETDATE_H_INCLUDED
+-
+-#ifndef __LIBARCHIVE_BUILD
+-#error This header is only to be used internally to libarchive.
+-#endif
+-
+-#include
+-
+-time_t __archive_get_date(time_t now, const char *);
+-
+-#endif
+--- contrib/libarchive/libarchive/archive_hmac_private.h.orig
++++ contrib/libarchive/libarchive/archive_hmac_private.h
+@@ -116,4 +116,4 @@
+ };
+
+ extern const struct archive_hmac __archive_hmac;
+-#endif /* ARCHIVE_HMAC_PRIVATE_H_INCLUDED */
++#endif /* !ARCHIVE_HMAC_PRIVATE_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_match.c.orig
++++ contrib/libarchive/libarchive/archive_match.c
+@@ -35,14 +35,17 @@
+ #ifdef HAVE_STRING_H
+ #include
+ #endif
++#ifdef HAVE_LIMITS_H
++#include
++#endif
+
+ #include "archive.h"
+ #include "archive_private.h"
+ #include "archive_entry.h"
+-#include "archive_getdate.h"
+ #include "archive_pathmatch.h"
+ #include "archive_rb.h"
+ #include "archive_string.h"
++#include "archive_time_private.h"
+
+ struct match {
+ struct match *next;
+@@ -53,8 +56,7 @@
+ struct match_list {
+ struct match *first;
+ struct match **last;
+- int count;
+- int unmatched_count;
++ size_t unmatched_count;
+ struct match *unmatched_next;
+ int unmatched_eof;
+ };
+@@ -73,7 +75,6 @@
+ struct entry_list {
+ struct match_file *first;
+ struct match_file **last;
+- int count;
+ };
+
+ struct id_array {
+@@ -144,12 +145,15 @@
+ const char *);
+ static int add_pattern_wcs(struct archive_match *, struct match_list *,
+ const wchar_t *);
++#if !defined(_WIN32) || defined(__CYGWIN__)
+ static int cmp_key_mbs(const struct archive_rb_node *, const void *);
+-static int cmp_key_wcs(const struct archive_rb_node *, const void *);
+ static int cmp_node_mbs(const struct archive_rb_node *,
+ const struct archive_rb_node *);
++#else
++static int cmp_key_wcs(const struct archive_rb_node *, const void *);
+ static int cmp_node_wcs(const struct archive_rb_node *,
+ const struct archive_rb_node *);
++#endif
+ static void entry_list_add(struct entry_list *, struct match_file *);
+ static void entry_list_free(struct entry_list *);
+ static void entry_list_init(struct entry_list *);
+@@ -187,14 +191,14 @@
+ struct archive_entry *);
+ static int validate_time_flag(struct archive *, int, const char *);
+
+-#define get_date __archive_get_date
++#define get_date archive_parse_date
+
+-static const struct archive_rb_tree_ops rb_ops_mbs = {
++static const struct archive_rb_tree_ops rb_ops = {
++#if !defined(_WIN32) || defined(__CYGWIN__)
+ cmp_node_mbs, cmp_key_mbs
+-};
+-
+-static const struct archive_rb_tree_ops rb_ops_wcs = {
++#else
+ cmp_node_wcs, cmp_key_wcs
++#endif
+ };
+
+ /*
+@@ -228,7 +232,7 @@
+ a->recursive_include = 1;
+ match_list_init(&(a->inclusions));
+ match_list_init(&(a->exclusions));
+- __archive_rb_tree_init(&(a->exclusion_tree), &rb_ops_mbs);
++ __archive_rb_tree_init(&(a->exclusion_tree), &rb_ops);
+ entry_list_init(&(a->exclusion_entry_list));
+ match_list_init(&(a->inclusion_unames));
+ match_list_init(&(a->inclusion_gnames));
+@@ -507,7 +511,9 @@
+ ARCHIVE_STATE_NEW, "archive_match_unmatched_inclusions");
+ a = (struct archive_match *)_a;
+
+- return (a->inclusions.unmatched_count);
++ if (a->inclusions.unmatched_count > (size_t)INT_MAX)
++ return INT_MAX;
++ return (int)(a->inclusions.unmatched_count);
+ }
+
+ int
+@@ -650,7 +656,7 @@
+ break;
+ }
+ } else {
+- if (*b == 0x0d || *b == 0x0a) {
++ if (*b == 0x0d || *b == 0x0a) {
+ found_separator = 1;
+ break;
+ }
+@@ -735,7 +741,7 @@
+ }
+ }
+
+- /* Exclusions take priority */
++ /* Exclusions take priority. */
+ for (match = a->exclusions.first; match != NULL;
+ match = match->next){
+ r = match_path_exclusion(a, match, mbs, pathname);
+@@ -834,7 +840,6 @@
+ {
+ list->first = NULL;
+ list->last = &(list->first);
+- list->count = 0;
+ }
+
+ static void
+@@ -855,7 +860,6 @@
+ {
+ *list->last = m;
+ list->last = &(m->next);
+- list->count++;
+ list->unmatched_count++;
+ }
+
+@@ -1145,36 +1149,15 @@
+ }
+
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+-#define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000)
+ static int
+ set_timefilter_find_data(struct archive_match *a, int timetype,
+- DWORD ftLastWriteTime_dwHighDateTime, DWORD ftLastWriteTime_dwLowDateTime,
+- DWORD ftCreationTime_dwHighDateTime, DWORD ftCreationTime_dwLowDateTime)
++ const FILETIME* ftLastWriteTime, const FILETIME* ftCreationTime)
+ {
+- ULARGE_INTEGER utc;
+ time_t ctime_sec, mtime_sec;
+- long ctime_ns, mtime_ns;
++ uint32_t ctime_ns, mtime_ns;
+
+- utc.HighPart = ftCreationTime_dwHighDateTime;
+- utc.LowPart = ftCreationTime_dwLowDateTime;
+- if (utc.QuadPart >= EPOC_TIME) {
+- utc.QuadPart -= EPOC_TIME;
+- ctime_sec = (time_t)(utc.QuadPart / 10000000);
+- ctime_ns = (long)(utc.QuadPart % 10000000) * 100;
+- } else {
+- ctime_sec = 0;
+- ctime_ns = 0;
+- }
+- utc.HighPart = ftLastWriteTime_dwHighDateTime;
+- utc.LowPart = ftLastWriteTime_dwLowDateTime;
+- if (utc.QuadPart >= EPOC_TIME) {
+- utc.QuadPart -= EPOC_TIME;
+- mtime_sec = (time_t)(utc.QuadPart / 10000000);
+- mtime_ns = (long)(utc.QuadPart % 10000000) * 100;
+- } else {
+- mtime_sec = 0;
+- mtime_ns = 0;
+- }
++ ntfs_to_unix(FILETIME_to_ntfs(ftLastWriteTime), &mtime_sec, &mtime_ns);
++ ntfs_to_unix(FILETIME_to_ntfs(ftCreationTime), &ctime_sec, &ctime_ns);
+ return set_timefilter(a, timetype,
+ mtime_sec, mtime_ns, ctime_sec, ctime_ns);
+ }
+@@ -1199,9 +1182,7 @@
+ return (ARCHIVE_FAILED);
+ }
+ FindClose(h);
+- return set_timefilter_find_data(a, timetype,
+- d.ftLastWriteTime.dwHighDateTime, d.ftLastWriteTime.dwLowDateTime,
+- d.ftCreationTime.dwHighDateTime, d.ftCreationTime.dwLowDateTime);
++ return set_timefilter_find_data(a, timetype, &d.ftLastWriteTime, &d.ftCreationTime);
+ }
+
+ static int
+@@ -1223,9 +1204,7 @@
+ return (ARCHIVE_FAILED);
+ }
+ FindClose(h);
+- return set_timefilter_find_data(a, timetype,
+- d.ftLastWriteTime.dwHighDateTime, d.ftLastWriteTime.dwLowDateTime,
+- d.ftCreationTime.dwHighDateTime, d.ftCreationTime.dwLowDateTime);
++ return set_timefilter_find_data(a, timetype, &d.ftLastWriteTime, &d.ftCreationTime);
+ }
+
+ #else /* _WIN32 && !__CYGWIN__ */
+@@ -1300,6 +1279,7 @@
+ /*
+ * Call back functions for archive_rb.
+ */
++#if !defined(_WIN32) || defined(__CYGWIN__)
+ static int
+ cmp_node_mbs(const struct archive_rb_node *n1,
+ const struct archive_rb_node *n2)
+@@ -1316,7 +1296,7 @@
+ return (-1);
+ return (strcmp(p1, p2));
+ }
+-
++
+ static int
+ cmp_key_mbs(const struct archive_rb_node *n, const void *key)
+ {
+@@ -1328,7 +1308,7 @@
+ return (-1);
+ return (strcmp(p, (const char *)key));
+ }
+-
++#else
+ static int
+ cmp_node_wcs(const struct archive_rb_node *n1,
+ const struct archive_rb_node *n2)
+@@ -1345,7 +1325,7 @@
+ return (-1);
+ return (wcscmp(p1, p2));
+ }
+-
++
+ static int
+ cmp_key_wcs(const struct archive_rb_node *n, const void *key)
+ {
+@@ -1357,13 +1337,13 @@
+ return (-1);
+ return (wcscmp(p, (const wchar_t *)key));
+ }
++#endif
+
+ static void
+ entry_list_init(struct entry_list *list)
+ {
+ list->first = NULL;
+ list->last = &(list->first);
+- list->count = 0;
+ }
+
+ static void
+@@ -1384,7 +1364,6 @@
+ {
+ *list->last = file;
+ list->last = &(file->next);
+- list->count++;
+ }
+
+ static int
+@@ -1407,9 +1386,7 @@
+ return (ARCHIVE_FAILED);
+ }
+ archive_mstring_copy_wcs(&(f->pathname), pathname);
+- a->exclusion_tree.rbt_ops = &rb_ops_wcs;
+ #else
+- (void)rb_ops_wcs;
+ pathname = archive_entry_pathname(entry);
+ if (pathname == NULL) {
+ free(f);
+@@ -1417,7 +1394,6 @@
+ return (ARCHIVE_FAILED);
+ }
+ archive_mstring_copy_mbs(&(f->pathname), pathname);
+- a->exclusion_tree.rbt_ops = &rb_ops_mbs;
+ #endif
+ f->flag = flag;
+ f->mtime_sec = archive_entry_mtime(entry);
+@@ -1542,16 +1518,13 @@
+ }
+
+ /* If there is no exclusion list, include the file. */
+- if (a->exclusion_entry_list.count == 0)
++ if (a->exclusion_entry_list.first == NULL)
+ return (0);
+
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ pathname = archive_entry_pathname_w(entry);
+- a->exclusion_tree.rbt_ops = &rb_ops_wcs;
+ #else
+- (void)rb_ops_wcs;
+ pathname = archive_entry_pathname(entry);
+- a->exclusion_tree.rbt_ops = &rb_ops_mbs;
+ #endif
+ if (pathname == NULL)
+ return (0);
+@@ -1707,7 +1680,7 @@
+ static int
+ add_owner_id(struct archive_match *a, struct id_array *ids, int64_t id)
+ {
+- unsigned i;
++ size_t i;
+
+ if (ids->count + 1 >= ids->size) {
+ void *p;
+@@ -1744,10 +1717,10 @@
+ static int
+ match_owner_id(struct id_array *ids, int64_t id)
+ {
+- unsigned b, m, t;
++ size_t b, m, t;
+
+ t = 0;
+- b = (unsigned)ids->count;
++ b = ids->count;
+ while (t < b) {
+ m = (t + b)>>1;
+ if (ids->ids[m] == id)
+@@ -1842,7 +1815,7 @@
+ return (1);
+ }
+
+- if (a->inclusion_unames.count) {
++ if (a->inclusion_unames.first != NULL) {
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ r = match_owner_name_wcs(a, &(a->inclusion_unames),
+ archive_entry_uname_w(entry));
+@@ -1856,7 +1829,7 @@
+ return (r);
+ }
+
+- if (a->inclusion_gnames.count) {
++ if (a->inclusion_gnames.first != NULL) {
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ r = match_owner_name_wcs(a, &(a->inclusion_gnames),
+ archive_entry_gname_w(entry));
+@@ -1871,4 +1844,3 @@
+ }
+ return (0);
+ }
+-
+--- contrib/libarchive/libarchive/archive_options.c.orig
++++ contrib/libarchive/libarchive/archive_options.c
+@@ -38,7 +38,7 @@
+ int
+ _archive_set_option(struct archive *a,
+ const char *m, const char *o, const char *v,
+- int magic, const char *fn, option_handler use_option)
++ unsigned int magic, const char *fn, option_handler use_option)
+ {
+ const char *mp, *op, *vp;
+ int r;
+@@ -97,7 +97,7 @@
+
+ int
+ _archive_set_options(struct archive *a, const char *options,
+- int magic, const char *fn, option_handler use_option)
++ unsigned int magic, const char *fn, option_handler use_option)
+ {
+ int allok = 1, anyok = 0, ignore_mod_err = 0, r;
+ char *data;
+--- contrib/libarchive/libarchive/archive_options_private.h.orig
++++ contrib/libarchive/libarchive/archive_options_private.h
+@@ -35,11 +35,11 @@
+ int
+ _archive_set_option(struct archive *a,
+ const char *mod, const char *opt, const char *val,
+- int magic, const char *fn, option_handler use_option);
++ unsigned int magic, const char *fn, option_handler use_option);
+
+ int
+ _archive_set_options(struct archive *a, const char *options,
+- int magic, const char *fn, option_handler use_option);
++ unsigned int magic, const char *fn, option_handler use_option);
+
+ int
+ _archive_set_either_option(struct archive *a,
+--- contrib/libarchive/libarchive/archive_pack_dev.h.orig
++++ contrib/libarchive/libarchive/archive_pack_dev.h
+@@ -46,4 +46,4 @@
+ (((y) << 12) & 0xfff00000) | \
+ (((y) << 0) & 0x000000ff)))
+
+-#endif /* ARCHIVE_PACK_DEV_H */
++#endif /* !ARCHIVE_PACK_DEV_H */
+--- /dev/null
++++ contrib/libarchive/libarchive/archive_parse_date.c
+@@ -0,0 +1,1147 @@
++/*
++ * This code is in the public domain and has no copyright.
++ *
++ * This is a plain C recursive-descent translation of an old
++ * public-domain YACC grammar that has been used for parsing dates in
++ * very many open-source projects.
++ *
++ * Since the original authors were generous enough to donate their
++ * work to the public domain, I feel compelled to match their
++ * generosity.
++ *
++ * Tim Kientzle, February 2009.
++ */
++
++/*
++ * Header comment from original getdate.y:
++ */
++
++/*
++** Originally written by Steven M. Bellovin while
++** at the University of North Carolina at Chapel Hill. Later tweaked by
++** a couple of people on Usenet. Completely overhauled by Rich $alz
++** and Jim Berets in August, 1990;
++**
++** This grammar has 10 shift/reduce conflicts.
++**
++** This code is in the public domain and has no copyright.
++*/
++
++#include "archive_platform.h"
++
++#include
++#include
++#include
++#include
++#include
++
++#include "archive.h"
++
++/* Basic time units. */
++#define EPOCH 1970
++#define MINUTE (60L)
++#define HOUR (60L * MINUTE)
++#define DAY (24L * HOUR)
++
++/* Daylight-savings mode: on, off, or not yet known. */
++enum DSTMODE { DSTon, DSToff, DSTmaybe };
++/* Meridian: am or pm. */
++enum { tAM, tPM };
++/* Token types returned by nexttoken() */
++enum { tAGO = 260, tDAY, tDAYZONE, tAMPM, tMONTH, tMONTH_UNIT, tSEC_UNIT,
++ tUNUMBER, tZONE, tDST };
++struct token { int token; time_t value; };
++
++/*
++ * Parser state.
++ */
++struct gdstate {
++ struct token *tokenp; /* Pointer to next token. */
++ /* HaveXxxx counts how many of this kind of phrase we've seen;
++ * it's a fatal error to have more than one time, zone, day,
++ * or date phrase. */
++ int HaveYear;
++ int HaveMonth;
++ int HaveDay;
++ int HaveWeekDay; /* Day of week */
++ int HaveTime; /* Hour/minute/second */
++ int HaveZone; /* timezone and/or DST info */
++ int HaveRel; /* time offset; we can have more than one */
++ /* Absolute time values. */
++ time_t Timezone; /* Seconds offset from GMT */
++ time_t Day;
++ time_t Hour;
++ time_t Minutes;
++ time_t Month;
++ time_t Seconds;
++ time_t Year;
++ /* DST selection */
++ enum DSTMODE DSTmode;
++ /* Day of week accounting, e.g., "3rd Tuesday" */
++ time_t DayOrdinal; /* "3" in "3rd Tuesday" */
++ time_t DayNumber; /* "Tuesday" in "3rd Tuesday" */
++ /* Relative time values: hour/day/week offsets are measured in
++ * seconds, month/year are counted in months. */
++ time_t RelMonth;
++ time_t RelSeconds;
++};
++
++/*
++ * A series of functions that recognize certain common time phrases.
++ * Each function returns 1 if it managed to make sense of some of the
++ * tokens, zero otherwise.
++ */
++
++/*
++ * hour:minute or hour:minute:second with optional AM, PM, or numeric
++ * timezone offset
++ */
++static int
++timephrase(struct gdstate *gds)
++{
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == ':'
++ && gds->tokenp[2].token == tUNUMBER
++ && gds->tokenp[3].token == ':'
++ && gds->tokenp[4].token == tUNUMBER) {
++ /* "12:14:18" or "22:08:07" */
++ ++gds->HaveTime;
++ gds->Hour = gds->tokenp[0].value;
++ gds->Minutes = gds->tokenp[2].value;
++ gds->Seconds = gds->tokenp[4].value;
++ gds->tokenp += 5;
++ }
++ else if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == ':'
++ && gds->tokenp[2].token == tUNUMBER) {
++ /* "12:14" or "22:08" */
++ ++gds->HaveTime;
++ gds->Hour = gds->tokenp[0].value;
++ gds->Minutes = gds->tokenp[2].value;
++ gds->Seconds = 0;
++ gds->tokenp += 3;
++ }
++ else if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == tAMPM) {
++ /* "7" is a time if it's followed by "am" or "pm" */
++ ++gds->HaveTime;
++ gds->Hour = gds->tokenp[0].value;
++ gds->Minutes = gds->Seconds = 0;
++ /* We'll handle the AM/PM below. */
++ gds->tokenp += 1;
++ } else {
++ /* We can't handle this. */
++ return 0;
++ }
++
++ if (gds->tokenp[0].token == tAMPM) {
++ /* "7:12pm", "12:20:13am" */
++ if (gds->Hour == 12)
++ gds->Hour = 0;
++ if (gds->tokenp[0].value == tPM)
++ gds->Hour += 12;
++ gds->tokenp += 1;
++ }
++ if (gds->tokenp[0].token == '+'
++ && gds->tokenp[1].token == tUNUMBER) {
++ /* "7:14+0700" */
++ gds->HaveZone++;
++ gds->DSTmode = DSToff;
++ gds->Timezone = - ((gds->tokenp[1].value / 100) * HOUR
++ + (gds->tokenp[1].value % 100) * MINUTE);
++ gds->tokenp += 2;
++ }
++ if (gds->tokenp[0].token == '-'
++ && gds->tokenp[1].token == tUNUMBER) {
++ /* "19:14:12-0530" */
++ gds->HaveZone++;
++ gds->DSTmode = DSToff;
++ gds->Timezone = + ((gds->tokenp[1].value / 100) * HOUR
++ + (gds->tokenp[1].value % 100) * MINUTE);
++ gds->tokenp += 2;
++ }
++ return 1;
++}
++
++/*
++ * Timezone name, possibly including DST.
++ */
++static int
++zonephrase(struct gdstate *gds)
++{
++ if (gds->tokenp[0].token == tZONE
++ && gds->tokenp[1].token == tDST) {
++ gds->HaveZone++;
++ gds->Timezone = gds->tokenp[0].value;
++ gds->DSTmode = DSTon;
++ gds->tokenp += 1;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tZONE) {
++ gds->HaveZone++;
++ gds->Timezone = gds->tokenp[0].value;
++ gds->DSTmode = DSToff;
++ gds->tokenp += 1;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tDAYZONE) {
++ gds->HaveZone++;
++ gds->Timezone = gds->tokenp[0].value;
++ gds->DSTmode = DSTon;
++ gds->tokenp += 1;
++ return 1;
++ }
++ return 0;
++}
++
++/*
++ * Year/month/day in various combinations.
++ */
++static int
++datephrase(struct gdstate *gds)
++{
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == '/'
++ && gds->tokenp[2].token == tUNUMBER
++ && gds->tokenp[3].token == '/'
++ && gds->tokenp[4].token == tUNUMBER) {
++ gds->HaveYear++;
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ if (gds->tokenp[0].value >= 13) {
++ /* First number is big: 2004/01/29, 99/02/17 */
++ gds->Year = gds->tokenp[0].value;
++ gds->Month = gds->tokenp[2].value;
++ gds->Day = gds->tokenp[4].value;
++ } else if ((gds->tokenp[4].value >= 13)
++ || (gds->tokenp[2].value >= 13)) {
++ /* Last number is big: 01/07/98 */
++ /* Middle number is big: 01/29/04 */
++ gds->Month = gds->tokenp[0].value;
++ gds->Day = gds->tokenp[2].value;
++ gds->Year = gds->tokenp[4].value;
++ } else {
++ /* No significant clues: 02/03/04 */
++ gds->Month = gds->tokenp[0].value;
++ gds->Day = gds->tokenp[2].value;
++ gds->Year = gds->tokenp[4].value;
++ }
++ gds->tokenp += 5;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == '/'
++ && gds->tokenp[2].token == tUNUMBER) {
++ /* "1/15" */
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ gds->Month = gds->tokenp[0].value;
++ gds->Day = gds->tokenp[2].value;
++ gds->tokenp += 3;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == '-'
++ && gds->tokenp[2].token == tUNUMBER
++ && gds->tokenp[3].token == '-'
++ && gds->tokenp[4].token == tUNUMBER) {
++ /* ISO 8601 format. yyyy-mm-dd. */
++ gds->HaveYear++;
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ gds->Year = gds->tokenp[0].value;
++ gds->Month = gds->tokenp[2].value;
++ gds->Day = gds->tokenp[4].value;
++ gds->tokenp += 5;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == '-'
++ && gds->tokenp[2].token == tMONTH
++ && gds->tokenp[3].token == '-'
++ && gds->tokenp[4].token == tUNUMBER) {
++ gds->HaveYear++;
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ if (gds->tokenp[0].value > 31) {
++ /* e.g. 1992-Jun-17 */
++ gds->Year = gds->tokenp[0].value;
++ gds->Month = gds->tokenp[2].value;
++ gds->Day = gds->tokenp[4].value;
++ } else {
++ /* e.g. 17-JUN-1992. */
++ gds->Day = gds->tokenp[0].value;
++ gds->Month = gds->tokenp[2].value;
++ gds->Year = gds->tokenp[4].value;
++ }
++ gds->tokenp += 5;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tMONTH
++ && gds->tokenp[1].token == tUNUMBER
++ && gds->tokenp[2].token == ','
++ && gds->tokenp[3].token == tUNUMBER) {
++ /* "June 17, 2001" */
++ gds->HaveYear++;
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ gds->Month = gds->tokenp[0].value;
++ gds->Day = gds->tokenp[1].value;
++ gds->Year = gds->tokenp[3].value;
++ gds->tokenp += 4;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tMONTH
++ && gds->tokenp[1].token == tUNUMBER) {
++ /* "May 3" */
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ gds->Month = gds->tokenp[0].value;
++ gds->Day = gds->tokenp[1].value;
++ gds->tokenp += 2;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == tMONTH
++ && gds->tokenp[2].token == tUNUMBER) {
++ /* "12 Sept 1997" */
++ gds->HaveYear++;
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ gds->Day = gds->tokenp[0].value;
++ gds->Month = gds->tokenp[1].value;
++ gds->Year = gds->tokenp[2].value;
++ gds->tokenp += 3;
++ return 1;
++ }
++
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == tMONTH) {
++ /* "12 Sept" */
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ gds->Day = gds->tokenp[0].value;
++ gds->Month = gds->tokenp[1].value;
++ gds->tokenp += 2;
++ return 1;
++ }
++
++ return 0;
++}
++
++/*
++ * Relative time phrase: "tomorrow", "yesterday", "+1 hour", etc.
++ */
++static int
++relunitphrase(struct gdstate *gds)
++{
++ if (gds->tokenp[0].token == '-'
++ && gds->tokenp[1].token == tUNUMBER
++ && gds->tokenp[2].token == tSEC_UNIT) {
++ /* "-3 hours" */
++ gds->HaveRel++;
++ gds->RelSeconds -= gds->tokenp[1].value * gds->tokenp[2].value;
++ gds->tokenp += 3;
++ return 1;
++ }
++ if (gds->tokenp[0].token == '+'
++ && gds->tokenp[1].token == tUNUMBER
++ && gds->tokenp[2].token == tSEC_UNIT) {
++ /* "+1 minute" */
++ gds->HaveRel++;
++ gds->RelSeconds += gds->tokenp[1].value * gds->tokenp[2].value;
++ gds->tokenp += 3;
++ return 1;
++ }
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == tSEC_UNIT) {
++ /* "1 day" */
++ gds->HaveRel++;
++ gds->RelSeconds += gds->tokenp[0].value * gds->tokenp[1].value;
++ gds->tokenp += 2;
++ return 1;
++ }
++ if (gds->tokenp[0].token == '-'
++ && gds->tokenp[1].token == tUNUMBER
++ && gds->tokenp[2].token == tMONTH_UNIT) {
++ /* "-3 months" */
++ gds->HaveRel++;
++ gds->RelMonth -= gds->tokenp[1].value * gds->tokenp[2].value;
++ gds->tokenp += 3;
++ return 1;
++ }
++ if (gds->tokenp[0].token == '+'
++ && gds->tokenp[1].token == tUNUMBER
++ && gds->tokenp[2].token == tMONTH_UNIT) {
++ /* "+5 years" */
++ gds->HaveRel++;
++ gds->RelMonth += gds->tokenp[1].value * gds->tokenp[2].value;
++ gds->tokenp += 3;
++ return 1;
++ }
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == tMONTH_UNIT) {
++ /* "2 years" */
++ gds->HaveRel++;
++ gds->RelMonth += gds->tokenp[0].value * gds->tokenp[1].value;
++ gds->tokenp += 2;
++ return 1;
++ }
++ if (gds->tokenp[0].token == tSEC_UNIT) {
++ /* "now", "tomorrow" */
++ gds->HaveRel++;
++ gds->RelSeconds += gds->tokenp[0].value;
++ gds->tokenp += 1;
++ return 1;
++ }
++ if (gds->tokenp[0].token == tMONTH_UNIT) {
++ /* "month" */
++ gds->HaveRel++;
++ gds->RelMonth += gds->tokenp[0].value;
++ gds->tokenp += 1;
++ return 1;
++ }
++ return 0;
++}
++
++/*
++ * Day of the week specification.
++ */
++static int
++dayphrase(struct gdstate *gds)
++{
++ if (gds->tokenp[0].token == tDAY) {
++ /* "tues", "wednesday," */
++ gds->HaveWeekDay++;
++ gds->DayOrdinal = 1;
++ gds->DayNumber = gds->tokenp[0].value;
++ gds->tokenp += 1;
++ if (gds->tokenp[0].token == ',')
++ gds->tokenp += 1;
++ return 1;
++ }
++ if (gds->tokenp[0].token == tUNUMBER
++ && gds->tokenp[1].token == tDAY) {
++ /* "second tues" "3 wed" */
++ gds->HaveWeekDay++;
++ gds->DayOrdinal = gds->tokenp[0].value;
++ gds->DayNumber = gds->tokenp[1].value;
++ gds->tokenp += 2;
++ return 1;
++ }
++ return 0;
++}
++
++/*
++ * Try to match a phrase using one of the above functions.
++ * This layer also deals with a couple of generic issues.
++ */
++static int
++phrase(struct gdstate *gds)
++{
++ if (timephrase(gds))
++ return 1;
++ if (zonephrase(gds))
++ return 1;
++ if (datephrase(gds))
++ return 1;
++ if (dayphrase(gds))
++ return 1;
++ if (relunitphrase(gds)) {
++ if (gds->tokenp[0].token == tAGO) {
++ gds->RelSeconds = -gds->RelSeconds;
++ gds->RelMonth = -gds->RelMonth;
++ gds->tokenp += 1;
++ }
++ return 1;
++ }
++
++ /* Bare numbers sometimes have meaning. */
++ if (gds->tokenp[0].token == tUNUMBER) {
++ if (gds->HaveTime && !gds->HaveYear && !gds->HaveRel) {
++ gds->HaveYear++;
++ gds->Year = gds->tokenp[0].value;
++ gds->tokenp += 1;
++ return 1;
++ }
++
++ if(gds->tokenp[0].value > 10000) {
++ /* "20040301" */
++ gds->HaveYear++;
++ gds->HaveMonth++;
++ gds->HaveDay++;
++ gds->Day= (gds->tokenp[0].value)%100;
++ gds->Month= (gds->tokenp[0].value/100)%100;
++ gds->Year = gds->tokenp[0].value/10000;
++ gds->tokenp += 1;
++ return 1;
++ }
++
++ if (gds->tokenp[0].value < 24) {
++ gds->HaveTime++;
++ gds->Hour = gds->tokenp[0].value;
++ gds->Minutes = 0;
++ gds->Seconds = 0;
++ gds->tokenp += 1;
++ return 1;
++ }
++
++ if ((gds->tokenp[0].value / 100 < 24)
++ && (gds->tokenp[0].value % 100 < 60)) {
++ /* "513" is same as "5:13" */
++ gds->Hour = gds->tokenp[0].value / 100;
++ gds->Minutes = gds->tokenp[0].value % 100;
++ gds->Seconds = 0;
++ gds->tokenp += 1;
++ return 1;
++ }
++ }
++
++ return 0;
++}
++
++/*
++ * A dictionary of time words.
++ */
++static struct LEXICON {
++ size_t abbrev;
++ const char *name;
++ int type;
++ time_t value;
++} const TimeWords[] = {
++ /* am/pm */
++ { 0, "am", tAMPM, tAM },
++ { 0, "pm", tAMPM, tPM },
++
++ /* Month names. */
++ { 3, "january", tMONTH, 1 },
++ { 3, "february", tMONTH, 2 },
++ { 3, "march", tMONTH, 3 },
++ { 3, "april", tMONTH, 4 },
++ { 3, "may", tMONTH, 5 },
++ { 3, "june", tMONTH, 6 },
++ { 3, "july", tMONTH, 7 },
++ { 3, "august", tMONTH, 8 },
++ { 3, "september", tMONTH, 9 },
++ { 3, "october", tMONTH, 10 },
++ { 3, "november", tMONTH, 11 },
++ { 3, "december", tMONTH, 12 },
++
++ /* Days of the week. */
++ { 2, "sunday", tDAY, 0 },
++ { 3, "monday", tDAY, 1 },
++ { 2, "tuesday", tDAY, 2 },
++ { 3, "wednesday", tDAY, 3 },
++ { 2, "thursday", tDAY, 4 },
++ { 2, "friday", tDAY, 5 },
++ { 2, "saturday", tDAY, 6 },
++
++ /* Timezones: Offsets are in seconds. */
++ { 0, "gmt", tZONE, 0*HOUR }, /* Greenwich Mean */
++ { 0, "ut", tZONE, 0*HOUR }, /* Universal (Coordinated) */
++ { 0, "utc", tZONE, 0*HOUR },
++ { 0, "wet", tZONE, 0*HOUR }, /* Western European */
++ { 0, "bst", tDAYZONE, 0*HOUR }, /* British Summer */
++ { 0, "wat", tZONE, 1*HOUR }, /* West Africa */
++ { 0, "at", tZONE, 2*HOUR }, /* Azores */
++ /* { 0, "bst", tZONE, 3*HOUR }, */ /* Brazil Standard: Conflict */
++ /* { 0, "gst", tZONE, 3*HOUR }, */ /* Greenland Standard: Conflict*/
++ { 0, "nft", tZONE, 3*HOUR+30*MINUTE }, /* Newfoundland */
++ { 0, "nst", tZONE, 3*HOUR+30*MINUTE }, /* Newfoundland Standard */
++ { 0, "ndt", tDAYZONE, 3*HOUR+30*MINUTE }, /* Newfoundland Daylight */
++ { 0, "ast", tZONE, 4*HOUR }, /* Atlantic Standard */
++ { 0, "adt", tDAYZONE, 4*HOUR }, /* Atlantic Daylight */
++ { 0, "est", tZONE, 5*HOUR }, /* Eastern Standard */
++ { 0, "edt", tDAYZONE, 5*HOUR }, /* Eastern Daylight */
++ { 0, "cst", tZONE, 6*HOUR }, /* Central Standard */
++ { 0, "cdt", tDAYZONE, 6*HOUR }, /* Central Daylight */
++ { 0, "mst", tZONE, 7*HOUR }, /* Mountain Standard */
++ { 0, "mdt", tDAYZONE, 7*HOUR }, /* Mountain Daylight */
++ { 0, "pst", tZONE, 8*HOUR }, /* Pacific Standard */
++ { 0, "pdt", tDAYZONE, 8*HOUR }, /* Pacific Daylight */
++ { 0, "yst", tZONE, 9*HOUR }, /* Yukon Standard */
++ { 0, "ydt", tDAYZONE, 9*HOUR }, /* Yukon Daylight */
++ { 0, "hst", tZONE, 10*HOUR }, /* Hawaii Standard */
++ { 0, "hdt", tDAYZONE, 10*HOUR }, /* Hawaii Daylight */
++ { 0, "cat", tZONE, 10*HOUR }, /* Central Alaska */
++ { 0, "ahst", tZONE, 10*HOUR }, /* Alaska-Hawaii Standard */
++ { 0, "nt", tZONE, 11*HOUR }, /* Nome */
++ { 0, "idlw", tZONE, 12*HOUR }, /* Intl Date Line West */
++ { 0, "cet", tZONE, -1*HOUR }, /* Central European */
++ { 0, "met", tZONE, -1*HOUR }, /* Middle European */
++ { 0, "mewt", tZONE, -1*HOUR }, /* Middle European Winter */
++ { 0, "mest", tDAYZONE, -1*HOUR }, /* Middle European Summer */
++ { 0, "swt", tZONE, -1*HOUR }, /* Swedish Winter */
++ { 0, "sst", tDAYZONE, -1*HOUR }, /* Swedish Summer */
++ { 0, "fwt", tZONE, -1*HOUR }, /* French Winter */
++ { 0, "fst", tDAYZONE, -1*HOUR }, /* French Summer */
++ { 0, "eet", tZONE, -2*HOUR }, /* Eastern Eur, USSR Zone 1 */
++ { 0, "bt", tZONE, -3*HOUR }, /* Baghdad, USSR Zone 2 */
++ { 0, "it", tZONE, -3*HOUR-30*MINUTE },/* Iran */
++ { 0, "zp4", tZONE, -4*HOUR }, /* USSR Zone 3 */
++ { 0, "zp5", tZONE, -5*HOUR }, /* USSR Zone 4 */
++ { 0, "ist", tZONE, -5*HOUR-30*MINUTE },/* Indian Standard */
++ { 0, "zp6", tZONE, -6*HOUR }, /* USSR Zone 5 */
++ /* { 0, "nst", tZONE, -6.5*HOUR }, */ /* North Sumatra: Conflict */
++ /* { 0, "sst", tZONE, -7*HOUR }, */ /* So Sumatra, USSR 6: Conflict */
++ { 0, "wast", tZONE, -7*HOUR }, /* West Australian Standard */
++ { 0, "wadt", tDAYZONE, -7*HOUR }, /* West Australian Daylight */
++ { 0, "jt", tZONE, -7*HOUR-30*MINUTE },/* Java (3pm in Cronusland!)*/
++ { 0, "cct", tZONE, -8*HOUR }, /* China Coast, USSR Zone 7 */
++ { 0, "jst", tZONE, -9*HOUR }, /* Japan Std, USSR Zone 8 */
++ { 0, "cast", tZONE, -9*HOUR-30*MINUTE },/* Ctrl Australian Std */
++ { 0, "cadt", tDAYZONE, -9*HOUR-30*MINUTE },/* Ctrl Australian Daylt */
++ { 0, "east", tZONE, -10*HOUR }, /* Eastern Australian Std */
++ { 0, "eadt", tDAYZONE, -10*HOUR }, /* Eastern Australian Daylt */
++ { 0, "gst", tZONE, -10*HOUR }, /* Guam Std, USSR Zone 9 */
++ { 0, "nzt", tZONE, -12*HOUR }, /* New Zealand */
++ { 0, "nzst", tZONE, -12*HOUR }, /* New Zealand Standard */
++ { 0, "nzdt", tDAYZONE, -12*HOUR }, /* New Zealand Daylight */
++ { 0, "idle", tZONE, -12*HOUR }, /* Intl Date Line East */
++
++ { 0, "dst", tDST, 0 },
++
++ /* Time units. */
++ { 4, "years", tMONTH_UNIT, 12 },
++ { 5, "months", tMONTH_UNIT, 1 },
++ { 9, "fortnights", tSEC_UNIT, 14 * DAY },
++ { 4, "weeks", tSEC_UNIT, 7 * DAY },
++ { 3, "days", tSEC_UNIT, DAY },
++ { 4, "hours", tSEC_UNIT, HOUR },
++ { 3, "minutes", tSEC_UNIT, MINUTE },
++ { 3, "seconds", tSEC_UNIT, 1 },
++
++ /* Relative-time words. */
++ { 0, "tomorrow", tSEC_UNIT, DAY },
++ { 0, "yesterday", tSEC_UNIT, -DAY },
++ { 0, "today", tSEC_UNIT, 0 },
++ { 0, "now", tSEC_UNIT, 0 },
++ { 0, "last", tUNUMBER, -1 },
++ { 0, "this", tSEC_UNIT, 0 },
++ { 0, "next", tUNUMBER, 2 },
++ { 0, "first", tUNUMBER, 1 },
++ { 0, "1st", tUNUMBER, 1 },
++/* { 0, "second", tUNUMBER, 2 }, */
++ { 0, "2nd", tUNUMBER, 2 },
++ { 0, "third", tUNUMBER, 3 },
++ { 0, "3rd", tUNUMBER, 3 },
++ { 0, "fourth", tUNUMBER, 4 },
++ { 0, "4th", tUNUMBER, 4 },
++ { 0, "fifth", tUNUMBER, 5 },
++ { 0, "5th", tUNUMBER, 5 },
++ { 0, "sixth", tUNUMBER, 6 },
++ { 0, "seventh", tUNUMBER, 7 },
++ { 0, "eighth", tUNUMBER, 8 },
++ { 0, "ninth", tUNUMBER, 9 },
++ { 0, "tenth", tUNUMBER, 10 },
++ { 0, "eleventh", tUNUMBER, 11 },
++ { 0, "twelfth", tUNUMBER, 12 },
++ { 0, "ago", tAGO, 1 },
++
++ /* Military timezones. */
++ { 0, "a", tZONE, 1*HOUR },
++ { 0, "b", tZONE, 2*HOUR },
++ { 0, "c", tZONE, 3*HOUR },
++ { 0, "d", tZONE, 4*HOUR },
++ { 0, "e", tZONE, 5*HOUR },
++ { 0, "f", tZONE, 6*HOUR },
++ { 0, "g", tZONE, 7*HOUR },
++ { 0, "h", tZONE, 8*HOUR },
++ { 0, "i", tZONE, 9*HOUR },
++ { 0, "k", tZONE, 10*HOUR },
++ { 0, "l", tZONE, 11*HOUR },
++ { 0, "m", tZONE, 12*HOUR },
++ { 0, "n", tZONE, -1*HOUR },
++ { 0, "o", tZONE, -2*HOUR },
++ { 0, "p", tZONE, -3*HOUR },
++ { 0, "q", tZONE, -4*HOUR },
++ { 0, "r", tZONE, -5*HOUR },
++ { 0, "s", tZONE, -6*HOUR },
++ { 0, "t", tZONE, -7*HOUR },
++ { 0, "u", tZONE, -8*HOUR },
++ { 0, "v", tZONE, -9*HOUR },
++ { 0, "w", tZONE, -10*HOUR },
++ { 0, "x", tZONE, -11*HOUR },
++ { 0, "y", tZONE, -12*HOUR },
++ { 0, "z", tZONE, 0*HOUR },
++
++ /* End of table. */
++ { 0, NULL, 0, 0 }
++};
++
++/*
++ * Year is either:
++ * = A number from 0 to 99, which means a year from 1970 to 2069, or
++ * = The actual year (>=100).
++ */
++static time_t
++Convert(time_t Month, time_t Day, time_t Year,
++ time_t Hours, time_t Minutes, time_t Seconds,
++ time_t Timezone, enum DSTMODE DSTmode)
++{
++ signed char DaysInMonth[12] = {
++ 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
++ };
++ time_t Julian;
++ int i;
++ struct tm *ltime;
++#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
++ struct tm tmbuf;
++#endif
++
++ if (Year < 69)
++ Year += 2000;
++ else if (Year < 100)
++ Year += 1900;
++ DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
++ ? 29 : 28;
++ /* Checking for 2038 bogusly assumes that time_t is 32 bits. But
++ I'm too lazy to try to check for time_t overflow in another way. */
++ if (Year < EPOCH || Year >= 2038
++ || Month < 1 || Month > 12
++ /* Lint fluff: "conversion from long may lose accuracy" */
++ || Day < 1 || Day > DaysInMonth[(int)--Month]
++ || Hours < 0 || Hours > 23
++ || Minutes < 0 || Minutes > 59
++ || Seconds < 0 || Seconds > 59)
++ return -1;
++
++ Julian = Day - 1;
++ for (i = 0; i < Month; i++)
++ Julian += DaysInMonth[i];
++ for (i = EPOCH; i < Year; i++)
++ Julian += 365 + (i % 4 == 0);
++ Julian *= DAY;
++ Julian += Timezone;
++ Julian += Hours * HOUR + Minutes * MINUTE + Seconds;
++#if defined(HAVE_LOCALTIME_S)
++ ltime = localtime_s(&tmbuf, &Julian) ? NULL : &tmbuf;
++#elif defined(HAVE_LOCALTIME_R)
++ ltime = localtime_r(&Julian, &tmbuf);
++#else
++ ltime = localtime(&Julian);
++#endif
++ if (DSTmode == DSTon
++ || (DSTmode == DSTmaybe && ltime->tm_isdst))
++ Julian -= HOUR;
++ return Julian;
++}
++
++static time_t
++DSTcorrect(time_t Start, time_t Future)
++{
++ time_t StartDay;
++ time_t FutureDay;
++ struct tm *ltime;
++#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
++ struct tm tmbuf;
++#endif
++#if defined(HAVE_LOCALTIME_S)
++ ltime = localtime_s(&tmbuf, &Start) ? NULL : &tmbuf;
++#elif defined(HAVE_LOCALTIME_R)
++ ltime = localtime_r(&Start, &tmbuf);
++#else
++ ltime = localtime(&Start);
++#endif
++ StartDay = (ltime->tm_hour + 1) % 24;
++#if defined(HAVE_LOCALTIME_S)
++ ltime = localtime_s(&tmbuf, &Future) ? NULL : &tmbuf;
++#elif defined(HAVE_LOCALTIME_R)
++ ltime = localtime_r(&Future, &tmbuf);
++#else
++ ltime = localtime(&Future);
++#endif
++ FutureDay = (ltime->tm_hour + 1) % 24;
++ return (Future - Start) + (StartDay - FutureDay) * HOUR;
++}
++
++
++static time_t
++RelativeDate(time_t Start, time_t zone, int dstmode,
++ time_t DayOrdinal, time_t DayNumber)
++{
++ struct tm *tm;
++ time_t t, now;
++#if defined(HAVE_GMTIME_R) || defined(HAVE_GMTIME_S)
++ struct tm tmbuf;
++#endif
++
++ t = Start - zone;
++#if defined(HAVE_GMTIME_S)
++ tm = gmtime_s(&tmbuf, &t) ? NULL : &tmbuf;
++#elif defined(HAVE_GMTIME_R)
++ tm = gmtime_r(&t, &tmbuf);
++#else
++ tm = gmtime(&t);
++#endif
++ now = Start;
++ now += DAY * ((DayNumber - tm->tm_wday + 7) % 7);
++ now += 7 * DAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
++ if (dstmode == DSTmaybe)
++ return DSTcorrect(Start, now);
++ return now - Start;
++}
++
++
++static time_t
++RelativeMonth(time_t Start, time_t Timezone, time_t RelMonth)
++{
++ struct tm *tm;
++ time_t Month;
++ time_t Year;
++#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
++ struct tm tmbuf;
++#endif
++
++ if (RelMonth == 0)
++ return 0;
++#if defined(HAVE_LOCALTIME_S)
++ tm = localtime_s(&tmbuf, &Start) ? NULL : &tmbuf;
++#elif defined(HAVE_LOCALTIME_R)
++ tm = localtime_r(&Start, &tmbuf);
++#else
++ tm = localtime(&Start);
++#endif
++ Month = 12 * (tm->tm_year + 1900) + tm->tm_mon + RelMonth;
++ Year = Month / 12;
++ Month = Month % 12 + 1;
++ return DSTcorrect(Start,
++ Convert(Month, (time_t)tm->tm_mday, Year,
++ (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
++ Timezone, DSTmaybe));
++}
++
++/*
++ * Parses and consumes an unsigned number.
++ * Returns 1 if any number is parsed. Otherwise, *value is unchanged.
++ */
++static char
++consume_unsigned_number(const char **in, time_t *value)
++{
++ char c;
++ if (isdigit((unsigned char)(c = **in))) {
++ for (*value = 0; isdigit((unsigned char)(c = *(*in)++)); )
++ *value = 10 * *value + c - '0';
++ (*in)--;
++ return 1;
++ }
++ return 0;
++}
++
++/*
++ * Tokenizer.
++ */
++static int
++nexttoken(const char **in, time_t *value)
++{
++ char c;
++ char buff[64];
++
++ for ( ; ; ) {
++ while (isspace((unsigned char)**in))
++ ++*in;
++
++ /* Skip parenthesized comments. */
++ if (**in == '(') {
++ int Count = 0;
++ do {
++ c = *(*in)++;
++ if (c == '\0')
++ return c;
++ if (c == '(')
++ Count++;
++ else if (c == ')')
++ Count--;
++ } while (Count > 0);
++ continue;
++ }
++
++ /* Try the next token in the word table first. */
++ /* This allows us to match "2nd", for example. */
++ {
++ const char *src = *in;
++ const struct LEXICON *tp;
++ unsigned i = 0;
++
++ /* Force to lowercase and strip '.' characters. */
++ while (*src != '\0'
++ && (isalnum((unsigned char)*src) || *src == '.')
++ && i < sizeof(buff)-1) {
++ if (*src != '.') {
++ if (isupper((unsigned char)*src))
++ buff[i++] = (char)tolower(
++ (unsigned char)*src);
++ else
++ buff[i++] = *src;
++ }
++ src++;
++ }
++ buff[i] = '\0';
++
++ /*
++ * Find the first match. If the word can be
++ * abbreviated, make sure we match at least
++ * the minimum abbreviation.
++ */
++ for (tp = TimeWords; tp->name; tp++) {
++ size_t abbrev = tp->abbrev;
++ if (abbrev == 0)
++ abbrev = strlen(tp->name);
++ if (strlen(buff) >= abbrev
++ && strncmp(tp->name, buff, strlen(buff))
++ == 0) {
++ /* Skip over token. */
++ *in = src;
++ /* Return the match. */
++ *value = tp->value;
++ return tp->type;
++ }
++ }
++ }
++
++ /*
++ * Not in the word table, maybe it's a number. Note:
++ * Because '-' and '+' have other special meanings, I
++ * don't deal with signed numbers here.
++ */
++ if (consume_unsigned_number(in, value)) {
++ return (tUNUMBER);
++ }
++
++ return *(*in)++;
++ }
++}
++
++#define TM_YEAR_ORIGIN 1900
++
++/* Yield A - B, measured in seconds. */
++static long
++difftm (struct tm *a, struct tm *b)
++{
++ int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
++ int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
++ long days = (
++ /* difference in day of year */
++ a->tm_yday - b->tm_yday
++ /* + intervening leap days */
++ + ((ay >> 2) - (by >> 2))
++ - (ay/100 - by/100)
++ + ((ay/100 >> 2) - (by/100 >> 2))
++ /* + difference in years * 365 */
++ + (long)(ay-by) * 365
++ );
++ return (days * DAY + (a->tm_hour - b->tm_hour) * HOUR
++ + (a->tm_min - b->tm_min) * MINUTE
++ + (a->tm_sec - b->tm_sec));
++}
++
++/*
++ * Parses a Unix epoch timestamp (seconds).
++ * This supports a subset of what GNU tar accepts from black box testing,
++ * but covers common use cases.
++ */
++static time_t
++parse_unix_epoch(const char *p)
++{
++ time_t epoch;
++
++ /* may begin with + */
++ if (*p == '+') {
++ p++;
++ }
++
++ /* followed by some number */
++ if (!consume_unsigned_number(&p, &epoch))
++ return (time_t)-1;
++
++ /* ...and nothing else */
++ if (*p != '\0')
++ return (time_t)-1;
++
++ return epoch;
++}
++
++/*
++ *
++ * The public function.
++ *
++ * TODO: tokens[] array should be dynamically sized.
++ */
++time_t
++archive_parse_date(time_t now, const char *p)
++{
++ struct token tokens[256];
++ struct gdstate _gds;
++ struct token *lasttoken;
++ struct gdstate *gds;
++ struct tm local, *tm;
++ struct tm gmt, *gmt_ptr;
++ time_t Start;
++ time_t tod;
++ long tzone;
++
++ /*
++ * @-prefixed Unix epoch timestamps (seconds)
++ * Skip the complex tokenizer - We do not want to accept strings like "@tenth"
++ */
++ if (*p == '@')
++ return parse_unix_epoch(p + 1);
++
++ /* Clear out the parsed token array. */
++ memset(tokens, 0, sizeof(tokens));
++ /* Initialize the parser state. */
++ memset(&_gds, 0, sizeof(_gds));
++ gds = &_gds;
++
++ /* Look up the current time. */
++#if defined(HAVE_LOCALTIME_S)
++ tm = localtime_s(&local, &now) ? NULL : &local;
++#elif defined(HAVE_LOCALTIME_R)
++ tm = localtime_r(&now, &local);
++#else
++ memset(&local, 0, sizeof(local));
++ tm = localtime(&now);
++#endif
++ if (tm == NULL)
++ return -1;
++#if !defined(HAVE_LOCALTIME_R) && !defined(HAVE_LOCALTIME_S)
++ local = *tm;
++#endif
++
++ /* Look up UTC if we can and use that to determine the current
++ * timezone offset. */
++#if defined(HAVE_GMTIME_S)
++ gmt_ptr = gmtime_s(&gmt, &now) ? NULL : &gmt;
++#elif defined(HAVE_GMTIME_R)
++ gmt_ptr = gmtime_r(&now, &gmt);
++#else
++ memset(&gmt, 0, sizeof(gmt));
++ gmt_ptr = gmtime(&now);
++ if (gmt_ptr != NULL) {
++ /* Copy, in case localtime and gmtime use the same buffer. */
++ gmt = *gmt_ptr;
++ }
++#endif
++ if (gmt_ptr != NULL)
++ tzone = difftm (&gmt, &local);
++ else
++ /* This system doesn't understand timezones; fake it. */
++ tzone = 0;
++ if(local.tm_isdst)
++ tzone += HOUR;
++
++ /* Tokenize the input string. */
++ lasttoken = tokens;
++ while ((lasttoken->token = nexttoken(&p, &lasttoken->value)) != 0) {
++ ++lasttoken;
++ if (lasttoken > tokens + 255)
++ return -1;
++ }
++ gds->tokenp = tokens;
++
++ /* Match phrases until we run out of input tokens. */
++ while (gds->tokenp < lasttoken) {
++ if (!phrase(gds))
++ return -1;
++ }
++
++ /* Use current local timezone if none was specified. */
++ if (!gds->HaveZone) {
++ gds->Timezone = tzone;
++ gds->DSTmode = DSTmaybe;
++ }
++
++ /* If a timezone was specified, use that for generating the default
++ * time components instead of the local timezone. */
++ if (gds->HaveZone && gmt_ptr != NULL) {
++ now -= gds->Timezone;
++#if defined(HAVE_GMTIME_S)
++ gmt_ptr = gmtime_s(&gmt, &now) ? NULL : &gmt;
++#elif defined(HAVE_GMTIME_R)
++ gmt_ptr = gmtime_r(&now, &gmt);
++#else
++ gmt_ptr = gmtime(&now);
++#endif
++ if (gmt_ptr != NULL)
++ local = *gmt_ptr;
++ now += gds->Timezone;
++ }
++
++ if (!gds->HaveYear)
++ gds->Year = local.tm_year + 1900;
++ if (!gds->HaveMonth)
++ gds->Month = local.tm_mon + 1;
++ if (!gds->HaveDay)
++ gds->Day = local.tm_mday;
++ /* Note: No default for hour/min/sec; a specifier that just
++ * gives date always refers to 00:00 on that date. */
++
++ /* If we saw more than one time, timezone, weekday, year, month,
++ * or day, then give up. */
++ if (gds->HaveTime > 1 || gds->HaveZone > 1 || gds->HaveWeekDay > 1
++ || gds->HaveYear > 1 || gds->HaveMonth > 1 || gds->HaveDay > 1)
++ return -1;
++
++ /* Compute an absolute time based on whatever absolute information
++ * we collected. */
++ if (gds->HaveYear || gds->HaveMonth || gds->HaveDay
++ || gds->HaveTime || gds->HaveWeekDay) {
++ Start = Convert(gds->Month, gds->Day, gds->Year,
++ gds->Hour, gds->Minutes, gds->Seconds,
++ gds->Timezone, gds->DSTmode);
++ if (Start < 0)
++ return -1;
++ } else {
++ Start = now;
++ if (!gds->HaveRel)
++ Start -= local.tm_hour * HOUR + local.tm_min * MINUTE
++ + local.tm_sec;
++ }
++
++ /* Add the relative offset. */
++ Start += gds->RelSeconds;
++ Start += RelativeMonth(Start, gds->Timezone, gds->RelMonth);
++
++ /* Adjust for day-of-week offsets. */
++ if (gds->HaveWeekDay
++ && !(gds->HaveYear || gds->HaveMonth || gds->HaveDay)) {
++ tod = RelativeDate(Start, gds->Timezone,
++ gds->DSTmode, gds->DayOrdinal, gds->DayNumber);
++ Start += tod;
++ }
++
++ /* -1 is an error indicator, so return 0 instead of -1 if
++ * that's the actual time. */
++ return Start == -1 ? 0 : Start;
++}
++
++
++#if defined(TEST)
++
++/* ARGSUSED */
++int
++main(int argc, char **argv)
++{
++ time_t d;
++ time_t now = time(NULL);
++
++ while (*++argv != NULL) {
++ (void)printf("Input: %s\n", *argv);
++ d = get_date(now, *argv);
++ if (d == -1)
++ (void)printf("Bad format - couldn't convert.\n");
++ else
++ (void)printf("Output: %s\n", ctime(&d));
++ }
++ exit(0);
++ /* NOTREACHED */
++}
++#endif /* defined(TEST) */
+--- contrib/libarchive/libarchive/archive_platform.h.orig
++++ contrib/libarchive/libarchive/archive_platform.h
+@@ -61,6 +61,11 @@
+ # endif
+ #endif
+
++/* For cygwin, to avoid missing LONG, ULONG, PUCHAR, ... definitions */
++#ifdef __CYGWIN__
++#include
++#endif
++
+ /* It should be possible to get rid of this by extending the feature-test
+ * macros to cover Windows API functions, probably along with non-trivial
+ * refactoring of code to find structures that sit more cleanly on top of
+--- contrib/libarchive/libarchive/archive_platform_acl.h.orig
++++ contrib/libarchive/libarchive/archive_platform_acl.h
+@@ -50,4 +50,4 @@
+ #define ARCHIVE_ACL_SUPPORT 1
+ #endif
+
+-#endif /* ARCHIVE_PLATFORM_ACL_H_INCLUDED */
++#endif /* !ARCHIVE_PLATFORM_ACL_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_platform_xattr.h.orig
++++ contrib/libarchive/libarchive/archive_platform_xattr.h
+@@ -42,4 +42,4 @@
+ #define ARCHIVE_XATTR_SUPPORT 1
+ #endif
+
+-#endif /* ARCHIVE_PLATFORM_XATTR_H_INCLUDED */
++#endif /* !ARCHIVE_PLATFORM_XATTR_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_ppmd7.c.orig
++++ contrib/libarchive/libarchive/archive_ppmd7.c
+@@ -287,9 +287,14 @@
+ return AllocUnitsRare(p, indx);
+ }
+
+-#define MyMem12Cpy(dest, src, num) \
+- { UInt32 *d = (UInt32 *)dest; const UInt32 *s = (const UInt32 *)src; UInt32 n = num; \
+- do { d[0] = s[0]; d[1] = s[1]; d[2] = s[2]; s += 3; d += 3; } while(--n); }
++#define MyMem12Cpy(dest, src, num) do { \
++ UInt32 *d = (UInt32 *)dest; \
++ const UInt32 *s = (const UInt32 *)src; \
++ UInt32 n = num; \
++ do { \
++ d[0] = s[0]; d[1] = s[1]; d[2] = s[2]; s += 3; d += 3; \
++ } while(--n); \
++} while (0)
+
+ static void *ShrinkUnits(CPpmd7 *p, void *oldPtr, unsigned oldNU, unsigned newNU)
+ {
+--- contrib/libarchive/libarchive/archive_ppmd8.c.orig
++++ contrib/libarchive/libarchive/archive_ppmd8.c
+@@ -242,9 +242,14 @@
+ return AllocUnitsRare(p, indx);
+ }
+
+-#define MyMem12Cpy(dest, src, num) \
+- { UInt32 *d = (UInt32 *)dest; const UInt32 *z = (const UInt32 *)src; UInt32 n = num; \
+- do { d[0] = z[0]; d[1] = z[1]; d[2] = z[2]; z += 3; d += 3; } while (--n); }
++#define MyMem12Cpy(dest, src, num) do { \
++ UInt32 *d = (UInt32 *)dest; \
++ const UInt32 *z = (const UInt32 *)src; \
++ UInt32 n = num; \
++ do { \
++ d[0] = z[0]; d[1] = z[1]; d[2] = z[2]; z += 3; d += 3; \
++ } while (--n); \
++} while (0)
+
+ static void *ShrinkUnits(CPpmd8 *p, void *oldPtr, unsigned oldNU, unsigned newNU)
+ {
+@@ -341,7 +346,9 @@
+ (p)->SuccessorHigh = (UInt16)(((UInt32)(v) >> 16) & 0xFFFF);
+ }
+
+-#define RESET_TEXT(offs) { p->Text = p->Base + p->AlignOffset + (offs); }
++#define RESET_TEXT(offs) do { \
++ p->Text = p->Base + p->AlignOffset + (offs); \
++} while (0)
+
+ static void RestartModel(CPpmd8 *p)
+ {
+--- contrib/libarchive/libarchive/archive_ppmd_private.h.orig
++++ contrib/libarchive/libarchive/archive_ppmd_private.h
+@@ -109,8 +109,12 @@
+ Byte Count; /* Count to next change of Shift */
+ } CPpmd_See;
+
+-#define Ppmd_See_Update(p) if ((p)->Shift < PPMD_PERIOD_BITS && --(p)->Count == 0) \
+- { (p)->Summ <<= 1; (p)->Count = (Byte)(3 << (p)->Shift++); }
++#define Ppmd_See_Update(p) do { \
++ if ((p)->Shift < PPMD_PERIOD_BITS && --(p)->Count == 0) { \
++ (p)->Summ <<= 1; \
++ (p)->Count = (Byte)(3 << (p)->Shift++); \
++ } \
++} while (0)
+
+ typedef struct
+ {
+@@ -144,8 +148,12 @@
+ #endif
+ CPpmd_Byte_Ref;
+
+-#define PPMD_SetAllBitsIn256Bytes(p) \
+- { unsigned j; for (j = 0; j < 256 / sizeof(p[0]); j += 8) { \
+- p[j+7] = p[j+6] = p[j+5] = p[j+4] = p[j+3] = p[j+2] = p[j+1] = p[j+0] = ~(size_t)0; }}
++#define PPMD_SetAllBitsIn256Bytes(p) do { \
++ unsigned j; \
++ for (j = 0; j < 256 / sizeof(p[0]); j += 8) { \
++ p[j+7] = p[j+6] = p[j+5] = p[j+4] = \
++ p[j+3] = p[j+2] = p[j+1] = p[j+0] = ~(size_t)0; \
++ } \
++} while (0)
+
+ #endif
+--- contrib/libarchive/libarchive/archive_random_private.h.orig
++++ contrib/libarchive/libarchive/archive_random_private.h
+@@ -33,4 +33,4 @@
+ /* Random number generator. */
+ int archive_random(void *buf, size_t nbytes);
+
+-#endif /* ARCHIVE_RANDOM_PRIVATE_H_INCLUDED */
++#endif /* !ARCHIVE_RANDOM_PRIVATE_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_rb.h.orig
++++ contrib/libarchive/libarchive/archive_rb.h
+@@ -110,4 +110,4 @@
+ __archive_rb_tree_iterate(struct archive_rb_tree *,
+ struct archive_rb_node *, const unsigned int);
+
+-#endif /* ARCHIVE_RB_H_*/
++#endif /* !ARCHIVE_RB_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_read.c.orig
++++ contrib/libarchive/libarchive/archive_read.c
+@@ -176,15 +176,9 @@
+ return 0;
+
+ if (self->archive->client.skipper != NULL) {
+- /* Seek requests over 1GiB are broken down into
+- * multiple seeks. This avoids overflows when the
+- * requests get passed through 32-bit arguments. */
+- int64_t skip_limit = (int64_t)1 << 30;
+ int64_t total = 0;
+ for (;;) {
+ int64_t get, ask = request;
+- if (ask > skip_limit)
+- ask = skip_limit;
+ get = (self->archive->client.skipper)
+ (&self->archive->archive, self->data, ask);
+ total += get;
+--- contrib/libarchive/libarchive/archive_read_append_filter.c.orig
++++ contrib/libarchive/libarchive/archive_read_append_filter.c
+@@ -96,6 +96,10 @@
+ strcpy(str, "lzip");
+ r1 = archive_read_support_filter_lzip(_a);
+ break;
++ case ARCHIVE_FILTER_LZOP:
++ strcpy(str, "lzop");
++ r1 = archive_read_support_filter_lzop(_a);
++ break;
+ case ARCHIVE_FILTER_LRZIP:
+ strcpy(str, "lrzip");
+ r1 = archive_read_support_filter_lrzip(_a);
+--- contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c.orig
++++ contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
+@@ -888,7 +888,7 @@
+ count = (sizeof(buff) - sizeof(*fm))/sizeof(*fe);
+ fm = (struct fiemap *)buff;
+ fm->fm_start = 0;
+- fm->fm_length = ~0ULL;;
++ fm->fm_length = ~0ULL;
+ fm->fm_flags = FIEMAP_FLAG_SYNC;
+ fm->fm_extent_count = count;
+ do_fiemap = 1;
+--- contrib/libarchive/libarchive/archive_read_disk_posix.c.orig
++++ contrib/libarchive/libarchive/archive_read_disk_posix.c
+@@ -276,7 +276,7 @@
+ #endif
+
+ /* Initiate/terminate a tree traversal. */
+-static struct tree *tree_open(const char *, int, int);
++static struct tree *tree_open(const char *, char, int);
+ static struct tree *tree_reopen(struct tree *, const char *, int);
+ static void tree_close(struct tree *);
+ static void tree_free(struct tree *);
+@@ -514,7 +514,7 @@
+
+ static void
+ setup_symlink_mode(struct archive_read_disk *a, char symlink_mode,
+- int follow_symlinks)
++ char follow_symlinks)
+ {
+ a->symlink_mode = symlink_mode;
+ a->follow_symlinks = follow_symlinks;
+@@ -778,7 +778,8 @@
+ */
+ if (t->current_sparse->offset > t->entry_total) {
+ if (lseek(t->entry_fd,
+- (off_t)t->current_sparse->offset, SEEK_SET) < 0) {
++ (off_t)t->current_sparse->offset, SEEK_SET) !=
++ t->current_sparse->offset) {
+ archive_set_error(&a->archive, errno, "Seek error");
+ r = ARCHIVE_FATAL;
+ a->archive.state = ARCHIVE_STATE_FATAL;
+@@ -2180,7 +2181,7 @@
+ * Open a directory tree for traversal.
+ */
+ static struct tree *
+-tree_open(const char *path, int symlink_mode, int restore_time)
++tree_open(const char *path, char symlink_mode, int restore_time)
+ {
+ struct tree *t;
+
+--- contrib/libarchive/libarchive/archive_read_disk_private.h.orig
++++ contrib/libarchive/libarchive/archive_read_disk_private.h
+@@ -52,10 +52,11 @@
+
+ /*
+ * Since symlink interaction changes, we need to track whether
+- * we're following symlinks for the current item. 'L' mode above
+- * sets this true, 'P' sets it false, 'H' changes it as we traverse.
++ * we're following symlinks for the current item, governed by the above
++ * symlink_mode. 'L' sets this true, 'P' sets it false, 'H' changes it
++ * as we traverse.
+ */
+- char follow_symlinks; /* Either 'L' or 'P'. */
++ char follow_symlinks; /* Either 0 or 1. */
+
+ /* Directory traversals. */
+ struct tree *tree;
+--- contrib/libarchive/libarchive/archive_read_format.3.orig
++++ contrib/libarchive/libarchive/archive_read_format.3
+@@ -37,8 +37,10 @@
+ .Nm archive_read_support_format_lha ,
+ .Nm archive_read_support_format_mtree ,
+ .Nm archive_read_support_format_rar ,
++.Nm archive_read_support_format_rar5 ,
+ .Nm archive_read_support_format_raw ,
+ .Nm archive_read_support_format_tar ,
++.Nm archive_read_support_format_warc ,
+ .Nm archive_read_support_format_xar ,
+ .Nm archive_read_support_format_zip
+ .Nd functions for reading streaming archives
+@@ -70,10 +72,14 @@
+ .Ft int
+ .Fn archive_read_support_format_rar "struct archive *"
+ .Ft int
++.Fn archive_read_support_format_rar5 "struct archive *"
++.Ft int
+ .Fn archive_read_support_format_raw "struct archive *"
+ .Ft int
+ .Fn archive_read_support_format_tar "struct archive *"
+ .Ft int
++.Fn archive_read_support_format_warc "struct archive *"
++.Ft int
+ .Fn archive_read_support_format_xar "struct archive *"
+ .Ft int
+ .Fn archive_read_support_format_zip "struct archive *"
+@@ -89,8 +95,10 @@
+ .Fn archive_read_support_format_lha ,
+ .Fn archive_read_support_format_mtree ,
+ .Fn archive_read_support_format_rar ,
++.Fn archive_read_support_format_rar5 ,
+ .Fn archive_read_support_format_raw ,
+ .Fn archive_read_support_format_tar ,
++.Fn archive_read_support_format_warc ,
+ .Fn archive_read_support_format_xar ,
+ .Fn archive_read_support_format_zip
+ .Xc
+@@ -100,6 +108,13 @@
+ .Fn archive_read_support_format_tar
+ enables support for a variety of standard tar formats, old-style tar,
+ ustar, pax interchange format, and many common variants.
++.Fn archive_read_support_format_zip
++enables support for both the streaming and the seeking zip readers,
++which can separately be enabled by respectively
++.Fn archive_read_support_format_zip_streamable
++and
++.Fn archive_read_support_format_zip_seekable
++.
+ .It Fn archive_read_support_format_all
+ Enables support for all available formats except the
+ .Dq raw
+--- contrib/libarchive/libarchive/archive_read_open_fd.c.orig
++++ contrib/libarchive/libarchive/archive_read_open_fd.c
+@@ -52,6 +52,7 @@
+ struct read_fd_data {
+ int fd;
+ size_t block_size;
++ int64_t size;
+ char use_lseek;
+ void *buffer;
+ };
+@@ -95,6 +96,7 @@
+ if (S_ISREG(st.st_mode)) {
+ archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino);
+ mine->use_lseek = 1;
++ mine->size = st.st_size;
+ }
+ #if defined(__CYGWIN__) || defined(_WIN32)
+ setmode(mine->fd, O_BINARY);
+@@ -131,7 +133,7 @@
+ file_skip(struct archive *a, void *client_data, int64_t request)
+ {
+ struct read_fd_data *mine = (struct read_fd_data *)client_data;
+- int64_t skip = request;
++ off_t skip = (off_t)request;
+ int64_t old_offset, new_offset;
+ int skip_bits = sizeof(skip) * 8 - 1; /* off_t is a signed type. */
+
+@@ -140,20 +142,25 @@
+
+ /* Reduce a request that would overflow the 'skip' variable. */
+ if (sizeof(request) > sizeof(skip)) {
+- int64_t max_skip =
++ const int64_t max_skip =
+ (((int64_t)1 << (skip_bits - 1)) - 1) * 2 + 1;
+ if (request > max_skip)
+- skip = max_skip;
++ skip = (off_t)max_skip;
+ }
+
+- /* Reduce request to the next smallest multiple of block_size */
+- request = (request / mine->block_size) * mine->block_size;
+- if (request == 0)
++ /* Reduce 'skip' to the next smallest multiple of block_size */
++ skip = (off_t)(((int64_t)skip / mine->block_size) * mine->block_size);
++ if (skip == 0)
+ return (0);
+
+- if (((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0) &&
+- ((new_offset = lseek(mine->fd, skip, SEEK_CUR)) >= 0))
+- return (new_offset - old_offset);
++ if ((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0) {
++ if (old_offset >= mine->size ||
++ skip > mine->size - old_offset) {
++ /* Do not seek past end of file. */
++ errno = ESPIPE;
++ } else if ((new_offset = lseek(mine->fd, skip, SEEK_CUR)) >= 0)
++ return (new_offset - old_offset);
++ }
+
+ /* If seek failed once, it will probably fail again. */
+ mine->use_lseek = 0;
+@@ -178,11 +185,24 @@
+ file_seek(struct archive *a, void *client_data, int64_t request, int whence)
+ {
+ struct read_fd_data *mine = (struct read_fd_data *)client_data;
++ off_t seek = (off_t)request;
+ int64_t r;
++ int seek_bits = sizeof(seek) * 8 - 1; /* off_t is a signed type. */
+
+ /* We use off_t here because lseek() is declared that way. */
+- /* See above for notes about when off_t is less than 64 bits. */
+- r = lseek(mine->fd, request, whence);
++
++ /* Reduce a request that would overflow the 'seek' variable. */
++ if (sizeof(request) > sizeof(seek)) {
++ const int64_t max_seek =
++ (((int64_t)1 << (seek_bits - 1)) - 1) * 2 + 1;
++ const int64_t min_seek = ~max_seek;
++ if (request > max_seek)
++ seek = (off_t)max_seek;
++ else if (request < min_seek)
++ seek = (off_t)min_seek;
++ }
++
++ r = lseek(mine->fd, seek, whence);
+ if (r >= 0)
+ return r;
+
+--- contrib/libarchive/libarchive/archive_read_open_file.c.orig
++++ contrib/libarchive/libarchive/archive_read_open_file.c
+@@ -52,13 +52,15 @@
+ struct read_FILE_data {
+ FILE *f;
+ size_t block_size;
++ int64_t size;
+ void *buffer;
+ char can_skip;
+ };
+
+-static int file_close(struct archive *, void *);
+-static ssize_t file_read(struct archive *, void *, const void **buff);
+-static int64_t file_skip(struct archive *, void *, int64_t request);
++static int FILE_close(struct archive *, void *);
++static ssize_t FILE_read(struct archive *, void *, const void **buff);
++static int64_t FILE_seek(struct archive *, void *, int64_t, int);
++static int64_t FILE_skip(struct archive *, void *, int64_t);
+
+ int
+ archive_read_open_FILE(struct archive *a, FILE *f)
+@@ -69,7 +71,7 @@
+ void *b;
+
+ archive_clear_error(a);
+- mine = malloc(sizeof(*mine));
++ mine = calloc(1, sizeof(*mine));
+ b = malloc(block_size);
+ if (mine == NULL || b == NULL) {
+ archive_set_error(a, ENOMEM, "No memory");
+@@ -90,22 +92,23 @@
+ archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino);
+ /* Enable the seek optimization only for regular files. */
+ mine->can_skip = 1;
+- } else
+- mine->can_skip = 0;
++ mine->size = st.st_size;
++ }
+
+ #if defined(__CYGWIN__) || defined(_WIN32)
+ setmode(fileno(mine->f), O_BINARY);
+ #endif
+
+- archive_read_set_read_callback(a, file_read);
+- archive_read_set_skip_callback(a, file_skip);
+- archive_read_set_close_callback(a, file_close);
++ archive_read_set_read_callback(a, FILE_read);
++ archive_read_set_skip_callback(a, FILE_skip);
++ archive_read_set_seek_callback(a, FILE_seek);
++ archive_read_set_close_callback(a, FILE_close);
+ archive_read_set_callback_data(a, mine);
+ return (archive_read_open1(a));
+ }
+
+ static ssize_t
+-file_read(struct archive *a, void *client_data, const void **buff)
++FILE_read(struct archive *a, void *client_data, const void **buff)
+ {
+ struct read_FILE_data *mine = (struct read_FILE_data *)client_data;
+ size_t bytes_read;
+@@ -119,16 +122,17 @@
+ }
+
+ static int64_t
+-file_skip(struct archive *a, void *client_data, int64_t request)
++FILE_skip(struct archive *a, void *client_data, int64_t request)
+ {
+ struct read_FILE_data *mine = (struct read_FILE_data *)client_data;
+-#if HAVE_FSEEKO
+- off_t skip = (off_t)request;
+-#elif HAVE__FSEEKI64
++#if HAVE__FSEEKI64
+ int64_t skip = request;
++#elif HAVE_FSEEKO
++ off_t skip = (off_t)request;
+ #else
+ long skip = (long)request;
+ #endif
++ int64_t old_offset, new_offset = -1;
+ int skip_bits = sizeof(skip) * 8 - 1;
+
+ (void)a; /* UNUSED */
+@@ -144,7 +148,7 @@
+
+ /* If request is too big for a long or an off_t, reduce it. */
+ if (sizeof(request) > sizeof(skip)) {
+- int64_t max_skip =
++ const int64_t max_skip =
+ (((int64_t)1 << (skip_bits - 1)) - 1) * 2 + 1;
+ if (request > max_skip)
+ skip = max_skip;
+@@ -152,23 +156,92 @@
+
+ #ifdef __ANDROID__
+ /* fileno() isn't safe on all platforms ... see above. */
+- if (lseek(fileno(mine->f), skip, SEEK_CUR) < 0)
++ old_offset = lseek(fileno(mine->f), 0, SEEK_CUR);
+ #elif HAVE__FSEEKI64
+- if (_fseeki64(mine->f, skip, SEEK_CUR) != 0)
++ old_offset = _ftelli64(mine->f);
+ #elif HAVE_FSEEKO
+- if (fseeko(mine->f, skip, SEEK_CUR) != 0)
++ old_offset = ftello(mine->f);
+ #else
+- if (fseek(mine->f, skip, SEEK_CUR) != 0)
++ old_offset = ftell(mine->f);
+ #endif
+- {
+- mine->can_skip = 0;
+- return (0);
++ if (old_offset >= 0) {
++ if (old_offset < mine->size &&
++ skip <= mine->size - old_offset) {
++#ifdef __ANDROID__
++ new_offset = lseek(fileno(mine->f), skip, SEEK_CUR);
++#elif HAVE__FSEEKI64
++ if (_fseeki64(mine->f, skip, SEEK_CUR) == 0)
++ new_offset = _ftelli64(mine->f);
++#elif HAVE_FSEEKO
++ if (fseeko(mine->f, skip, SEEK_CUR) == 0)
++ new_offset = ftello(mine->f);
++#else
++ if (fseek(mine->f, skip, SEEK_CUR) == 0)
++ new_offset = ftell(mine->f);
++#endif
++ if (new_offset >= 0)
++ return (new_offset - old_offset);
++ }
++ }
++
++ mine->can_skip = 0;
++ return (0);
++}
++
++/*
++ * TODO: Store the offset and use it in the read callback.
++ */
++static int64_t
++FILE_seek(struct archive *a, void *client_data, int64_t request, int whence)
++{
++ struct read_FILE_data *mine = (struct read_FILE_data *)client_data;
++#if HAVE__FSEEKI64
++ int64_t seek = request;
++#elif HAVE_FSEEKO
++ off_t seek = (off_t)request;
++#else
++ long seek = (long)request;
++#endif
++ int seek_bits = sizeof(seek) * 8 - 1;
++ (void)a; /* UNUSED */
++
++ /* Reduce a request that would overflow the 'seek' variable. */
++ if (sizeof(request) > sizeof(seek)) {
++ const int64_t max_seek =
++ (((int64_t)1 << (seek_bits - 1)) - 1) * 2 + 1;
++ const int64_t min_seek = ~max_seek;
++ if (request > max_seek)
++ seek = max_seek;
++ else if (request < min_seek)
++ seek = min_seek;
+ }
+- return (request);
++
++#ifdef __ANDROID__
++ /* Newer Android versions have fseeko...to meditate. */
++ int64_t ret = lseek(fileno(mine->f), seek, whence);
++ if (ret >= 0) {
++ return ret;
++ }
++#elif HAVE__FSEEKI64
++ if (_fseeki64(mine->f, seek, whence) == 0) {
++ return _ftelli64(mine->f);
++ }
++#elif HAVE_FSEEKO
++ if (fseeko(mine->f, seek, whence) == 0) {
++ return ftello(mine->f);
++ }
++#else
++ if (fseek(mine->f, seek, whence) == 0) {
++ return ftell(mine->f);
++ }
++#endif
++ /* If we arrive here, the input is corrupted or truncated so fail. */
++ archive_set_error(a, errno, "Error seeking in FILE* pointer");
++ return (ARCHIVE_FATAL);
+ }
+
+ static int
+-file_close(struct archive *a, void *client_data)
++FILE_close(struct archive *a, void *client_data)
+ {
+ struct read_FILE_data *mine = (struct read_FILE_data *)client_data;
+
+--- contrib/libarchive/libarchive/archive_read_open_filename.c.orig
++++ contrib/libarchive/libarchive/archive_read_open_filename.c
+@@ -74,6 +74,7 @@
+ size_t block_size;
+ void *buffer;
+ mode_t st_mode; /* Mode bits for opened file. */
++ int64_t size;
+ char use_lseek;
+ enum fnt_e { FNT_STDIN, FNT_MBS, FNT_WCS } filename_type;
+ union {
+@@ -303,7 +304,7 @@
+ }
+ if (fd < 0) {
+ archive_set_error(a, errno,
+- "Failed to open '%S'", wfilename);
++ "Failed to open '%ls'", wfilename);
+ return (ARCHIVE_FATAL);
+ }
+ #else
+@@ -315,7 +316,7 @@
+ if (fstat(fd, &st) != 0) {
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ if (mine->filename_type == FNT_WCS)
+- archive_set_error(a, errno, "Can't stat '%S'",
++ archive_set_error(a, errno, "Can't stat '%ls'",
+ wfilename);
+ else
+ #endif
+@@ -400,8 +401,10 @@
+ mine->st_mode = st.st_mode;
+
+ /* Disk-like inputs can use lseek(). */
+- if (is_disk_like)
++ if (is_disk_like) {
+ mine->use_lseek = 1;
++ mine->size = st.st_size;
++ }
+
+ return (ARCHIVE_OK);
+ fail:
+@@ -447,7 +450,7 @@
+ "Error reading '%s'", mine->filename.m);
+ else
+ archive_set_error(a, errno,
+- "Error reading '%S'", mine->filename.w);
++ "Error reading '%ls'", mine->filename.w);
+ }
+ return (bytes_read);
+ }
+@@ -479,21 +482,30 @@
+ struct read_file_data *mine = (struct read_file_data *)client_data;
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ /* We use _lseeki64() on Windows. */
+- int64_t old_offset, new_offset;
++ int64_t old_offset, new_offset, skip = request;
+ #else
+- off_t old_offset, new_offset;
++ off_t old_offset, new_offset, skip = (off_t)request;
+ #endif
++ int skip_bits = sizeof(skip) * 8 - 1;
+
+ /* We use off_t here because lseek() is declared that way. */
+
+- /* TODO: Deal with case where off_t isn't 64 bits.
+- * This shouldn't be a problem on Linux or other POSIX
+- * systems, since the configuration logic for libarchive
+- * tries to obtain a 64-bit off_t.
+- */
+- if ((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0 &&
+- (new_offset = lseek(mine->fd, request, SEEK_CUR)) >= 0)
+- return (new_offset - old_offset);
++ /* Reduce a request that would overflow the 'skip' variable. */
++ if (sizeof(request) > sizeof(skip)) {
++ const int64_t max_skip =
++ (((int64_t)1 << (skip_bits - 1)) - 1) * 2 + 1;
++ if (request > max_skip)
++ skip = max_skip;
++ }
++
++ if ((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0) {
++ if (old_offset >= mine->size ||
++ skip > mine->size - old_offset) {
++ /* Do not seek past end of file. */
++ errno = ESPIPE;
++ } else if ((new_offset = lseek(mine->fd, skip, SEEK_CUR)) >= 0)
++ return (new_offset - old_offset);
++ }
+
+ /* If lseek() fails, don't bother trying again. */
+ mine->use_lseek = 0;
+@@ -509,7 +521,7 @@
+ archive_set_error(a, errno, "Error seeking in '%s'",
+ mine->filename.m);
+ else
+- archive_set_error(a, errno, "Error seeking in '%S'",
++ archive_set_error(a, errno, "Error seeking in '%ls'",
+ mine->filename.w);
+ return (-1);
+ }
+@@ -540,11 +552,24 @@
+ file_seek(struct archive *a, void *client_data, int64_t request, int whence)
+ {
+ struct read_file_data *mine = (struct read_file_data *)client_data;
++ off_t seek = (off_t)request;
+ int64_t r;
++ int seek_bits = sizeof(seek) * 8 - 1;
+
+ /* We use off_t here because lseek() is declared that way. */
+- /* See above for notes about when off_t is less than 64 bits. */
+- r = lseek(mine->fd, request, whence);
++
++ /* Reduce a request that would overflow the 'seek' variable. */
++ if (sizeof(request) > sizeof(seek)) {
++ const int64_t max_seek =
++ (((int64_t)1 << (seek_bits - 1)) - 1) * 2 + 1;
++ const int64_t min_seek = ~max_seek;
++ if (request > max_seek)
++ seek = (off_t)max_seek;
++ else if (request < min_seek)
++ seek = (off_t)min_seek;
++ }
++
++ r = lseek(mine->fd, seek, whence);
+ if (r >= 0)
+ return r;
+
+@@ -555,7 +580,7 @@
+ archive_set_error(a, errno, "Error seeking in '%s'",
+ mine->filename.m);
+ else
+- archive_set_error(a, errno, "Error seeking in '%S'",
++ archive_set_error(a, errno, "Error seeking in '%ls'",
+ mine->filename.w);
+ return (ARCHIVE_FATAL);
+ }
+--- contrib/libarchive/libarchive/archive_read_support_filter_by_code.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_filter_by_code.c
+@@ -37,46 +37,32 @@
+ switch (filter_code) {
+ case ARCHIVE_FILTER_NONE:
+ return archive_read_support_filter_none(a);
+- break;
+ case ARCHIVE_FILTER_GZIP:
+ return archive_read_support_filter_gzip(a);
+- break;
+ case ARCHIVE_FILTER_BZIP2:
+ return archive_read_support_filter_bzip2(a);
+- break;
+ case ARCHIVE_FILTER_COMPRESS:
+ return archive_read_support_filter_compress(a);
+- break;
+ case ARCHIVE_FILTER_LZMA:
+ return archive_read_support_filter_lzma(a);
+- break;
+ case ARCHIVE_FILTER_XZ:
+ return archive_read_support_filter_xz(a);
+- break;
+ case ARCHIVE_FILTER_UU:
+ return archive_read_support_filter_uu(a);
+- break;
+ case ARCHIVE_FILTER_RPM:
+ return archive_read_support_filter_rpm(a);
+- break;
+ case ARCHIVE_FILTER_LZIP:
+ return archive_read_support_filter_lzip(a);
+- break;
+ case ARCHIVE_FILTER_LRZIP:
+ return archive_read_support_filter_lrzip(a);
+- break;
+ case ARCHIVE_FILTER_LZOP:
+ return archive_read_support_filter_lzop(a);
+- break;
+ case ARCHIVE_FILTER_GRZIP:
+ return archive_read_support_filter_grzip(a);
+- break;
+ case ARCHIVE_FILTER_LZ4:
+ return archive_read_support_filter_lz4(a);
+- break;
+ case ARCHIVE_FILTER_ZSTD:
+ return archive_read_support_filter_zstd(a);
+- break;
+ }
+ return (ARCHIVE_FATAL);
+ }
+--- contrib/libarchive/libarchive/archive_read_support_filter_compress.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_filter_compress.c
+@@ -328,6 +328,7 @@
+ static int debug_buff[1024];
+ static unsigned debug_index;
+
++again:
+ code = newcode = getbits(self, state->bits);
+ if (code < 0)
+ return (code);
+@@ -360,7 +361,7 @@
+ state->section_end_code = (1 << state->bits) - 1;
+ state->free_ent = 257;
+ state->oldcode = -1;
+- return (next_code(self));
++ goto again;
+ }
+
+ if (code > state->free_ent
+--- contrib/libarchive/libarchive/archive_read_support_filter_lz4.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
+@@ -323,7 +323,6 @@
+ archive_set_error(&self->archive->archive,
+ ARCHIVE_ERRNO_MISC, "Program error.");
+ return (ARCHIVE_FATAL);
+- break;
+ }
+
+ while (state->stage == SELECT_STREAM) {
+--- contrib/libarchive/libarchive/archive_read_support_format_7zip.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_7zip.c
+@@ -28,6 +28,9 @@
+ #ifdef HAVE_ERRNO_H
+ #include
+ #endif
++#if HAVE_STDINT_H
++#include
++#endif
+ #ifdef HAVE_STDLIB_H
+ #include
+ #endif
+@@ -50,6 +53,7 @@
+ #include "archive_ppmd7_private.h"
+ #include "archive_private.h"
+ #include "archive_read_private.h"
++#include "archive_time_private.h"
+ #include "archive_endian.h"
+
+ #ifndef HAVE_ZLIB_H
+@@ -59,7 +63,26 @@
+ #define _7ZIP_SIGNATURE "7z\xBC\xAF\x27\x1C"
+ #define SFX_MIN_ADDR 0x27000
+ #define SFX_MAX_ADDR 0x60000
++#define SFX_MAX_OFFSET (SFX_MAX_ADDR - SFX_MIN_ADDR)
+
++/*
++ * PE format
++ */
++#define PE_DOS_HDR_LEN 0x40
++#define PE_DOS_HDR_ELFANEW_OFFSET 0x3c
++#define PE_COFF_HDR_LEN 0x18
++#define PE_COFF_HDR_SEC_CNT_OFFSET 0x6
++#define PE_COFF_HDR_OPT_SZ_OFFSET 0x14
++#define PE_SEC_HDR_LEN 0x28
++#define PE_SEC_HDR_RAW_ADDR_OFFSET 0x14
++#define PE_SEC_HDR_RAW_SZ_OFFSET 0x10
++
++/*
++ * ELF format
++ */
++#define ELF_HDR_MIN_LEN 0x34
++#define ELF_HDR_EI_CLASS_OFFSET 0x04
++#define ELF_HDR_EI_DATA_OFFSET 0x05
+
+ /*
+ * Codec ID
+@@ -83,6 +106,7 @@
+ #define _7Z_ARM 0x03030501
+ #define _7Z_ARMTHUMB 0x03030701
+ #define _7Z_ARM64 0xa
++#define _7Z_RISCV 0xb
+ #define _7Z_SPARC 0x03030805
+
+ #define _7Z_ZSTD 0x4F71101 /* Copied from https://github.com/mcmilk/7-Zip-zstd.git */
+@@ -144,7 +168,6 @@
+ uint32_t *digests;
+ };
+
+-
+ struct _7z_folder {
+ uint64_t numCoders;
+ struct _7z_coder {
+@@ -224,13 +247,13 @@
+ #define CRC32_IS_SET (1<<3)
+ #define HAS_STREAM (1<<4)
+
+- time_t mtime;
+- time_t atime;
+- time_t ctime;
+- long mtime_ns;
+- long atime_ns;
+- long ctime_ns;
+- uint32_t mode;
++ int64_t mtime;
++ int64_t atime;
++ int64_t ctime;
++ uint32_t mtime_ns;
++ uint32_t atime_ns;
++ uint32_t ctime_ns;
++ __LA_MODE_T mode;
+ uint32_t attr;
+ };
+
+@@ -388,7 +411,6 @@
+ static int decompress(struct archive_read *, struct _7zip *,
+ void *, size_t *, const void *, size_t *);
+ static ssize_t extract_pack_stream(struct archive_read *, size_t);
+-static void fileTimeToUtc(uint64_t, time_t *, long *);
+ static uint64_t folder_uncompressed_size(struct _7z_folder *);
+ static void free_CodersInfo(struct _7z_coders_info *);
+ static void free_Digest(struct _7z_digests *);
+@@ -424,7 +446,9 @@
+ size_t);
+ static int seek_pack(struct archive_read *);
+ static int64_t skip_stream(struct archive_read *, size_t);
+-static int skip_sfx(struct archive_read *, ssize_t);
++static int skip_sfx(struct archive_read *, const ssize_t);
++static ssize_t find_pe_overlay(struct archive_read *);
++static ssize_t find_elf_data_sec(struct archive_read *);
+ static int slurp_central_directory(struct archive_read *, struct _7zip *,
+ struct _7z_header_info *);
+ static int setup_decode_folder(struct archive_read *, struct _7z_folder *,
+@@ -435,6 +459,8 @@
+ static size_t arm_Convert(struct _7zip *, uint8_t *, size_t);
+ static size_t arm64_Convert(struct _7zip *, uint8_t *, size_t);
+ static ssize_t Bcj2_Decode(struct _7zip *, uint8_t *, size_t);
++static size_t sparc_Convert(struct _7zip *, uint8_t *, size_t);
++static size_t powerpc_Convert(struct _7zip *, uint8_t *, size_t);
+
+
+ int
+@@ -522,15 +548,17 @@
+ * It may a 7-Zip SFX archive file. If first two bytes are
+ * 'M' and 'Z' available on Windows or first four bytes are
+ * "\x7F\x45LF" available on posix like system, seek the 7-Zip
+- * signature. Although we will perform a seek when reading
+- * a header, what we do not use __archive_read_seek() here is
+- * due to a bidding performance.
++ * signature. While find_pe_overlay can be performed without
++ * performing a seek, find_elf_data_sec requires one,
++ * thus a performance difference between the two is expected.
+ */
+ if ((p[0] == 'M' && p[1] == 'Z') || memcmp(p, "\x7F\x45LF", 4) == 0) {
+- ssize_t offset = SFX_MIN_ADDR;
++ const ssize_t min_addr = p[0] == 'M' ? find_pe_overlay(a) :
++ find_elf_data_sec(a);
++ ssize_t offset = min_addr;
+ ssize_t window = 4096;
+ ssize_t bytes_avail;
+- while (offset + window <= (SFX_MAX_ADDR)) {
++ while (offset + window <= (min_addr + SFX_MAX_OFFSET)) {
+ const char *buff = __archive_read_ahead(a,
+ offset + window, &bytes_avail);
+ if (buff == NULL) {
+@@ -580,21 +608,14 @@
+ }
+
+ static int
+-skip_sfx(struct archive_read *a, ssize_t bytes_avail)
++skip_sfx(struct archive_read *a, const ssize_t min_addr)
+ {
+ const void *h;
+ const char *p, *q;
+ size_t skip, offset;
+ ssize_t bytes, window;
+
+- /*
+- * If bytes_avail > SFX_MIN_ADDR we do not have to call
+- * __archive_read_seek() at this time since we have
+- * already had enough data.
+- */
+- if (bytes_avail > SFX_MIN_ADDR)
+- __archive_read_consume(a, SFX_MIN_ADDR);
+- else if (__archive_read_seek(a, SFX_MIN_ADDR, SEEK_SET) < 0)
++ if (__archive_read_seek(a, min_addr, SEEK_SET) < 0)
+ return (ARCHIVE_FATAL);
+
+ offset = 0;
+@@ -627,7 +648,7 @@
+ (struct _7zip *)a->format->data;
+ skip = p - (const char *)h;
+ __archive_read_consume(a, skip);
+- zip->seek_base = SFX_MIN_ADDR + offset + skip;
++ zip->seek_base = min_addr + offset + skip;
+ return (ARCHIVE_OK);
+ }
+ p += step;
+@@ -644,6 +665,207 @@
+ return (ARCHIVE_FATAL);
+ }
+
++static ssize_t
++find_pe_overlay(struct archive_read *a)
++{
++ const char *h;
++ ssize_t bytes, max_offset, offset, sec_end;
++ ssize_t opt_hdr_sz, sec_cnt;
++
++ for (;;) {
++ /*
++ * Read Dos header to find e_lfanew
++ */
++ h = __archive_read_ahead(a, PE_DOS_HDR_LEN, &bytes);
++ if (h == NULL || h[0] != 'M' || h[1] != 'Z') {
++ break;
++ }
++ offset = archive_le32dec(h + PE_DOS_HDR_ELFANEW_OFFSET);
++
++ /*
++ * Read COFF header to find opt header size and sec cnt
++ */
++ if (bytes < offset + PE_COFF_HDR_LEN) {
++ h = __archive_read_ahead(a, offset + PE_COFF_HDR_LEN,
++ &bytes);
++ if (h == NULL || h[offset] != 'P' ||
++ h[offset + 1] != 'E') {
++ break;
++ }
++ }
++ sec_cnt = archive_le16dec(
++ h + offset + PE_COFF_HDR_SEC_CNT_OFFSET);
++ opt_hdr_sz = archive_le16dec(
++ h + offset + PE_COFF_HDR_OPT_SZ_OFFSET);
++
++ /*
++ * Skip optional header
++ */
++ if (opt_hdr_sz != 0) {
++ offset += PE_COFF_HDR_LEN + opt_hdr_sz;
++ } else {
++ break;
++ }
++
++ /*
++ * Traverse sec table to find max raw offset (i.e., overlay)
++ */
++ if (bytes < offset + sec_cnt * PE_SEC_HDR_LEN) {
++ h = __archive_read_ahead(a,
++ offset + sec_cnt * PE_SEC_HDR_LEN, NULL);
++ if (h == NULL) {
++ break;
++ }
++ }
++ max_offset = offset;
++ while (sec_cnt > 0) {
++ sec_end = archive_le32dec(
++ h + offset + PE_SEC_HDR_RAW_SZ_OFFSET) +
++ archive_le32dec(
++ h + offset + PE_SEC_HDR_RAW_ADDR_OFFSET);
++ if (sec_end > max_offset) {
++ max_offset = sec_end;
++ }
++ offset += PE_SEC_HDR_LEN;
++ sec_cnt--;
++ }
++ return (max_offset);
++ }
++
++ /*
++ * If encounter any weirdness, revert to old brute-force style search
++ */
++ return (SFX_MIN_ADDR);
++}
++
++static ssize_t
++find_elf_data_sec(struct archive_read *a)
++{
++ const char *h;
++ char big_endian, format_64;
++ ssize_t bytes, min_addr = SFX_MIN_ADDR;
++ uint64_t e_shoff, strtab_offset, strtab_size;
++ uint16_t e_shentsize, e_shnum, e_shstrndx;
++ uint16_t (*dec16)(const void *);
++ uint32_t (*dec32)(const void *);
++ uint64_t (*dec64)(const void *);
++
++ for (;;) {
++ /*
++ * Read Elf header to find bitness & endianness
++ */
++ h = __archive_read_ahead(a, ELF_HDR_MIN_LEN, &bytes);
++ if (h == NULL || memcmp(h, "\x7F\x45LF", 4) != 0) {
++ break;
++ }
++ format_64 = h[ELF_HDR_EI_CLASS_OFFSET] == 0x2;
++ big_endian = h[ELF_HDR_EI_DATA_OFFSET] == 0x2;
++ if (big_endian) {
++ dec16 = &archive_be16dec;
++ dec32 = &archive_be32dec;
++ dec64 = &archive_be64dec;
++ } else {
++ dec16 = &archive_le16dec;
++ dec32 = &archive_le32dec;
++ dec64 = &archive_le64dec;
++ }
++
++ /*
++ * Read section header table info
++ */
++ if (format_64) {
++ e_shoff = (*dec64)(h + 0x28);
++ e_shentsize = (*dec16)(h + 0x3A);
++ e_shnum = (*dec16)(h + 0x3C);
++ e_shstrndx = (*dec16)(h + 0x3E);
++ if (e_shnum < e_shstrndx || e_shentsize < 0x28)
++ break;
++
++ } else {
++ e_shoff = (*dec32)(h + 0x20);
++ e_shentsize = (*dec16)(h + 0x2E);
++ e_shnum = (*dec16)(h + 0x30);
++ e_shstrndx = (*dec16)(h + 0x32);
++ if (e_shnum < e_shstrndx || e_shentsize < 0x18)
++ break;
++ }
++
++ /*
++ * Reading the section table to find strtab section
++ */
++ if (__archive_read_seek(a, e_shoff, SEEK_SET) < 0) {
++ break;
++ }
++ h = __archive_read_ahead(a, (size_t)e_shnum * (size_t)e_shentsize, NULL);
++ if (h == NULL) {
++ break;
++ }
++ if (format_64) {
++ strtab_offset = (*dec64)(
++ h + e_shstrndx * e_shentsize + 0x18);
++ strtab_size = (*dec64)(
++ h + e_shstrndx * e_shentsize + 0x20);
++ } else {
++ strtab_offset = (*dec32)(
++ h + e_shstrndx * e_shentsize + 0x10);
++ strtab_size = (*dec32)(
++ h + e_shstrndx * e_shentsize + 0x14);
++ }
++
++ /*
++ * Read the STRTAB section to find the .data offset
++ */
++ if (__archive_read_seek(a, strtab_offset, SEEK_SET) < 0) {
++ break;
++ }
++ h = __archive_read_ahead(a, strtab_size, NULL);
++ if (h == NULL) {
++ break;
++ }
++ ssize_t data_sym_offset = -1;
++ for (size_t offset = 0; offset < strtab_size - 6; offset++) {
++ if (memcmp(h + offset, ".data\00", 6) == 0) {
++ data_sym_offset = offset;
++ break;
++ }
++ }
++ if (data_sym_offset == -1) {
++ break;
++ }
++
++ /*
++ * Find the section with the .data name
++ */
++ if (__archive_read_seek(a, e_shoff, SEEK_SET) < 0) {
++ break;
++ }
++ h = __archive_read_ahead(a, (size_t)e_shnum * (size_t)e_shentsize, NULL);
++ if (h == NULL) {
++ break;
++ }
++ ssize_t sec_tbl_offset = 0, name_offset;
++ while (e_shnum > 0) {
++ name_offset = (*dec32)(h + sec_tbl_offset);
++ if (name_offset == data_sym_offset) {
++ if (format_64) {
++ min_addr = (*dec64)(
++ h + sec_tbl_offset + 0x18);
++ } else {
++ min_addr = (*dec32)(
++ h + sec_tbl_offset + 0x10);
++ }
++ break;
++ }
++ sec_tbl_offset += e_shentsize;
++ e_shnum--;
++ }
++ break;
++ }
++
++ __archive_read_seek(a, 0, SEEK_SET);
++ return (min_addr);
++}
++
+ static int
+ archive_read_format_7zip_read_header(struct archive_read *a,
+ struct archive_entry *entry)
+@@ -770,7 +992,7 @@
+ /* allocate for ",rdonly,hidden,system" */
+ fflags_text = malloc(22 * sizeof(*fflags_text));
+ if (fflags_text != NULL) {
+- ptr = fflags_text;
++ ptr = fflags_text;
+ if (zip_entry->attr & FILE_ATTRIBUTE_READONLY) {
+ strcpy(ptr, ",rdonly");
+ ptr = ptr + 7;
+@@ -1109,7 +1331,9 @@
+ if (coder2->codec != _7Z_X86 &&
+ coder2->codec != _7Z_X86_BCJ2 &&
+ coder2->codec != _7Z_ARM &&
+- coder2->codec != _7Z_ARM64) {
++ coder2->codec != _7Z_ARM64 &&
++ coder2->codec != _7Z_POWERPC &&
++ coder2->codec != _7Z_SPARC) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+ "Unsupported filter %lx for %lx",
+@@ -1223,6 +1447,12 @@
+ filters[fi].id = LZMA_FILTER_ARM64;
+ fi++;
+ break;
++#endif
++#ifdef LZMA_FILTER_RISCV
++ case _7Z_RISCV:
++ filters[fi].id = LZMA_FILTER_RISCV;
++ fi++;
++ break;
+ #endif
+ case _7Z_SPARC:
+ filters[fi].id = LZMA_FILTER_SPARC;
+@@ -1396,6 +1626,7 @@
+ case _7Z_ARM:
+ case _7Z_ARMTHUMB:
+ case _7Z_ARM64:
++ case _7Z_RISCV:
+ case _7Z_SPARC:
+ case _7Z_DELTA:
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+@@ -1708,6 +1939,10 @@
+ *outbytes = arm_Convert(zip, buff, *outbytes);
+ } else if (zip->codec2 == _7Z_ARM64) {
+ *outbytes = arm64_Convert(zip, buff, *outbytes);
++ } else if (zip->codec2 == _7Z_SPARC) {
++ *outbytes = sparc_Convert(zip, buff, *outbytes);
++ } else if (zip->codec2 == _7Z_POWERPC) {
++ *outbytes = powerpc_Convert(zip, buff, *outbytes);
+ }
+ }
+
+@@ -2841,23 +3076,6 @@
+ return (0);
+ }
+
+-#define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000)
+-static void
+-fileTimeToUtc(uint64_t fileTime, time_t *timep, long *ns)
+-{
+-
+- if (fileTime >= EPOC_TIME) {
+- fileTime -= EPOC_TIME;
+- /* milli seconds base */
+- *timep = (time_t)(fileTime / 10000000);
+- /* nano seconds base */
+- *ns = (long)(fileTime % 10000000) * 100;
+- } else {
+- *timep = 0;
+- *ns = 0;
+- }
+-}
+-
+ static int
+ read_Times(struct archive_read *a, struct _7z_header_info *h, int type)
+ {
+@@ -2900,19 +3118,19 @@
+ goto failed;
+ switch (type) {
+ case kCTime:
+- fileTimeToUtc(archive_le64dec(p),
++ ntfs_to_unix(archive_le64dec(p),
+ &(entries[i].ctime),
+ &(entries[i].ctime_ns));
+ entries[i].flg |= CTIME_IS_SET;
+ break;
+ case kATime:
+- fileTimeToUtc(archive_le64dec(p),
++ ntfs_to_unix(archive_le64dec(p),
+ &(entries[i].atime),
+ &(entries[i].atime_ns));
+ entries[i].flg |= ATIME_IS_SET;
+ break;
+ case kMTime:
+- fileTimeToUtc(archive_le64dec(p),
++ ntfs_to_unix(archive_le64dec(p),
+ &(entries[i].mtime),
+ &(entries[i].mtime_ns));
+ entries[i].flg |= MTIME_IS_SET;
+@@ -3007,7 +3225,9 @@
+
+ if ((p[0] == 'M' && p[1] == 'Z') || memcmp(p, "\x7F\x45LF", 4) == 0) {
+ /* This is an executable ? Must be self-extracting... */
+- r = skip_sfx(a, bytes_avail);
++ const ssize_t min_addr = p[0] == 'M' ? find_pe_overlay(a) :
++ find_elf_data_sec(a);
++ r = skip_sfx(a, min_addr);
+ if (r < ARCHIVE_WARN)
+ return (r);
+ if ((p = __archive_read_ahead(a, 32, &bytes_avail)) == NULL)
+@@ -4007,6 +4227,121 @@
+ return i;
+ }
+
++static size_t
++sparc_Convert(struct _7zip *zip, uint8_t *buf, size_t size)
++{
++ // This function was adapted from
++ // static size_t bcj_sparc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
++ // in https://git.tukaani.org/xz-embedded.git
++
++ /*
++ * Branch/Call/Jump (BCJ) filter decoders
++ *
++ * Authors: Lasse Collin
++ * Igor Pavlov
++ *
++ * Copyright (C) The XZ Embedded authors and contributors
++ *
++ * Permission to use, copy, modify, and/or distribute this
++ * software for any purpose with or without fee is hereby granted.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
++ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
++ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
++ * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
++ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++ size_t i;
++ uint32_t instr;
++
++ size &= ~(size_t)3;
++
++ for (i = 0; i < size; i += 4) {
++ instr = (uint32_t)(buf[i] << 24)
++ | ((uint32_t)buf[i+1] << 16)
++ | ((uint32_t)buf[i+2] << 8)
++ | (uint32_t)buf[i+3];
++
++ if ((instr >> 22) == 0x100 || (instr >> 22) == 0x1FF) {
++ instr <<= 2;
++ instr -= zip->bcj_ip + (uint32_t)i;
++ instr >>= 2;
++ instr = ((uint32_t)0x40000000 - (instr & 0x400000))
++ | 0x40000000 | (instr & 0x3FFFFF);
++
++ buf[i] = (uint8_t)(instr >> 24);
++ buf[i+1] = (uint8_t)(instr >> 16);
++ buf[i+2] = (uint8_t)(instr >> 8);
++ buf[i+3] = (uint8_t)instr;
++ }
++ }
++
++ zip->bcj_ip += (uint32_t)i;
++
++ return i;
++}
++
++static size_t
++powerpc_Convert(struct _7zip *zip, uint8_t *buf, size_t size)
++{
++ // This function was adapted from
++ // static size_t powerpc_code(void *simple, uint32_t now_pos, bool is_encoder, uint8_t *buffer, size_t size)
++ // in https://git.tukaani.org/xz.git
++
++ /*
++ * Filter for PowerPC (big endian) binaries
++ *
++ * Authors: Igor Pavlov
++ * Lasse Collin
++ *
++ * Copyright (C) The XZ Utils authors and contributors
++ *
++ * Permission to use, copy, modify, and/or distribute this
++ * software for any purpose with or without fee is hereby granted.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
++ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
++ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
++ * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
++ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++ size &= ~(size_t)3;
++
++ size_t i;
++ for (i = 0; i < size; i += 4) {
++ // PowerPC branch 6(48) 24(Offset) 1(Abs) 1(Link)
++ if ((buf[i] >> 2) == 0x12
++ && ((buf[i + 3] & 3) == 1)) {
++
++ const uint32_t src
++ = (((uint32_t)(buf[i + 0]) & 3) << 24)
++ | ((uint32_t)(buf[i + 1]) << 16)
++ | ((uint32_t)(buf[i + 2]) << 8)
++ | ((uint32_t)(buf[i + 3]) & ~UINT32_C(3));
++
++ uint32_t dest = src - (zip->bcj_ip + (uint32_t)(i));
++
++ buf[i + 0] = 0x48 | ((dest >> 24) & 0x03);
++ buf[i + 1] = (dest >> 16);
++ buf[i + 2] = (dest >> 8);
++ buf[i + 3] &= 0x03;
++ buf[i + 3] |= dest;
++ }
++ }
++
++ zip->bcj_ip += (uint32_t)i;
++
++ return i;
++}
++
+ /*
+ * Brought from LZMA SDK.
+ *
+@@ -4029,8 +4364,17 @@
+
+ #define RC_READ_BYTE (*buffer++)
+ #define RC_TEST { if (buffer == bufferLim) return SZ_ERROR_DATA; }
+-#define RC_INIT2 zip->bcj2_code = 0; zip->bcj2_range = 0xFFFFFFFF; \
+- { int ii; for (ii = 0; ii < 5; ii++) { RC_TEST; zip->bcj2_code = (zip->bcj2_code << 8) | RC_READ_BYTE; }}
++#define RC_INIT2 do { \
++ zip->bcj2_code = 0; \
++ zip->bcj2_range = 0xFFFFFFFF; \
++ { \
++ int ii; \
++ for (ii = 0; ii < 5; ii++) { \
++ RC_TEST; \
++ zip->bcj2_code = (zip->bcj2_code << 8) | RC_READ_BYTE; \
++ } \
++ } \
++} while (0)
+
+ #define NORMALIZE if (zip->bcj2_range < kTopValue) { RC_TEST; zip->bcj2_range <<= 8; zip->bcj2_code = (zip->bcj2_code << 8) | RC_READ_BYTE; }
+
+@@ -4177,4 +4521,3 @@
+
+ return ((ssize_t)outPos);
+ }
+-
+--- contrib/libarchive/libarchive/archive_read_support_format_by_code.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_by_code.c
+@@ -41,49 +41,34 @@
+ switch (format_code & ARCHIVE_FORMAT_BASE_MASK) {
+ case ARCHIVE_FORMAT_7ZIP:
+ return archive_read_support_format_7zip(a);
+- break;
+ case ARCHIVE_FORMAT_AR:
+ return archive_read_support_format_ar(a);
+- break;
+ case ARCHIVE_FORMAT_CAB:
+ return archive_read_support_format_cab(a);
+- break;
+ case ARCHIVE_FORMAT_CPIO:
+ return archive_read_support_format_cpio(a);
+- break;
+ case ARCHIVE_FORMAT_EMPTY:
+ return archive_read_support_format_empty(a);
+- break;
+ case ARCHIVE_FORMAT_ISO9660:
+ return archive_read_support_format_iso9660(a);
+- break;
+ case ARCHIVE_FORMAT_LHA:
+ return archive_read_support_format_lha(a);
+- break;
+ case ARCHIVE_FORMAT_MTREE:
+ return archive_read_support_format_mtree(a);
+- break;
+ case ARCHIVE_FORMAT_RAR:
+ return archive_read_support_format_rar(a);
+- break;
+ case ARCHIVE_FORMAT_RAR_V5:
+ return archive_read_support_format_rar5(a);
+- break;
+ case ARCHIVE_FORMAT_RAW:
+ return archive_read_support_format_raw(a);
+- break;
+ case ARCHIVE_FORMAT_TAR:
+ return archive_read_support_format_tar(a);
+- break;
+ case ARCHIVE_FORMAT_WARC:
+ return archive_read_support_format_warc(a);
+- break;
+ case ARCHIVE_FORMAT_XAR:
+ return archive_read_support_format_xar(a);
+- break;
+ case ARCHIVE_FORMAT_ZIP:
+ return archive_read_support_format_zip(a);
+- break;
+ }
+ archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER,
+ "Invalid format code specified");
+--- contrib/libarchive/libarchive/archive_read_support_format_cab.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_cab.c
+@@ -363,7 +363,12 @@
+ return (ARCHIVE_FATAL);
+ }
+ archive_string_init(&cab->ws);
+- archive_wstring_ensure(&cab->ws, 256);
++ if (archive_wstring_ensure(&cab->ws, 256) == NULL) {
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't allocate memory");
++ free(cab);
++ return (ARCHIVE_FATAL);
++ }
+
+ r = __archive_read_register_format(a,
+ cab,
+--- contrib/libarchive/libarchive/archive_read_support_format_cpio.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_cpio.c
+@@ -189,6 +189,7 @@
+ };
+
+ static int64_t atol16(const char *, unsigned);
++static uint64_t atol16u(const char *, unsigned);
+ static int64_t atol8(const char *, unsigned);
+ static int archive_read_format_cpio_bid(struct archive_read *, int);
+ static int archive_read_format_cpio_options(struct archive_read *,
+@@ -835,6 +836,7 @@
+ struct archive_entry *entry, size_t *namelength, size_t *name_pad)
+ {
+ int64_t t;
++ uint64_t u;
+ const void *h;
+ const char *header;
+
+@@ -851,12 +853,12 @@
+
+ archive_entry_set_dev(entry,
+ (dev_t)atol16(header + afiol_dev_offset, afiol_dev_size));
+- t = atol16(header + afiol_ino_offset, afiol_ino_size);
+- if (t < 0) {
+- archive_set_error(&a->archive, 0, "Nonsensical ino value");
+- return (ARCHIVE_FATAL);
+- }
+- archive_entry_set_ino(entry, t);
++ u = atol16u(header + afiol_ino_offset, afiol_ino_size);
++#if ARCHIVE_VERSION_NUMBER < 4000000
++ archive_entry_set_ino(entry, (int64_t)(u & INT64_MAX));
++#else
++ archive_entry_set_ino(entry, u);
++#endif
+ archive_entry_set_mode(entry,
+ (mode_t)atol8(header + afiol_mode_offset, afiol_mode_size));
+ archive_entry_set_uid(entry, atol16(header + afiol_uid_offset, afiol_uid_size));
+@@ -1030,6 +1032,12 @@
+
+ static int64_t
+ atol16(const char *p, unsigned char_cnt)
++{
++ return ((int64_t)atol16u(p, char_cnt));
++}
++
++static uint64_t
++atol16u(const char *p, unsigned char_cnt)
+ {
+ uint64_t l;
+ int digit;
+@@ -1048,7 +1056,7 @@
+ l <<= 4;
+ l |= digit;
+ }
+- return ((int64_t)l);
++ return (l);
+ }
+
+ static int
+--- contrib/libarchive/libarchive/archive_read_support_format_iso9660.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
+@@ -1429,7 +1429,7 @@
+ * information first, then store all file bodies. */
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Ignoring out-of-order file @%jx (%s) %jd < %jd",
+- (intmax_t)file->number,
++ (uintmax_t)file->number,
+ iso9660->pathname.s,
+ (intmax_t)file->offset,
+ (intmax_t)iso9660->current_position);
+@@ -2273,7 +2273,7 @@
+ if (version == 1) {
+ if (data_length >= 8)
+ file->mode
+- = toi(data, 4);
++ = (__LA_MODE_T)toi(data, 4);
+ if (data_length >= 16)
+ file->nlinks
+ = toi(data + 8, 4);
+--- contrib/libarchive/libarchive/archive_read_support_format_lha.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_lha.c
+@@ -43,6 +43,7 @@
+ #include "archive_entry_locale.h"
+ #include "archive_private.h"
+ #include "archive_read_private.h"
++#include "archive_time_private.h"
+ #include "archive_endian.h"
+
+
+@@ -162,12 +163,12 @@
+ #define ATIME_IS_SET 2
+ #define UNIX_MODE_IS_SET 4
+ #define CRC_IS_SET 8
+- time_t birthtime;
+- long birthtime_tv_nsec;
+- time_t mtime;
+- long mtime_tv_nsec;
+- time_t atime;
+- long atime_tv_nsec;
++ int64_t birthtime;
++ uint32_t birthtime_tv_nsec;
++ int64_t mtime;
++ uint32_t mtime_tv_nsec;
++ int64_t atime;
++ uint32_t atime_tv_nsec;
+ mode_t mode;
+ int64_t uid;
+ int64_t gid;
+@@ -230,8 +231,6 @@
+ struct lha *, uint16_t *, int, uint64_t, size_t *);
+ static size_t lha_check_header_format(const void *);
+ static int lha_skip_sfx(struct archive_read *);
+-static time_t lha_dos_time(const unsigned char *);
+-static time_t lha_win_time(uint64_t, long *);
+ static unsigned char lha_calcsum(unsigned char, const void *,
+ int, size_t);
+ static int lha_parse_linkname(struct archive_wstring *,
+@@ -819,7 +818,7 @@
+ headersum = p[H0_HEADER_SUM_OFFSET];
+ lha->compsize = archive_le32dec(p + H0_COMP_SIZE_OFFSET);
+ lha->origsize = archive_le32dec(p + H0_ORIG_SIZE_OFFSET);
+- lha->mtime = lha_dos_time(p + H0_DOS_TIME_OFFSET);
++ lha->mtime = dos_to_unix(archive_le32dec(p + H0_DOS_TIME_OFFSET));
+ namelen = p[H0_NAME_LEN_OFFSET];
+ extdsize = (int)lha->header_size - H0_FIXED_SIZE - namelen;
+ if ((namelen > 221 || extdsize < 0) && extdsize != -2) {
+@@ -919,7 +918,7 @@
+ /* Note: An extended header size is included in a compsize. */
+ lha->compsize = archive_le32dec(p + H1_COMP_SIZE_OFFSET);
+ lha->origsize = archive_le32dec(p + H1_ORIG_SIZE_OFFSET);
+- lha->mtime = lha_dos_time(p + H1_DOS_TIME_OFFSET);
++ lha->mtime = dos_to_unix(archive_le32dec(p + H1_DOS_TIME_OFFSET));
+ namelen = p[H1_NAME_LEN_OFFSET];
+ /* Calculate a padding size. The result will be normally 0 only(?) */
+ padding = ((int)lha->header_size) - H1_FIXED_SIZE - namelen;
+@@ -1090,7 +1089,7 @@
+
+ if (archive_le16dec(p + H3_FIELD_LEN_OFFSET) != 4)
+ goto invalid;
+- lha->header_size =archive_le32dec(p + H3_HEADER_SIZE_OFFSET);
++ lha->header_size = archive_le32dec(p + H3_HEADER_SIZE_OFFSET);
+ lha->compsize = archive_le32dec(p + H3_COMP_SIZE_OFFSET);
+ lha->origsize = archive_le32dec(p + H3_ORIG_SIZE_OFFSET);
+ lha->mtime = archive_le32dec(p + H3_TIME_OFFSET);
+@@ -1326,16 +1325,16 @@
+ break;
+ case EXT_TIMESTAMP:
+ if (datasize == (sizeof(uint64_t) * 3)) {
+- lha->birthtime = lha_win_time(
+- archive_le64dec(extdheader),
++ ntfs_to_unix(archive_le64dec(extdheader),
++ &lha->birthtime,
+ &lha->birthtime_tv_nsec);
+ extdheader += sizeof(uint64_t);
+- lha->mtime = lha_win_time(
+- archive_le64dec(extdheader),
++ ntfs_to_unix(archive_le64dec(extdheader),
++ &lha->mtime,
+ &lha->mtime_tv_nsec);
+ extdheader += sizeof(uint64_t);
+- lha->atime = lha_win_time(
+- archive_le64dec(extdheader),
++ ntfs_to_unix(archive_le64dec(extdheader),
++ &lha->atime,
+ &lha->atime_tv_nsec);
+ lha->setflag |= BIRTHTIME_IS_SET |
+ ATIME_IS_SET;
+@@ -1716,45 +1715,6 @@
+ return (0);
+ }
+
+-/* Convert an MSDOS-style date/time into Unix-style time. */
+-static time_t
+-lha_dos_time(const unsigned char *p)
+-{
+- int msTime, msDate;
+- struct tm ts;
+-
+- msTime = archive_le16dec(p);
+- msDate = archive_le16dec(p+2);
+-
+- memset(&ts, 0, sizeof(ts));
+- ts.tm_year = ((msDate >> 9) & 0x7f) + 80; /* Years since 1900. */
+- ts.tm_mon = ((msDate >> 5) & 0x0f) - 1; /* Month number. */
+- ts.tm_mday = msDate & 0x1f; /* Day of month. */
+- ts.tm_hour = (msTime >> 11) & 0x1f;
+- ts.tm_min = (msTime >> 5) & 0x3f;
+- ts.tm_sec = (msTime << 1) & 0x3e;
+- ts.tm_isdst = -1;
+- return (mktime(&ts));
+-}
+-
+-/* Convert an MS-Windows-style date/time into Unix-style time. */
+-static time_t
+-lha_win_time(uint64_t wintime, long *ns)
+-{
+-#define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000)
+-
+- if (wintime >= EPOC_TIME) {
+- wintime -= EPOC_TIME; /* 1970-01-01 00:00:00 (UTC) */
+- if (ns != NULL)
+- *ns = (long)(wintime % 10000000) * 100;
+- return (wintime / 10000000);
+- } else {
+- if (ns != NULL)
+- *ns = 0;
+- return (0);
+- }
+-}
+-
+ static unsigned char
+ lha_calcsum(unsigned char sum, const void *pp, int offset, size_t size)
+ {
+@@ -2917,4 +2877,3 @@
+ /* This bit pattern needs to be found out at a huffman tree. */
+ return (lzh_decode_huffman_tree(hf, rbits, c));
+ }
+-
+--- contrib/libarchive/libarchive/archive_read_support_format_rar.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_rar.c
+@@ -335,8 +335,8 @@
+ int found_first_header;
+ char has_endarc_header;
+ struct data_block_offsets *dbo;
+- unsigned int cursor;
+- unsigned int nodes;
++ size_t cursor;
++ size_t nodes;
+ char filename_must_match;
+
+ /* LZSS members */
+@@ -451,7 +451,7 @@
+ static int rar_decode_byte(struct archive_read*, uint8_t *);
+ static int execute_filter(struct archive_read*, struct rar_filter *,
+ struct rar_virtual_machine *, size_t);
+-static int copy_from_lzss_window(struct archive_read *, void *, int64_t, int);
++static int copy_from_lzss_window(struct archive_read *, uint8_t *, int64_t, int);
+ static inline void vm_write_32(struct rar_virtual_machine*, size_t, uint32_t);
+ static inline uint32_t vm_read_32(struct rar_virtual_machine*, size_t);
+
+@@ -475,7 +475,7 @@
+ ((rar_br_has(br, (n)) || rar_br_fillup(a, br)) || rar_br_has(br, (n)))
+ /* Notify how many bits we consumed. */
+ #define rar_br_consume(br, n) ((br)->cache_avail -= (n))
+-#define rar_br_consume_unalined_bits(br) ((br)->cache_avail &= ~7)
++#define rar_br_consume_unaligned_bits(br) ((br)->cache_avail &= ~7)
+
+ static const uint32_t cache_masks[] = {
+ 0x00000000, 0x00000001, 0x00000003, 0x00000007,
+@@ -741,11 +741,11 @@
+ return (ARCHIVE_FATAL);
+ }
+
+- /*
+- * Until enough data has been read, we cannot tell about
+- * any encrypted entries yet.
+- */
+- rar->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
++ /*
++ * Until enough data has been read, we cannot tell about
++ * any encrypted entries yet.
++ */
++ rar->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
+
+ r = __archive_read_register_format(a,
+ rar,
+@@ -768,21 +768,21 @@
+ static int
+ archive_read_support_format_rar_capabilities(struct archive_read * a)
+ {
+- (void)a; /* UNUSED */
+- return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA
+- | ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
++ (void)a; /* UNUSED */
++ return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA
++ | ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
+ }
+
+ static int
+ archive_read_format_rar_has_encrypted_entries(struct archive_read *_a)
+ {
+- if (_a && _a->format) {
+- struct rar * rar = (struct rar *)_a->format->data;
+- if (rar) {
+- return rar->has_encrypted_entries;
+- }
+- }
+- return ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
++ if (_a && _a->format) {
++ struct rar * rar = (struct rar *)_a->format->data;
++ if (rar) {
++ return rar->has_encrypted_entries;
++ }
++ }
++ return ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
+ }
+
+
+@@ -793,7 +793,7 @@
+
+ /* If there's already a bid > 30, we'll never win. */
+ if (best_bid > 30)
+- return (-1);
++ return (-1);
+
+ if ((p = __archive_read_ahead(a, 7, NULL)) == NULL)
+ return (-1);
+@@ -865,7 +865,7 @@
+ }
+ skip = p - (const char *)h;
+ __archive_read_consume(a, skip);
+- total += skip;
++ total += skip;
+ }
+ fatal:
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+@@ -910,7 +910,7 @@
+ const void *h;
+ const char *p;
+ struct rar *rar;
+- size_t skip;
++ int64_t skip;
+ char head_type;
+ int ret;
+ unsigned flags;
+@@ -930,7 +930,7 @@
+ * as well.
+ */
+ if (rar->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
+- rar->has_encrypted_entries = 0;
++ rar->has_encrypted_entries = 0;
+ }
+
+ /* RAR files can be generated without EOF headers, so return ARCHIVE_EOF if
+@@ -953,8 +953,11 @@
+ {
+ unsigned long crc32_val;
+
+- if ((h = __archive_read_ahead(a, 7, NULL)) == NULL)
++ if ((h = __archive_read_ahead(a, 7, NULL)) == NULL) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Failed to read next header.");
+ return (ARCHIVE_FATAL);
++ }
+ p = h;
+
+ head_type = p[2];
+@@ -972,7 +975,7 @@
+ case MAIN_HEAD:
+ rar->main_flags = archive_le16dec(p + 3);
+ skip = archive_le16dec(p + 5);
+- if (skip < 7 + sizeof(rar->reserved1) + sizeof(rar->reserved2)) {
++ if ((size_t)skip < 7 + sizeof(rar->reserved1) + sizeof(rar->reserved2)) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Invalid header size");
+ return (ARCHIVE_FATAL);
+@@ -984,7 +987,8 @@
+ memcpy(rar->reserved2, p + 7 + sizeof(rar->reserved1),
+ sizeof(rar->reserved2));
+ if (rar->main_flags & MHD_ENCRYPTVER) {
+- if (skip < 7 + sizeof(rar->reserved1) + sizeof(rar->reserved2)+1) {
++ if ((size_t)skip <
++ 7 + sizeof(rar->reserved1) + sizeof(rar->reserved2) + 1) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Invalid header size");
+ return (ARCHIVE_FATAL);
+@@ -1053,28 +1057,30 @@
+ /* Skim the entire header and compute the CRC. */
+ crc32_val = 0;
+ while (skip > 0) {
+- size_t to_read = skip;
+- if (to_read > 32 * 1024)
+- to_read = 32 * 1024;
+- if ((h = __archive_read_ahead(a, to_read, NULL)) == NULL) {
+- archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+- "Bad RAR file");
+- return (ARCHIVE_FATAL);
+- }
+- p = h;
+- crc32_val = crc32(crc32_val, (const unsigned char *)p, (unsigned int)to_read);
+- __archive_read_consume(a, to_read);
+- skip -= to_read;
++ unsigned to_read;
++ if (skip > 32 * 1024)
++ to_read = 32 * 1024;
++ else
++ to_read = (unsigned)skip;
++ if ((h = __archive_read_ahead(a, to_read, NULL)) == NULL) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Bad RAR file");
++ return (ARCHIVE_FATAL);
++ }
++ p = h;
++ crc32_val = crc32(crc32_val, (const unsigned char *)p, to_read);
++ __archive_read_consume(a, to_read);
++ skip -= to_read;
+ }
+ if ((crc32_val & 0xffff) != crc32_expected) {
+ #ifndef DONT_FAIL_ON_CRC_ERROR
+- archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+- "Header CRC error");
+- return (ARCHIVE_FATAL);
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Header CRC error");
++ return (ARCHIVE_FATAL);
+ #endif
+ }
+ if (head_type == ENDARC_HEAD)
+- return (ARCHIVE_EOF);
++ return (ARCHIVE_EOF);
+ break;
+
+ case NEWSUB_HEAD:
+@@ -1083,7 +1089,7 @@
+ break;
+
+ default:
+- archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Bad RAR file");
+ return (ARCHIVE_FATAL);
+ }
+@@ -1098,7 +1104,7 @@
+ int ret;
+
+ if (rar->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
+- rar->has_encrypted_entries = 0;
++ rar->has_encrypted_entries = 0;
+ }
+
+ if (rar->bytes_unconsumed > 0) {
+@@ -1186,7 +1192,7 @@
+ int whence)
+ {
+ int64_t client_offset, ret;
+- unsigned int i;
++ size_t i;
+ struct rar *rar = (struct rar *)(a->format->data);
+
+ if (rar->compression_method == COMPRESS_METHOD_STORE)
+@@ -1433,7 +1439,11 @@
+ }
+
+ if ((h = __archive_read_ahead(a, (size_t)header_size - 7, NULL)) == NULL)
++ {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Failed to read full header content.");
+ return (ARCHIVE_FATAL);
++ }
+
+ /* File Header CRC check. */
+ crc32_computed = crc32(crc32_computed, h, (unsigned)(header_size - 7));
+@@ -1460,8 +1470,8 @@
+
+ if (rar->file_flags & FHD_PASSWORD)
+ {
+- archive_entry_set_is_data_encrypted(entry, 1);
+- rar->has_encrypted_entries = 1;
++ archive_entry_set_is_data_encrypted(entry, 1);
++ rar->has_encrypted_entries = 1;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "RAR encryption support unavailable.");
+ /* Since it is only the data part itself that is encrypted we can at least
+@@ -1506,10 +1516,23 @@
+ */
+ if (head_type == NEWSUB_HEAD) {
+ size_t distance = p - (const char *)h;
++ if (rar->packed_size > INT64_MAX - header_size) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Extended header size too large.");
++ return (ARCHIVE_FATAL);
++ }
+ header_size += rar->packed_size;
++ if ((uintmax_t)header_size > SIZE_MAX) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Unable to read extended header data.");
++ return (ARCHIVE_FATAL);
++ }
+ /* Make sure we have the extended data. */
+- if ((h = __archive_read_ahead(a, (size_t)header_size - 7, NULL)) == NULL)
+- return (ARCHIVE_FATAL);
++ if ((h = __archive_read_ahead(a, (size_t)header_size - 7, NULL)) == NULL) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Failed to read extended header data.");
++ return (ARCHIVE_FATAL);
++ }
+ p = h;
+ endp = p + header_size - 7;
+ p += distance;
+@@ -1670,6 +1693,8 @@
+ !memcmp(rar->filename, rar->filename_save, filename_size + 1))
+ {
+ __archive_read_consume(a, header_size - 7);
++ rar->br.avail_in = 0;
++ rar->br.next_in = NULL;
+ rar->cursor++;
+ if (rar->cursor >= rar->nodes)
+ {
+@@ -1689,6 +1714,12 @@
+ }
+ if (rar->dbo[rar->cursor].start_offset < 0)
+ {
++ if (rar->packed_size > INT64_MAX - a->filter->position)
++ {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Unable to store offsets.");
++ return (ARCHIVE_FATAL);
++ }
+ rar->dbo[rar->cursor].start_offset = a->filter->position;
+ rar->dbo[rar->cursor].end_offset = rar->dbo[rar->cursor].start_offset +
+ rar->packed_size;
+@@ -1745,6 +1776,11 @@
+ }
+
+ __archive_read_consume(a, header_size - 7);
++ if (rar->packed_size > INT64_MAX - a->filter->position) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Unable to store offsets.");
++ return (ARCHIVE_FATAL);
++ }
+ rar->dbo[0].start_offset = a->filter->position;
+ rar->dbo[0].end_offset = rar->dbo[0].start_offset + rar->packed_size;
+
+@@ -1753,7 +1789,7 @@
+ case OS_MSDOS:
+ case OS_OS2:
+ case OS_WIN32:
+- rar->mode = archive_le32dec(file_header.file_attr);
++ rar->mode = (__LA_MODE_T)archive_le32dec(file_header.file_attr);
+ if (rar->mode & FILE_ATTRIBUTE_DIRECTORY)
+ rar->mode = AE_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
+ else
+@@ -1764,7 +1800,7 @@
+ case OS_UNIX:
+ case OS_MAC_OS:
+ case OS_BEOS:
+- rar->mode = archive_le32dec(file_header.file_attr);
++ rar->mode = (__LA_MODE_T)archive_le32dec(file_header.file_attr);
+ break;
+
+ default:
+@@ -1780,6 +1816,7 @@
+ rar->offset_outgoing = 0;
+ rar->br.cache_avail = 0;
+ rar->br.avail_in = 0;
++ rar->br.next_in = NULL;
+ rar->crc_calculated = 0;
+ rar->entry_eof = 0;
+ rar->valid = 1;
+@@ -1941,8 +1978,18 @@
+ int ret = (ARCHIVE_OK);
+
+ rar = (struct rar *)(a->format->data);
++ if ((uintmax_t)rar->packed_size > SIZE_MAX)
++ {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Unable to read link.");
++ return (ARCHIVE_FATAL);
++ }
+ if ((h = rar_read_ahead(a, (size_t)rar->packed_size, NULL)) == NULL)
++ {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ "Failed to read link.");
+ return (ARCHIVE_FATAL);
++ }
+ p = h;
+
+ if (archive_entry_copy_symlink_l(entry,
+@@ -2224,7 +2271,7 @@
+
+ ret = expand(a, &end);
+ if (ret != ARCHIVE_OK)
+- return (ret);
++ return (ret);
+
+ rar->bytes_uncopied = end - start;
+ rar->filters.lastend = end;
+@@ -2276,7 +2323,7 @@
+ free_codes(a);
+
+ /* Skip to the next byte */
+- rar_br_consume_unalined_bits(br);
++ rar_br_consume_unaligned_bits(br);
+
+ /* PPMd block flag */
+ if (!rar_br_read_ahead(a, br, 1))
+@@ -2332,9 +2379,9 @@
+ __archive_ppmd7_functions.Ppmd7_Construct(&rar->ppmd7_context);
+
+ if (rar->dictionary_size == 0) {
+- archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Invalid zero dictionary size");
+- return (ARCHIVE_FATAL);
++ return (ARCHIVE_FATAL);
+ }
+
+ if (!__archive_ppmd7_functions.Ppmd7_Alloc(&rar->ppmd7_context,
+@@ -2803,7 +2850,7 @@
+ else
+ code->tablesize = code->maxlength;
+
+- code->table = calloc(1U << code->tablesize, sizeof(*code->table));
++ code->table = calloc(((size_t)1U) << code->tablesize, sizeof(*code->table));
+
+ return make_table_recurse(a, code, 0, code->table, 0, code->tablesize);
+ }
+@@ -2929,11 +2976,11 @@
+ }
+
+ if ((symbol = read_next_symbol(a, &rar->maincode)) < 0)
+- return (ARCHIVE_FATAL);
++ goto bad_data;
+
+ if (symbol < 256)
+ {
+- lzss_emit_literal(rar, symbol);
++ lzss_emit_literal(rar, (uint8_t)symbol);
+ continue;
+ }
+ else if (symbol == 256)
+@@ -2956,14 +3003,14 @@
+ else
+ {
+ if (parse_codes(a) != ARCHIVE_OK)
+- return (ARCHIVE_FATAL);
++ goto bad_data;
+ continue;
+ }
+ }
+ else if(symbol==257)
+ {
+ if (!read_filter(a, end))
+- return (ARCHIVE_FATAL);
++ goto bad_data;
+ continue;
+ }
+ else if(symbol==258)
+@@ -3048,7 +3095,7 @@
+ {
+ if ((lowoffsetsymbol =
+ read_next_symbol(a, &rar->lowoffsetcode)) < 0)
+- return (ARCHIVE_FATAL);
++ goto bad_data;
+ if(lowoffsetsymbol == 16)
+ {
+ rar->numlowoffsetrepeats = 15;
+@@ -3096,7 +3143,7 @@
+ }
+
+ static int
+-copy_from_lzss_window(struct archive_read *a, void *buffer,
++copy_from_lzss_window(struct archive_read *a, uint8_t *buffer,
+ int64_t startpos, int length)
+ {
+ int windowoffs, firstpart;
+@@ -3111,7 +3158,7 @@
+ }
+ if (firstpart < length) {
+ memcpy(buffer, &rar->lzss.window[windowoffs], firstpart);
+- memcpy(buffer, &rar->lzss.window[0], length - firstpart);
++ memcpy(buffer + firstpart, &rar->lzss.window[0], length - firstpart);
+ } else {
+ memcpy(buffer, &rar->lzss.window[windowoffs], length);
+ }
+@@ -3180,8 +3227,12 @@
+ rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail)
+ {
+ struct rar *rar = (struct rar *)(a->format->data);
+- const void *h = __archive_read_ahead(a, min, avail);
++ const void *h;
+ int ret;
++
++again:
++ h = __archive_read_ahead(a, min, avail);
++
+ if (avail)
+ {
+ if (a->archive.read_data_is_posix_read && *avail > (ssize_t)a->archive.read_data_requested)
+@@ -3203,7 +3254,7 @@
+ rar->filename_must_match = 0;
+ if (ret != (ARCHIVE_OK))
+ return NULL;
+- return rar_read_ahead(a, min, avail);
++ goto again;
+ }
+ }
+ return h;
+@@ -3266,6 +3317,9 @@
+ else
+ blocklength = prog ? prog->oldfilterlength : 0;
+
++ if (blocklength > rar->dictionary_size)
++ return 0;
++
+ registers[3] = PROGRAM_SYSTEM_GLOBAL_ADDRESS;
+ registers[4] = blocklength;
+ registers[5] = prog ? prog->usagecount : 0;
+--- contrib/libarchive/libarchive/archive_read_support_format_rar5.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_rar5.c
+@@ -46,6 +46,7 @@
+ #include "archive_entry_locale.h"
+ #include "archive_ppmd7_private.h"
+ #include "archive_entry_private.h"
++#include "archive_time_private.h"
+
+ #ifdef HAVE_BLAKE2_H
+ #include
+@@ -100,10 +101,12 @@
+ uint8_t dir : 1; /* Is this file entry a directory? */
+
+ /* Optional time fields. */
+- uint64_t e_mtime;
+- uint64_t e_ctime;
+- uint64_t e_atime;
+- uint32_t e_unix_ns;
++ int64_t e_mtime;
++ int64_t e_ctime;
++ int64_t e_atime;
++ uint32_t e_mtime_ns;
++ uint32_t e_ctime_ns;
++ uint32_t e_atime_ns;
+
+ /* Optional hash fields. */
+ uint32_t stored_crc32;
+@@ -691,7 +694,8 @@
+ default:
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_FILE_FORMAT,
+- "Unsupported filter type: 0x%x", flt->type);
++ "Unsupported filter type: 0x%x",
++ (unsigned int)flt->type);
+ return ARCHIVE_FATAL;
+ }
+
+@@ -1100,22 +1104,22 @@
+ return ARCHIVE_OK;
+ }
+
+-static int read_u32(struct archive_read* a, uint32_t* pvalue) {
++static char read_u32(struct archive_read* a, uint32_t* pvalue) {
+ const uint8_t* p;
+ if(!read_ahead(a, 4, &p))
+ return 0;
+
+ *pvalue = archive_le32dec(p);
+- return ARCHIVE_OK == consume(a, 4) ? 1 : 0;
++ return ARCHIVE_OK == consume(a, 4);
+ }
+
+-static int read_u64(struct archive_read* a, uint64_t* pvalue) {
++static char read_u64(struct archive_read* a, uint64_t* pvalue) {
+ const uint8_t* p;
+ if(!read_ahead(a, 8, &p))
+ return 0;
+
+ *pvalue = archive_le64dec(p);
+- return ARCHIVE_OK == consume(a, 8) ? 1 : 0;
++ return ARCHIVE_OK == consume(a, 8);
+ }
+
+ static int bid_standard(struct archive_read* a) {
+@@ -1293,21 +1297,15 @@
+ *extra_data_size -= hash_size;
+ } else {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+- "Unsupported hash type (0x%x)", (int) hash_type);
++ "Unsupported hash type (0x%jx)", (uintmax_t)hash_type);
+ return ARCHIVE_FATAL;
+ }
+
+ return ARCHIVE_OK;
+ }
+
+-static uint64_t time_win_to_unix(uint64_t win_time) {
+- const size_t ns_in_sec = 10000000;
+- const uint64_t sec_to_unix = 11644473600LL;
+- return win_time / ns_in_sec - sec_to_unix;
+-}
+-
+ static int parse_htime_item(struct archive_read* a, char unix_time,
+- uint64_t* where, int64_t* extra_data_size)
++ int64_t* sec, uint32_t* nsec, int64_t* extra_data_size)
+ {
+ if(unix_time) {
+ uint32_t time_val;
+@@ -1315,13 +1313,13 @@
+ return ARCHIVE_EOF;
+
+ *extra_data_size -= 4;
+- *where = (uint64_t) time_val;
++ *sec = (int64_t) time_val;
+ } else {
+ uint64_t windows_time;
+ if(!read_u64(a, &windows_time))
+ return ARCHIVE_EOF;
+
+- *where = time_win_to_unix(windows_time);
++ ntfs_to_unix(windows_time, sec, nsec);
+ *extra_data_size -= 8;
+ }
+
+@@ -1385,7 +1383,7 @@
+ static int parse_file_extra_htime(struct archive_read* a,
+ struct archive_entry* e, struct rar5* rar, int64_t* extra_data_size)
+ {
+- char unix_time = 0;
++ char unix_time, has_unix_ns, has_mtime, has_ctime, has_atime;
+ size_t flags = 0;
+ size_t value_len;
+
+@@ -1406,32 +1404,62 @@
+ }
+
+ unix_time = flags & IS_UNIX;
++ has_unix_ns = unix_time && (flags & HAS_UNIX_NS);
++ has_mtime = flags & HAS_MTIME;
++ has_atime = flags & HAS_ATIME;
++ has_ctime = flags & HAS_CTIME;
++ rar->file.e_atime_ns = rar->file.e_ctime_ns = rar->file.e_mtime_ns = 0;
+
+- if(flags & HAS_MTIME) {
++ if(has_mtime) {
+ parse_htime_item(a, unix_time, &rar->file.e_mtime,
+- extra_data_size);
+- archive_entry_set_mtime(e, rar->file.e_mtime, 0);
++ &rar->file.e_mtime_ns, extra_data_size);
+ }
+
+- if(flags & HAS_CTIME) {
++ if(has_ctime) {
+ parse_htime_item(a, unix_time, &rar->file.e_ctime,
+- extra_data_size);
+- archive_entry_set_ctime(e, rar->file.e_ctime, 0);
++ &rar->file.e_ctime_ns, extra_data_size);
+ }
+
+- if(flags & HAS_ATIME) {
++ if(has_atime) {
+ parse_htime_item(a, unix_time, &rar->file.e_atime,
+- extra_data_size);
+- archive_entry_set_atime(e, rar->file.e_atime, 0);
++ &rar->file.e_atime_ns, extra_data_size);
+ }
+
+- if(flags & HAS_UNIX_NS) {
+- if(!read_u32(a, &rar->file.e_unix_ns))
++ if(has_mtime && has_unix_ns) {
++ if(!read_u32(a, &rar->file.e_mtime_ns))
+ return ARCHIVE_EOF;
+
+ *extra_data_size -= 4;
+ }
+
++ if(has_ctime && has_unix_ns) {
++ if(!read_u32(a, &rar->file.e_ctime_ns))
++ return ARCHIVE_EOF;
++
++ *extra_data_size -= 4;
++ }
++
++ if(has_atime && has_unix_ns) {
++ if(!read_u32(a, &rar->file.e_atime_ns))
++ return ARCHIVE_EOF;
++
++ *extra_data_size -= 4;
++ }
++
++ /* The seconds and nanoseconds are either together, or separated in two
++ * fields so we parse them, then set the archive_entry's times. */
++ if(has_mtime) {
++ archive_entry_set_mtime(e, rar->file.e_mtime, rar->file.e_mtime_ns);
++ }
++
++ if(has_ctime) {
++ archive_entry_set_ctime(e, rar->file.e_ctime, rar->file.e_ctime_ns);
++ }
++
++ if(has_atime) {
++ archive_entry_set_atime(e, rar->file.e_atime, rar->file.e_atime_ns);
++ }
++
+ return ARCHIVE_OK;
+ }
+
+@@ -1896,7 +1924,8 @@
+ } else {
+ /* Unknown host OS */
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+- "Unsupported Host OS: 0x%x", (int) host_os);
++ "Unsupported Host OS: 0x%jx",
++ (uintmax_t)host_os);
+
+ return ARCHIVE_FATAL;
+ }
+@@ -2104,8 +2133,8 @@
+ default:
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_FILE_FORMAT,
+- "Unsupported extra type (0x%x)",
+- (int) extra_field_id);
++ "Unsupported extra type (0x%jx)",
++ (uintmax_t)extra_field_id);
+ return ARCHIVE_FATAL;
+ }
+
+@@ -3093,7 +3122,7 @@
+ * can be stored in the output buffer directly.
+ *
+ * - Code 256 defines a new filter, which is later used to
+- * ransform the data block accordingly to the filter type.
++ * transform the data block accordingly to the filter type.
+ * The data block needs to be fully uncompressed first.
+ *
+ * - Code bigger than 257 and smaller than 262 define
+@@ -3983,7 +4012,7 @@
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_FILE_FORMAT,
+ "Compression method not supported: 0x%x",
+- rar->cstate.method);
++ (unsigned int)rar->cstate.method);
+
+ return ARCHIVE_FATAL;
+ }
+--- contrib/libarchive/libarchive/archive_read_support_format_tar.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_tar.c
+@@ -129,7 +129,11 @@
+ int64_t entry_offset;
+ int64_t entry_padding;
+ int64_t entry_bytes_unconsumed;
+- int64_t realsize;
++ int64_t disk_size;
++ int64_t GNU_sparse_realsize;
++ int64_t GNU_sparse_size;
++ int64_t SCHILY_sparse_realsize;
++ int64_t pax_size;
+ struct sparse_block *sparse_list;
+ struct sparse_block *sparse_last;
+ int64_t sparse_offset;
+@@ -138,6 +142,7 @@
+ int sparse_gnu_minor;
+ char sparse_gnu_attributes_seen;
+ char filetype;
++ char size_fields; /* Bits defined below */
+
+ struct archive_string localname;
+ struct archive_string_conv *opt_sconv;
+@@ -148,9 +153,15 @@
+ int compat_2x;
+ int process_mac_extensions;
+ int read_concatenated_archives;
+- int realsize_override;
+ };
+
++/* Track which size fields were present in the headers */
++#define TAR_SIZE_PAX_SIZE 1
++#define TAR_SIZE_GNU_SPARSE_REALSIZE 2
++#define TAR_SIZE_GNU_SPARSE_SIZE 4
++#define TAR_SIZE_SCHILY_SPARSE_REALSIZE 8
++
++
+ static int archive_block_is_null(const char *p);
+ static char *base64_decode(const char *, size_t, size_t *);
+ static int gnu_add_sparse_entry(struct archive_read *, struct tar *,
+@@ -158,36 +169,36 @@
+
+ static void gnu_clear_sparse_list(struct tar *);
+ static int gnu_sparse_old_read(struct archive_read *, struct tar *,
+- const struct archive_entry_header_gnutar *header, size_t *);
++ const struct archive_entry_header_gnutar *header, int64_t *);
+ static int gnu_sparse_old_parse(struct archive_read *, struct tar *,
+ const struct gnu_sparse *sparse, int length);
+ static int gnu_sparse_01_parse(struct archive_read *, struct tar *,
+ const char *, size_t);
+-static ssize_t gnu_sparse_10_read(struct archive_read *, struct tar *,
+- size_t *);
++static int64_t gnu_sparse_10_read(struct archive_read *, struct tar *,
++ int64_t *);
+ static int header_Solaris_ACL(struct archive_read *, struct tar *,
+- struct archive_entry *, const void *, size_t *);
++ struct archive_entry *, const void *, int64_t *);
+ static int header_common(struct archive_read *, struct tar *,
+ struct archive_entry *, const void *);
+ static int header_old_tar(struct archive_read *, struct tar *,
+ struct archive_entry *, const void *);
+ static int header_pax_extension(struct archive_read *, struct tar *,
+- struct archive_entry *, const void *, size_t *);
++ struct archive_entry *, const void *, int64_t *);
+ static int header_pax_global(struct archive_read *, struct tar *,
+- struct archive_entry *, const void *h, size_t *);
++ struct archive_entry *, const void *h, int64_t *);
+ static int header_gnu_longlink(struct archive_read *, struct tar *,
+- struct archive_entry *, const void *h, size_t *);
++ struct archive_entry *, const void *h, int64_t *);
+ static int header_gnu_longname(struct archive_read *, struct tar *,
+- struct archive_entry *, const void *h, size_t *);
++ struct archive_entry *, const void *h, int64_t *);
+ static int is_mac_metadata_entry(struct archive_entry *entry);
+ static int read_mac_metadata_blob(struct archive_read *,
+- struct archive_entry *, size_t *);
++ struct archive_entry *, int64_t *);
+ static int header_volume(struct archive_read *, struct tar *,
+- struct archive_entry *, const void *h, size_t *);
++ struct archive_entry *, const void *h, int64_t *);
+ static int header_ustar(struct archive_read *, struct tar *,
+ struct archive_entry *, const void *h);
+ static int header_gnutar(struct archive_read *, struct tar *,
+- struct archive_entry *, const void *h, size_t *);
++ struct archive_entry *, const void *h, int64_t *);
+ static int archive_read_format_tar_bid(struct archive_read *, int);
+ static int archive_read_format_tar_options(struct archive_read *,
+ const char *, const char *);
+@@ -200,7 +211,7 @@
+ static int checksum(struct archive_read *, const void *);
+ static int pax_attribute(struct archive_read *, struct tar *,
+ struct archive_entry *, const char *key, size_t key_length,
+- size_t value_length, size_t *unconsumed);
++ size_t value_length, int64_t *unconsumed);
+ static int pax_attribute_LIBARCHIVE_xattr(struct archive_entry *,
+ const char *, size_t, const char *, size_t);
+ static int pax_attribute_SCHILY_acl(struct archive_read *, struct tar *,
+@@ -209,20 +220,20 @@
+ struct archive_entry *, const char *, size_t);
+ static void pax_time(const char *, size_t, int64_t *sec, long *nanos);
+ static ssize_t readline(struct archive_read *, struct tar *, const char **,
+- ssize_t limit, size_t *);
++ ssize_t limit, int64_t *);
+ static int read_body_to_string(struct archive_read *, struct tar *,
+- struct archive_string *, const void *h, size_t *);
++ struct archive_string *, const void *h, int64_t *);
+ static int read_bytes_to_string(struct archive_read *,
+- struct archive_string *, size_t, size_t *);
++ struct archive_string *, size_t, int64_t *);
+ static int64_t tar_atol(const char *, size_t);
+ static int64_t tar_atol10(const char *, size_t);
+ static int64_t tar_atol256(const char *, size_t);
+ static int64_t tar_atol8(const char *, size_t);
+ static int tar_read_header(struct archive_read *, struct tar *,
+- struct archive_entry *, size_t *);
++ struct archive_entry *, int64_t *);
+ static int tohex(int c);
+ static char *url_decode(const char *, size_t);
+-static void tar_flush_unconsumed(struct archive_read *, size_t *);
++static void tar_flush_unconsumed(struct archive_read *, int64_t *);
+
+ /* Sanity limits: These numbers should be low enough to
+ * prevent a maliciously-crafted archive from forcing us to
+@@ -467,7 +478,7 @@
+ * anything outstanding since we're going to do read_aheads
+ */
+ static void
+-tar_flush_unconsumed(struct archive_read *a, size_t *unconsumed)
++tar_flush_unconsumed(struct archive_read *a, int64_t *unconsumed)
+ {
+ if (*unconsumed) {
+ /*
+@@ -515,7 +526,8 @@
+ const char *p;
+ const wchar_t *wp;
+ int r;
+- size_t l, unconsumed = 0;
++ size_t l;
++ int64_t unconsumed = 0;
+
+ /* Assign default device/inode values. */
+ archive_entry_set_dev(entry, 1 + default_dev); /* Don't use zero. */
+@@ -529,8 +541,7 @@
+ tar = (struct tar *)(a->format->data);
+ tar->entry_offset = 0;
+ gnu_clear_sparse_list(tar);
+- tar->realsize = -1; /* Mark this as "unset" */
+- tar->realsize_override = 0;
++ tar->size_fields = 0; /* We don't have any size info yet */
+
+ /* Setup default string conversion. */
+ tar->sconv = tar->opt_sconv;
+@@ -617,12 +628,15 @@
+ /* If we're at end of file, return EOF. */
+ if (tar->sparse_list == NULL ||
+ tar->entry_bytes_remaining == 0) {
+- if (__archive_read_consume(a, tar->entry_padding) < 0)
++ int64_t request = tar->entry_bytes_remaining +
++ tar->entry_padding;
++
++ if (__archive_read_consume(a, request) != request)
+ return (ARCHIVE_FATAL);
+ tar->entry_padding = 0;
+ *buff = NULL;
+ *size = 0;
+- *offset = tar->realsize;
++ *offset = tar->disk_size;
+ return (ARCHIVE_EOF);
+ }
+
+@@ -655,29 +669,15 @@
+ static int
+ archive_read_format_tar_skip(struct archive_read *a)
+ {
+- int64_t bytes_skipped;
+ int64_t request;
+- struct sparse_block *p;
+ struct tar* tar;
+
+ tar = (struct tar *)(a->format->data);
+
+- /* Do not consume the hole of a sparse file. */
+- request = 0;
+- for (p = tar->sparse_list; p != NULL; p = p->next) {
+- if (!p->hole) {
+- if (p->remaining >= INT64_MAX - request) {
+- return ARCHIVE_FATAL;
+- }
+- request += p->remaining;
+- }
+- }
+- if (request > tar->entry_bytes_remaining)
+- request = tar->entry_bytes_remaining;
+- request += tar->entry_padding + tar->entry_bytes_unconsumed;
++ request = tar->entry_bytes_remaining + tar->entry_padding +
++ tar->entry_bytes_unconsumed;
+
+- bytes_skipped = __archive_read_consume(a, request);
+- if (bytes_skipped < 0)
++ if (__archive_read_consume(a, request) != request)
+ return (ARCHIVE_FATAL);
+
+ tar->entry_bytes_remaining = 0;
+@@ -690,13 +690,29 @@
+ return (ARCHIVE_OK);
+ }
+
++/*
++ * This function resets the accumulated state while reading
++ * a header.
++ */
++static void
++tar_reset_header_state(struct tar *tar)
++{
++ tar->pax_hdrcharset_utf8 = 1;
++ tar->sparse_gnu_attributes_seen = 0;
++ archive_string_empty(&(tar->entry_gname));
++ archive_string_empty(&(tar->entry_pathname));
++ archive_string_empty(&(tar->entry_pathname_override));
++ archive_string_empty(&(tar->entry_uname));
++ archive_string_empty(&tar->entry_linkpath);
++}
++
+ /*
+ * This function reads and interprets all of the headers associated
+ * with a single entry.
+ */
+ static int
+ tar_read_header(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, size_t *unconsumed)
++ struct archive_entry *entry, int64_t *unconsumed)
+ {
+ ssize_t bytes;
+ int err = ARCHIVE_OK, err2;
+@@ -715,13 +731,7 @@
+ static const int32_t seen_x_header = 32; /* Also X */
+ static const int32_t seen_mac_metadata = 512;
+
+- tar->pax_hdrcharset_utf8 = 1;
+- tar->sparse_gnu_attributes_seen = 0;
+- archive_string_empty(&(tar->entry_gname));
+- archive_string_empty(&(tar->entry_pathname));
+- archive_string_empty(&(tar->entry_pathname_override));
+- archive_string_empty(&(tar->entry_uname));
+- archive_string_empty(&tar->entry_linkpath);
++ tar_reset_header_state(tar);
+
+ /* Ensure format is set. */
+ if (a->archive.archive_format_name == NULL) {
+@@ -750,7 +760,7 @@
+ * if there's no regular header, then this is
+ * a premature EOF. */
+ archive_set_error(&a->archive, EINVAL,
+- "Damaged tar archive");
++ "Damaged tar archive (end-of-archive within a sequence of headers)");
+ return (ARCHIVE_FATAL);
+ } else {
+ return (ARCHIVE_EOF);
+@@ -760,7 +770,7 @@
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_FILE_FORMAT,
+ "Truncated tar archive"
+- " detected while reading next heaader");
++ " detected while reading next header");
+ return (ARCHIVE_FATAL);
+ }
+ *unconsumed += 512;
+@@ -787,7 +797,8 @@
+ /* This is NOT a null block, so it must be a valid header. */
+ if (!checksum(a, h)) {
+ tar_flush_unconsumed(a, unconsumed);
+- archive_set_error(&a->archive, EINVAL, "Damaged tar archive");
++ archive_set_error(&a->archive, EINVAL,
++ "Damaged tar archive (bad header checksum)");
+ /* If we've read some critical information (pax headers, etc)
+ * and _then_ see a bad header, we can't really recover. */
+ if (eof_fatal) {
+@@ -804,6 +815,8 @@
+ switch(header->typeflag[0]) {
+ case 'A': /* Solaris tar ACL */
+ if (seen_headers & seen_A_header) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Redundant 'A' header");
+ return (ARCHIVE_FATAL);
+ }
+ seen_headers |= seen_A_header;
+@@ -813,6 +826,8 @@
+ break;
+ case 'g': /* POSIX-standard 'g' header. */
+ if (seen_headers & seen_g_header) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Redundant 'g' header");
+ return (ARCHIVE_FATAL);
+ }
+ seen_headers |= seen_g_header;
+@@ -822,27 +837,41 @@
+ break;
+ case 'K': /* Long link name (GNU tar, others) */
+ if (seen_headers & seen_K_header) {
+- return (ARCHIVE_FATAL);
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Damaged archive: Redundant 'K' headers may cause linknames to be incorrect");
++ err = err_combine(err, ARCHIVE_WARN);
+ }
+ seen_headers |= seen_K_header;
++ a->archive.archive_format = ARCHIVE_FORMAT_TAR_GNUTAR;
++ a->archive.archive_format_name = "GNU tar format";
+ err2 = header_gnu_longlink(a, tar, entry, h, unconsumed);
+ break;
+ case 'L': /* Long filename (GNU tar, others) */
+ if (seen_headers & seen_L_header) {
+- return (ARCHIVE_FATAL);
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Damaged archive: Redundant 'L' headers may cause filenames to be incorrect");
++ err = err_combine(err, ARCHIVE_WARN);
+ }
+ seen_headers |= seen_L_header;
++ a->archive.archive_format = ARCHIVE_FORMAT_TAR_GNUTAR;
++ a->archive.archive_format_name = "GNU tar format";
+ err2 = header_gnu_longname(a, tar, entry, h, unconsumed);
+ break;
+ case 'V': /* GNU volume header */
+ if (seen_headers & seen_V_header) {
+- return (ARCHIVE_FATAL);
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Redundant 'V' header");
++ err = err_combine(err, ARCHIVE_WARN);
+ }
+ seen_headers |= seen_V_header;
++ a->archive.archive_format = ARCHIVE_FORMAT_TAR_GNUTAR;
++ a->archive.archive_format_name = "GNU tar format";
+ err2 = header_volume(a, tar, entry, h, unconsumed);
+ break;
+ case 'X': /* Used by SUN tar; same as 'x'. */
+ if (seen_headers & seen_x_header) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Redundant 'X'/'x' header");
+ return (ARCHIVE_FATAL);
+ }
+ seen_headers |= seen_x_header;
+@@ -853,6 +882,8 @@
+ break;
+ case 'x': /* POSIX-standard 'x' header. */
+ if (seen_headers & seen_x_header) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Redundant 'x' header");
+ return (ARCHIVE_FATAL);
+ }
+ seen_headers |= seen_x_header;
+@@ -904,6 +935,7 @@
+ err = err_combine(err, err2);
+ /* Note: Other headers can appear again. */
+ seen_headers = seen_mac_metadata;
++ tar_reset_header_state(tar);
+ break;
+ }
+
+@@ -1032,13 +1064,13 @@
+ */
+ static int
+ header_Solaris_ACL(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, const void *h, size_t *unconsumed)
++ struct archive_entry *entry, const void *h, int64_t *unconsumed)
+ {
+ const struct archive_entry_header_ustar *header;
+ struct archive_string acl_text;
+ size_t size;
+ int err, acl_type;
+- int64_t type;
++ uint64_t type;
+ char *acl, *p;
+
+ header = (const struct archive_entry_header_ustar *)h;
+@@ -1075,7 +1107,7 @@
+ }
+ p++;
+ }
+- switch ((int)type & ~0777777) {
++ switch (type & ~0777777) {
+ case 01000000:
+ /* POSIX.1e ACL */
+ acl_type = ARCHIVE_ENTRY_ACL_TYPE_ACCESS;
+@@ -1086,8 +1118,8 @@
+ break;
+ default:
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Malformed Solaris ACL attribute (unsupported type %o)",
+- (int)type);
++ "Malformed Solaris ACL attribute (unsupported type %llu)",
++ (unsigned long long)type);
+ archive_string_free(&acl_text);
+ return (ARCHIVE_WARN);
+ }
+@@ -1138,14 +1170,16 @@
+ */
+ static int
+ header_gnu_longlink(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, const void *h, size_t *unconsumed)
++ struct archive_entry *entry, const void *h, int64_t *unconsumed)
+ {
+ int err;
+
+ struct archive_string linkpath;
+ archive_string_init(&linkpath);
+ err = read_body_to_string(a, tar, &linkpath, h, unconsumed);
+- archive_entry_set_link(entry, linkpath.s);
++ if (err == ARCHIVE_OK) {
++ archive_entry_set_link(entry, linkpath.s);
++ }
+ archive_string_free(&linkpath);
+ return (err);
+ }
+@@ -1170,7 +1204,7 @@
+ */
+ static int
+ header_gnu_longname(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, const void *h, size_t *unconsumed)
++ struct archive_entry *entry, const void *h, int64_t *unconsumed)
+ {
+ int err;
+ struct archive_string longname;
+@@ -1191,7 +1225,7 @@
+ */
+ static int
+ header_volume(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, const void *h, size_t *unconsumed)
++ struct archive_entry *entry, const void *h, int64_t *unconsumed)
+ {
+ const struct archive_entry_header_ustar *header;
+ int64_t size, to_consume;
+@@ -1217,7 +1251,7 @@
+ static int
+ read_bytes_to_string(struct archive_read *a,
+ struct archive_string *as, size_t size,
+- size_t *unconsumed) {
++ int64_t *unconsumed) {
+ const void *src;
+
+ /* Fail if we can't make our buffer big enough. */
+@@ -1250,7 +1284,7 @@
+ */
+ static int
+ read_body_to_string(struct archive_read *a, struct tar *tar,
+- struct archive_string *as, const void *h, size_t *unconsumed)
++ struct archive_string *as, const void *h, int64_t *unconsumed)
+ {
+ int64_t size;
+ const struct archive_entry_header_ustar *header;
+@@ -1259,18 +1293,21 @@
+ (void)tar; /* UNUSED */
+ header = (const struct archive_entry_header_ustar *)h;
+ size = tar_atol(header->size, sizeof(header->size));
+- if (size > entry_limit) {
++ if (size < 0 || size > entry_limit) {
++ archive_set_error(&a->archive, EINVAL,
++ "Special header has invalid size: %lld",
++ (long long)size);
+ return (ARCHIVE_FATAL);
+ }
+- if ((size > (int64_t)pathname_limit) || (size < 0)) {
++ if (size > (int64_t)pathname_limit) {
+ archive_string_empty(as);
+ int64_t to_consume = ((size + 511) & ~511);
+ if (to_consume != __archive_read_consume(a, to_consume)) {
+ return (ARCHIVE_FATAL);
+ }
+ archive_set_error(&a->archive, EINVAL,
+- "Special header too large: %d > 1MiB",
+- (int)size);
++ "Special header too large: %lld > 1MiB",
++ (long long)size);
+ return (ARCHIVE_WARN);
+ }
+ r = read_bytes_to_string(a, as, size, unconsumed);
+@@ -1287,6 +1324,11 @@
+ * allows header_old_tar and header_ustar
+ * to handle filenames differently, while still putting most of the
+ * common parsing into one place.
++ *
++ * This is called _after_ ustar, GNU tar, Schily, etc, special
++ * fields have already been parsed into the `tar` structure.
++ * So we can make final decisions here about how to reconcile
++ * size, mode, etc, information.
+ */
+ static int
+ header_common(struct archive_read *a, struct tar *tar,
+@@ -1308,34 +1350,73 @@
+ archive_entry_set_perm(entry,
+ (mode_t)tar_atol(header->mode, sizeof(header->mode)));
+ }
++
++ /* Set uid, gid, mtime if not already set */
+ if (!archive_entry_uid_is_set(entry)) {
+ archive_entry_set_uid(entry, tar_atol(header->uid, sizeof(header->uid)));
+ }
+ if (!archive_entry_gid_is_set(entry)) {
+ archive_entry_set_gid(entry, tar_atol(header->gid, sizeof(header->gid)));
+ }
++ if (!archive_entry_mtime_is_set(entry)) {
++ archive_entry_set_mtime(entry, tar_atol(header->mtime, sizeof(header->mtime)), 0);
++ }
++
++ /* Reconcile the size info. */
++ /* First, how big is the file on disk? */
++ if ((tar->size_fields & TAR_SIZE_GNU_SPARSE_REALSIZE) != 0) {
++ /* GNU sparse format 1.0 uses `GNU.sparse.realsize`
++ * to hold the size of the file on disk. */
++ tar->disk_size = tar->GNU_sparse_realsize;
++ } else if ((tar->size_fields & TAR_SIZE_GNU_SPARSE_SIZE) != 0
++ && (tar->sparse_gnu_major == 0)) {
++ /* GNU sparse format 0.0 and 0.1 use `GNU.sparse.size`
++ * to hold the size of the file on disk. */
++ tar->disk_size = tar->GNU_sparse_size;
++ } else if ((tar->size_fields & TAR_SIZE_SCHILY_SPARSE_REALSIZE) != 0) {
++ tar->disk_size = tar->SCHILY_sparse_realsize;
++ } else if ((tar->size_fields & TAR_SIZE_PAX_SIZE) != 0) {
++ tar->disk_size = tar->pax_size;
++ } else {
++ /* There wasn't a suitable pax header, so use the ustar info */
++ tar->disk_size = tar_atol(header->size, sizeof(header->size));
++ }
+
+- tar->entry_bytes_remaining = tar_atol(header->size, sizeof(header->size));
++ if (tar->disk_size < 0) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Tar entry has negative file size");
++ return (ARCHIVE_FATAL);
++ } else if (tar->disk_size > entry_limit) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Tar entry size overflow");
++ return (ARCHIVE_FATAL);
++ } else {
++ archive_entry_set_size(entry, tar->disk_size);
++ }
++
++ /* Second, how big is the data in the archive? */
++ if ((tar->size_fields & TAR_SIZE_GNU_SPARSE_SIZE) != 0
++ && (tar->sparse_gnu_major == 1)) {
++ /* GNU sparse format 1.0 uses `GNU.sparse.size`
++ * to hold the size of the data in the archive. */
++ tar->entry_bytes_remaining = tar->GNU_sparse_size;
++ } else if ((tar->size_fields & TAR_SIZE_PAX_SIZE) != 0) {
++ tar->entry_bytes_remaining = tar->pax_size;
++ } else {
++ tar->entry_bytes_remaining
++ = tar_atol(header->size, sizeof(header->size));
++ }
+ if (tar->entry_bytes_remaining < 0) {
+ tar->entry_bytes_remaining = 0;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Tar entry has negative size");
++ "Tar entry has negative size");
+ return (ARCHIVE_FATAL);
+- }
+- if (tar->entry_bytes_remaining > entry_limit) {
++ } else if (tar->entry_bytes_remaining > entry_limit) {
+ tar->entry_bytes_remaining = 0;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Tar entry size overflow");
++ "Tar entry size overflow");
+ return (ARCHIVE_FATAL);
+ }
+- if (!tar->realsize_override) {
+- tar->realsize = tar->entry_bytes_remaining;
+- }
+- archive_entry_set_size(entry, tar->realsize);
+-
+- if (!archive_entry_mtime_is_set(entry)) {
+- archive_entry_set_mtime(entry, tar_atol(header->mtime, sizeof(header->mtime)), 0);
+- }
+
+ /* Handle the tar type flag appropriately. */
+ tar->filetype = header->typeflag[0];
+@@ -1597,7 +1678,7 @@
+ */
+ static int
+ read_mac_metadata_blob(struct archive_read *a,
+- struct archive_entry *entry, size_t *unconsumed)
++ struct archive_entry *entry, int64_t *unconsumed)
+ {
+ int64_t size;
+ size_t msize;
+@@ -1654,7 +1735,7 @@
+ */
+ static int
+ header_pax_global(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, const void *h, size_t *unconsumed)
++ struct archive_entry *entry, const void *h, int64_t *unconsumed)
+ {
+ const struct archive_entry_header_ustar *header;
+ int64_t size, to_consume;
+@@ -1665,7 +1746,10 @@
+
+ header = (const struct archive_entry_header_ustar *)h;
+ size = tar_atol(header->size, sizeof(header->size));
+- if (size > entry_limit) {
++ if (size < 0 || size > entry_limit) {
++ archive_set_error(&a->archive, EINVAL,
++ "Special header has invalid size: %lld",
++ (long long)size);
+ return (ARCHIVE_FATAL);
+ }
+ to_consume = ((size + 511) & ~511);
+@@ -1761,7 +1845,7 @@
+
+ static int
+ header_pax_extension(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, const void *h, size_t *unconsumed)
++ struct archive_entry *entry, const void *h, int64_t *unconsumed)
+ {
+ /* Sanity checks: The largest `x` body I've ever heard of was
+ * a little over 4MB. So I doubt there has ever been a
+@@ -1812,8 +1896,8 @@
+ return (ARCHIVE_FATAL);
+ }
+ archive_set_error(&a->archive, EINVAL,
+- "Ignoring oversized pax extensions: %d > %d",
+- (int)ext_size, (int)ext_size_limit);
++ "Ignoring oversized pax extensions: %lld > %lld",
++ (long long)ext_size, (long long)ext_size_limit);
+ return (ARCHIVE_WARN);
+ }
+ tar_flush_unconsumed(a, unconsumed);
+@@ -1912,6 +1996,13 @@
+ *unconsumed += p - attr_start;
+ tar_flush_unconsumed(a, unconsumed);
+
++ if (value_length == 0) {
++ archive_set_error(&a->archive, EINVAL,
++ "Malformed pax attributes");
++ *unconsumed += ext_size + ext_padding;
++ return (ARCHIVE_WARN);
++ }
++
+ /* pax_attribute will consume value_length - 1 */
+ r = pax_attribute(a, tar, entry, attr_name.s, archive_strlen(&attr_name), value_length - 1, unconsumed);
+ ext_size -= value_length - 1;
+@@ -2121,8 +2212,9 @@
+ if (value_length > acl_limit) {
+ __archive_read_consume(a, value_length);
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Unreasonably large ACL: %d > %d",
+- (int)value_length, (int)acl_limit);
++ "Unreasonably large ACL: %llu > %llu",
++ (unsigned long long)value_length,
++ (unsigned long long)acl_limit);
+ return (ARCHIVE_WARN);
+ }
+
+@@ -2154,7 +2246,7 @@
+ }
+
+ static int
+-pax_attribute_read_time(struct archive_read *a, size_t value_length, int64_t *ps, long *pn, size_t *unconsumed) {
++pax_attribute_read_time(struct archive_read *a, size_t value_length, int64_t *ps, long *pn, int64_t *unconsumed) {
+ struct archive_string as;
+ int r;
+
+@@ -2169,12 +2261,16 @@
+ r = read_bytes_to_string(a, &as, value_length, unconsumed);
+ if (r < ARCHIVE_OK) {
+ archive_string_free(&as);
++ *ps = 0;
++ *pn = 0;
+ return (r);
+ }
+
+ pax_time(as.s, archive_strlen(&as), ps, pn);
+ archive_string_free(&as);
+- if (*ps < 0 || *ps == INT64_MAX) {
++ if (*ps == INT64_MIN) {
++ *ps = 0;
++ *pn = 0;
+ return (ARCHIVE_WARN);
+ }
+ return (ARCHIVE_OK);
+@@ -2183,7 +2279,7 @@
+ static int
+ pax_attribute_read_number(struct archive_read *a, size_t value_length, int64_t *result) {
+ struct archive_string as;
+- size_t unconsumed = 0;
++ int64_t unconsumed = 0;
+ int r;
+
+ if (value_length > 64) {
+@@ -2197,6 +2293,7 @@
+ tar_flush_unconsumed(a, &unconsumed);
+ if (r < ARCHIVE_OK) {
+ archive_string_free(&as);
++ *result = 0;
+ return (r);
+ }
+
+@@ -2223,7 +2320,7 @@
+ */
+ static int
+ pax_attribute(struct archive_read *a, struct tar *tar, struct archive_entry *entry,
+- const char *key, size_t key_length, size_t value_length, size_t *unconsumed)
++ const char *key, size_t key_length, size_t value_length, int64_t *unconsumed)
+ {
+ int64_t t;
+ long n;
+@@ -2289,10 +2386,13 @@
+ }
+ else if (key_length == 4 && memcmp(key, "size", 4) == 0) {
+ /* GNU.sparse.size */
++ /* This is either the size of stored entry OR the size of data on disk,
++ * depending on which GNU sparse format version is in use.
++ * Since pax attributes can be in any order, we may not actually
++ * know at this point how to interpret this. */
+ if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
+- tar->realsize = t;
+- archive_entry_set_size(entry, tar->realsize);
+- tar->realsize_override = 1;
++ tar->GNU_sparse_size = t;
++ tar->size_fields |= TAR_SIZE_GNU_SPARSE_SIZE;
+ }
+ return (err);
+ }
+@@ -2304,8 +2404,9 @@
+ tar->sparse_gnu_minor = 1;
+ if (value_length > sparse_map_limit) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Unreasonably large sparse map: %d > %d",
+- (int)value_length, (int)sparse_map_limit);
++ "Unreasonably large sparse map: %llu > %llu",
++ (unsigned long long)value_length,
++ (unsigned long long)sparse_map_limit);
+ err = ARCHIVE_FAILED;
+ } else {
+ p = __archive_read_ahead(a, value_length, &bytes_read);
+@@ -2360,11 +2461,10 @@
+ return (err);
+ }
+ else if (key_length == 8 && memcmp(key, "realsize", 8) == 0) {
+- /* GNU.sparse.realsize */
++ /* GNU.sparse.realsize = size of file on disk */
+ if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
+- tar->realsize = t;
+- archive_entry_set_size(entry, tar->realsize);
+- tar->realsize_override = 1;
++ tar->GNU_sparse_realsize = t;
++ tar->size_fields |= TAR_SIZE_GNU_SPARSE_REALSIZE;
+ }
+ return (err);
+ }
+@@ -2413,8 +2513,8 @@
+ } else {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "symlink type is very long"
+- "(longest recognized value is 4 bytes, this is %d)",
+- (int)value_length);
++ "(longest recognized value is 4 bytes, this is %llu)",
++ (unsigned long long)value_length);
+ err = ARCHIVE_WARN;
+ }
+ __archive_read_consume(a, value_length);
+@@ -2450,8 +2550,9 @@
+ if (value_length > xattr_limit) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Ignoring unreasonably large security.selinux attribute:"
+- " %d > %d",
+- (int)value_length, (int)xattr_limit);
++ " %llu > %llu",
++ (unsigned long long)value_length,
++ (unsigned long long)xattr_limit);
+ /* TODO: Should this be FAILED instead? */
+ err = ARCHIVE_WARN;
+ } else {
+@@ -2545,12 +2646,12 @@
+ }
+ else if (key_length == 8 && memcmp(key, "realsize", 8) == 0) {
+ if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
+- tar->realsize = t;
+- tar->realsize_override = 1;
+- archive_entry_set_size(entry, tar->realsize);
++ tar->SCHILY_sparse_realsize = t;
++ tar->size_fields |= TAR_SIZE_SCHILY_SPARSE_REALSIZE;
+ }
+ return (err);
+ }
++ /* TODO: Is there a SCHILY.sparse.size similar to GNU.sparse.size ? */
+ else if (key_length > 6 && memcmp(key, "xattr.", 6) == 0) {
+ key_length -= 6;
+ key += 6;
+@@ -2568,8 +2669,9 @@
+ }
+ } else {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Unreasonably large xattr: %d > %d",
+- (int)value_length, (int)xattr_limit);
++ "Unreasonably large xattr: %llu > %llu",
++ (unsigned long long)value_length,
++ (unsigned long long)xattr_limit);
+ err = ARCHIVE_WARN;
+ }
+ __archive_read_consume(a, value_length);
+@@ -2599,8 +2701,9 @@
+ }
+ } else {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Unreasonably large sparse map: %d > %d",
+- (int)value_length, (int)sparse_map_limit);
++ "Unreasonably large sparse map: %llu > %llu",
++ (unsigned long long)value_length,
++ (unsigned long long)sparse_map_limit);
+ err = ARCHIVE_FAILED;
+ }
+ __archive_read_consume(a, value_length);
+@@ -2669,8 +2772,8 @@
+ }
+ } else {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+- "hdrcharset attribute is unreasonably large (%d bytes)",
+- (int)value_length);
++ "hdrcharset attribute is unreasonably large (%llu bytes)",
++ (unsigned long long)value_length);
+ err = ARCHIVE_WARN;
+ }
+ __archive_read_consume(a, value_length);
+@@ -2717,19 +2820,8 @@
+ if (key_length == 4 && memcmp(key, "size", 4) == 0) {
+ /* "size" is the size of the data in the entry. */
+ if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
+- tar->entry_bytes_remaining = t;
+- /*
+- * The "size" pax header keyword always overrides the
+- * "size" field in the tar header.
+- * GNU.sparse.realsize, GNU.sparse.size and
+- * SCHILY.realsize override this value.
+- */
+- if (!tar->realsize_override) {
+- archive_entry_set_size(entry,
+- tar->entry_bytes_remaining);
+- tar->realsize
+- = tar->entry_bytes_remaining;
+- }
++ tar->pax_size = t;
++ tar->size_fields |= TAR_SIZE_PAX_SIZE;
+ }
+ else if (t == INT64_MAX) {
+ /* Note: pax_attr_read_number returns INT64_MAX on overflow or < 0 */
+@@ -2768,7 +2860,9 @@
+
+
+ /*
+- * parse a decimal time value, which may include a fractional portion
++ * Parse a decimal time value, which may include a fractional portion
++ *
++ * Sets ps to INT64_MIN on error.
+ */
+ static void
+ pax_time(const char *p, size_t length, int64_t *ps, long *pn)
+@@ -2784,6 +2878,7 @@
+
+ if (length <= 0) {
+ *ps = 0;
++ *pn = 0;
+ return;
+ }
+ s = 0;
+@@ -2797,8 +2892,9 @@
+ digit = *p - '0';
+ if (s > limit ||
+ (s == limit && digit > last_digit_limit)) {
+- s = INT64_MAX;
+- break;
++ *ps = INT64_MIN;
++ *pn = 0;
++ return;
+ }
+ s = (s * 10) + digit;
+ ++p;
+@@ -2829,7 +2925,7 @@
+ */
+ static int
+ header_gnutar(struct archive_read *a, struct tar *tar,
+- struct archive_entry *entry, const void *h, size_t *unconsumed)
++ struct archive_entry *entry, const void *h, int64_t *unconsumed)
+ {
+ const struct archive_entry_header_gnutar *header;
+ int64_t t;
+@@ -2841,11 +2937,6 @@
+ * filename is stored as in old-style archives.
+ */
+
+- /* Grab fields common to all tar variants. */
+- err = header_common(a, tar, entry, h);
+- if (err == ARCHIVE_FATAL)
+- return (err);
+-
+ /* Copy filename over (to ensure null termination). */
+ header = (const struct archive_entry_header_gnutar *)h;
+ const char *existing_pathname = archive_entry_pathname(entry);
+@@ -2894,8 +2985,6 @@
+ archive_entry_set_rdev(entry, 0);
+ }
+
+- tar->entry_padding = 0x1ff & (-tar->entry_bytes_remaining);
+-
+ /* Grab GNU-specific fields. */
+ if (!archive_entry_atime_is_set(entry)) {
+ t = tar_atol(header->atime, sizeof(header->atime));
+@@ -2909,10 +2998,10 @@
+ }
+
+ if (header->realsize[0] != 0) {
+- tar->realsize
++ /* Treat as a synonym for the pax GNU.sparse.realsize attr */
++ tar->GNU_sparse_realsize
+ = tar_atol(header->realsize, sizeof(header->realsize));
+- archive_entry_set_size(entry, tar->realsize);
+- tar->realsize_override = 1;
++ tar->size_fields |= TAR_SIZE_GNU_SPARSE_REALSIZE;
+ }
+
+ if (header->sparse[0].offset[0] != 0) {
+@@ -2925,6 +3014,13 @@
+ }
+ }
+
++ /* Grab fields common to all tar variants. */
++ err = header_common(a, tar, entry, h);
++ if (err == ARCHIVE_FATAL)
++ return (err);
++
++ tar->entry_padding = 0x1ff & (-tar->entry_bytes_remaining);
++
+ return (err);
+ }
+
+@@ -2980,7 +3076,7 @@
+
+ static int
+ gnu_sparse_old_read(struct archive_read *a, struct tar *tar,
+- const struct archive_entry_header_gnutar *header, size_t *unconsumed)
++ const struct archive_entry_header_gnutar *header, int64_t *unconsumed)
+ {
+ ssize_t bytes_read;
+ const void *data;
+@@ -3104,8 +3200,7 @@
+ * it's not possible to support both variants. This code supports
+ * the later variant at the expense of not supporting the former.
+ *
+- * This variant also replaced GNU.sparse.size with GNU.sparse.realsize
+- * and introduced the GNU.sparse.major/GNU.sparse.minor attributes.
++ * This variant also introduced the GNU.sparse.major/GNU.sparse.minor attributes.
+ */
+
+ /*
+@@ -3115,7 +3210,7 @@
+ */
+ static int64_t
+ gnu_sparse_10_atol(struct archive_read *a, struct tar *tar,
+- int64_t *remaining, size_t *unconsumed)
++ int64_t *remaining, int64_t *unconsumed)
+ {
+ int64_t l, limit, last_digit_limit;
+ const char *p;
+@@ -3160,12 +3255,10 @@
+ * Returns length (in bytes) of the sparse data description
+ * that was read.
+ */
+-static ssize_t
+-gnu_sparse_10_read(struct archive_read *a, struct tar *tar, size_t *unconsumed)
++static int64_t
++gnu_sparse_10_read(struct archive_read *a, struct tar *tar, int64_t *unconsumed)
+ {
+- ssize_t bytes_read;
+- int entries;
+- int64_t offset, size, to_skip, remaining;
++ int64_t bytes_read, entries, offset, size, to_skip, remaining;
+
+ /* Clear out the existing sparse list. */
+ gnu_clear_sparse_list(tar);
+@@ -3173,7 +3266,7 @@
+ remaining = tar->entry_bytes_remaining;
+
+ /* Parse entries. */
+- entries = (int)gnu_sparse_10_atol(a, tar, &remaining, unconsumed);
++ entries = gnu_sparse_10_atol(a, tar, &remaining, unconsumed);
+ if (entries < 0)
+ return (ARCHIVE_FATAL);
+ /* Parse the individual entries. */
+@@ -3191,14 +3284,14 @@
+ }
+ /* Skip rest of block... */
+ tar_flush_unconsumed(a, unconsumed);
+- bytes_read = (ssize_t)(tar->entry_bytes_remaining - remaining);
++ bytes_read = tar->entry_bytes_remaining - remaining;
+ to_skip = 0x1ff & -bytes_read;
+ /* Fail if tar->entry_bytes_remaing would get negative */
+ if (to_skip > remaining)
+ return (ARCHIVE_FATAL);
+ if (to_skip != __archive_read_consume(a, to_skip))
+ return (ARCHIVE_FATAL);
+- return ((ssize_t)(bytes_read + to_skip));
++ return (bytes_read + to_skip);
+ }
+
+ /*
+@@ -3408,7 +3501,7 @@
+ */
+ static ssize_t
+ readline(struct archive_read *a, struct tar *tar, const char **start,
+- ssize_t limit, size_t *unconsumed)
++ ssize_t limit, int64_t *unconsumed)
+ {
+ ssize_t bytes_read;
+ ssize_t total_size = 0;
+--- contrib/libarchive/libarchive/archive_read_support_format_warc.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_warc.c
+@@ -386,7 +386,8 @@
+ case LAST_WT:
+ default:
+ /* consume the content and start over */
+- _warc_skip(a);
++ if (_warc_skip(a) < 0)
++ return (ARCHIVE_FATAL);
+ goto start_over;
+ }
+ return (ARCHIVE_OK);
+@@ -439,7 +440,9 @@
+ {
+ struct warc_s *w = a->format->data;
+
+- __archive_read_consume(a, w->cntlen + 4U/*\r\n\r\n separator*/);
++ if (__archive_read_consume(a, w->cntlen) < 0 ||
++ __archive_read_consume(a, 4U/*\r\n\r\n separator*/) < 0)
++ return (ARCHIVE_FATAL);
+ w->cntlen = 0U;
+ w->cntoff = 0U;
+ return (ARCHIVE_OK);
+--- contrib/libarchive/libarchive/archive_read_support_format_xar.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_xar.c
+@@ -36,6 +36,10 @@
+ #include
+ #elif HAVE_EXPAT_H
+ #include
++#elif HAVE_XMLLITE_H
++#include
++#include
++#include
+ #endif
+ #ifdef HAVE_BZLIB_H
+ #include
+@@ -56,12 +60,13 @@
+ #include "archive_read_private.h"
+
+ #if (!defined(HAVE_LIBXML_XMLREADER_H) && \
+- !defined(HAVE_BSDXML_H) && !defined(HAVE_EXPAT_H)) ||\
++ !defined(HAVE_BSDXML_H) && !defined(HAVE_EXPAT_H) && \
++ !defined(HAVE_XMLLITE_H)) ||\
+ !defined(HAVE_ZLIB_H) || \
+ !defined(ARCHIVE_HAS_MD5) || !defined(ARCHIVE_HAS_SHA1)
+ /*
+ * xar needs several external libraries.
+- * o libxml2 or expat --- XML parser
++ * o libxml2, expat or (Windows only) xmllite --- XML parser
+ * o openssl or MD5/SHA1 hash function
+ * o zlib
+ * o bzlib2 (option)
+@@ -438,6 +443,8 @@
+ static void expat_end_cb(void *, const XML_Char *);
+ static void expat_data_cb(void *, const XML_Char *, int);
+ static int expat_read_toc(struct archive_read *);
++#elif defined(HAVE_XMLLITE_H)
++static int xmllite_read_toc(struct archive_read *);
+ #endif
+
+ int
+@@ -589,6 +596,8 @@
+ r = xml2_read_toc(a);
+ #elif defined(HAVE_BSDXML_H) || defined(HAVE_EXPAT_H)
+ r = expat_read_toc(a);
++#elif defined(HAVE_XMLLITE_H)
++ r = xmllite_read_toc(a);
+ #endif
+ if (r != ARCHIVE_OK)
+ return (r);
+@@ -1110,17 +1119,17 @@
+ while (bsize && psize > 1) {
+ unsigned char x;
+
+- if (p[0] >= 'a' && p[0] <= 'z')
++ if (p[0] >= 'a' && p[0] <= 'f')
+ x = (p[0] - 'a' + 0x0a) << 4;
+- else if (p[0] >= 'A' && p[0] <= 'Z')
++ else if (p[0] >= 'A' && p[0] <= 'F')
+ x = (p[0] - 'A' + 0x0a) << 4;
+ else if (p[0] >= '0' && p[0] <= '9')
+ x = (p[0] - '0') << 4;
+ else
+ return (-1);
+- if (p[1] >= 'a' && p[1] <= 'z')
++ if (p[1] >= 'a' && p[1] <= 'f')
+ x |= p[1] - 'a' + 0x0a;
+- else if (p[1] >= 'A' && p[1] <= 'Z')
++ else if (p[1] >= 'A' && p[1] <= 'F')
+ x |= p[1] - 'A' + 0x0a;
+ else if (p[1] >= '0' && p[1] <= '9')
+ x |= p[1] - '0';
+@@ -1745,15 +1754,6 @@
+ #if defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
+ if (xar->lzstream_valid)
+ lzma_end(&(xar->lzstream));
+-#elif defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
+- if (xar->lzstream_valid) {
+- if (lzmadec_end(&(xar->lzstream)) != LZMADEC_OK) {
+- archive_set_error(&a->archive,
+- ARCHIVE_ERRNO_MISC,
+- "Failed to clean up lzmadec decompressor");
+- r = ARCHIVE_FATAL;
+- }
+- }
+ #endif
+ return (r);
+ }
+@@ -2070,7 +2070,7 @@
+ if (xar->file->link > 0)
+ if (add_link(a, xar, xar->file) != ARCHIVE_OK) {
+ return (ARCHIVE_FATAL);
+- };
++ }
+ }
+ }
+ }
+@@ -2851,7 +2851,6 @@
+ xar->file->has |= HAS_XATTR;
+ archive_strncpy(&(xar->xattr->fstype), s, len);
+ break;
+- break;
+ case FILE_ACL_DEFAULT:
+ case FILE_ACL_ACCESS:
+ case FILE_ACL_APPLEEXTENDED:
+@@ -3343,6 +3342,326 @@
+ XML_ParserFree(parser);
+ return (ud.state);
+ }
+-#endif /* defined(HAVE_BSDXML_H) || defined(HAVE_EXPAT_H) */
++
++#elif defined(HAVE_XMLLITE_H)
++
++struct ArchiveStreamAdapter {
++ const ISequentialStreamVtbl *lpVtbl; /* see asaStaticVtable */
++ struct archive_read *a;
++};
++
++static HRESULT STDMETHODCALLTYPE
++asaQueryInterface(ISequentialStream *this, REFIID riid, void **ppv)
++{
++ if (!IsEqualIID(riid, &IID_ISequentialStream)) {
++ *ppv = NULL;
++ return E_NOINTERFACE;
++ }
++ *ppv = this;
++ return S_OK;
++}
++
++/*
++ * We can dispense with reference counting as we tightly manage the lifetime
++ * of an ArchiveStreamAdapter.
++ */
++static ULONG STDMETHODCALLTYPE
++asaAddRef(ISequentialStream *this)
++{
++ (void)this; /* UNUSED */
++ return ULONG_MAX;
++}
++
++static ULONG STDMETHODCALLTYPE
++asaRelease(ISequentialStream *this)
++{
++ (void)this; /* UNUSED */
++ return ULONG_MAX;
++}
++
++static HRESULT STDMETHODCALLTYPE
++asaRead(ISequentialStream *this, void *pv, ULONG cb, ULONG *pcbRead)
++{
++ struct ArchiveStreamAdapter *asa = (struct ArchiveStreamAdapter *)this;
++ struct archive_read *a;
++ struct xar *xar;
++ const void *d = pv;
++ size_t outbytes = cb;
++ size_t used = 0;
++ int r;
++
++ a = asa->a;
++ xar = (struct xar *)(a->format->data);
++
++ *pcbRead = 0;
++
++ if (xar->toc_remaining <= 0)
++ return cb != 0 ? S_FALSE : S_OK;
++
++ r = rd_contents(a, &d, &outbytes, &used, xar->toc_remaining);
++ if (r != ARCHIVE_OK)
++ return E_FAIL;
++ __archive_read_consume(a, used);
++ xar->toc_remaining -= used;
++ xar->offset += used;
++ xar->toc_total += outbytes;
++ PRINT_TOC(pv, outbytes);
++
++ *pcbRead = (ULONG)outbytes;
++ return outbytes < cb ? S_FALSE : S_OK;
++}
++
++static HRESULT STDMETHODCALLTYPE
++asaWrite(ISequentialStream *this, const void *pv, ULONG cb, ULONG *pcbWritten)
++{
++ (void)this; /* UNUSED */
++ (void)pv; /* UNUSED */
++ (void)cb; /* UNUSED */
++ if (!pcbWritten) return E_INVALIDARG;
++ *pcbWritten = 0;
++ return E_NOTIMPL;
++}
++
++static const ISequentialStreamVtbl asaStaticVtable = {
++ .QueryInterface = asaQueryInterface,
++ .AddRef = asaAddRef,
++ .Release = asaRelease,
++ .Read = asaRead,
++ .Write = asaWrite,
++};
++
++static int
++xmllite_create_stream_adapter(struct archive_read *a,
++ struct ArchiveStreamAdapter **pasa)
++{
++ struct ArchiveStreamAdapter *asa =
++ calloc(1, sizeof(struct ArchiveStreamAdapter));
++ if (!asa) {
++ archive_set_error(&(a->archive), ENOMEM, "Out of memory");
++ return (ARCHIVE_FATAL);
++ }
++ asa->lpVtbl = &asaStaticVtable;
++ asa->a = a;
++ *pasa = asa;
++ return (ARCHIVE_OK);
++}
++
++typedef HRESULT(STDMETHODCALLTYPE *xmllite_wstr_func)(IXmlReader *, LPCWSTR *,
++ UINT *);
++
++/*
++ * Returns an narrow-char archive_string in *as after calling
++ * the wide-char COM API callee() on the XmlReader reader.
++ * Sets an appropriate error on the archive if it fails.
++ */
++static int
++xmllite_call_return_as(struct archive_read *a, struct archive_string *as,
++ IXmlReader *reader, xmllite_wstr_func callee)
++{
++ LPCWSTR wcs;
++ UINT wlen;
++
++ if (FAILED(callee(reader, &wcs, &wlen))) {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "Failed to read XML data");
++ return (ARCHIVE_FATAL);
++ }
++
++ archive_string_init(as);
++ if (archive_string_append_from_wcs(as, wcs, (size_t)wlen) < 0) {
++ archive_string_free(as);
++ archive_set_error(&(a->archive), ENOMEM, "Out of memory");
++ return (ARCHIVE_FATAL);
++ }
++
++ return (ARCHIVE_OK);
++}
++
++static char *
++xmllite_call_return_mbs(struct archive_read *a, IXmlReader *reader,
++ xmllite_wstr_func callee)
++{
++ char *ret;
++ struct archive_string as;
++
++ if (xmllite_call_return_as(a, &as, reader, callee) < 0) {
++ return NULL;
++ }
++
++ ret = strdup(as.s);
++ archive_string_free(&as);
++ if (ret == NULL) {
++ archive_set_error(&(a->archive), ENOMEM, "Out of memory");
++ return NULL;
++ }
++ return ret;
++}
++
++static int
++xmllite_xmlattr_setup(struct archive_read *a,
++ struct xmlattr_list *list, IXmlReader *reader)
++{
++ struct xmlattr *attr;
++ HRESULT hr;
++
++ list->first = NULL;
++ list->last = &(list->first);
++ hr = reader->lpVtbl->MoveToFirstAttribute(reader);
++ /* Contrary to other checks, we're not using SUCCEEDED/FAILED
++ * because MoveToNextAttribute returns *S_FALSE* (success!)
++ * when it runs out of attributes.
++ */
++ while (hr == S_OK) {
++ /* Attributes implied as being default by the DTD are ignored */
++ if (reader->lpVtbl->IsDefault(reader))
++ continue;
++
++ attr = malloc(sizeof*(attr));
++ if (attr == NULL) {
++ archive_set_error(&(a->archive), ENOMEM,
++ "Out of memory");
++ return (ARCHIVE_FATAL);
++ }
++
++ attr->name = xmllite_call_return_mbs(a, reader,
++ reader->lpVtbl->GetLocalName);
++ if (attr->name == NULL) {
++ free(attr);
++ /* xmllite_call_return_mbs sets an appropriate error */
++ return (ARCHIVE_FATAL);
++ }
++
++ attr->value = xmllite_call_return_mbs(a, reader,
++ reader->lpVtbl->GetValue);
++ if (attr->value == NULL) {
++ free(attr->name);
++ free(attr);
++ /* xmllite_call_return_mbs sets an appropriate error */
++ return (ARCHIVE_FATAL);
++ }
++
++ attr->next = NULL;
++ *list->last = attr;
++ list->last = &(attr->next);
++ hr = reader->lpVtbl->MoveToNextAttribute(reader);
++ }
++
++ if (FAILED(hr)) {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_FILE_FORMAT,
++ "Failed to parse XML document");
++ return (ARCHIVE_FAILED);
++ }
++
++ return (ARCHIVE_OK);
++}
++
++static int
++xmllite_read_toc(struct archive_read *a)
++{
++ struct ArchiveStreamAdapter *asa = NULL;
++ char *name;
++ struct archive_string as;
++ BOOL empty;
++ XmlNodeType type;
++ struct xmlattr_list list;
++ IXmlReader *reader = NULL;
++ int r = ARCHIVE_OK;
++
++ if ((r = xmllite_create_stream_adapter(a, &asa)) < 0) {
++ goto out;
++ }
++
++ if (FAILED(CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL))) {
++ r = ARCHIVE_FATAL;
++ goto out;
++ }
++
++ if (FAILED(reader->lpVtbl->SetInput(reader, (IUnknown *)asa))) {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "Failed to prepare XML stream");
++ r = ARCHIVE_FATAL;
++ goto out;
++ }
++
++ while (!reader->lpVtbl->IsEOF(reader)) {
++ if (FAILED(reader->lpVtbl->Read(reader, &type))) {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "Failed to read XML stream");
++ r = ARCHIVE_FATAL;
++ goto out;
++ }
++
++ switch (type) {
++ case XmlNodeType_Element:
++ empty = reader->lpVtbl->IsEmptyElement(reader);
++
++ name = xmllite_call_return_mbs(a, reader,
++ reader->lpVtbl->GetLocalName);
++ if (name == NULL) {
++ /* xmllite_call_return_mbs sets an appropriate error */
++ r = ARCHIVE_FATAL;
++ goto out;
++ }
++
++ r = xmllite_xmlattr_setup(a, &list, reader);
++ if (r == ARCHIVE_OK) {
++ r = xml_start(a, name, &list);
++ }
++ xmlattr_cleanup(&list);
++ if (r == ARCHIVE_OK && empty) {
++ xml_end(a, name);
++ }
++
++ free(name);
++ if (r != ARCHIVE_OK) {
++ goto out;
++ }
++
++ break;
++ case XmlNodeType_EndElement:
++ name = xmllite_call_return_mbs(a, reader,
++ reader->lpVtbl->GetLocalName);
++ if (name == NULL) {
++ /* xmllite_call_return_mbs sets an appropriate error */
++ r = ARCHIVE_FATAL;
++ goto out;
++ }
++
++ xml_end(a, name);
++ free(name);
++ break;
++ case XmlNodeType_Text:
++ r = xmllite_call_return_as(a, &as, reader,
++ reader->lpVtbl->GetValue);
++ if (r != ARCHIVE_OK) {
++ /* xmllite_call_return_as sets an appropriate error */
++ goto out;
++ }
++
++ xml_data(a, as.s, (int)archive_strlen(&as));
++ archive_string_free(&as);
++
++ case XmlNodeType_None:
++ case XmlNodeType_Attribute:
++ case XmlNodeType_CDATA:
++ case XmlNodeType_ProcessingInstruction:
++ case XmlNodeType_Comment:
++ case XmlNodeType_DocumentType:
++ case XmlNodeType_Whitespace:
++ case XmlNodeType_XmlDeclaration:
++ default:
++ break;
++ }
++ }
++
++out:
++ if (reader)
++ reader->lpVtbl->Release(reader);
++
++ free(asa);
++
++ return r;
++}
++#endif /* defined(XMLLITE) */
+
+ #endif /* Support xar format */
+--- contrib/libarchive/libarchive/archive_read_support_format_zip.c.orig
++++ contrib/libarchive/libarchive/archive_read_support_format_zip.c
+@@ -71,6 +71,7 @@
+ #include "archive_private.h"
+ #include "archive_rb.h"
+ #include "archive_read_private.h"
++#include "archive_time_private.h"
+ #include "archive_ppmd8_private.h"
+
+ #ifndef HAVE_ZLIB_H
+@@ -465,27 +466,6 @@
+ return "??";
+ }
+
+-/* Convert an MSDOS-style date/time into Unix-style time. */
+-static time_t
+-zip_time(const char *p)
+-{
+- int msTime, msDate;
+- struct tm ts;
+-
+- msTime = (0xff & (unsigned)p[0]) + 256 * (0xff & (unsigned)p[1]);
+- msDate = (0xff & (unsigned)p[2]) + 256 * (0xff & (unsigned)p[3]);
+-
+- memset(&ts, 0, sizeof(ts));
+- ts.tm_year = ((msDate >> 9) & 0x7f) + 80; /* Years since 1900. */
+- ts.tm_mon = ((msDate >> 5) & 0x0f) - 1; /* Month number. */
+- ts.tm_mday = msDate & 0x1f; /* Day of month. */
+- ts.tm_hour = (msTime >> 11) & 0x1f;
+- ts.tm_min = (msTime >> 5) & 0x3f;
+- ts.tm_sec = (msTime << 1) & 0x3e;
+- ts.tm_isdst = -1;
+- return mktime(&ts);
+-}
+-
+ /*
+ * The extra data is stored as a list of
+ * id1+size1+data1 + id2+size2+data2 ...
+@@ -978,7 +958,7 @@
+ }
+ zip->init_decryption = (zip_entry->zip_flags & ZIP_ENCRYPTED);
+ zip_entry->compression = (char)archive_le16dec(p + 8);
+- zip_entry->mtime = zip_time(p + 10);
++ zip_entry->mtime = dos_to_unix(archive_le32dec(p + 10));
+ zip_entry->crc32 = archive_le32dec(p + 14);
+ if (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
+ zip_entry->decdat = p[11];
+@@ -2134,15 +2114,15 @@
+
+ if(order < 2 || restore_method > 2) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+- "Invalid parameter set in PPMd8 stream (order=%" PRId32 ", "
+- "restore=%" PRId32 ")", order, restore_method);
++ "Invalid parameter set in PPMd8 stream (order=%" PRIu32 ", "
++ "restore=%" PRIu32 ")", order, restore_method);
+ return (ARCHIVE_FAILED);
+ }
+
+ /* Allocate the memory needed to properly decompress the file. */
+ if(!__archive_ppmd8_functions.Ppmd8_Alloc(&zip->ppmd8, mem << 20)) {
+ archive_set_error(&a->archive, ENOMEM,
+- "Unable to allocate memory for PPMd8 stream: %" PRId32 " bytes",
++ "Unable to allocate memory for PPMd8 stream: %" PRIu32 " bytes",
+ mem << 20);
+ return (ARCHIVE_FATAL);
+ }
+@@ -3168,7 +3148,6 @@
+ /* We can't decompress this entry, but we will
+ * be able to skip() it and try the next entry. */
+ return (ARCHIVE_FAILED);
+- break;
+ }
+ if (r != ARCHIVE_OK)
+ return (r);
+@@ -3987,7 +3966,7 @@
+ zip->has_encrypted_entries = 1;
+ }
+ zip_entry->compression = (char)archive_le16dec(p + 10);
+- zip_entry->mtime = zip_time(p + 12);
++ zip_entry->mtime = dos_to_unix(archive_le32dec(p + 12));
+ zip_entry->crc32 = archive_le32dec(p + 16);
+ if (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
+ zip_entry->decdat = p[13];
+--- contrib/libarchive/libarchive/archive_string.c.orig
++++ contrib/libarchive/libarchive/archive_string.c
+@@ -154,7 +154,6 @@
+ struct archive_string_conv *);
+ static int archive_string_append_from_wcs_in_codepage(struct archive_string *,
+ const wchar_t *, size_t, struct archive_string_conv *);
+-static int is_big_endian(void);
+ static int strncat_in_codepage(struct archive_string *, const void *,
+ size_t, struct archive_string_conv *);
+ static int win_strncat_from_utf16be(struct archive_string *, const void *,
+@@ -199,6 +198,29 @@
+ static int archive_string_append_unicode(struct archive_string *,
+ const void *, size_t, struct archive_string_conv *);
+
++#if defined __LITTLE_ENDIAN__
++ #define IS_BIG_ENDIAN 0
++#elif defined __BIG_ENDIAN__
++ #define IS_BIG_ENDIAN 1
++#elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
++ #define IS_BIG_ENDIAN 0
++#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
++ #define IS_BIG_ENDIAN 1
++#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(_M_ARM64))
++ #define IS_BIG_ENDIAN 0
++#else
++// Detect endianness at runtime.
++static int
++is_big_endian(void)
++{
++ uint16_t d = 1;
++
++ return (archive_be16dec(&d) == 1);
++}
++
++#define IS_BIG_ENDIAN is_big_endian()
++#endif
++
+ static struct archive_string *
+ archive_string_append(struct archive_string *as, const char *p, size_t s)
+ {
+@@ -450,7 +472,8 @@
+ archive_wstring_append_from_mbs_in_codepage(struct archive_wstring *dest,
+ const char *s, size_t length, struct archive_string_conv *sc)
+ {
+- int count, ret = 0;
++ int ret = 0;
++ size_t count;
+ UINT from_cp;
+
+ if (sc != NULL)
+@@ -472,7 +495,7 @@
+ ws = dest->s + dest->length;
+ mp = (const unsigned char *)s;
+ count = 0;
+- while (count < (int)length && *mp) {
++ while (count < length && *mp) {
+ *ws++ = (wchar_t)*mp++;
+ count++;
+ }
+@@ -485,7 +508,7 @@
+ struct archive_string u16;
+ int saved_flag = sc->flag;/* save current flag. */
+
+- if (is_big_endian())
++ if (IS_BIG_ENDIAN)
+ sc->flag |= SCONV_TO_UTF16BE;
+ else
+ sc->flag |= SCONV_TO_UTF16LE;
+@@ -495,16 +518,16 @@
+ * UTF-16BE/LE NFD ===> UTF-16 NFC
+ * UTF-16BE/LE NFC ===> UTF-16 NFD
+ */
+- count = (int)utf16nbytes(s, length);
++ count = utf16nbytes(s, length);
+ } else {
+ /*
+ * UTF-8 NFD ===> UTF-16 NFC
+ * UTF-8 NFC ===> UTF-16 NFD
+ */
+- count = (int)mbsnbytes(s, length);
++ count = mbsnbytes(s, length);
+ }
+ u16.s = (char *)dest->s;
+- u16.length = dest->length << 1;;
++ u16.length = dest->length << 1;
+ u16.buffer_length = dest->buffer_length;
+ if (sc->flag & SCONV_NORMALIZATION_C)
+ ret = archive_string_normalize_C(&u16, s, count, sc);
+@@ -516,23 +539,23 @@
+ sc->flag = saved_flag;/* restore the saved flag. */
+ return (ret);
+ } else if (sc != NULL && (sc->flag & SCONV_FROM_UTF16)) {
+- count = (int)utf16nbytes(s, length);
++ count = utf16nbytes(s, length);
+ count >>= 1; /* to be WCS length */
+ /* Allocate memory for WCS. */
+ if (NULL == archive_wstring_ensure(dest,
+ dest->length + count + 1))
+ return (-1);
+ wmemcpy(dest->s + dest->length, (const wchar_t *)s, count);
+- if ((sc->flag & SCONV_FROM_UTF16BE) && !is_big_endian()) {
++ if ((sc->flag & SCONV_FROM_UTF16BE) && !IS_BIG_ENDIAN) {
+ uint16_t *u16 = (uint16_t *)(dest->s + dest->length);
+- int b;
++ size_t b;
+ for (b = 0; b < count; b++) {
+ uint16_t val = archive_le16dec(u16+b);
+ archive_be16enc(u16+b, val);
+ }
+- } else if ((sc->flag & SCONV_FROM_UTF16LE) && is_big_endian()) {
++ } else if ((sc->flag & SCONV_FROM_UTF16LE) && IS_BIG_ENDIAN) {
+ uint16_t *u16 = (uint16_t *)(dest->s + dest->length);
+- int b;
++ size_t b;
+ for (b = 0; b < count; b++) {
+ uint16_t val = archive_be16dec(u16+b);
+ archive_le16enc(u16+b, val);
+@@ -556,21 +579,28 @@
+
+ buffsize = dest->length + length + 1;
+ do {
++ int r;
++
++ /* MultiByteToWideChar is limited to int. */
++ if (length > (size_t)INT_MAX ||
++ (dest->buffer_length >> 1) > (size_t)INT_MAX)
++ return (-1);
+ /* Allocate memory for WCS. */
+ if (NULL == archive_wstring_ensure(dest, buffsize))
+ return (-1);
+ /* Convert MBS to WCS. */
+- count = MultiByteToWideChar(from_cp,
++ r = MultiByteToWideChar(from_cp,
+ mbflag, s, (int)length, dest->s + dest->length,
+ (int)(dest->buffer_length >> 1) -1);
+- if (count == 0 &&
++ if (r == 0 &&
+ GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+ /* Expand the WCS buffer. */
+ buffsize = dest->buffer_length << 1;
+ continue;
+ }
+- if (count == 0 && length != 0)
++ if (r == 0 && length != 0)
+ ret = -1;
++ count = (size_t)r;
+ break;
+ } while (1);
+ }
+@@ -679,9 +709,9 @@
+ const wchar_t *ws, size_t len, struct archive_string_conv *sc)
+ {
+ BOOL defchar_used, *dp;
+- int count, ret = 0;
++ int ret = 0;
+ UINT to_cp;
+- int wslen = (int)len;
++ size_t count, wslen = len;
+
+ if (sc != NULL)
+ to_cp = sc->to_cp;
+@@ -720,13 +750,13 @@
+ count = 0;
+ defchar_used = 0;
+ if (sc->flag & SCONV_TO_UTF16BE) {
+- while (count < (int)len && *ws) {
++ while (count < len && *ws) {
+ archive_be16enc(u16+count, *ws);
+ ws++;
+ count++;
+ }
+ } else {
+- while (count < (int)len && *ws) {
++ while (count < len && *ws) {
+ archive_le16enc(u16+count, *ws);
+ ws++;
+ count++;
+@@ -739,15 +769,21 @@
+ archive_string_ensure(as, as->length + len * 2 + 1))
+ return (-1);
+ do {
++ int r;
++
+ defchar_used = 0;
+ if (to_cp == CP_UTF8 || sc == NULL)
+ dp = NULL;
+ else
+ dp = &defchar_used;
+- count = WideCharToMultiByte(to_cp, 0, ws, wslen,
++ /* WideCharToMultiByte is limited to int. */
++ if (as->buffer_length - as->length - 1 > (size_t)INT_MAX ||
++ wslen > (size_t)INT_MAX)
++ return (-1);
++ r = WideCharToMultiByte(to_cp, 0, ws, (int)wslen,
+ as->s + as->length,
+- (int)as->buffer_length - (int)as->length - 1, NULL, dp);
+- if (count == 0 &&
++ (int)(as->buffer_length - as->length - 1), NULL, dp);
++ if (r == 0 &&
+ GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+ /* Expand the MBS buffer and retry. */
+ if (NULL == archive_string_ensure(as,
+@@ -755,8 +791,9 @@
+ return (-1);
+ continue;
+ }
+- if (count == 0)
++ if (r == 0)
+ ret = -1;
++ count = (size_t)r;
+ break;
+ } while (1);
+ }
+@@ -2032,7 +2069,7 @@
+ char *outp;
+ size_t avail, bs;
+ int return_value = 0; /* success */
+- int to_size, from_size;
++ size_t to_size, from_size;
+
+ if (sc->flag & SCONV_TO_UTF16)
+ to_size = 2;
+@@ -2051,7 +2088,7 @@
+ remaining = length;
+ outp = as->s + as->length;
+ avail = as->buffer_length - as->length - to_size;
+- while (remaining >= (size_t)from_size) {
++ while (remaining >= from_size) {
+ size_t result = iconv(cd, &itp, &remaining, &outp, &avail);
+
+ if (result != (size_t)-1)
+@@ -2174,6 +2211,8 @@
+ if (codepage != CP_UTF8)
+ mbflag |= MB_PRECOMPOSED;
+
++ if (n > (size_t)INT_MAX)
++ return (-1); /* Invalid */
+ if (MultiByteToWideChar(codepage, mbflag, p, (int)n, NULL, 0) == 0)
+ return (-1); /* Invalid */
+ return (0); /* Okay */
+@@ -2327,7 +2366,7 @@
+ cnt = utf8_count[ch];
+
+ /* Invalid sequence or there are not plenty bytes. */
+- if ((int)n < cnt) {
++ if (n < (size_t)cnt) {
+ cnt = (int)n;
+ for (i = 1; i < cnt; i++) {
+ if ((s[i] & 0xc0) != 0x80) {
+@@ -2396,7 +2435,7 @@
+ cnt = 6;
+ else
+ cnt = 1;
+- if ((int)n < cnt)
++ if (n < (size_t)cnt)
+ cnt = (int)n;
+ for (i = 1; i < cnt; i++) {
+ if ((s[i] & 0xc0) != 0x80) {
+@@ -2612,7 +2651,7 @@
+ } else {
+ if (remaining < 2)
+ return (0);
+- archive_be16enc(utf16, uc);
++ archive_be16enc(utf16, (uint16_t)uc);
+ return (2);
+ }
+ }
+@@ -2634,7 +2673,7 @@
+ } else {
+ if (remaining < 2)
+ return (0);
+- archive_le16enc(utf16, uc);
++ archive_le16enc(utf16, (uint16_t)uc);
+ return (2);
+ }
+ }
+@@ -3499,10 +3538,9 @@
+ {
+ struct archive_string tmp;
+ const char *u16;
+- int ll;
+ BOOL defchar;
+ char *mbs;
+- size_t mbs_size, b;
++ size_t mbs_size, b, ll;
+ int ret = 0;
+
+ bytes &= ~1;
+@@ -3538,7 +3576,7 @@
+
+ archive_string_init(&tmp);
+ if (be) {
+- if (is_big_endian()) {
++ if (IS_BIG_ENDIAN) {
+ u16 = _p;
+ } else {
+ if (archive_string_ensure(&tmp, bytes+2) == NULL)
+@@ -3551,7 +3589,7 @@
+ u16 = tmp.s;
+ }
+ } else {
+- if (!is_big_endian()) {
++ if (!IS_BIG_ENDIAN) {
+ u16 = _p;
+ } else {
+ if (archive_string_ensure(&tmp, bytes+2) == NULL)
+@@ -3566,18 +3604,24 @@
+ }
+
+ do {
++ int r;
+ defchar = 0;
+- ll = WideCharToMultiByte(sc->to_cp, 0,
++ /* WideCharToMultiByte is limited to int. */
++ if (bytes > (size_t)INT_MAX || mbs_size > (size_t)INT_MAX)
++ return (-1);
++ r = WideCharToMultiByte(sc->to_cp, 0,
+ (LPCWSTR)u16, (int)bytes>>1, mbs, (int)mbs_size,
+ NULL, &defchar);
+ /* Exit loop if we succeeded */
+- if (ll != 0 ||
++ if (r != 0 ||
+ GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
++ ll = (size_t)r;
+ break;
+ }
+ /* Else expand buffer and loop to try again. */
+- ll = WideCharToMultiByte(sc->to_cp, 0,
++ r = WideCharToMultiByte(sc->to_cp, 0,
+ (LPCWSTR)u16, (int)bytes, NULL, 0, NULL, NULL);
++ ll = (size_t)r;
+ if (archive_string_ensure(as, ll +1) == NULL)
+ return (-1);
+ mbs = as->s + as->length;
+@@ -3605,14 +3649,6 @@
+ return (win_strncat_from_utf16(as, _p, bytes, sc, 0));
+ }
+
+-static int
+-is_big_endian(void)
+-{
+- uint16_t d = 1;
+-
+- return (archive_be16dec(&d) == 1);
+-}
+-
+ /*
+ * Convert a current locale string to UTF-16BE/LE and copy the result.
+ * Return -1 if conversion fails.
+@@ -3651,16 +3687,21 @@
+ return (0);
+ }
+ do {
+- count = MultiByteToWideChar(sc->from_cp,
++ int r;
++ if (length > (size_t)INT_MAX || (avail >> 1) > (size_t)INT_MAX)
++ return (-1);
++ r = MultiByteToWideChar(sc->from_cp,
+ MB_PRECOMPOSED, s, (int)length, (LPWSTR)u16, (int)avail>>1);
+ /* Exit loop if we succeeded */
+- if (count != 0 ||
++ if (r != 0 ||
+ GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
++ count = (size_t)r;
+ break;
+ }
+ /* Expand buffer and try again */
+- count = MultiByteToWideChar(sc->from_cp,
++ r = MultiByteToWideChar(sc->from_cp,
+ MB_PRECOMPOSED, s, (int)length, NULL, 0);
++ count = (size_t)r;
+ if (archive_string_ensure(as16, (count +1) * 2)
+ == NULL)
+ return (-1);
+@@ -3673,7 +3714,7 @@
+ if (count == 0)
+ return (-1);
+
+- if (is_big_endian()) {
++ if (IS_BIG_ENDIAN) {
+ if (!bigendian) {
+ while (count > 0) {
+ uint16_t v = archive_be16dec(u16);
+@@ -3811,9 +3852,9 @@
+ ret = -1;
+ }
+ if (bigendian)
+- archive_be16enc(utf16, c);
++ archive_be16enc(utf16, (uint16_t)c);
+ else
+- archive_le16enc(utf16, c);
++ archive_le16enc(utf16, (uint16_t)c);
+ utf16 += 2;
+ }
+ as16->length = utf16 - as16->s;
+--- contrib/libarchive/libarchive/archive_string_composition.h.orig
++++ contrib/libarchive/libarchive/archive_string_composition.h
+@@ -2286,5 +2286,4 @@
+ { 0x110AB , 0x110A5 , 0x110BA },
+ };
+
+-#endif /* ARCHIVE_STRING_COMPOSITION_H_INCLUDED */
+-
++#endif /* !ARCHIVE_STRING_COMPOSITION_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_string_sprintf.c.orig
++++ contrib/libarchive/libarchive/archive_string_sprintf.c
+@@ -116,8 +116,14 @@
+
+ long_flag = '\0';
+ switch(*p) {
+- case 'j':
+ case 'l':
++ if (p[1] == 'l') {
++ long_flag = 'L';
++ p += 2;
++ break;
++ }
++ __LA_FALLTHROUGH;
++ case 'j':
+ case 'z':
+ long_flag = *p;
+ p++;
+@@ -136,6 +142,7 @@
+ switch(long_flag) {
+ case 'j': s = va_arg(ap, intmax_t); break;
+ case 'l': s = va_arg(ap, long); break;
++ case 'L': s = va_arg(ap, long long); break;
+ case 'z': s = va_arg(ap, ssize_t); break;
+ default: s = va_arg(ap, int); break;
+ }
+@@ -144,6 +151,7 @@
+ case 's':
+ switch(long_flag) {
+ case 'l':
++ case 'L':
+ pw = va_arg(ap, wchar_t *);
+ if (pw == NULL)
+ pw = L"(null)";
+@@ -172,6 +180,7 @@
+ switch(long_flag) {
+ case 'j': u = va_arg(ap, uintmax_t); break;
+ case 'l': u = va_arg(ap, unsigned long); break;
++ case 'L': u = va_arg(ap, unsigned long long); break;
+ case 'z': u = va_arg(ap, size_t); break;
+ default: u = va_arg(ap, unsigned int); break;
+ }
+--- /dev/null
++++ contrib/libarchive/libarchive/archive_time.c
+@@ -0,0 +1,163 @@
++/*-
++ * Copyright © 2025 ARJANEN Loïc Jean David
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include "archive_platform.h"
++#include "archive_private.h"
++#include "archive_time_private.h"
++#include
++#include
++#include
++
++#define NTFS_EPOC_TIME ARCHIVE_LITERAL_ULL(11644473600)
++#define NTFS_TICKS ARCHIVE_LITERAL_ULL(10000000)
++#define NTFS_EPOC_TICKS (NTFS_EPOC_TIME * NTFS_TICKS)
++#define DOS_MIN_TIME 0x00210000U
++#define DOS_MAX_TIME 0xff9fbf7dU
++
++#if defined(_WIN32) && !defined(__CYGWIN__)
++#include
++/* Windows FILETIME to NTFS time. */
++uint64_t
++FILETIME_to_ntfs(const FILETIME* filetime)
++{
++ ULARGE_INTEGER utc;
++ utc.HighPart = filetime->dwHighDateTime;
++ utc.LowPart = filetime->dwLowDateTime;
++ return utc.QuadPart;
++}
++#endif
++
++/* Convert an MSDOS-style date/time into Unix-style time. */
++int64_t
++dos_to_unix(uint32_t dos_time)
++{
++ uint16_t msTime, msDate;
++ struct tm ts;
++ time_t t;
++
++ msTime = (0xFFFF & dos_time);
++ msDate = (dos_time >> 16);
++
++ memset(&ts, 0, sizeof(ts));
++ ts.tm_year = ((msDate >> 9) & 0x7f) + 80; /* Years since 1900. */
++ ts.tm_mon = ((msDate >> 5) & 0x0f) - 1; /* Month number. */
++ ts.tm_mday = msDate & 0x1f; /* Day of month. */
++ ts.tm_hour = (msTime >> 11) & 0x1f;
++ ts.tm_min = (msTime >> 5) & 0x3f;
++ ts.tm_sec = (msTime << 1) & 0x3e;
++ ts.tm_isdst = -1;
++ t = mktime(&ts);
++ return (int64_t)(t == (time_t)-1 ? INT32_MAX : t);
++}
++
++/* Convert into MSDOS-style date/time. */
++uint32_t
++unix_to_dos(int64_t unix_time)
++{
++ struct tm *t;
++ uint32_t dt;
++ time_t ut = unix_time;
++#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
++ struct tm tmbuf;
++#endif
++
++ if (sizeof(time_t) < sizeof(int64_t) && (int64_t)ut != unix_time) {
++ ut = (time_t)(unix_time > 0 ? INT32_MAX : INT32_MIN);
++ }
++
++#if defined(HAVE_LOCALTIME_S)
++ t = localtime_s(&tmbuf, &ut) ? NULL : &tmbuf;
++#elif defined(HAVE_LOCALTIME_R)
++ t = localtime_r(&ut, &tmbuf);
++#else
++ t = localtime(&ut);
++#endif
++ dt = 0;
++ if (t != NULL && t->tm_year >= INT_MIN + 80) {
++ const int year = t->tm_year - 80;
++
++ if (year & ~0x7f) {
++ dt = year > 0 ? DOS_MAX_TIME : DOS_MIN_TIME;
++ }
++ else {
++ dt += (year & 0x7f) << 9;
++ dt += ((t->tm_mon + 1) & 0x0f) << 5;
++ dt += (t->tm_mday & 0x1f);
++ dt <<= 16;
++ dt += (t->tm_hour & 0x1f) << 11;
++ dt += (t->tm_min & 0x3f) << 5;
++ /* Only counting every 2 seconds. */
++ dt += (t->tm_sec & 0x3e) >> 1;
++ }
++ }
++ if (dt > DOS_MAX_TIME) {
++ dt = DOS_MAX_TIME;
++ }
++ else if (dt < DOS_MIN_TIME) {
++ dt = DOS_MIN_TIME;
++ }
++ return dt;
++}
++
++/* Convert NTFS time to Unix sec/nsec */
++void
++ntfs_to_unix(uint64_t ntfs, int64_t* secs, uint32_t* nsecs)
++{
++ if (ntfs > INT64_MAX) {
++ ntfs -= NTFS_EPOC_TICKS;
++ *secs = ntfs / NTFS_TICKS;
++ *nsecs = 100 * (ntfs % NTFS_TICKS);
++ }
++ else {
++ lldiv_t tdiv;
++ int64_t value = (int64_t)ntfs - (int64_t)NTFS_EPOC_TICKS;
++
++ tdiv = lldiv(value, NTFS_TICKS);
++ *secs = tdiv.quot;
++ *nsecs = (uint32_t)(tdiv.rem * 100);
++ }
++}
++
++/* Convert Unix sec/nsec to NTFS time */
++uint64_t
++unix_to_ntfs(int64_t secs, uint32_t nsecs)
++{
++ uint64_t ntfs;
++
++ if (secs < -(int64_t)NTFS_EPOC_TIME)
++ return 0;
++
++ ntfs = secs + NTFS_EPOC_TIME;
++
++ if (ntfs > UINT64_MAX / NTFS_TICKS)
++ return UINT64_MAX;
++
++ ntfs *= NTFS_TICKS;
++
++ if (ntfs > UINT64_MAX - nsecs/100)
++ return UINT64_MAX;
++
++ return ntfs + nsecs/100;
++}
+--- /dev/null
++++ contrib/libarchive/libarchive/archive_time_private.h
+@@ -0,0 +1,47 @@
++/*-
++ * Copyright © 2025 ARJANEN Loïc Jean David
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++#ifndef ARCHIVE_TIME_PRIVATE_H_INCLUDED
++#define ARCHIVE_TIME_PRIVATE_H_INCLUDED
++
++#ifndef __LIBARCHIVE_BUILD
++#error This header is only to be used internally to libarchive.
++#endif
++#include
++
++/* NTFS time to Unix sec/nsec. */
++void ntfs_to_unix(uint64_t ntfs, int64_t* secs, uint32_t* nsecs);
++/* DOS time to Unix sec. */
++int64_t dos_to_unix(uint32_t dos);
++/* Unix sec/nsec to NTFS time. */
++uint64_t unix_to_ntfs(int64_t secs, uint32_t nsecs);
++/* Unix sec to DOS time. */
++uint32_t unix_to_dos(int64_t secs);
++#if defined(_WIN32) && !defined(__CYGWIN__)
++#include
++#include
++/* Windows FILETIME to NTFS time. */
++uint64_t FILETIME_to_ntfs(const FILETIME* filetime);
++#endif
++#endif /* ARCHIVE_TIME_PRIVATE_H_INCLUDED */
+--- contrib/libarchive/libarchive/archive_util.c.orig
++++ contrib/libarchive/libarchive/archive_util.c
+@@ -77,7 +77,9 @@
+ #define O_CLOEXEC 0
+ #endif
+
+-static int archive_utility_string_sort_helper(char **, unsigned int);
++#if ARCHIVE_VERSION_NUMBER < 4000000
++static int __LA_LIBC_CC archive_utility_string_sort_helper(const void *, const void *);
++#endif
+
+ /* Generic initialization of 'struct archive' objects. */
+ int
+@@ -629,74 +631,28 @@
+ #endif
+ }
+
++#if ARCHIVE_VERSION_NUMBER < 4000000
+ /*
+- * Utility function to sort a group of strings using quicksort.
++ * Utility functions to sort a group of strings using quicksort.
+ */
+ static int
+-archive_utility_string_sort_helper(char **strings, unsigned int n)
++__LA_LIBC_CC
++archive_utility_string_sort_helper(const void *p1, const void *p2)
+ {
+- unsigned int i, lesser_count, greater_count;
+- char **lesser, **greater, **tmp, *pivot;
+- int retval1, retval2;
+-
+- /* A list of 0 or 1 elements is already sorted */
+- if (n <= 1)
+- return (ARCHIVE_OK);
+-
+- lesser_count = greater_count = 0;
+- lesser = greater = NULL;
+- pivot = strings[0];
+- for (i = 1; i < n; i++)
+- {
+- if (strcmp(strings[i], pivot) < 0)
+- {
+- lesser_count++;
+- tmp = realloc(lesser, lesser_count * sizeof(*tmp));
+- if (!tmp) {
+- free(greater);
+- free(lesser);
+- return (ARCHIVE_FATAL);
+- }
+- lesser = tmp;
+- lesser[lesser_count - 1] = strings[i];
+- }
+- else
+- {
+- greater_count++;
+- tmp = realloc(greater, greater_count * sizeof(*tmp));
+- if (!tmp) {
+- free(greater);
+- free(lesser);
+- return (ARCHIVE_FATAL);
+- }
+- greater = tmp;
+- greater[greater_count - 1] = strings[i];
+- }
+- }
++ const char * const * const s1 = p1;
++ const char * const * const s2 = p2;
+
+- /* quicksort(lesser) */
+- retval1 = archive_utility_string_sort_helper(lesser, lesser_count);
+- for (i = 0; i < lesser_count; i++)
+- strings[i] = lesser[i];
+- free(lesser);
+-
+- /* pivot */
+- strings[lesser_count] = pivot;
+-
+- /* quicksort(greater) */
+- retval2 = archive_utility_string_sort_helper(greater, greater_count);
+- for (i = 0; i < greater_count; i++)
+- strings[lesser_count + 1 + i] = greater[i];
+- free(greater);
+-
+- return (retval1 < retval2) ? retval1 : retval2;
++ return strcmp(*s1, *s2);
+ }
+
+ int
+ archive_utility_string_sort(char **strings)
+ {
+- unsigned int size = 0;
+- while (strings[size] != NULL)
++ size_t size = 0;
++ while (strings[size] != NULL)
+ size++;
+- return archive_utility_string_sort_helper(strings, size);
++ qsort(strings, size, sizeof(char *),
++ archive_utility_string_sort_helper);
++ return (ARCHIVE_OK);
+ }
++#endif
+--- contrib/libarchive/libarchive/archive_version_details.c.orig
++++ contrib/libarchive/libarchive/archive_version_details.c
+@@ -46,11 +46,125 @@
+ #endif
+ #ifdef HAVE_ZSTD_H
+ #include
++#include
++#endif
++#ifdef HAVE_LZO_LZOCONF_H
++#include
++#endif
++#if HAVE_LIBXML_XMLVERSION_H
++#include
++#elif HAVE_BSDXML_H
++#include
++#elif HAVE_EXPAT_H
++#include
++#endif
++#if HAVE_MBEDTLS_VERSION_H
++#include
++#endif
++#if HAVE_NETTLE_VERSION_H
++#include
++#include
++#endif
++#if HAVE_OPENSSL_OPENSSLV_H
++#include
++#include
++#endif
++#if HAVE_ICONV_H
++#include
++#endif
++#if HAVE_PCRE_H
++#include
++#endif
++#if HAVE_PCRE2_H
++#include
+ #endif
+
+ #include "archive.h"
+ #include "archive_private.h"
+ #include "archive_string.h"
++#include "archive_cryptor_private.h"
++#include "archive_digest_private.h"
++
++static void
++archive_regex_version(struct archive_string* str)
++{
++#if HAVE_LIBPCREPOSIX && HAVE_PCRE_H
++ archive_strcat(str, " libpcre/");
++ archive_strcat(str, archive_libpcre_version());
++#elif HAVE_LIBPCRE2POSIX && HAVE_PCRE2_H
++ archive_strcat(str, " libpcre2/");
++ archive_strcat(str, archive_libpcre2_version());
++#else
++ (void)str; /* UNUSED */
++#endif
++}
++
++static void
++archive_xml_version(struct archive_string* str)
++{
++#if HAVE_LIBXML_XMLVERSION_H && HAVE_LIBXML2
++ archive_strcat(str, " libxml2/");
++ archive_strcat(str, archive_libxml2_version());
++#elif HAVE_BSDXML_H && HAVE_LIBBSDXML
++ archive_strcat(str, " bsdxml/");
++ archive_strcat(str, archive_libbsdxml_version());
++#elif HAVE_EXPAT_H && HAVE_LIBEXPAT
++ archive_strcat(str, " expat/");
++ archive_strcat(str, archive_libexpat_version());
++#else
++ (void)str; /* UNUSED */
++#endif
++}
++
++static void
++archive_libb2_version(struct archive_string* str)
++{
++ archive_strcat(str, " libb2/");
++#if HAVE_BLAKE2_H && HAVE_LIBB2
++#if defined(LIBB2_PKGCONFIG_VERSION)
++ archive_strcat(str, LIBB2_PKGCONFIG_VERSION);
++#else
++ archive_strcat(str, "system");
++#endif
++#else
++ archive_strcat(str, "bundled");
++#endif
++}
++
++static void
++archive_crypto_version(struct archive_string* str)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto)
++ archive_strcat(str, " CommonCrypto/");
++ archive_strcat(str, archive_commoncrypto_version());
++#endif
++#if defined(ARCHIVE_CRYPTOR_USE_CNG)
++ archive_strcat(str, " cng/");
++ archive_strcat(str, archive_cng_version());
++#endif
++#if defined(ARCHIVE_CRYPTOR_USE_MBED)
++ archive_strcat(str, " mbedtls/");
++ archive_strcat(str, archive_mbedtls_version());
++#endif
++#if defined(ARCHIVE_CRYPTOR_USE_NETTLE)
++ archive_strcat(str, " nettle/");
++ archive_strcat(str, archive_nettle_version());
++#endif
++#if defined(ARCHIVE_CRYPTOR_USE_OPENSSL)
++ archive_strcat(str, " openssl/");
++ archive_strcat(str, archive_openssl_version());
++#endif
++#if defined(ARCHIVE_CRYPTOR_USE_LIBMD)
++ archive_strcat(str, " libmd/");
++ archive_strcat(str, archive_libmd_version());
++#endif
++#if defined(ARCHIVE_CRYPTOR_USE_WINCRYPT)
++ archive_strcat(str, " WinCrypt/");
++ archive_strcat(str, archive_wincrypt_version());
++#endif
++ // Just in case
++ (void)str; /* UNUSED */
++}
+
+ const char *
+ archive_version_details(void)
+@@ -62,12 +176,17 @@
+ const char *bzlib = archive_bzlib_version();
+ const char *liblz4 = archive_liblz4_version();
+ const char *libzstd = archive_libzstd_version();
++ const char *liblzo = archive_liblzo2_version();
++ const char *libiconv = archive_libiconv_version();
++ const char *libacl = archive_libacl_version();
++ const char *librichacl = archive_librichacl_version();
++ const char *libattr = archive_libacl_version();
+
+ if (!init) {
+ archive_string_init(&str);
+
+ archive_strcat(&str, ARCHIVE_VERSION_STRING);
+- if (zlib != NULL) {
++ if (zlib) {
+ archive_strcat(&str, " zlib/");
+ archive_strcat(&str, zlib);
+ }
+@@ -91,6 +210,30 @@
+ archive_strcat(&str, " libzstd/");
+ archive_strcat(&str, libzstd);
+ }
++ if (liblzo) {
++ archive_strcat(&str, " liblzo2/");
++ archive_strcat(&str, liblzo);
++ }
++ archive_xml_version(&str);
++ archive_regex_version(&str);
++ archive_crypto_version(&str);
++ archive_libb2_version(&str);
++ if (librichacl) {
++ archive_strcat(&str, " librichacl/");
++ archive_strcat(&str, librichacl);
++ }
++ if (libacl) {
++ archive_strcat(&str, " libacl/");
++ archive_strcat(&str, libacl);
++ }
++ if (libattr) {
++ archive_strcat(&str, " libattr/");
++ archive_strcat(&str, libattr);
++ }
++ if (libiconv) {
++ archive_strcat(&str, " libiconv/");
++ archive_strcat(&str, libiconv);
++ }
+ }
+ return str.s;
+ }
+@@ -98,8 +241,8 @@
+ const char *
+ archive_zlib_version(void)
+ {
+-#ifdef HAVE_ZLIB_H
+- return ZLIB_VERSION;
++#if HAVE_ZLIB_H && HAVE_LIBZ
++ return zlibVersion();
+ #else
+ return NULL;
+ #endif
+@@ -108,8 +251,8 @@
+ const char *
+ archive_liblzma_version(void)
+ {
+-#ifdef HAVE_LZMA_H
+- return LZMA_VERSION_STRING;
++#if HAVE_LZMA_H && HAVE_LIBLZMA
++ return lzma_version_string();
+ #else
+ return NULL;
+ #endif
+@@ -118,7 +261,7 @@
+ const char *
+ archive_bzlib_version(void)
+ {
+-#ifdef HAVE_BZLIB_H
++#if HAVE_BZLIB_H && HAVE_LIBBZ2
+ return BZ2_bzlibVersion();
+ #else
+ return NULL;
+@@ -128,12 +271,22 @@
+ const char *
+ archive_liblz4_version(void)
+ {
+-#if defined(HAVE_LZ4_H) && defined(HAVE_LIBLZ4)
++#if HAVE_LZ4_H && HAVE_LIBLZ4
++#if LZ4_VERSION_NUMBER > 10705
++ return LZ4_versionString();
++#elif LZ4_VERSION_NUMBER > 10300
++ div_t major = div(LZ4_versionNumber(), 10000);
++ div_t minor = div(major.rem, 100);
++ static char lz4_version[9];
++ snprintf(lz4_version, 9, "%d.%d.%d", major.quot, minor.quot, minor.rem);
++ return lz4_version;
++#else
+ #define str(s) #s
+ #define NUMBER(x) str(x)
+ return NUMBER(LZ4_VERSION_MAJOR) "." NUMBER(LZ4_VERSION_MINOR) "." NUMBER(LZ4_VERSION_RELEASE);
+ #undef NUMBER
+ #undef str
++#endif
+ #else
+ return NULL;
+ #endif
+@@ -143,7 +296,243 @@
+ archive_libzstd_version(void)
+ {
+ #if HAVE_ZSTD_H && HAVE_LIBZSTD
+- return ZSTD_VERSION_STRING;
++#if ZSTD_VERSION_NUMBER > 10300
++ return ZSTD_versionString();
++#else
++ div_t major = div(ZSTD_versionNumber(), 10000);
++ div_t minor = div(major.rem, 100);
++ static char zstd_version[9];
++ snprintf(zstd_version, 9, "%d.%d.%d", major.quot, minor.quot, minor.rem);
++ return zstd_version;
++#endif
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_liblzo2_version(void)
++{
++#if HAVE_LZO_LZOCONF_H && HAVE_LIBLZO2
++ return LZO_VERSION_STRING;
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libbsdxml_version(void)
++{
++#if HAVE_BSDXML_H && HAVE_LIBBSDXML
++ return XML_ExpatVersion();
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libxml2_version(void)
++{
++#if HAVE_LIBXML_XMLREADER_H && HAVE_LIBXML2
++ return LIBXML_DOTTED_VERSION;
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libexpat_version(void)
++{
++#if HAVE_EXPAT_H && HAVE_LIBEXPAT
++ return XML_ExpatVersion();
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_mbedtls_version(void)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_MBED) || defined(ARCHIVE_CRYPTO_MBED)
++ static char mbed_version[9];
++ mbedtls_version_get_string(mbed_version);
++ return mbed_version;
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_nettle_version(void)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_NETTLE) || defined(ARCHIVE_CRYPTO_NETTLE)
++ static char nettle_version[6];
++ snprintf(nettle_version, 6, "%d.%d", nettle_version_major(), nettle_version_minor());
++ return nettle_version;
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_openssl_version(void)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_OPENSSL) || defined(ARCHIVE_CRYPTO_OPENSSL)
++#ifdef OPENSSL_VERSION_STR
++ return OPENSSL_VERSION_STR;
++#else
++#define OPENSSL_MAJOR (OPENSSL_VERSION_NUMBER >> 28)
++#define OPENSSL_MINOR ((OPENSSL_VERSION_NUMBER >> 20) & 0xFF)
++ static char openssl_version[6];
++ snprintf(openssl_version, 6, "%ld.%ld", OPENSSL_MAJOR, OPENSSL_MINOR);
++ return openssl_version;
++#undef OPENSSL_MAJOR
++#undef OPENSSL_MINOR
++#endif
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libmd_version(void)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_LIBMD) || defined(ARCHIVE_CRYPTO_LIBMD)
++ return "system";
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_commoncrypto_version(void)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto) || defined(ARCHIVE_CRYPTO_CommonCrypto)
++ return "system";
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_cng_version(void)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_CNG) || defined(ARCHIVE_CRYPTO_CNG)
++#ifdef BCRYPT_HASH_INTERFACE_MAJORVERSION_2
++ return "2.0";
++#else
++ return "1.0";
++#endif
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_wincrypt_version(void)
++{
++#if defined(ARCHIVE_CRYPTOR_USE_WINCRYPT) || defined(ARCHIVE_CRYPTO_WINCRYPT)
++ HCRYPTPROV prov;
++ if (!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
++ if (GetLastError() != (DWORD)NTE_BAD_KEYSET)
++ return NULL;
++ if (!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET))
++ return NULL;
++ }
++ DWORD version, length = sizeof(version);
++ if (!CryptGetProvParam(prov, PP_VERSION, (BYTE *)&version, &length, 0)) {
++ return NULL;
++ } else {
++ char major = (version >> 8) & 0xFF;
++ char minor = version & 0xFF;
++ static char wincrypt_version[6];
++ snprintf(wincrypt_version, 6, "%hhd.%hhd", major, minor);
++ return wincrypt_version;
++ }
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_librichacl_version(void)
++{
++#if HAVE_LIBRICHACL
++#if defined(LIBRICHACL_PKGCONFIG_VERSION)
++ return LIBRICHACL_PKGCONFIG_VERSION;
++#else
++ return "system";
++#endif
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libacl_version(void)
++{
++#if HAVE_LIBACL
++#if defined(LIBACL_PKGCONFIG_VERSION)
++ return LIBACL_PKGCONFIG_VERSION;
++#else
++ return "system";
++#endif
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libattr_version(void)
++{
++#if HAVE_LIBATTR
++#if defined(LIBATTR_PKGCONFIG_VERSION)
++ return LIBATTR_PKGCONFIG_VERSION;
++#else
++ return "system";
++#endif
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libiconv_version(void)
++{
++#if HAVE_LIBCHARSET && HAVE_ICONV_H
++ char major = _libiconv_version >> 8;
++ char minor = _libiconv_version & 0xFF;
++ static char charset_version[6];
++ snprintf(charset_version, 6, "%hhd.%hhd", major, minor);
++ return charset_version;
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libpcre_version(void)
++{
++#if HAVE_LIBPCREPOSIX && HAVE_PCRE_H
++#define str(s) #s
++#define NUMBER(x) str(x)
++ return NUMBER(PCRE_MAJOR) "." NUMBER(PCRE_MINOR);
++#undef NUMBER
++#undef str
++#else
++ return NULL;
++#endif
++}
++
++const char *
++archive_libpcre2_version(void)
++{
++#if HAVE_LIBPCRE2POSIX && HAVE_PCRE2_H
++#define str(s) #s
++#define NUMBER(x) str(x)
++ return NUMBER(PCRE2_MAJOR) "." NUMBER(PCRE2_MINOR);
++#undef NUMBER
++#undef str
+ #else
+ return NULL;
+ #endif
+--- contrib/libarchive/libarchive/archive_write.c.orig
++++ contrib/libarchive/libarchive/archive_write.c
+@@ -283,7 +283,7 @@
+ }
+
+ /*
+- * Close all filtes
++ * Close all filters
+ */
+ static int
+ __archive_write_filters_close(struct archive_write *a)
+--- contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c.orig
++++ contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c
+@@ -166,7 +166,7 @@
+ }
+
+ archive_string_sprintf(&state->encoded_buff, "begin-base64 %o %s\n",
+- state->mode, state->name.s);
++ (unsigned int)state->mode, state->name.s);
+
+ f->data = state;
+ return (0);
+--- contrib/libarchive/libarchive/archive_write_add_filter_gzip.c.orig
++++ contrib/libarchive/libarchive/archive_write_add_filter_gzip.c
+@@ -58,6 +58,7 @@
+ struct private_data {
+ int compression_level;
+ int timestamp;
++ char *original_filename;
+ #ifdef HAVE_ZLIB_H
+ z_stream stream;
+ int64_t total_in;
+@@ -113,6 +114,8 @@
+ f->free = &archive_compressor_gzip_free;
+ f->code = ARCHIVE_FILTER_GZIP;
+ f->name = "gzip";
++
++ data->original_filename = NULL;
+ #ifdef HAVE_ZLIB_H
+ data->compression_level = Z_DEFAULT_COMPRESSION;
+ return (ARCHIVE_OK);
+@@ -140,6 +143,7 @@
+ #else
+ __archive_write_program_free(data->pdata);
+ #endif
++ free((void*)data->original_filename);
+ free(data);
+ f->data = NULL;
+ return (ARCHIVE_OK);
+@@ -165,6 +169,13 @@
+ data->timestamp = (value == NULL)?-1:1;
+ return (ARCHIVE_OK);
+ }
++ if (strcmp(key, "original-filename") == 0) {
++ free((void*)data->original_filename);
++ data->original_filename = NULL;
++ if (value)
++ data->original_filename = strdup(value);
++ return (ARCHIVE_OK);
++ }
+
+ /* Note: The "warn" return is just to inform the options
+ * supervisor that we didn't handle it. It will generate
+@@ -210,7 +221,7 @@
+ data->compressed[0] = 0x1f; /* GZip signature bytes */
+ data->compressed[1] = 0x8b;
+ data->compressed[2] = 0x08; /* "Deflate" compression */
+- data->compressed[3] = 0; /* No options */
++ data->compressed[3] = data->original_filename == NULL ? 0 : 0x8;
+ if (data->timestamp >= 0) {
+ time_t t = time(NULL);
+ data->compressed[4] = (uint8_t)(t)&0xff; /* Timestamp */
+@@ -229,6 +240,12 @@
+ data->stream.next_out += 10;
+ data->stream.avail_out -= 10;
+
++ if (data->original_filename != NULL) {
++ strcpy((char*)data->compressed + 10, data->original_filename);
++ data->stream.next_out += strlen(data->original_filename) + 1;
++ data->stream.avail_out -= strlen(data->original_filename) + 1;
++ }
++
+ f->write = archive_compressor_gzip_write;
+
+ /* Initialize compression library. */
+--- contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c.orig
++++ contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c
+@@ -155,7 +155,7 @@
+ }
+
+ archive_string_sprintf(&state->encoded_buff, "begin %o %s\n",
+- state->mode, state->name.s);
++ (unsigned int)state->mode, state->name.s);
+
+ f->data = state;
+ return (0);
+--- contrib/libarchive/libarchive/archive_write_disk_posix.c.orig
++++ contrib/libarchive/libarchive/archive_write_disk_posix.c
+@@ -478,9 +478,11 @@
+ case AE_IFLNK:
+ ret = (S_ISLNK(mode));
+ break;
++#ifdef S_ISSOCK
+ case AE_IFSOCK:
+ ret = (S_ISSOCK(mode));
+ break;
++#endif
+ case AE_IFCHR:
+ ret = (S_ISCHR(mode));
+ break;
+@@ -3605,7 +3607,7 @@
+ tstamp.atime.tv_sec = atime;
+ tstamp.mtime.tv_sec = mtime;
+ tstamp.ctime.tv_sec = ctime;
+-#if defined (__hpux) && defined (__ia64)
++#if defined (__hpux) && ( defined (__ia64) || defined (__hppa) )
+ tstamp.atime.tv_nsec = atime_nsec;
+ tstamp.mtime.tv_nsec = mtime_nsec;
+ tstamp.ctime.tv_nsec = ctime_nsec;
+@@ -3788,7 +3790,7 @@
+ * permissions on symlinks, so a failure here has no
+ * impact.
+ */
+- if (lchmod(a->name, mode) != 0) {
++ if (lchmod(a->name, (mode_t)mode) != 0) {
+ switch (errno) {
+ case ENOTSUP:
+ case ENOSYS:
+@@ -3803,7 +3805,8 @@
+ break;
+ default:
+ archive_set_error(&a->archive, errno,
+- "Can't set permissions to 0%o", (int)mode);
++ "Can't set permissions to 0%o",
++ (unsigned int)mode);
+ r = ARCHIVE_WARN;
+ }
+ }
+@@ -3817,16 +3820,16 @@
+ */
+ #ifdef HAVE_FCHMOD
+ if (a->fd >= 0)
+- r2 = fchmod(a->fd, mode);
++ r2 = fchmod(a->fd, (mode_t)mode);
+ else
+ #endif
+ /* If this platform lacks fchmod(), then
+ * we'll just use chmod(). */
+- r2 = chmod(a->name, mode);
++ r2 = chmod(a->name, (mode_t)mode);
+
+ if (r2 != 0) {
+ archive_set_error(&a->archive, errno,
+- "Can't set permissions to 0%o", (int)mode);
++ "Can't set permissions to 0%o", (unsigned int)mode);
+ r = ARCHIVE_WARN;
+ }
+ }
+--- contrib/libarchive/libarchive/archive_write_open_filename.c.orig
++++ contrib/libarchive/libarchive/archive_write_open_filename.c
+@@ -118,7 +118,7 @@
+ (const char *)filename);
+ else
+ archive_set_error(a, ARCHIVE_ERRNO_MISC,
+- "Can't convert '%S' to MBS",
++ "Can't convert '%ls' to MBS",
+ (const wchar_t *)filename);
+ return (ARCHIVE_FAILED);
+ }
+@@ -170,7 +170,7 @@
+ else {
+ archive_mstring_get_wcs(a, &mine->filename, &wcs);
+ archive_set_error(a, errno,
+- "Can't convert '%S' to MBS", wcs);
++ "Can't convert '%ls' to MBS", wcs);
+ }
+ return (ARCHIVE_FATAL);
+ }
+@@ -181,7 +181,7 @@
+ if (mbs != NULL)
+ archive_set_error(a, errno, "Failed to open '%s'", mbs);
+ else
+- archive_set_error(a, errno, "Failed to open '%S'", wcs);
++ archive_set_error(a, errno, "Failed to open '%ls'", wcs);
+ return (ARCHIVE_FATAL);
+ }
+
+@@ -189,7 +189,7 @@
+ if (mbs != NULL)
+ archive_set_error(a, errno, "Couldn't stat '%s'", mbs);
+ else
+- archive_set_error(a, errno, "Couldn't stat '%S'", wcs);
++ archive_set_error(a, errno, "Couldn't stat '%ls'", wcs);
+ return (ARCHIVE_FATAL);
+ }
+
+--- contrib/libarchive/libarchive/archive_write_set_format_7zip.c.orig
++++ contrib/libarchive/libarchive/archive_write_set_format_7zip.c
+@@ -28,7 +28,12 @@
+ #ifdef HAVE_ERRNO_H
+ #include
+ #endif
++#ifdef HAVE_STDLIB_H
+ #include
++#endif
++#ifdef HAVE_UNISTD_H
++#include
++#endif
+ #ifdef HAVE_BZLIB_H
+ #include
+ #endif
+@@ -38,6 +43,9 @@
+ #ifdef HAVE_ZLIB_H
+ #include
+ #endif
++#ifdef HAVE_ZSTD_H
++#include
++#endif
+
+ #include "archive.h"
+ #ifndef HAVE_ZLIB_H
+@@ -50,6 +58,7 @@
+ #include "archive_private.h"
+ #include "archive_rb.h"
+ #include "archive_string.h"
++#include "archive_time_private.h"
+ #include "archive_write_private.h"
+ #include "archive_write_set_format_private.h"
+
+@@ -63,6 +72,8 @@
+ #define _7Z_BZIP2 0x040202
+ #define _7Z_PPMD 0x030401
+
++#define _7Z_ZSTD 0x4F71101 /* Copied from https://github.com/mcmilk/7-Zip-zstd.git */
++
+ /*
+ * 7-Zip header property IDs.
+ */
+@@ -110,6 +121,9 @@
+ // the attr field along with the unix permissions.
+ #define FILE_ATTRIBUTE_UNIX_EXTENSION 0x8000
+
++// Many systems define min or MIN, but not all.
++#define sevenzipmin(a,b) ((a) < (b) ? (a) : (b))
++
+ enum la_zaction {
+ ARCHIVE_Z_FINISH,
+ ARCHIVE_Z_RUN
+@@ -209,7 +223,11 @@
+ #define ENCODED_CRC32 2
+
+ unsigned opt_compression;
++
+ int opt_compression_level;
++ int opt_zstd_compression_level; // This requires a different default value.
++
++ int opt_threads;
+
+ struct la_zstream stream;
+ struct coder coder;
+@@ -285,12 +303,19 @@
+ static int compression_end_lzma(struct archive *, struct la_zstream *);
+ #endif
+ static int compression_init_encoder_ppmd(struct archive *,
+- struct la_zstream *, unsigned, uint32_t);
++ struct la_zstream *, uint8_t, uint32_t);
+ static int compression_code_ppmd(struct archive *,
+ struct la_zstream *, enum la_zaction);
+ static int compression_end_ppmd(struct archive *, struct la_zstream *);
+ static int _7z_compression_init_encoder(struct archive_write *, unsigned,
+ int);
++static int compression_init_encoder_zstd(struct archive *,
++ struct la_zstream *, int, int);
++#if defined(HAVE_ZSTD_H)
++static int compression_code_zstd(struct archive *,
++ struct la_zstream *, enum la_zaction);
++static int compression_end_zstd(struct archive *, struct la_zstream *);
++#endif
+ static int compression_code(struct archive *,
+ struct la_zstream *, enum la_zaction);
+ static int compression_end(struct archive *,
+@@ -301,6 +326,21 @@
+ static int make_streamsInfo(struct archive_write *, uint64_t, uint64_t,
+ uint64_t, int, struct coder *, int, uint32_t);
+
++static int
++string_to_number(const char *string, intmax_t *numberp)
++{
++ char *end;
++
++ if (string == NULL || *string == '\0')
++ return (ARCHIVE_WARN);
++ *numberp = strtoimax(string, &end, 10);
++ if (end == string || *end != '\0' || errno == EOVERFLOW) {
++ *numberp = 0;
++ return (ARCHIVE_WARN);
++ }
++ return (ARCHIVE_OK);
++}
++
+ int
+ archive_write_set_format_7zip(struct archive *_a)
+ {
+@@ -335,11 +375,24 @@
+ zip->opt_compression = _7Z_BZIP2;
+ #elif defined(HAVE_ZLIB_H)
+ zip->opt_compression = _7Z_DEFLATE;
++#elif HAVE_ZSTD_H
++ zip->opt_compression = _7Z_ZSTD;
+ #else
+ zip->opt_compression = _7Z_COPY;
+ #endif
++
+ zip->opt_compression_level = 6;
+
++#ifdef ZSTD_CLEVEL_DEFAULT
++ // Zstandard compression needs a different default
++ // value than other encoders.
++ zip->opt_zstd_compression_level = ZSTD_CLEVEL_DEFAULT;
++#else
++ zip->opt_zstd_compression_level = 3;
++#endif
++
++ zip->opt_threads = 1;
++
+ a->format_data = zip;
+
+ a->format_name = "7zip";
+@@ -397,6 +450,13 @@
+ zip->opt_compression = _7Z_LZMA2;
+ #else
+ name = "lzma2";
++#endif
++ else if (strcmp(value, "zstd") == 0 ||
++ strcmp(value, "ZSTD") == 0)
++#if HAVE_ZSTD_H
++ zip->opt_compression = _7Z_ZSTD;
++#else
++ name = "zstd";
+ #endif
+ else if (strcmp(value, "ppmd") == 0 ||
+ strcmp(value, "PPMD") == 0 ||
+@@ -420,16 +480,68 @@
+ return (ARCHIVE_OK);
+ }
+ if (strcmp(key, "compression-level") == 0) {
+- if (value == NULL ||
+- !(value[0] >= '0' && value[0] <= '9') ||
+- value[1] != '\0') {
+- archive_set_error(&(a->archive),
+- ARCHIVE_ERRNO_MISC,
+- "Illegal value `%s'",
+- value);
++ if (value == NULL || *value == '\0') {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "Invalid compression-level option value `%s'", value);
++ return (ARCHIVE_FAILED);
++ }
++
++ char *end = NULL;
++ long lvl = strtol(value, &end, 10);
++ if (end == NULL || *end != '\0') {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "parsing compression-level option value failed `%s'", value);
++ return (ARCHIVE_FAILED);
++ }
++
++#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream && HAVE_ZSTD_minCLevel
++ int min_level = sevenzipmin(0, ZSTD_minCLevel());
++#else
++ const int min_level = 0;
++#endif
++
++#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
++ int max_level = ZSTD_maxCLevel();
++#else
++ const int max_level = 9;
++#endif
++
++ if (lvl < min_level || lvl > max_level) {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "compression-level option value `%ld' out of range", lvl);
+ return (ARCHIVE_FAILED);
+ }
+- zip->opt_compression_level = value[0] - '0';
++
++ // Note: we don't know here if this value is for zstd (negative to ~22),
++ // or zlib-style 0-9. If zstd is enabled but not in use, we will need to
++ // validate opt_compression_level before use.
++ zip->opt_compression_level = (int)lvl;
++
++ zip->opt_zstd_compression_level = (int)lvl;
++ return (ARCHIVE_OK);
++ }
++ if (strcmp(key, "threads") == 0) {
++ intmax_t threads;
++ if (string_to_number(value, &threads) != ARCHIVE_OK) {
++ return (ARCHIVE_WARN);
++ }
++ if (threads < 0) {
++ return (ARCHIVE_WARN);
++ }
++ if (threads == 0) {
++#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
++ threads = sysconf(_SC_NPROCESSORS_ONLN);
++#elif !defined(__CYGWIN__) && defined(_WIN32_WINNT) && \
++ _WIN32_WINNT >= 0x0601 /* _WIN32_WINNT_WIN7 */
++ DWORD winCores = GetActiveProcessorCount(
++ ALL_PROCESSOR_GROUPS);
++ threads = (intmax_t)winCores;
++#else
++ threads = 1;
++#endif
++ }
++
++ zip->opt_threads = (int)threads;
+ return (ARCHIVE_OK);
+ }
+
+@@ -495,8 +607,20 @@
+ * Init compression.
+ */
+ if ((zip->total_number_entry - zip->total_number_empty_entry) == 1) {
+- r = _7z_compression_init_encoder(a, zip->opt_compression,
+- zip->opt_compression_level);
++
++ int level = zip->opt_compression_level;
++#if HAVE_ZSTD_H
++ if (zip->opt_compression == _7Z_ZSTD) {
++ level = zip->opt_zstd_compression_level;
++ } else if (level < 0 || level > 9) {
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "compression-level option value `%d' out of range 0-9", level);
++ file_free(file);
++ return (ARCHIVE_FATAL);
++ }
++#endif
++
++ r = _7z_compression_init_encoder(a, zip->opt_compression, level);
+ if (r < 0) {
+ file_free(file);
+ return (ARCHIVE_FATAL);
+@@ -785,8 +909,12 @@
+ #else
+ header_compression = _7Z_COPY;
+ #endif
+- r = _7z_compression_init_encoder(a, header_compression,
+- zip->opt_compression_level);
++
++ int level = zip->opt_compression_level;
++ if (level < 0) level = 0;
++ else if (level > 9) level = 9;
++
++ r = _7z_compression_init_encoder(a, header_compression, level);
+ if (r < 0)
+ return (r);
+ zip->crc32flg = PRECODE_CRC32;
+@@ -844,7 +972,7 @@
+ header_offset = header_size = 0;
+ header_crc32 = 0;
+ }
+-
++
+ length = zip->temp_offset;
+
+ /*
+@@ -1164,20 +1292,6 @@
+ return (ARCHIVE_OK);
+ }
+
+-
+-#define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000)
+-static uint64_t
+-utcToFiletime(time_t t, long ns)
+-{
+- uint64_t fileTime;
+-
+- fileTime = t;
+- fileTime *= 10000000;
+- fileTime += ns / 100;
+- fileTime += EPOC_TIME;
+- return (fileTime);
+-}
+-
+ static int
+ make_time(struct archive_write *a, uint8_t type, unsigned flg, int ti)
+ {
+@@ -1249,7 +1363,6 @@
+ if (r < 0)
+ return (r);
+
+-
+ /*
+ * Make Times.
+ */
+@@ -1257,7 +1370,7 @@
+ for (;file != NULL; file = file->next) {
+ if ((file->flg & flg) == 0)
+ continue;
+- archive_le64enc(filetime, utcToFiletime(file->times[ti].time,
++ archive_le64enc(filetime, unix_to_ntfs(file->times[ti].time,
+ file->times[ti].time_ns));
+ r = (int)compress_out(a, filetime, 8, ARCHIVE_Z_RUN);
+ if (r < 0)
+@@ -1504,7 +1617,7 @@
+ return (memcmp(f1->utf16name, f2->utf16name, f1->name_len));
+ return (f1->name_len > f2->name_len)?1:-1;
+ }
+-
++
+ static int
+ file_cmp_key(const struct archive_rb_node *n, const void *key)
+ {
+@@ -1646,7 +1759,8 @@
+ }
+
+ #if !defined(HAVE_ZLIB_H) || !defined(HAVE_BZLIB_H) ||\
+- !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H)
++ !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H) ||\
++ !(HAVE_ZSTD_H && HAVE_ZSTD_compressStream)
+ static int
+ compression_unsupported_encoder(struct archive *a,
+ struct la_zstream *lastrm, const char *name)
+@@ -2159,7 +2273,7 @@
+
+ static int
+ compression_init_encoder_ppmd(struct archive *a,
+- struct la_zstream *lastrm, unsigned maxOrder, uint32_t msize)
++ struct la_zstream *lastrm, uint8_t maxOrder, uint32_t msize)
+ {
+ struct ppmd_stream *strm;
+ uint8_t *props;
+@@ -2279,6 +2393,117 @@
+ return (ARCHIVE_OK);
+ }
+
++#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
++static int
++compression_init_encoder_zstd(struct archive *a, struct la_zstream *lastrm, int level, int threads)
++{
++ if (lastrm->valid)
++ compression_end(a, lastrm);
++
++ ZSTD_CStream *strm = ZSTD_createCStream();
++ if (strm == NULL) {
++ archive_set_error(a, ENOMEM,
++ "Can't allocate memory for zstd stream");
++ return (ARCHIVE_FATAL);
++ }
++
++ if (ZSTD_isError(ZSTD_initCStream(strm, level))) {
++ ZSTD_freeCStream(strm);
++ archive_set_error(a, ARCHIVE_ERRNO_MISC,
++ "Internal error initializing zstd compressor object");
++ return (ARCHIVE_FATAL);
++ }
++
++ ZSTD_CCtx_setParameter(strm, ZSTD_c_nbWorkers, threads);
++
++ // p7zip-zstd fails to unpack archives that don't have prop_size 5.
++ // 7-Zip-zstd fails to unpack archives that don't have prop_size 3 or 5.
++ // So let's use 5...
++ lastrm->prop_size = 5;
++ lastrm->props = calloc(5, 1);
++ if (lastrm->props == NULL) {
++ ZSTD_freeCStream(strm);
++ archive_set_error(a, ARCHIVE_ERRNO_MISC,
++ "Internal error initializing zstd compressor properties");
++ return (ARCHIVE_FATAL);
++ }
++
++ // Refer to the DProps struct in 7-Zip-zstd's ZstdDecoder.h:
++ // https://github.com/mcmilk/7-Zip-zstd/blob/79b2c78e9e7735ddf90147129b75cf2797ff6522/CPP/7zip/Compress/ZstdDecoder.h#L34S
++ lastrm->props[0] = ZSTD_VERSION_MAJOR;
++ lastrm->props[1] = ZSTD_VERSION_MINOR;
++ lastrm->props[2] = level;
++ // lastrm->props[3] and lastrm->props[4] are reserved. Leave them as 0.
++
++ lastrm->real_stream = strm;
++ lastrm->valid = 1;
++ lastrm->code = compression_code_zstd;
++ lastrm->end = compression_end_zstd;
++
++ return (ARCHIVE_OK);
++}
++
++static int
++compression_code_zstd(struct archive *a,
++ struct la_zstream *lastrm, enum la_zaction action)
++{
++ ZSTD_CStream *strm = (ZSTD_CStream *)lastrm->real_stream;
++
++ ZSTD_outBuffer out = { .dst = lastrm->next_out, .size = lastrm->avail_out, .pos = 0 };
++ ZSTD_inBuffer in = { .src = lastrm->next_in, .size = lastrm->avail_in, .pos = 0 };
++
++ size_t zret;
++
++ ZSTD_EndDirective mode = (action == ARCHIVE_Z_RUN) ? ZSTD_e_continue : ZSTD_e_end;
++
++ zret = ZSTD_compressStream2(strm, &out, &in, mode);
++ if (ZSTD_isError(zret)) {
++ archive_set_error(a, ARCHIVE_ERRNO_MISC,
++ "zstd compression failed, ZSTD_compressStream2 returned: %s",
++ ZSTD_getErrorName(zret));
++ return (ARCHIVE_FATAL);
++ }
++
++ lastrm->next_in += in.pos;
++ lastrm->avail_in -= in.pos;
++ lastrm->total_in += in.pos;
++
++ lastrm->next_out += out.pos;
++ lastrm->avail_out -= out.pos;
++ lastrm->total_out += out.pos;
++
++ if (action == ARCHIVE_Z_FINISH && zret == 0)
++ return (ARCHIVE_EOF); // All done.
++
++ return (ARCHIVE_OK); // More work to do.
++}
++
++static int
++compression_end_zstd(struct archive *a, struct la_zstream *lastrm)
++{
++ ZSTD_CStream *strm;
++
++ (void)a; /* UNUSED */
++ strm = (ZSTD_CStream *)lastrm->real_stream;
++ ZSTD_freeCStream(strm);
++ lastrm->valid = 0;
++ lastrm->real_stream = NULL;
++ return (ARCHIVE_OK);
++}
++
++#else
++
++static int
++compression_init_encoder_zstd(struct archive *a, struct la_zstream *lastrm, int level, int threads)
++{
++ (void) level; /* UNUSED */
++ (void) threads; /* UNUSED */
++ if (lastrm->valid)
++ compression_end(a, lastrm);
++ return (compression_unsupported_encoder(a, lastrm, "zstd"));
++}
++#endif
++
+ /*
+ * Universal compressor initializer.
+ */
+@@ -2316,6 +2541,11 @@
+ &(a->archive), &(zip->stream),
+ PPMD7_DEFAULT_ORDER, PPMD7_DEFAULT_MEM_SIZE);
+ break;
++ case _7Z_ZSTD:
++ r = compression_init_encoder_zstd(
++ &(a->archive), &(zip->stream),
++ compression_level, zip->opt_threads);
++ break;
+ case _7Z_COPY:
+ default:
+ r = compression_init_encoder_copy(
+@@ -2352,5 +2582,3 @@
+ }
+ return (ARCHIVE_OK);
+ }
+-
+-
+--- contrib/libarchive/libarchive/archive_write_set_format_gnutar.c.orig
++++ contrib/libarchive/libarchive/archive_write_set_format_gnutar.c
+@@ -153,7 +153,7 @@
+ static int archive_write_gnutar_options(struct archive_write *,
+ const char *, const char *);
+ static int archive_format_gnutar_header(struct archive_write *, char h[512],
+- struct archive_entry *, int tartype);
++ struct archive_entry *, char tartype);
+ static int archive_write_gnutar_header(struct archive_write *,
+ struct archive_entry *entry);
+ static ssize_t archive_write_gnutar_data(struct archive_write *a, const void *buff,
+@@ -274,7 +274,7 @@
+ {
+ char buff[512];
+ int r, ret, ret2 = ARCHIVE_OK;
+- int tartype;
++ char tartype;
+ struct gnutar *gnutar;
+ struct archive_string_conv *sconv;
+ struct archive_entry *entry_main;
+@@ -504,7 +504,7 @@
+ archive_entry_set_uname(temp, "root");
+ archive_entry_set_gname(temp, "wheel");
+
+- archive_entry_set_pathname(temp, "././@LongLink");
++ archive_entry_set_pathname(temp, "././@LongName");
+ archive_entry_set_size(temp, length);
+ ret = archive_format_gnutar_header(a, buff, temp, 'L');
+ archive_entry_free(temp);
+@@ -562,7 +562,7 @@
+
+ static int
+ archive_format_gnutar_header(struct archive_write *a, char h[512],
+- struct archive_entry *entry, int tartype)
++ struct archive_entry *entry, char tartype)
+ {
+ unsigned int checksum;
+ int i, ret;
+@@ -640,7 +640,7 @@
+ if (format_number(archive_entry_uid(entry), h + GNUTAR_uid_offset,
+ GNUTAR_uid_size, GNUTAR_uid_max_size)) {
+ archive_set_error(&a->archive, ERANGE,
+- "Numeric user ID %jd too large",
++ "Numeric user ID %jd too large for gnutar format",
+ (intmax_t)archive_entry_uid(entry));
+ ret = ARCHIVE_FAILED;
+ }
+@@ -649,7 +649,7 @@
+ if (format_number(archive_entry_gid(entry), h + GNUTAR_gid_offset,
+ GNUTAR_gid_size, GNUTAR_gid_max_size)) {
+ archive_set_error(&a->archive, ERANGE,
+- "Numeric group ID %jd too large",
++ "Numeric group ID %jd too large for gnutar format",
+ (intmax_t)archive_entry_gid(entry));
+ ret = ARCHIVE_FAILED;
+ }
+@@ -672,7 +672,7 @@
+ h + GNUTAR_rdevmajor_offset,
+ GNUTAR_rdevmajor_size)) {
+ archive_set_error(&a->archive, ERANGE,
+- "Major device number too large");
++ "Major device number too large for gnutar format");
+ ret = ARCHIVE_FAILED;
+ }
+
+@@ -680,7 +680,7 @@
+ h + GNUTAR_rdevminor_offset,
+ GNUTAR_rdevminor_size)) {
+ archive_set_error(&a->archive, ERANGE,
+- "Minor device number too large");
++ "Minor device number too large for gnutar format");
+ ret = ARCHIVE_FAILED;
+ }
+ }
+--- contrib/libarchive/libarchive/archive_write_set_format_iso9660.c.orig
++++ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c
+@@ -911,7 +911,7 @@
+ static int iso9660_close(struct archive_write *);
+ static int iso9660_free(struct archive_write *);
+
+-static void get_system_identitier(char *, size_t);
++static void get_system_identifier(char *, size_t);
+ static void set_str(unsigned char *, const char *, size_t, char,
+ const char *);
+ static inline int joliet_allowed_char(unsigned char, unsigned char);
+@@ -1167,7 +1167,12 @@
+ iso9660->primary.rootent->parent = iso9660->primary.rootent;
+ iso9660->cur_dirent = iso9660->primary.rootent;
+ archive_string_init(&(iso9660->cur_dirstr));
+- archive_string_ensure(&(iso9660->cur_dirstr), 1);
++ if (archive_string_ensure(&(iso9660->cur_dirstr), 1) == NULL) {
++ free(iso9660);
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't allocate memory");
++ return (ARCHIVE_FATAL);
++ }
+ iso9660->cur_dirstr.s[0] = 0;
+ iso9660->sconv_to_utf16be = NULL;
+ iso9660->sconv_from_utf16be = NULL;
+@@ -2166,7 +2171,7 @@
+ * Get the System Identifier
+ */
+ static void
+-get_system_identitier(char *system_id, size_t size)
++get_system_identifier(char *system_id, size_t size)
+ {
+ #if defined(HAVE_SYS_UTSNAME_H)
+ struct utsname u;
+@@ -3872,7 +3877,7 @@
+ /* Unused Field */
+ set_unused_field_bp(bp, 8, 8);
+ /* System Identifier */
+- get_system_identitier(identifier, sizeof(identifier));
++ get_system_identifier(identifier, sizeof(identifier));
+ r = set_str_a_characters_bp(a, bp, 9, 40, identifier, vdc);
+ if (r != ARCHIVE_OK)
+ return (r);
+@@ -4037,7 +4042,7 @@
+ case KEY_HEX:
+ d = va_arg(ap, int);
+ archive_string_sprintf(info, "%c%s=%x",
+- prefix, key, d);
++ prefix, key, (unsigned int)d);
+ break;
+ }
+ va_end(ap);
+@@ -5666,9 +5671,15 @@
+ * inserted. */
+ iso9660->cur_dirent = dent;
+ archive_string_empty(&(iso9660->cur_dirstr));
+- archive_string_ensure(&(iso9660->cur_dirstr),
++ if (archive_string_ensure(&(iso9660->cur_dirstr),
+ archive_strlen(&(dent->file->parentdir)) +
+- archive_strlen(&(dent->file->basename)) + 2);
++ archive_strlen(&(dent->file->basename)) + 2) == NULL) {
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't allocate memory");
++ _isoent_free(isoent);
++ *isoentpp = NULL;
++ return (ARCHIVE_FATAL);
++ }
+ if (archive_strlen(&(dent->file->parentdir)) +
+ archive_strlen(&(dent->file->basename)) == 0)
+ iso9660->cur_dirstr.s[0] = 0;
+--- contrib/libarchive/libarchive/archive_write_set_format_mtree.c.orig
++++ contrib/libarchive/libarchive/archive_write_set_format_mtree.c
+@@ -54,7 +54,7 @@
+ int count;
+ };
+
+-struct att_counter_set {
++struct attr_counter_set {
+ struct attr_counter *uid_list;
+ struct attr_counter *gid_list;
+ struct attr_counter *mode_list;
+@@ -82,6 +82,7 @@
+ struct reg_info {
+ int compute_sum;
+ uint32_t crc;
++ uint_least32_t mset_digest;
+ struct ae_digest digest;
+ };
+
+@@ -141,7 +142,7 @@
+ unsigned long fflags_set;
+ unsigned long fflags_clear;
+ } set;
+- struct att_counter_set acs;
++ struct attr_counter_set acs;
+ int classic;
+ int depth;
+
+@@ -437,7 +438,7 @@
+ {
+ struct archive_string setstr;
+ struct archive_string unsetstr;
+- struct att_counter_set *acs;
++ struct attr_counter_set *acs;
+ int keys, oldkeys, effkeys;
+
+ archive_string_init(&setstr);
+@@ -638,7 +639,7 @@
+ attr_counter_set_collect(struct mtree_writer *mtree, struct mtree_entry *me)
+ {
+ struct attr_counter *ac, *last;
+- struct att_counter_set *acs = &mtree->acs;
++ struct attr_counter_set *acs = &mtree->acs;
+ int keys = mtree->keys;
+
+ if (keys & (F_UNAME | F_UID)) {
+@@ -714,7 +715,7 @@
+ static void
+ attr_counter_set_free(struct mtree_writer *mtree)
+ {
+- struct att_counter_set *acs = &mtree->acs;
++ struct attr_counter_set *acs = &mtree->acs;
+
+ attr_counter_free(&acs->uid_list);
+ attr_counter_free(&acs->gid_list);
+@@ -862,6 +863,50 @@
+ free(me);
+ }
+
++static void
++mtree_copy_ae_digests(struct reg_info *reg, struct archive_entry *entry, int compute_sum)
++{
++ reg->compute_sum = compute_sum;
++ reg->mset_digest = entry->mset_digest;
++
++ if ((reg->compute_sum & F_MD5)
++ && (reg->mset_digest & AE_MSET_DIGEST_MD5)) {
++
++ memcpy(®->digest.md5, entry->digest.md5,
++ sizeof(reg->digest.md5));
++ }
++ if ((reg->compute_sum & F_RMD160)
++ && (reg->mset_digest & AE_MSET_DIGEST_RMD160)) {
++
++ memcpy(®->digest.rmd160, entry->digest.rmd160,
++ sizeof(reg->digest.rmd160));
++ }
++ if ((reg->compute_sum & F_SHA1)
++ && (reg->mset_digest & AE_MSET_DIGEST_SHA1)) {
++
++ memcpy(®->digest.sha1, entry->digest.sha1,
++ sizeof(reg->digest.sha1));
++ }
++ if ((reg->compute_sum & F_SHA256)
++ && (reg->mset_digest & AE_MSET_DIGEST_SHA256)) {
++
++ memcpy(®->digest.sha256, entry->digest.sha256,
++ sizeof(reg->digest.sha256));
++ }
++ if ((reg->compute_sum & F_SHA384)
++ && (reg->mset_digest & AE_MSET_DIGEST_SHA384)) {
++
++ memcpy(®->digest.sha384, entry->digest.sha384,
++ sizeof(reg->digest.sha384));
++ }
++ if ((reg->compute_sum & F_SHA512)
++ && (reg->mset_digest & AE_MSET_DIGEST_SHA512)) {
++
++ memcpy(®->digest.sha512, entry->digest.sha512,
++ sizeof(reg->digest.sha512));
++ }
++}
++
+ static int
+ archive_write_mtree_header(struct archive_write *a,
+ struct archive_entry *entry)
+@@ -896,8 +941,12 @@
+ /* If the current file is a regular file, we have to
+ * compute the sum of its content.
+ * Initialize a bunch of checksum context. */
+- if (mtree_entry->reg_info)
++ if (mtree_entry->reg_info) {
+ sum_init(mtree);
++ /* honor archive_entry_set_digest() calls. These values will be
++ * overwritten if archive_write_mtree_data() is called */
++ mtree_copy_ae_digests(mtree_entry->reg_info, entry, mtree->compute_sum);
++ }
+
+ return (r2);
+ }
+@@ -1516,28 +1565,46 @@
+ mtree->crc_len += n;
+ }
+ #ifdef ARCHIVE_HAS_MD5
+- if (mtree->compute_sum & F_MD5)
++ if (mtree->compute_sum & F_MD5) {
+ archive_md5_update(&mtree->md5ctx, buff, n);
++ mtree->mtree_entry->reg_info->mset_digest &=
++ ~AE_MSET_DIGEST_MD5;
++ }
+ #endif
+ #ifdef ARCHIVE_HAS_RMD160
+- if (mtree->compute_sum & F_RMD160)
++ if (mtree->compute_sum & F_RMD160) {
+ archive_rmd160_update(&mtree->rmd160ctx, buff, n);
++ mtree->mtree_entry->reg_info->mset_digest &=
++ ~AE_MSET_DIGEST_RMD160;
++ }
+ #endif
+ #ifdef ARCHIVE_HAS_SHA1
+- if (mtree->compute_sum & F_SHA1)
++ if (mtree->compute_sum & F_SHA1) {
+ archive_sha1_update(&mtree->sha1ctx, buff, n);
++ mtree->mtree_entry->reg_info->mset_digest &=
++ ~AE_MSET_DIGEST_SHA1;
++ }
+ #endif
+ #ifdef ARCHIVE_HAS_SHA256
+- if (mtree->compute_sum & F_SHA256)
++ if (mtree->compute_sum & F_SHA256) {
+ archive_sha256_update(&mtree->sha256ctx, buff, n);
++ mtree->mtree_entry->reg_info->mset_digest &=
++ ~AE_MSET_DIGEST_SHA256;
++ }
+ #endif
+ #ifdef ARCHIVE_HAS_SHA384
+- if (mtree->compute_sum & F_SHA384)
++ if (mtree->compute_sum & F_SHA384) {
+ archive_sha384_update(&mtree->sha384ctx, buff, n);
++ mtree->mtree_entry->reg_info->mset_digest &=
++ ~AE_MSET_DIGEST_SHA384;
++ }
+ #endif
+ #ifdef ARCHIVE_HAS_SHA512
+- if (mtree->compute_sum & F_SHA512)
++ if (mtree->compute_sum & F_SHA512) {
+ archive_sha512_update(&mtree->sha512ctx, buff, n);
++ mtree->mtree_entry->reg_info->mset_digest &=
++ ~AE_MSET_DIGEST_SHA512;
++ }
+ #endif
+ }
+
+@@ -1553,27 +1620,39 @@
+ reg->crc = ~mtree->crc;
+ }
+ #ifdef ARCHIVE_HAS_MD5
+- if (mtree->compute_sum & F_MD5)
++ if ((mtree->compute_sum & F_MD5)
++ && !(reg->mset_digest & AE_MSET_DIGEST_MD5))
++
+ archive_md5_final(&mtree->md5ctx, reg->digest.md5);
+ #endif
+ #ifdef ARCHIVE_HAS_RMD160
+- if (mtree->compute_sum & F_RMD160)
++ if ((mtree->compute_sum & F_RMD160)
++ && !(reg->mset_digest & AE_MSET_DIGEST_RMD160))
++
+ archive_rmd160_final(&mtree->rmd160ctx, reg->digest.rmd160);
+ #endif
+ #ifdef ARCHIVE_HAS_SHA1
+- if (mtree->compute_sum & F_SHA1)
++ if ((mtree->compute_sum & F_SHA1)
++ && !(reg->mset_digest & AE_MSET_DIGEST_SHA1))
++
+ archive_sha1_final(&mtree->sha1ctx, reg->digest.sha1);
+ #endif
+ #ifdef ARCHIVE_HAS_SHA256
+- if (mtree->compute_sum & F_SHA256)
++ if ((mtree->compute_sum & F_SHA256)
++ && !(reg->mset_digest & AE_MSET_DIGEST_SHA256))
++
+ archive_sha256_final(&mtree->sha256ctx, reg->digest.sha256);
+ #endif
+ #ifdef ARCHIVE_HAS_SHA384
+- if (mtree->compute_sum & F_SHA384)
++ if ((mtree->compute_sum & F_SHA384)
++ && !(reg->mset_digest & AE_MSET_DIGEST_SHA384))
++
+ archive_sha384_final(&mtree->sha384ctx, reg->digest.sha384);
+ #endif
+ #ifdef ARCHIVE_HAS_SHA512
+- if (mtree->compute_sum & F_SHA512)
++ if ((mtree->compute_sum & F_SHA512)
++ && !(reg->mset_digest & AE_MSET_DIGEST_SHA512))
++
+ archive_sha512_final(&mtree->sha512ctx, reg->digest.sha512);
+ #endif
+ /* Save what types of sum are computed. */
+@@ -2130,9 +2209,13 @@
+ * inserted. */
+ mtree->cur_dirent = dent;
+ archive_string_empty(&(mtree->cur_dirstr));
+- archive_string_ensure(&(mtree->cur_dirstr),
++ if (archive_string_ensure(&(mtree->cur_dirstr),
+ archive_strlen(&(dent->parentdir)) +
+- archive_strlen(&(dent->basename)) + 2);
++ archive_strlen(&(dent->basename)) + 2) == NULL) {
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't allocate memory");
++ return (ARCHIVE_FATAL);
++ }
+ if (archive_strlen(&(dent->parentdir)) +
+ archive_strlen(&(dent->basename)) == 0)
+ mtree->cur_dirstr.s[0] = 0;
+--- contrib/libarchive/libarchive/archive_write_set_format_pax.c.orig
++++ contrib/libarchive/libarchive/archive_write_set_format_pax.c
+@@ -1414,7 +1414,7 @@
+ struct archive_entry *pax_attr_entry;
+ time_t s;
+ int64_t uid, gid;
+- int mode;
++ __LA_MODE_T mode;
+
+ pax_attr_entry = archive_entry_new2(&a->archive);
+ p = entry_name.s;
+@@ -1571,7 +1571,7 @@
+ const char *filename, *filename_end;
+ char *p;
+ int need_slash = 0; /* Was there a trailing slash? */
+- size_t suffix_length = 99;
++ size_t suffix_length = 98; /* 99 - 1 for trailing slash */
+ size_t insert_length;
+
+ /* Length of additional dir element to be added. */
+@@ -1623,7 +1623,7 @@
+ /* Step 2: Locate the "prefix" section of the dirname, including
+ * trailing '/'. */
+ prefix = src;
+- prefix_end = prefix + 155;
++ prefix_end = prefix + 154 /* 155 - 1 for trailing / */;
+ if (prefix_end > filename)
+ prefix_end = filename;
+ while (prefix_end > prefix && *prefix_end != '/')
+--- contrib/libarchive/libarchive/archive_write_set_format_xar.c.orig
++++ contrib/libarchive/libarchive/archive_write_set_format_xar.c
+@@ -34,6 +34,14 @@
+ #include
+ #if HAVE_LIBXML_XMLWRITER_H
+ #include
++#if defined(LIBXML_VERSION) && LIBXML_VERSION >= 20703
++#define XAR_WRITER_HAS_XML
++#endif /* LIBXML_VERSION */
++#elif HAVE_XMLLITE_H
++#include
++#include
++#include
++#define XAR_WRITER_HAS_XML
+ #endif
+ #ifdef HAVE_BZLIB_H
+ #include
+@@ -70,13 +78,12 @@
+ *
+ */
+
+-#if !(defined(HAVE_LIBXML_XMLWRITER_H) && defined(LIBXML_VERSION) &&\
+- LIBXML_VERSION >= 20703) ||\
++#if !defined(XAR_WRITER_HAS_XML) ||\
+ !defined(HAVE_ZLIB_H) || \
+ !defined(ARCHIVE_HAS_MD5) || !defined(ARCHIVE_HAS_SHA1)
+ /*
+ * xar needs several external libraries.
+- * o libxml2
++ * o libxml2 or xmllite (on Windows)
+ * o openssl or MD5/SHA1 hash function
+ * o zlib
+ * o bzlib2 (option)
+@@ -94,9 +101,26 @@
+
+ #else /* Support xar format */
+
+-/*#define DEBUG_PRINT_TOC 1 */
++struct xml_writer;
++static int xml_writer_create(struct xml_writer **pctx);
++static int xml_writer_start_document(struct xml_writer *ctx);
++static int xml_writer_end_document(struct xml_writer *ctx);
++static int xml_writer_set_indent(struct xml_writer *ctx, unsigned int indent);
++static int xml_writer_start_element(struct xml_writer *ctx,
++ const char *localName);
++static int xml_writer_write_attribute(struct xml_writer *ctx, const char *key,
++ const char *value);
++static int xml_writer_write_attributef(struct xml_writer *ctx, const char *key,
++ const char *format, ...);
++static int xml_writer_write_string(struct xml_writer *ctx, const char *string);
++static int xml_writer_write_base64(struct xml_writer* ctx,
++ const char *data, size_t start, size_t len);
++static int xml_writer_end_element(struct xml_writer *ctx);
++static int xml_writer_get_final_content_and_length(struct xml_writer *ctx,
++ const char **out, size_t *size);
++static int xml_writer_destroy(struct xml_writer *ctx);
+
+-#define BAD_CAST_CONST (const xmlChar *)
++/*#define DEBUG_PRINT_TOC 1 */
+
+ #define HEADER_MAGIC 0x78617221
+ #define HEADER_SIZE 28
+@@ -807,50 +831,49 @@
+ }
+
+ static int
+-xmlwrite_string_attr(struct archive_write *a, xmlTextWriterPtr writer,
++xmlwrite_string_attr(struct archive_write *a, struct xml_writer *writer,
+ const char *key, const char *value,
+ const char *attrkey, const char *attrvalue)
+ {
+ int r;
+
+- r = xmlTextWriterStartElement(writer, BAD_CAST_CONST(key));
++ r = xml_writer_start_element(writer, key);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ if (attrkey != NULL && attrvalue != NULL) {
+- r = xmlTextWriterWriteAttribute(writer,
+- BAD_CAST_CONST(attrkey), BAD_CAST_CONST(attrvalue));
++ r = xml_writer_write_attribute(writer, attrkey, attrvalue);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteAttribute() failed: %d", r);
++ "xml_writer_write_attribute() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ }
+ if (value != NULL) {
+- r = xmlTextWriterWriteString(writer, BAD_CAST_CONST(value));
++ r = xml_writer_write_string(writer, value);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteString() failed: %d", r);
++ "xml_writer_write_string() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ }
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ return (ARCHIVE_OK);
+ }
+
+ static int
+-xmlwrite_string(struct archive_write *a, xmlTextWriterPtr writer,
++xmlwrite_string(struct archive_write *a, struct xml_writer *writer,
+ const char *key, const char *value)
+ {
+ int r;
+@@ -858,34 +881,34 @@
+ if (value == NULL)
+ return (ARCHIVE_OK);
+
+- r = xmlTextWriterStartElement(writer, BAD_CAST_CONST(key));
++ r = xml_writer_start_element(writer, key);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ if (value != NULL) {
+- r = xmlTextWriterWriteString(writer, BAD_CAST_CONST(value));
++ r = xml_writer_write_string(writer, value);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteString() failed: %d", r);
++ "xml_writer_write_string() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ }
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ return (ARCHIVE_OK);
+ }
+
+ static int
+-xmlwrite_fstring(struct archive_write *a, xmlTextWriterPtr writer,
++xmlwrite_fstring(struct archive_write *a, struct xml_writer *writer,
+ const char *key, const char *fmt, ...)
+ {
+ struct xar *xar;
+@@ -900,7 +923,7 @@
+ }
+
+ static int
+-xmlwrite_time(struct archive_write *a, xmlTextWriterPtr writer,
++xmlwrite_time(struct archive_write *a, struct xml_writer *writer,
+ const char *key, time_t t, int z)
+ {
+ char timestr[100];
+@@ -922,7 +945,7 @@
+ }
+
+ static int
+-xmlwrite_mode(struct archive_write *a, xmlTextWriterPtr writer,
++xmlwrite_mode(struct archive_write *a, struct xml_writer *writer,
+ const char *key, mode_t mode)
+ {
+ char ms[5];
+@@ -937,7 +960,7 @@
+ }
+
+ static int
+-xmlwrite_sum(struct archive_write *a, xmlTextWriterPtr writer,
++xmlwrite_sum(struct archive_write *a, struct xml_writer *writer,
+ const char *key, struct chksumval *sum)
+ {
+ const char *algname;
+@@ -971,7 +994,7 @@
+ }
+
+ static int
+-xmlwrite_heap(struct archive_write *a, xmlTextWriterPtr writer,
++xmlwrite_heap(struct archive_write *a, struct xml_writer *writer,
+ struct heap_data *heap)
+ {
+ const char *encname;
+@@ -1029,7 +1052,7 @@
+ * Our implements records both and if it's necessary.
+ */
+ static int
+-make_fflags_entry(struct archive_write *a, xmlTextWriterPtr writer,
++make_fflags_entry(struct archive_write *a, struct xml_writer *writer,
+ const char *element, const char *fflags_text)
+ {
+ static const struct flagentry {
+@@ -1119,11 +1142,11 @@
+ } while (p != NULL);
+
+ if (n > 0) {
+- r = xmlTextWriterStartElement(writer, BAD_CAST_CONST(element));
++ r = xml_writer_start_element(writer, element);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ for (i = 0; i < n; i++) {
+@@ -1133,29 +1156,59 @@
+ return (r);
+ }
+
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ }
+ return (ARCHIVE_OK);
+ }
+
++/*
++ * This function determines whether a UTF-8 string contains
++ * only codepoints that are convertible to Latin-1. Strings
++ * beyond Latin-1 are stored base64-encoded in the XAR TOC.
++ */
+ static int
+-make_file_entry(struct archive_write *a, xmlTextWriterPtr writer,
++is_u8_zstring_latin1(const char *in)
++{
++ unsigned int c;
++ while (*in) {
++ c = *in++;
++ if (c < 0x80) continue;
++ /*
++ * Filter out non-continuation, any continuation of 2-3
++ * bytes, and any continuation of 1 byte whose high 3 bits
++ * are non-zero. Recall, 1-byte continuations can store 11
++ * bits whereas Latin-1 codepoints are only 8 bits wide.
++ */
++ if ((c & 0xFC) != 0xC0)
++ return (0);
++ c = *in++;
++ /*
++ * If we get any non-continuation byte (including 0x00!),
++ * the string is not valid UTF-8.
++ */
++ if ((c & 0xC0) != 0x80)
++ return (0); /* invalid unicode */
++ }
++ return (1);
++}
++
++static int
++make_file_entry(struct archive_write *a, struct xml_writer *writer,
+ struct file *file)
+ {
+ struct xar *xar;
+ const char *filetype, *filelink, *fflags;
+ struct archive_string linkto;
+ struct heap_data *heap;
+- unsigned char *tmp;
+ const char *p;
+ size_t len;
+- int r, r2, l, ll;
++ int r, r2;
+
+ xar = (struct xar *)a->format_data;
+ r2 = ARCHIVE_OK;
+@@ -1163,44 +1216,35 @@
+ /*
+ * Make a file name entry, "".
+ */
+- l = ll = (int)archive_strlen(&(file->basename));
+- tmp = malloc(l);
+- if (tmp == NULL) {
+- archive_set_error(&a->archive, ENOMEM,
+- "Can't allocate memory");
+- return (ARCHIVE_FATAL);
+- }
+- r = UTF8Toisolat1(tmp, &l, BAD_CAST(file->basename.s), &ll);
+- free(tmp);
+- if (r < 0) {
+- r = xmlTextWriterStartElement(writer, BAD_CAST("name"));
++ if (!is_u8_zstring_latin1(file->basename.s)) {
++ r = xml_writer_start_element(writer, "name");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+- r = xmlTextWriterWriteAttribute(writer,
+- BAD_CAST("enctype"), BAD_CAST("base64"));
++ r = xml_writer_write_attribute(writer,
++ "enctype", "base64");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteAttribute() failed: %d", r);
++ "xml_writer_write_attribute() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+- r = xmlTextWriterWriteBase64(writer, file->basename.s,
++ r = xml_writer_write_base64(writer, file->basename.s,
+ 0, (int)archive_strlen(&(file->basename)));
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteBase64() failed: %d", r);
++ "xml_writer_write_base64() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ } else {
+@@ -1281,11 +1325,11 @@
+ break;
+ case AE_IFCHR:
+ case AE_IFBLK:
+- r = xmlTextWriterStartElement(writer, BAD_CAST("device"));
++ r = xml_writer_start_element(writer, "device");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ r = xmlwrite_fstring(a, writer, "major",
+@@ -1296,11 +1340,11 @@
+ "%d", archive_entry_rdevminor(file->entry));
+ if (r < 0)
+ return (ARCHIVE_FATAL);
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ break;
+@@ -1436,19 +1480,19 @@
+
+ archive_entry_xattr_next(file->entry,
+ &name, &value, &size);
+- r = xmlTextWriterStartElement(writer, BAD_CAST("ea"));
++ r = xml_writer_start_element(writer, "ea");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+- r = xmlTextWriterWriteFormatAttribute(writer,
+- BAD_CAST("id"), "%d", heap->id);
++ r = xml_writer_write_attributef(writer,
++ "id", "%d", heap->id);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteAttribute() failed: %d", r);
++ "xml_writer_write_attributef() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ r = xmlwrite_heap(a, writer, heap);
+@@ -1458,11 +1502,11 @@
+ if (r < 0)
+ return (ARCHIVE_FATAL);
+
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ }
+@@ -1471,11 +1515,11 @@
+ * Make a file data entry, "".
+ */
+ if (file->data.length > 0) {
+- r = xmlTextWriterStartElement(writer, BAD_CAST("data"));
++ r = xml_writer_start_element(writer, "data");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+
+@@ -1483,21 +1527,21 @@
+ if (r < 0)
+ return (ARCHIVE_FATAL);
+
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ }
+
+ if (archive_strlen(&file->script) > 0) {
+- r = xmlTextWriterStartElement(writer, BAD_CAST("content"));
++ r = xml_writer_start_element(writer, "content");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+
+@@ -1510,11 +1554,11 @@
+ if (r < 0)
+ return (ARCHIVE_FATAL);
+
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ return (ARCHIVE_FATAL);
+ }
+ }
+@@ -1530,8 +1574,9 @@
+ {
+ struct xar *xar;
+ struct file *np;
+- xmlBufferPtr bp;
+- xmlTextWriterPtr writer;
++ struct xml_writer *writer;
++ const char* content;
++ size_t use;
+ int algsize;
+ int r, ret;
+
+@@ -1543,51 +1588,43 @@
+ * Initialize xml writer.
+ */
+ writer = NULL;
+- bp = xmlBufferCreate();
+- if (bp == NULL) {
+- archive_set_error(&a->archive, ENOMEM,
+- "xmlBufferCreate() "
+- "couldn't create xml buffer");
+- goto exit_toc;
+- }
+- writer = xmlNewTextWriterMemory(bp, 0);
+- if (writer == NULL) {
++ r = xml_writer_create(&writer);
++ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlNewTextWriterMemory() "
+- "couldn't create xml writer");
++ "xml_writer_create() failed: %d", r);
+ goto exit_toc;
+ }
+- r = xmlTextWriterStartDocument(writer, "1.0", "UTF-8", NULL);
++ r = xml_writer_set_indent(writer, 4);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartDocument() failed: %d", r);
++ "xml_writer_set_indent() failed: %d", r);
+ goto exit_toc;
+ }
+- r = xmlTextWriterSetIndent(writer, 4);
++ r = xml_writer_start_document(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterSetIndent() failed: %d", r);
++ "xml_writer_start_document() failed: %d", r);
+ goto exit_toc;
+ }
+
+ /*
+ * Start recording TOC
+ */
+- r = xmlTextWriterStartElement(writer, BAD_CAST("xar"));
++ r = xml_writer_start_element(writer, "xar");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ goto exit_toc;
+ }
+- r = xmlTextWriterStartElement(writer, BAD_CAST("toc"));
++ r = xml_writer_start_element(writer, "toc");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartDocument() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ goto exit_toc;
+ }
+
+@@ -1606,19 +1643,19 @@
+ /*
+ * Record TOC checksum
+ */
+- r = xmlTextWriterStartElement(writer, BAD_CAST("checksum"));
++ r = xml_writer_start_element(writer, "checksum");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() failed: %d", r);
++ "xml_writer_start_element() failed: %d", r);
+ goto exit_toc;
+ }
+- r = xmlTextWriterWriteAttribute(writer, BAD_CAST("style"),
+- BAD_CAST_CONST(getalgname(xar->opt_toc_sumalg)));
++ r = xml_writer_write_attribute(writer, "style",
++ getalgname(xar->opt_toc_sumalg));
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteAttribute() failed: %d", r);
++ "xml_writer_write_attribute() failed: %d", r);
+ goto exit_toc;
+ }
+
+@@ -1636,11 +1673,11 @@
+ if (r < 0)
+ goto exit_toc;
+
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() failed: %d", r);
++ "xml_writer_end_element() failed: %d", r);
+ goto exit_toc;
+ }
+ }
+@@ -1656,32 +1693,32 @@
+ if (np->dir && np->children.first != NULL) {
+ /* Enter to sub directories. */
+ np = np->children.first;
+- r = xmlTextWriterStartElement(writer,
+- BAD_CAST("file"));
++ r = xml_writer_start_element(writer,
++ "file");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() "
++ "xml_writer_start_element() "
+ "failed: %d", r);
+ goto exit_toc;
+ }
+- r = xmlTextWriterWriteFormatAttribute(
+- writer, BAD_CAST("id"), "%d", np->id);
++ r = xml_writer_write_attributef(
++ writer, "id", "%d", np->id);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteAttribute() "
++ "xml_writer_write_attributef() "
+ "failed: %d", r);
+ goto exit_toc;
+ }
+ continue;
+ }
+ while (np != np->parent) {
+- r = xmlTextWriterEndElement(writer);
++ r = xml_writer_end_element(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndElement() "
++ "xml_writer_end_element() "
+ "failed: %d", r);
+ goto exit_toc;
+ }
+@@ -1690,21 +1727,21 @@
+ np = np->parent;
+ } else {
+ np = np->chnext;
+- r = xmlTextWriterStartElement(writer,
+- BAD_CAST("file"));
++ r = xml_writer_start_element(writer,
++ "file");
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterStartElement() "
++ "xml_writer_start_element() "
+ "failed: %d", r);
+ goto exit_toc;
+ }
+- r = xmlTextWriterWriteFormatAttribute(
+- writer, BAD_CAST("id"), "%d", np->id);
++ r = xml_writer_write_attributef(
++ writer, "id", "%d", np->id);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterWriteAttribute() "
++ "xml_writer_write_attributef() "
+ "failed: %d", r);
+ goto exit_toc;
+ }
+@@ -1713,31 +1750,40 @@
+ }
+ } while (np != np->parent);
+
+- r = xmlTextWriterEndDocument(writer);
++ r = xml_writer_end_document(writer);
+ if (r < 0) {
+ archive_set_error(&a->archive,
+ ARCHIVE_ERRNO_MISC,
+- "xmlTextWriterEndDocument() failed: %d", r);
++ "xml_writer_end_document() failed: %d", r);
+ goto exit_toc;
+ }
++
++ r = xml_writer_get_final_content_and_length(writer, &content, &use);
++ if (r < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "xml_writer_get_final_content_and_length() failed: %d", r);
++ goto exit_toc;
++ }
++
+ #if DEBUG_PRINT_TOC
+ fprintf(stderr, "\n---TOC-- %d bytes --\n%s\n",
+- strlen((const char *)bp->content), bp->content);
++ (int)strlen(content), content);
+ #endif
+
+ /*
+ * Compress the TOC and calculate the sum of the TOC.
+ */
+ xar->toc.temp_offset = xar->temp_offset;
+- xar->toc.size = bp->use;
++ xar->toc.size = (uint64_t)use;
+ checksum_init(&(xar->a_sumwrk), xar->opt_toc_sumalg);
+
+ r = compression_init_encoder_gzip(&(a->archive),
+ &(xar->stream), 6, 1);
+ if (r != ARCHIVE_OK)
+ goto exit_toc;
+- xar->stream.next_in = bp->content;
+- xar->stream.avail_in = bp->use;
++ xar->stream.next_in = (const unsigned char *)content;
++ xar->stream.avail_in = use;
+ xar->stream.total_in = 0;
+ xar->stream.next_out = xar->wbuff;
+ xar->stream.avail_out = sizeof(xar->wbuff);
+@@ -1768,9 +1814,7 @@
+ ret = ARCHIVE_OK;
+ exit_toc:
+ if (writer)
+- xmlFreeTextWriter(writer);
+- if (bp)
+- xmlBufferFree(bp);
++ xml_writer_destroy(writer);
+
+ return (ret);
+ }
+@@ -3251,4 +3295,404 @@
+ }
+ }
+
++#if HAVE_LIBXML_XMLWRITER_H
++
++#define BAD_CAST_CONST (const xmlChar *)
++
++struct xml_writer {
++ xmlTextWriterPtr writer;
++ xmlBufferPtr bp;
++ unsigned int indent;
++};
++
++static int
++xml_writer_create(struct xml_writer **pctx)
++{
++ struct xml_writer *ctx = calloc(1, sizeof(struct xml_writer));
++ if (ctx == NULL) {
++ return (-1);
++ }
++
++ ctx->bp = xmlBufferCreate();
++ if (ctx->bp == NULL) {
++ free(ctx);
++ return (-1);
++ }
++
++ ctx->writer = xmlNewTextWriterMemory(ctx->bp, 0);
++ if (ctx->writer == NULL) {
++ xmlBufferFree(ctx->bp);
++ free(ctx);
++ return (-1);
++ }
++
++ *pctx = ctx;
++ return (0);
++}
++
++static int
++xml_writer_destroy(struct xml_writer *ctx)
++{
++ xmlFreeTextWriter(ctx->writer);
++ xmlBufferFree(ctx->bp);
++ free(ctx);
++ return (0);
++}
++
++static int
++xml_writer_start_document(struct xml_writer *ctx)
++{
++ int r;
++ r = xmlTextWriterStartDocument(ctx->writer, "1.0", "UTF-8", NULL);
++ if (r < 0) {
++ return (r);
++ }
++
++ r = xmlTextWriterSetIndent(ctx->writer, (int)ctx->indent);
++ return (r);
++}
++
++static int
++xml_writer_end_document(struct xml_writer *ctx)
++{
++ return (xmlTextWriterEndDocument(ctx->writer));
++}
++
++static int
++xml_writer_set_indent(struct xml_writer *ctx, unsigned int indent)
++{
++ /* libxml2 only lets you set the indent after starting the document */
++ ctx->indent = indent;
++ return (0);
++}
++
++static int
++xml_writer_start_element(struct xml_writer *ctx, const char *localName)
++{
++ return (xmlTextWriterStartElement(ctx->writer,
++ BAD_CAST_CONST(localName)));
++}
++
++static int
++xml_writer_write_attribute(struct xml_writer *ctx,
++ const char *key, const char *value)
++{
++ return (xmlTextWriterWriteAttribute(ctx->writer,
++ BAD_CAST_CONST(key), BAD_CAST_CONST(value)));
++}
++
++static int
++xml_writer_write_attributef(struct xml_writer *ctx,
++ const char *key, const char *format, ...)
++{
++ va_list ap;
++ int ret;
++ va_start(ap, format);
++ ret = xmlTextWriterWriteVFormatAttribute(ctx->writer,
++ BAD_CAST_CONST(key), format, ap);
++ va_end(ap);
++ return (ret);
++}
++
++static int
++xml_writer_write_string(struct xml_writer *ctx, const char *string)
++{
++ return (xmlTextWriterWriteString(ctx->writer, BAD_CAST_CONST(string)));
++}
++
++static int
++xml_writer_write_base64(struct xml_writer* ctx,
++ const char *data, size_t start, size_t len)
++{
++ return (xmlTextWriterWriteBase64(ctx->writer, data,
++ (int)start, (int)len));
++}
++
++static int
++xml_writer_end_element(struct xml_writer *ctx)
++{
++ return (xmlTextWriterEndElement(ctx->writer));
++}
++
++static int
++xml_writer_get_final_content_and_length(struct xml_writer *ctx,
++ const char **out, size_t *size)
++{
++ *out = (const char*)ctx->bp->content;
++ *size = (size_t)ctx->bp->use;
++ return (0);
++}
++
++#elif HAVE_XMLLITE_H
++
++struct xml_writer {
++ IXmlWriter *writer;
++ IStream *stream;
++ HGLOBAL global;
++};
++
++static int
++xml_writer_create(struct xml_writer **pctx)
++{
++ struct xml_writer *ctx;
++ HRESULT hr;
++
++ ctx = calloc(1, sizeof(struct xml_writer));
++ if (ctx == NULL) {
++ return (E_OUTOFMEMORY);
++ }
++
++ hr = CreateStreamOnHGlobal(NULL, TRUE, &ctx->stream);
++ if (FAILED(hr)) {
++ free(ctx);
++ return (hr);
++ }
++
++ hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&ctx->writer, NULL);
++ if (FAILED(hr)) {
++ ctx->stream->lpVtbl->Release(ctx->stream);
++ free(ctx);
++ return (hr);
++ }
++
++ hr = ctx->writer->lpVtbl->SetOutput(ctx->writer,
++ (IUnknown *)ctx->stream);
++ if (FAILED(hr)) {
++ ctx->writer->lpVtbl->Release(ctx->writer);
++ ctx->stream->lpVtbl->Release(ctx->stream);
++ free(ctx);
++ return (hr);
++ }
++
++ *pctx = ctx;
++ return (S_OK);
++}
++
++static int
++xml_writer_destroy(struct xml_writer *ctx)
++{
++ if (ctx->global)
++ GlobalUnlock(ctx->global);
++ ctx->writer->lpVtbl->Release(ctx->writer); /* Destroys only writer */
++ ctx->stream->lpVtbl->Release(ctx->stream); /* Destroys stream, global */
++ free(ctx);
++ return (S_OK);
++}
++
++static int
++xml_writer_start_document(struct xml_writer *ctx)
++{
++ return ctx->writer->lpVtbl->WriteStartDocument(ctx->writer,
++ XmlStandalone_Omit);
++}
++
++static int
++xml_writer_end_document(struct xml_writer *ctx)
++{
++ return ctx->writer->lpVtbl->WriteEndDocument(ctx->writer);
++}
++
++static int
++xml_writer_set_indent(struct xml_writer *ctx, unsigned int indent)
++{
++ /* Windows' xmllite does not support indent sizes; will always be 2 */
++ (void)indent;
++ return ctx->writer->lpVtbl->SetProperty(ctx->writer,
++ XmlWriterProperty_Indent, (LONG_PTR)TRUE);
++}
++
++static int
++xml_writer_start_element(struct xml_writer *ctx, const char *localName)
++{
++ struct archive_wstring as;
++ HRESULT hr;
++ archive_string_init(&as);
++ if (archive_wstring_append_from_mbs(&as, localName,
++ strlen(localName))) {
++ hr = E_OUTOFMEMORY;
++ goto exit_hr;
++ }
++ hr = ctx->writer->lpVtbl->WriteStartElement(ctx->writer, NULL,
++ as.s, NULL);
++
++exit_hr:
++ archive_wstring_free(&as);
++ return hr;
++}
++
++static int
++xml_writer_write_attribute(struct xml_writer *ctx,
++ const char *key, const char *value)
++{
++ struct archive_wstring ask, asv;
++ HRESULT hr;
++ archive_string_init(&ask);
++ archive_string_init(&asv);
++ if (archive_wstring_append_from_mbs(&ask, key, strlen(key))) {
++ hr = E_OUTOFMEMORY;
++ goto exit_hr;
++ }
++ if (archive_wstring_append_from_mbs(&asv, value, strlen(value))) {
++ hr = E_OUTOFMEMORY;
++ goto exit_hr;
++ }
++ hr = ctx->writer->lpVtbl->WriteAttributeString(ctx->writer, NULL,
++ ask.s, NULL, asv.s);
++
++exit_hr:
++ archive_wstring_free(&asv);
++ archive_wstring_free(&ask);
++ return hr;
++}
++
++static int
++xml_writer_write_attributef(struct xml_writer *ctx,
++ const char *key, const char *format, ...)
++{
++ struct archive_wstring ask, asv;
++ struct archive_string asf;
++ HRESULT hr;
++ va_list ap;
++
++ va_start(ap, format);
++ archive_string_init(&ask);
++ archive_string_init(&asv);
++ archive_string_init(&asf);
++
++ if (archive_wstring_append_from_mbs(&ask, key, strlen(key))) {
++ hr = E_OUTOFMEMORY;
++ goto exit_hr;
++ }
++
++ archive_string_vsprintf(&asf, format, ap);
++ if (archive_wstring_append_from_mbs(&asv, asf.s, asf.length)) {
++ hr = E_OUTOFMEMORY;
++ goto exit_hr;
++ }
++
++ hr = ctx->writer->lpVtbl->WriteAttributeString(ctx->writer, NULL,
++ ask.s, NULL, asv.s);
++
++exit_hr:
++ archive_string_free(&asf);
++ archive_wstring_free(&asv);
++ archive_wstring_free(&ask);
++ va_end(ap);
++
++ return hr;
++}
++
++static int
++xml_writer_write_string(struct xml_writer *ctx, const char *string)
++{
++ struct archive_wstring as;
++ HRESULT hr;
++ archive_string_init(&as);
++ if (archive_wstring_append_from_mbs(&as, string, strlen(string))) {
++ hr = E_OUTOFMEMORY;
++ goto exit_hr;
++ }
++ hr = ctx->writer->lpVtbl->WriteString(ctx->writer, as.s);
++
++exit_hr:
++ archive_wstring_free(&as);
++ return hr;
++}
++
++static const wchar_t base64[] = {
++ L'A', L'B', L'C', L'D', L'E', L'F', L'G', L'H',
++ L'I', L'J', L'K', L'L', L'M', L'N', L'O', L'P',
++ L'Q', L'R', L'S', L'T', L'U', L'V', L'W', L'X',
++ L'Y', L'Z', L'a', L'b', L'c', L'd', L'e', L'f',
++ L'g', L'h', L'i', L'j', L'k', L'l', L'm', L'n',
++ L'o', L'p', L'q', L'r', L's', L't', L'u', L'v',
++ L'w', L'x', L'y', L'z', L'0', L'1', L'2', L'3',
++ L'4', L'5', L'6', L'7', L'8', L'9', L'+', L'/'
++};
++
++static void
++la_b64_wencode(struct archive_wstring *as, const unsigned char *p, size_t len)
++{
++ int c;
++
++ for (; len >= 3; p += 3, len -= 3) {
++ c = p[0] >> 2;
++ archive_wstrappend_wchar(as, base64[c]);
++ c = ((p[0] & 0x03) << 4) | ((p[1] & 0xf0) >> 4);
++ archive_wstrappend_wchar(as, base64[c]);
++ c = ((p[1] & 0x0f) << 2) | ((p[2] & 0xc0) >> 6);
++ archive_wstrappend_wchar(as, base64[c]);
++ c = p[2] & 0x3f;
++ archive_wstrappend_wchar(as, base64[c]);
++ }
++ if (len > 0) {
++ c = p[0] >> 2;
++ archive_wstrappend_wchar(as, base64[c]);
++ c = (p[0] & 0x03) << 4;
++ if (len == 1) {
++ archive_wstrappend_wchar(as, base64[c]);
++ archive_wstrappend_wchar(as, '=');
++ archive_wstrappend_wchar(as, '=');
++ } else {
++ c |= (p[1] & 0xf0) >> 4;
++ archive_wstrappend_wchar(as, base64[c]);
++ c = (p[1] & 0x0f) << 2;
++ archive_wstrappend_wchar(as, base64[c]);
++ archive_wstrappend_wchar(as, '=');
++ }
++ }
++}
++
++static int
++xml_writer_write_base64(struct xml_writer* ctx,
++ const char *data, size_t start, size_t len)
++{
++ struct archive_wstring as;
++ HRESULT hr;
++ archive_string_init(&as);
++ la_b64_wencode(&as, (const unsigned char *)data + start, len - start);
++ hr = ctx->writer->lpVtbl->WriteString(ctx->writer, as.s);
++ archive_wstring_free(&as);
++ return hr;
++}
++
++static int
++xml_writer_end_element(struct xml_writer *ctx)
++{
++ return ctx->writer->lpVtbl->WriteEndElement(ctx->writer);
++}
++
++static int
++xml_writer_get_final_content_and_length(struct xml_writer *ctx,
++ const char **out, size_t *size)
++{
++ HGLOBAL gbl;
++ HRESULT hr;
++
++ hr = ctx->writer->lpVtbl->Flush(ctx->writer);
++ if (FAILED(hr)) {
++ return (hr);
++ }
++
++ hr = GetHGlobalFromStream(ctx->stream, &gbl);
++ if (FAILED(hr)) {
++ return (hr);
++ }
++
++ *out = (const char *)GlobalLock(gbl);
++ if (*out == NULL) {
++ hr = HRESULT_FROM_WIN32(GetLastError());
++ return (hr);
++ }
++
++ /* GlobalUnlock is called in
++ * xml_writer_destroy.
++ */
++ *size = (size_t)GlobalSize(gbl);
++ ctx->global = gbl;
++ return (hr);
++}
++
++#endif /* HAVE_LIBXML_XMLWRITER_H */
++
+ #endif /* Support xar format */
+--- contrib/libarchive/libarchive/archive_write_set_format_zip.c.orig
++++ contrib/libarchive/libarchive/archive_write_set_format_zip.c
+@@ -43,9 +43,24 @@
+ #ifdef HAVE_STRING_H
+ #include
+ #endif
++#ifdef HAVE_LIMITS_H
++#include
++#endif
++#ifdef HAVE_UNISTD_H
++#include
++#endif
+ #ifdef HAVE_ZLIB_H
+ #include
+ #endif
++#ifdef HAVE_LZMA_H
++#include
++#endif
++#ifdef HAVE_BZLIB_H
++#include
++#endif
++#ifdef HAVE_ZSTD_H
++#include
++#endif
+
+ #include "archive.h"
+ #include "archive_cryptor_private.h"
+@@ -55,6 +70,7 @@
+ #include "archive_hmac_private.h"
+ #include "archive_private.h"
+ #include "archive_random_private.h"
++#include "archive_time_private.h"
+ #include "archive_write_private.h"
+ #include "archive_write_set_format_private.h"
+
+@@ -62,8 +78,12 @@
+ #include "archive_crc32.h"
+ #endif
+
+-#define ZIP_ENTRY_FLAG_ENCRYPTED (1<<0)
+-#define ZIP_ENTRY_FLAG_LENGTH_AT_END (1<<3)
++#define ZIP_ENTRY_FLAG_ENCRYPTED (1 << 0)
++#define ZIP_ENTRY_FLAG_LZMA_EOPM (1 << 1)
++#define ZIP_ENTRY_FLAG_DEFLATE_MAX (1 << 1) /* i.e. compression levels 8 & 9 */
++#define ZIP_ENTRY_FLAG_DEFLATE_FAST (1 << 2) /* i.e. compression levels 3 & 4 */
++#define ZIP_ENTRY_FLAG_DEFLATE_SUPER_FAST (1 << 1) | (1 << 2) /* i.e. compression levels 1 & 2 */
++#define ZIP_ENTRY_FLAG_LENGTH_AT_END (1 << 3)
+ #define ZIP_ENTRY_FLAG_UTF8_NAME (1 << 11)
+
+ #define ZIP_4GB_MAX ARCHIVE_LITERAL_LL(0xffffffff)
+@@ -72,7 +92,11 @@
+ enum compression {
+ COMPRESSION_UNSPECIFIED = -1,
+ COMPRESSION_STORE = 0,
+- COMPRESSION_DEFLATE = 8
++ COMPRESSION_DEFLATE = 8,
++ COMPRESSION_BZIP2 = 12,
++ COMPRESSION_LZMA = 14,
++ COMPRESSION_ZSTD = 93,
++ COMPRESSION_XZ = 95
+ };
+
+ #ifdef HAVE_ZLIB_H
+@@ -119,7 +143,6 @@
+ };
+
+ struct zip {
+-
+ int64_t entry_offset;
+ int64_t entry_compressed_size;
+ int64_t entry_uncompressed_size;
+@@ -155,17 +178,45 @@
+ struct archive_string_conv *opt_sconv;
+ struct archive_string_conv *sconv_default;
+ enum compression requested_compression;
+- int deflate_compression_level;
++ short compression_level;
+ int init_default_conversion;
+- enum encryption encryption_type;
++ enum encryption encryption_type;
++ short threads;
+
+ #define ZIP_FLAG_AVOID_ZIP64 1
+ #define ZIP_FLAG_FORCE_ZIP64 2
+ #define ZIP_FLAG_EXPERIMENT_xl 4
+ int flags;
+-
++#if defined(HAVE_LZMA_H) || defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H) || defined(HAVE_ZSTD_H)
++ union {
++#ifdef HAVE_LZMA_H
++ /* ZIP's XZ format (id 95) is easy enough: copy Deflate, mutatis
++ * mutandis the library changes. ZIP's LZMA format (id 14),
++ * however, is rather more involved, starting here: it being a
++ * modified LZMA Alone format requires a bit more
++ * book-keeping. */
++ struct {
++ char headers_to_write;
++ lzma_options_lzma options;
++ lzma_stream context;
++ } lzma;
++#endif
+ #ifdef HAVE_ZLIB_H
+- z_stream stream;
++ z_stream deflate;
++#endif
++#ifdef HAVE_BZLIB_H
++ bz_stream bzip2;
++#endif
++#if defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream
++ struct {
++ /* Libzstd's init function gives a pointer to a memory area
++ * it manages rather than asking for memory to initialise. */
++ ZSTD_CStream* context;
++ ZSTD_inBuffer in;
++ ZSTD_outBuffer out;
++ } zstd;
++#endif
++ } stream;
+ #endif
+ size_t len_buf;
+ unsigned char *buf;
+@@ -184,7 +235,6 @@
+ struct archive_entry *);
+ static int archive_write_zip_options(struct archive_write *,
+ const char *, const char *);
+-static unsigned int dos_time(const time_t);
+ static size_t path_length(struct archive_entry *);
+ static int write_path(struct archive_entry *, struct archive_write *);
+ static void copy_path(struct archive_entry *, unsigned char *);
+@@ -197,6 +247,44 @@
+ static int init_winzip_aes_encryption(struct archive_write *);
+ static int is_winzip_aes_encryption_supported(int encryption);
+
++#ifdef HAVE_LZMA_H
++/* ZIP's LZMA format requires the use of a alas not exposed in LibLZMA
++ * function to write the ZIP header. Given our internal version never
++ * fails, no need for a non-void return type. */
++static void
++lzma_lzma_props_encode(const lzma_options_lzma* options, uint8_t* out)
++{
++ out[0] = (options->pb * 5 + options->lp) * 9 + options->lc;
++ archive_le32enc(out + 1, options->dict_size);
++}
++#endif
++
++#if defined(HAVE_LZMA_H) && !defined(HAVE_LZMA_STREAM_ENCODER_MT)
++/* Dummy mt declarations, to avoid spaghetti includes below. Defined with
++ * macros being renamed afterwards to shadow liblzma's types in order to
++ * avoid some compiler errors. */
++#define lzma_stream_encoder_mt(str, opt) dummy_mt(str, opt)
++#define lzma_mt dummy_options
++
++typedef struct {
++ void* filters;
++ uint32_t preset;
++ lzma_check check;
++ short threads;
++ char flags;
++ char block_size;
++ char timeout;
++} dummy_options;
++
++static inline lzma_ret
++dummy_mt(lzma_stream* stream, const lzma_mt* options)
++{
++ (void)stream; /* UNUSED */
++ (void)options; /* UNUSED */
++ return LZMA_PROG_ERROR;
++}
++#endif
++
+ static unsigned char *
+ cd_alloc(struct zip *zip, size_t length)
+ {
+@@ -274,26 +362,104 @@
+ } else if (strcmp(val, "store") == 0) {
+ zip->requested_compression = COMPRESSION_STORE;
+ ret = ARCHIVE_OK;
++ } else if (strcmp(val, "bzip2") == 0) {
++#ifdef HAVE_BZLIB_H
++ zip->requested_compression = COMPRESSION_BZIP2;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "bzip2 compression not supported");
++#endif
++ } else if (strcmp(val, "lzma") == 0) {
++#ifdef HAVE_LZMA_H
++ zip->requested_compression = COMPRESSION_LZMA;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "lzma compression not supported");
++#endif
++ } else if (strcmp(val, "xz") == 0) {
++#ifdef HAVE_LZMA_H
++ zip->requested_compression = COMPRESSION_XZ;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "xz compression not supported");
++#endif
++ } else if (strcmp(val, "zstd") == 0) {
++#if defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream
++ zip->requested_compression = COMPRESSION_ZSTD;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "zstd compression not supported");
++#endif
+ }
+ return (ret);
+ } else if (strcmp(key, "compression-level") == 0) {
+- if (val == NULL || !(val[0] >= '0' && val[0] <= '9') || val[1] != '\0') {
+- return ARCHIVE_WARN;
++ char *endptr;
++
++ if (val == NULL)
++ return (ARCHIVE_WARN);
++ errno = 0;
++ zip->compression_level = (short)strtoul(val, &endptr, 10);
++ if (errno != 0 || *endptr != '\0' || zip->compression_level < 0 ||
++ zip->compression_level > 9) {
++ zip->compression_level = 6; // set to default
++ return (ARCHIVE_WARN);
+ }
+
+- if (val[0] == '0') {
++ if (zip->compression_level == 0) {
+ zip->requested_compression = COMPRESSION_STORE;
+ return ARCHIVE_OK;
+ } else {
++#if defined(HAVE_ZLIB_H) || defined(HAVE_LZMA_H) || defined(HAVE_BZLIB_H) || (defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream)
++ // Not forcing an already specified compression algorithm
++ if (zip->requested_compression == COMPRESSION_UNSPECIFIED) {
+ #ifdef HAVE_ZLIB_H
+- zip->requested_compression = COMPRESSION_DEFLATE;
+- zip->deflate_compression_level = val[0] - '0';
++ zip->requested_compression = COMPRESSION_DEFLATE;
++#elif defined(HAVE_BZLIB_H)
++ zip->requested_compression = COMPRESSION_BZIP2;
++#elif defined(HAVE_LZMA_H)
++ // Arbitrarily choosing LZMA of the two LZMA methods
++ zip->requested_compression = COMPRESSION_LZMA;
++#else
++ zip->requested_compression = COMPRESSION_ZSTD;
++#endif
++ }
+ return ARCHIVE_OK;
+ #else
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "deflate compression not supported");
++ "compression not supported");
++#endif
++ }
++ } else if (strcmp(key, "threads") == 0) {
++ char *endptr;
++
++ if (val == NULL)
++ return (ARCHIVE_FAILED);
++ errno = 0;
++ zip->threads = (short)strtoul(val, &endptr, 10);
++ if (errno != 0 || *endptr != '\0') {
++ zip->threads = 1;
++ archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
++ "Illegal value `%s'", val);
++ return (ARCHIVE_FAILED);
++ }
++ if (zip->threads == 0) {
++#ifdef HAVE_LZMA_STREAM_ENCODER_MT
++ zip->threads = lzma_cputhreads();
++#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
++ zip->threads = sysconf(_SC_NPROCESSORS_ONLN);
++#elif !defined(__CYGWIN__) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0601
++ /* Windows 7 and up */
++ DWORD activeProcs = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
++ zip->threads = activeProcs <= SHRT_MAX ? (short)activeProcs : SHRT_MAX;
++#else
++ zip->threads = 1;
+ #endif
+ }
++ return (ARCHIVE_OK);
+ } else if (strcmp(key, "encryption") == 0) {
+ if (val == NULL) {
+ zip->encryption_type = ENCRYPTION_NONE;
+@@ -305,8 +471,7 @@
+ zip->encryption_type = ENCRYPTION_TRADITIONAL;
+ ret = ARCHIVE_OK;
+ } else {
+- archive_set_error(&a->archive,
+- ARCHIVE_ERRNO_MISC,
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "encryption not supported");
+ }
+ } else if (strcmp(val, "aes128") == 0) {
+@@ -315,8 +480,7 @@
+ zip->encryption_type = ENCRYPTION_WINZIP_AES128;
+ ret = ARCHIVE_OK;
+ } else {
+- archive_set_error(&a->archive,
+- ARCHIVE_ERRNO_MISC,
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "encryption not supported");
+ }
+ } else if (strcmp(val, "aes256") == 0) {
+@@ -325,14 +489,12 @@
+ zip->encryption_type = ENCRYPTION_WINZIP_AES256;
+ ret = ARCHIVE_OK;
+ } else {
+- archive_set_error(&a->archive,
+- ARCHIVE_ERRNO_MISC,
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "encryption not supported");
+ }
+ } else {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "%s: unknown encryption '%s'",
+- a->format_name, val);
++ "%s: unknown encryption '%s'", a->format_name, val);
+ }
+ return (ret);
+ } else if (strcmp(key, "experimental") == 0) {
+@@ -421,6 +583,118 @@
+ return (ret);
+ }
+
++int
++archive_write_zip_set_compression_bzip2(struct archive *_a)
++{
++ struct archive_write *a = (struct archive_write *)_a;
++ int ret = ARCHIVE_FAILED;
++
++ archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
++ ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
++ "archive_write_zip_set_compression_bzip2");
++ if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Can only use archive_write_zip_set_compression_bzip2"
++ " with zip format");
++ ret = ARCHIVE_FATAL;
++ } else {
++#ifdef HAVE_BZLIB_H
++ struct zip *zip = a->format_data;
++ zip->requested_compression = COMPRESSION_BZIP2;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "bzip2 compression not supported");
++ ret = ARCHIVE_FAILED;
++#endif
++ }
++ return (ret);
++}
++
++int
++archive_write_zip_set_compression_zstd(struct archive *_a)
++{
++ struct archive_write *a = (struct archive_write *)_a;
++ int ret = ARCHIVE_FAILED;
++
++ archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
++ ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
++ "archive_write_zip_set_compression_zstd");
++ if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Can only use archive_write_zip_set_compression_zstd"
++ " with zip format");
++ ret = ARCHIVE_FATAL;
++ } else {
++#if defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream
++ struct zip *zip = a->format_data;
++ zip->requested_compression = COMPRESSION_ZSTD;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "zstd compression not supported");
++ ret = ARCHIVE_FAILED;
++#endif
++ }
++ return (ret);
++}
++
++int
++archive_write_zip_set_compression_lzma(struct archive *_a)
++{
++ struct archive_write *a = (struct archive_write *)_a;
++ int ret = ARCHIVE_FAILED;
++
++ archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
++ ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
++ "archive_write_zip_set_compression_lzma");
++ if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Can only use archive_write_zip_set_compression_lzma"
++ " with zip format");
++ ret = ARCHIVE_FATAL;
++ } else {
++#ifdef HAVE_LZMA_H
++ struct zip *zip = a->format_data;
++ zip->requested_compression = COMPRESSION_LZMA;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "lzma compression not supported");
++ ret = ARCHIVE_FAILED;
++#endif
++ }
++ return (ret);
++}
++
++int
++archive_write_zip_set_compression_xz(struct archive *_a)
++{
++ struct archive_write *a = (struct archive_write *)_a;
++ int ret = ARCHIVE_FAILED;
++
++ archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
++ ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
++ "archive_write_zip_set_compression_xz");
++ if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "Can only use archive_write_zip_set_compression_xz"
++ " with zip format");
++ ret = ARCHIVE_FATAL;
++ } else {
++#ifdef HAVE_LZMA_H
++ struct zip *zip = a->format_data;
++ zip->requested_compression = COMPRESSION_XZ;
++ ret = ARCHIVE_OK;
++#else
++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++ "xz compression not supported");
++ ret = ARCHIVE_FAILED;
++#endif
++ }
++ return (ret);
++}
++
+ int
+ archive_write_zip_set_compression_store(struct archive *_a)
+ {
+@@ -430,7 +704,7 @@
+
+ archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
+ ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
+- "archive_write_zip_set_compression_deflate");
++ "archive_write_zip_set_compression_store");
+ if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Can only use archive_write_zip_set_compression_store"
+@@ -465,9 +739,14 @@
+
+ /* "Unspecified" lets us choose the appropriate compression. */
+ zip->requested_compression = COMPRESSION_UNSPECIFIED;
+-#ifdef HAVE_ZLIB_H
+- zip->deflate_compression_level = Z_DEFAULT_COMPRESSION;
+-#endif
++ /* Following the 7-zip write support's lead, setting the default
++ * compression level explicitly to 6 no matter what. */
++ zip->compression_level = 6;
++ /* Following the xar write support's lead, the default number of
++ * threads is 1 (i.e. the xz compression, the only one caring about
++ * that, not being multi-threaded even if the multi-threaded encoder
++ * were available) */
++ zip->threads = 1;
+ zip->crc32func = real_crc32;
+
+ /* A buffer used for both compression and encryption. */
+@@ -529,7 +808,7 @@
+ __archive_write_entry_filetype_unsupported(
+ &a->archive, entry, "zip");
+ return ARCHIVE_FAILED;
+- };
++ }
+
+ /* If we're not using Zip64, reject large files. */
+ if (zip->flags & ZIP_FLAG_AVOID_ZIP64) {
+@@ -552,7 +831,6 @@
+ if (type != AE_IFREG)
+ archive_entry_set_size(entry, 0);
+
+-
+ /* Reset information from last entry. */
+ zip->entry_offset = zip->written_bytes;
+ zip->entry_uncompressed_limit = INT64_MAX;
+@@ -589,7 +867,6 @@
+ }
+ }
+
+-
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ /* Make sure the path separators in pathname, hardlink and symlink
+ * are all slash '/', not the Windows path separator '\'. */
+@@ -685,13 +962,49 @@
+ if (zip->entry_compression == COMPRESSION_UNSPECIFIED) {
+ zip->entry_compression = COMPRESSION_DEFAULT;
+ }
+- if (zip->entry_compression == COMPRESSION_STORE) {
++ switch (zip->entry_compression) {
++ case COMPRESSION_STORE:
+ zip->entry_compressed_size = size;
+ zip->entry_uncompressed_size = size;
+ MIN_VERSION_NEEDED(10);
+- } else {
++ break;
++ case COMPRESSION_ZSTD:
++ zip->entry_uncompressed_size = size;
++ MIN_VERSION_NEEDED(63);
++ break;
++ case COMPRESSION_LZMA:
+ zip->entry_uncompressed_size = size;
++ zip->entry_flags |= ZIP_ENTRY_FLAG_LZMA_EOPM;
++ MIN_VERSION_NEEDED(63);
++ break;
++ case COMPRESSION_XZ:
++ zip->entry_uncompressed_size = size;
++ MIN_VERSION_NEEDED(63);
++ break;
++ case COMPRESSION_BZIP2:
++ zip->entry_uncompressed_size = size;
++ MIN_VERSION_NEEDED(46);
++ break;
++ default: // i.e. deflate compression
++ zip->entry_uncompressed_size = size;
++ switch (zip->compression_level) {
++ case 1:
++ case 2:
++ zip->entry_flags |= ZIP_ENTRY_FLAG_DEFLATE_SUPER_FAST;
++ break;
++ case 3:
++ case 4:
++ zip->entry_flags |= ZIP_ENTRY_FLAG_DEFLATE_FAST;
++ break;
++ case 8:
++ case 9:
++ zip->entry_flags |= ZIP_ENTRY_FLAG_DEFLATE_MAX;
++ break;
++ default:
++ break;
++ }
+ MIN_VERSION_NEEDED(20);
++ break;
+ }
+
+ if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
+@@ -741,9 +1054,8 @@
+ /* We don't know the size. Use the default
+ * compression unless specified otherwise.
+ */
+-
+ zip->entry_compression = zip->requested_compression;
+- if(zip->entry_compression == COMPRESSION_UNSPECIFIED){
++ if (zip->entry_compression == COMPRESSION_UNSPECIFIED) {
+ zip->entry_compression = COMPRESSION_DEFAULT;
+ }
+
+@@ -751,10 +1063,43 @@
+ if ((zip->flags & ZIP_FLAG_AVOID_ZIP64) == 0) {
+ /* We might use zip64 extensions, so require 4.5 */
+ MIN_VERSION_NEEDED(45);
+- } else if (zip->entry_compression == COMPRESSION_STORE) {
++ }
++ switch (zip->entry_compression) {
++ case COMPRESSION_STORE:
+ MIN_VERSION_NEEDED(10);
+- } else {
++ break;
++ case COMPRESSION_ZSTD:
++ MIN_VERSION_NEEDED(63);
++ break;
++ case COMPRESSION_LZMA:
++ zip->entry_flags |= ZIP_ENTRY_FLAG_LZMA_EOPM;
++ MIN_VERSION_NEEDED(63);
++ break;
++ case COMPRESSION_XZ:
++ MIN_VERSION_NEEDED(63);
++ break;
++ case COMPRESSION_BZIP2:
++ MIN_VERSION_NEEDED(46);
++ break;
++ default: // i.e. deflate compression
++ switch (zip->compression_level) {
++ case 1:
++ case 2:
++ zip->entry_flags |= ZIP_ENTRY_FLAG_DEFLATE_SUPER_FAST;
++ break;
++ case 3:
++ case 4:
++ zip->entry_flags |= ZIP_ENTRY_FLAG_DEFLATE_FAST;
++ break;
++ case 8:
++ case 9:
++ zip->entry_flags |= ZIP_ENTRY_FLAG_DEFLATE_MAX;
++ break;
++ default:
++ break;
++ }
+ MIN_VERSION_NEEDED(20);
++ break;
+ }
+
+ if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
+@@ -782,7 +1127,7 @@
+ else
+ archive_le16enc(local_header + 8, zip->entry_compression);
+ archive_le32enc(local_header + 10,
+- dos_time(archive_entry_mtime(zip->entry)));
++ unix_to_dos(archive_entry_mtime(zip->entry)));
+ if ((zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END) == 0) {
+ archive_le32enc(local_header + 14, zip->entry_crc32);
+ archive_le32enc(local_header + 18, (uint32_t)zip->entry_compressed_size);
+@@ -813,7 +1158,7 @@
+ else
+ archive_le16enc(zip->file_header + 10, zip->entry_compression);
+ archive_le32enc(zip->file_header + 12,
+- dos_time(archive_entry_mtime(zip->entry)));
++ unix_to_dos(archive_entry_mtime(zip->entry)));
+ archive_le16enc(zip->file_header + 28, (uint16_t)filename_length);
+ /* Following Info-Zip, store mode in the "external attributes" field. */
+ archive_le32enc(zip->file_header + 38,
+@@ -983,21 +1328,147 @@
+ zip->written_bytes += slink_size;
+ }
+
++ switch (zip->entry_compression) {
+ #ifdef HAVE_ZLIB_H
+- if (zip->entry_compression == COMPRESSION_DEFLATE) {
+- zip->stream.zalloc = Z_NULL;
+- zip->stream.zfree = Z_NULL;
+- zip->stream.opaque = Z_NULL;
+- zip->stream.next_out = zip->buf;
+- zip->stream.avail_out = (uInt)zip->len_buf;
+- if (deflateInit2(&zip->stream, zip->deflate_compression_level,
++ case COMPRESSION_DEFLATE:
++ zip->stream.deflate.zalloc = Z_NULL;
++ zip->stream.deflate.zfree = Z_NULL;
++ zip->stream.deflate.opaque = Z_NULL;
++ zip->stream.deflate.next_out = zip->buf;
++ zip->stream.deflate.avail_out = (uInt)zip->len_buf;
++ if (deflateInit2(&zip->stream.deflate, zip->compression_level,
+ Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
+ archive_set_error(&a->archive, ENOMEM,
+ "Can't init deflate compressor");
+ return (ARCHIVE_FATAL);
+ }
+- }
++ break;
++#endif
++#ifdef HAVE_BZLIB_H
++ case COMPRESSION_BZIP2:
++ memset(&zip->stream.bzip2, 0, sizeof(bz_stream));
++ zip->stream.bzip2.next_out = (char*)zip->buf;
++ zip->stream.bzip2.avail_out = (unsigned int)zip->len_buf;
++ if (BZ2_bzCompressInit(&zip->stream.bzip2, zip->compression_level, 0, 0) != BZ_OK) {
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't init bzip2 compressor");
++ return (ARCHIVE_FATAL);
++ }
++ break;
++#endif
++#if defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream
++ case COMPRESSION_ZSTD:
++ {/* Libzstd, contrary to many compression libraries, doesn't use
++ * zlib's 0 to 9 scale and its negative scale is way bigger than
++ * its positive one. So setting 1 as the lowest allowed compression
++ * level and rescaling to 2 to 9 to libzstd's positive scale. */
++ int zstd_compression_level = zip->compression_level == 1
++ ? ZSTD_minCLevel() // ZSTD_minCLevel is negative !
++ : (zip->compression_level - 1) * ZSTD_maxCLevel() / 8;
++ zip->stream.zstd.context = ZSTD_createCStream();
++ size_t zret = ZSTD_initCStream(zip->stream.zstd.context, zstd_compression_level);
++ if (ZSTD_isError(zret)) {
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't init zstd compressor");
++ return (ARCHIVE_FATAL);
++ }
++ /* Asking for the multi-threaded compressor is a no-op in zstd if
++ * it's not supported, so no need to explicitly check for it */
++ ZSTD_CCtx_setParameter(zip->stream.zstd.context, ZSTD_c_nbWorkers, zip->threads);
++ zip->stream.zstd.out.dst = zip->buf;
++ zip->stream.zstd.out.size = zip->len_buf;
++ zip->stream.zstd.out.pos = 0;
++ break;}
++#endif
++#ifdef HAVE_LZMA_H
++ case COMPRESSION_LZMA:
++ {/* Set compression level 9 as the no-holds barred one */
++ uint32_t lzma_compression_level = zip->compression_level == 9
++ ? LZMA_PRESET_EXTREME | zip->compression_level
++ : (uint32_t)zip->compression_level;
++ /* Forcibly setting up the encoder to use the LZMA1 variant, as
++ * it is the one LZMA Alone uses. */
++ lzma_filter filters[2] = {
++ {
++ .id = LZMA_FILTER_LZMA1,
++ .options = &zip->stream.lzma.options
++ },
++ {
++ .id = LZMA_VLI_UNKNOWN
++ }
++ };
++ memset(&zip->stream.lzma.context, 0, sizeof(lzma_stream));
++ lzma_lzma_preset(&zip->stream.lzma.options, lzma_compression_level);
++ zip->stream.lzma.headers_to_write = 1;
++ /* We'll be writing the headers ourselves, so using the raw
++ * encoder */
++ if (lzma_raw_encoder(&zip->stream.lzma.context, filters) != LZMA_OK) {
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't init lzma compressor");
++ return (ARCHIVE_FATAL);
++ }
++ zip->stream.lzma.context.next_out = zip->buf;
++ zip->stream.lzma.context.avail_out = (unsigned int)zip->len_buf;
++ break;}
++ case COMPRESSION_XZ:
++ {/* Set compression level 9 as the no-holds barred one */
++ uint32_t lzma_compression_level = zip->compression_level == 9
++ ? LZMA_PRESET_EXTREME | zip->compression_level
++ : (uint32_t)zip->compression_level;
++ lzma_ret retval;
++#ifndef HAVE_LZMA_STREAM_ENCODER_MT
++ /* Force the number of threads to one, and thus to a mono-threaded
++ * encoder in case we don't have the multi-threaded one */
++ zip->threads = 1;
+ #endif
++ memset(&zip->stream.lzma.context, 0, sizeof(lzma_stream));
++ /* The XZ check will be arbitrarily set to none: ZIP already has
++ * a CRC-32 check of its own */
++ if (zip->threads == 1) {
++ /* XZ uses LZMA2. */
++ lzma_filter filters[2] = {
++ {
++ .id = LZMA_FILTER_LZMA2,
++ .options = &zip->stream.lzma.options
++ },
++ {
++ .id = LZMA_VLI_UNKNOWN
++ }
++ };
++ /* Might as well use the lzma_options we already allocated,
++ * even if we'll never use it after the initialisation */
++ lzma_lzma_preset(&zip->stream.lzma.options, lzma_compression_level);
++ /* 1 thread requested, so non multi-threaded encoder */
++ retval = lzma_stream_encoder(&zip->stream.lzma.context,
++ filters, LZMA_CHECK_NONE);
++ }
++ else {
++ lzma_mt options = {
++ .flags = 0,
++ .block_size = 0,
++ .timeout = 0,
++ .filters = NULL,
++ .check = LZMA_CHECK_NONE,
++ .preset = lzma_compression_level,
++ .threads = zip->threads
++ };
++ /* More than 1 thread requested, so multi-threaded encoder
++ * which always outputs XZ */
++ retval = lzma_stream_encoder_mt(&zip->stream.lzma.context,
++ &options);
++ }
++ if (retval != LZMA_OK) {
++ archive_set_error(&a->archive, ENOMEM,
++ "Can't init xz compressor");
++ return (ARCHIVE_FATAL);
++ }
++ zip->stream.lzma.context.next_out = zip->buf;
++ zip->stream.lzma.context.avail_out = (unsigned int)zip->len_buf;
++ break;}
++#endif
++ default:
++ break;
++ }
+
+ return (ret2);
+ }
+@@ -1082,15 +1553,15 @@
+ zip->entry_compressed_written += s;
+ }
+ break;
+-#if HAVE_ZLIB_H
++#ifdef HAVE_ZLIB_H
+ case COMPRESSION_DEFLATE:
+- zip->stream.next_in = (unsigned char*)(uintptr_t)buff;
+- zip->stream.avail_in = (uInt)s;
++ zip->stream.deflate.next_in = (unsigned char*)(uintptr_t)buff;
++ zip->stream.deflate.avail_in = (uInt)s;
+ do {
+- ret = deflate(&zip->stream, Z_NO_FLUSH);
++ ret = deflate(&zip->stream.deflate, Z_NO_FLUSH);
+ if (ret == Z_STREAM_ERROR)
+ return (ARCHIVE_FATAL);
+- if (zip->stream.avail_out == 0) {
++ if (zip->stream.deflate.avail_out == 0) {
+ if (zip->tctx_valid) {
+ trad_enc_encrypt_update(&zip->tctx,
+ zip->buf, zip->len_buf,
+@@ -1116,13 +1587,223 @@
+ return (ret);
+ zip->entry_compressed_written += zip->len_buf;
+ zip->written_bytes += zip->len_buf;
+- zip->stream.next_out = zip->buf;
+- zip->stream.avail_out = (uInt)zip->len_buf;
++ zip->stream.deflate.next_out = zip->buf;
++ zip->stream.deflate.avail_out = (uInt)zip->len_buf;
+ }
+- } while (zip->stream.avail_in != 0);
++ } while (zip->stream.deflate.avail_in != 0);
++ break;
++#endif
++#if defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream
++ case COMPRESSION_ZSTD:
++ zip->stream.zstd.in.src = buff;
++ zip->stream.zstd.in.size = s;
++ zip->stream.zstd.in.pos = 0;
++ do {
++ size_t zret = ZSTD_compressStream(zip->stream.zstd.context,
++ &zip->stream.zstd.out, &zip->stream.zstd.in);
++ if (ZSTD_isError(zret))
++ return (ARCHIVE_FATAL);
++ if (zip->stream.zstd.out.pos == zip->stream.zstd.out.size) {
++ if (zip->tctx_valid) {
++ trad_enc_encrypt_update(&zip->tctx,
++ zip->buf, zip->len_buf,
++ zip->buf, zip->len_buf);
++ } else if (zip->cctx_valid) {
++ size_t outl = zip->len_buf;
++ ret = archive_encrypto_aes_ctr_update(
++ &zip->cctx,
++ zip->buf, zip->len_buf,
++ zip->buf, &outl);
++ if (ret < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "Failed to encrypt file");
++ return (ARCHIVE_FAILED);
++ }
++ archive_hmac_sha1_update(&zip->hctx,
++ zip->buf, zip->len_buf);
++ }
++ ret = __archive_write_output(a, zip->buf,
++ zip->len_buf);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->entry_compressed_written += zip->len_buf;
++ zip->written_bytes += zip->len_buf;
++ zip->stream.zstd.out.dst = zip->buf;
++ zip->stream.zstd.out.size = zip->len_buf;
++ zip->stream.zstd.out.pos = 0;
++ }
++ } while (zip->stream.zstd.in.pos != zip->stream.zstd.in.size);
++ break;
++#endif
++#ifdef HAVE_BZLIB_H
++ case COMPRESSION_BZIP2:
++ zip->stream.bzip2.next_in = (char*)(uintptr_t)buff;
++ zip->stream.bzip2.avail_in = (unsigned int)s;
++ do {
++ ret = BZ2_bzCompress(&zip->stream.bzip2, BZ_RUN);
++ if (ret != BZ_RUN_OK)
++ return (ARCHIVE_FATAL);
++ if (zip->stream.bzip2.avail_out == 0) {
++ if (zip->tctx_valid) {
++ trad_enc_encrypt_update(&zip->tctx,
++ zip->buf, zip->len_buf,
++ zip->buf, zip->len_buf);
++ } else if (zip->cctx_valid) {
++ size_t outl = zip->len_buf;
++ ret = archive_encrypto_aes_ctr_update(
++ &zip->cctx,
++ zip->buf, zip->len_buf,
++ zip->buf, &outl);
++ if (ret < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "Failed to encrypt file");
++ return (ARCHIVE_FAILED);
++ }
++ archive_hmac_sha1_update(&zip->hctx,
++ zip->buf, zip->len_buf);
++ }
++ ret = __archive_write_output(a, zip->buf,
++ zip->len_buf);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->entry_compressed_written += zip->len_buf;
++ zip->written_bytes += zip->len_buf;
++ zip->stream.bzip2.next_out = (char*)zip->buf;
++ zip->stream.bzip2.avail_out = (unsigned int)zip->len_buf;
++ }
++ } while (zip->stream.bzip2.avail_in != 0);
++ break;
++#endif
++#ifdef HAVE_LZMA_H
++ case COMPRESSION_LZMA:
++ if (zip->stream.lzma.headers_to_write) {
++ /* LZMA Alone and ZIP's LZMA format (i.e. id 14) are almost
++ * the same. Here's an example of a structure of LZMA Alone:
++ *
++ * $ cat /bin/ls | lzma | xxd | head -n 1
++ * 00000000: 5d00 0080 00ff ffff ffff ffff ff00 2814
++ *
++ * 5 bytes 8 bytes n bytes
++ *
++ *
++ * lzma_params is a 5-byte blob that has to be decoded to
++ * extract parameters of this LZMA stream. The
++ * uncompressed_size field is an uint64_t value that contains
++ * information about the size of the uncompressed file, or
++ * UINT64_MAX if this value is unknown. The part is
++ * the actual LZMA-compressed data stream.
++ *
++ * Now here's the structure of ZIP's LZMA format:
++ *
++ * $ cat stream_inside_zipx | xxd | head -n 1
++ * 00000000: 0914 0500 5d00 8000 0000 2814 .... ....
++ *
++ * 2byte 2byte 5 bytes n bytes
++ *
++ *
++ * This means that ZIP's LZMA format contains an additional
++ * magic1 and magic2 headers, the lzma_params field contains
++ * the same parameter set as in LZMA Alone, and the
++ * field is the same as in LZMA Alone as well. However, note
++ * that ZIP's format is missing the uncompressed_size field.
++ *
++ * So we need to write a raw LZMA stream, set up for LZMA1
++ * (i.e. the algorithm variant LZMA Alone uses), which was
++ * done above in the initialisation but first we need to
++ * write ZIP's LZMA header, as if it were Stored data. Then
++ * we can use the raw stream as if it were any other. magic1
++ * being version numbers and magic2 being lzma_params's size,
++ * they get written in without further ado but lzma_params
++ * requires to use other functions than the usual lzma_stream
++ * manipulating ones, hence the additional book-keeping
++ * required alongside the lzma_stream.
++ */
++ uint8_t buf[9] = { LZMA_VERSION_MAJOR, LZMA_VERSION_MINOR, 5, 0 };
++ lzma_lzma_props_encode(&zip->stream.lzma.options, buf + 4);
++ const size_t sh = 9;
++ if (zip->tctx_valid || zip->cctx_valid) {
++ uint8_t* header = buf;
++ const uint8_t * const rh = header + sh;
++
++ while (header < rh) {
++ size_t l;
++
++ if (zip->tctx_valid) {
++ l = trad_enc_encrypt_update(&zip->tctx,
++ header, rh - header,
++ zip->buf, zip->len_buf);
++ } else {
++ l = zip->len_buf;
++ ret = archive_encrypto_aes_ctr_update(
++ &zip->cctx,
++ header, rh - header, zip->buf, &l);
++ if (ret < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "Failed to encrypt file");
++ return (ARCHIVE_FAILED);
++ }
++ archive_hmac_sha1_update(&zip->hctx,
++ zip->buf, l);
++ }
++ ret = __archive_write_output(a, zip->buf, l);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->entry_compressed_written += l;
++ zip->written_bytes += l;
++ header += l;
++ }
++ } else {
++ ret = __archive_write_output(a, buf, sh);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->written_bytes += sh;
++ zip->entry_compressed_written += sh;
++ }
++ zip->stream.lzma.headers_to_write = 0;
++ }
++ /* FALLTHROUGH */
++ case COMPRESSION_XZ:
++ zip->stream.lzma.context.next_in = (unsigned char*)(uintptr_t)buff;
++ zip->stream.lzma.context.avail_in = (unsigned int)s;
++ do {
++ ret = lzma_code(&zip->stream.lzma.context, LZMA_RUN);
++ if (ret == LZMA_MEM_ERROR)
++ return (ARCHIVE_FATAL);
++ if (zip->stream.lzma.context.avail_out == 0) {
++ if (zip->tctx_valid) {
++ trad_enc_encrypt_update(&zip->tctx,
++ zip->buf, zip->len_buf,
++ zip->buf, zip->len_buf);
++ } else if (zip->cctx_valid) {
++ size_t outl = zip->len_buf;
++ ret = archive_encrypto_aes_ctr_update(
++ &zip->cctx,
++ zip->buf, zip->len_buf,
++ zip->buf, &outl);
++ if (ret < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "Failed to encrypt file");
++ return (ARCHIVE_FAILED);
++ }
++ archive_hmac_sha1_update(&zip->hctx,
++ zip->buf, zip->len_buf);
++ }
++ ret = __archive_write_output(a, zip->buf,
++ zip->len_buf);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->entry_compressed_written += zip->len_buf;
++ zip->written_bytes += zip->len_buf;
++ zip->stream.lzma.context.next_out = zip->buf;
++ zip->stream.lzma.context.avail_out = (unsigned int)zip->len_buf;
++ }
++ } while (zip->stream.lzma.context.avail_in != 0);
+ break;
+ #endif
+-
+ case COMPRESSION_UNSPECIFIED:
+ default:
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+@@ -1135,7 +1816,6 @@
+ zip->entry_crc32 =
+ zip->crc32func(zip->entry_crc32, buff, (unsigned)s);
+ return (s);
+-
+ }
+
+ static int
+@@ -1143,16 +1823,20 @@
+ {
+ struct zip *zip = a->format_data;
+ int ret;
++#if defined(HAVE_BZLIB_H) || (defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream) || HAVE_LZMA_H
++ char finishing;
++#endif
+
+-#if HAVE_ZLIB_H
+- if (zip->entry_compression == COMPRESSION_DEFLATE) {
++ switch (zip->entry_compression) {
++#ifdef HAVE_ZLIB_H
++ case COMPRESSION_DEFLATE:
+ for (;;) {
+ size_t remainder;
+
+- ret = deflate(&zip->stream, Z_FINISH);
++ ret = deflate(&zip->stream.deflate, Z_FINISH);
+ if (ret == Z_STREAM_ERROR)
+ return (ARCHIVE_FATAL);
+- remainder = zip->len_buf - zip->stream.avail_out;
++ remainder = zip->len_buf - zip->stream.deflate.avail_out;
+ if (zip->tctx_valid) {
+ trad_enc_encrypt_update(&zip->tctx,
+ zip->buf, remainder, zip->buf, remainder);
+@@ -1175,14 +1859,145 @@
+ return (ret);
+ zip->entry_compressed_written += remainder;
+ zip->written_bytes += remainder;
+- zip->stream.next_out = zip->buf;
+- if (zip->stream.avail_out != 0)
++ zip->stream.deflate.next_out = zip->buf;
++ if (zip->stream.deflate.avail_out != 0)
+ break;
+- zip->stream.avail_out = (uInt)zip->len_buf;
++ zip->stream.deflate.avail_out = (uInt)zip->len_buf;
+ }
+- deflateEnd(&zip->stream);
+- }
++ deflateEnd(&zip->stream.deflate);
++ break;
+ #endif
++#ifdef HAVE_BZLIB_H
++ case COMPRESSION_BZIP2:
++ finishing = 1;
++ do {
++ size_t remainder;
++
++ ret = BZ2_bzCompress(&zip->stream.bzip2, BZ_FINISH);
++ if (ret == BZ_STREAM_END)
++ finishing = 0;
++ else if (ret != BZ_RUN_OK && ret != BZ_FINISH_OK)
++ return (ARCHIVE_FATAL);
++ remainder = zip->len_buf - zip->stream.bzip2.avail_out;
++ if (zip->tctx_valid) {
++ trad_enc_encrypt_update(&zip->tctx,
++ zip->buf, remainder, zip->buf, remainder);
++ } else if (zip->cctx_valid) {
++ size_t outl = remainder;
++ ret = archive_encrypto_aes_ctr_update(
++ &zip->cctx, zip->buf, remainder,
++ zip->buf, &outl);
++ if (ret < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "Failed to encrypt file");
++ return (ARCHIVE_FAILED);
++ }
++ archive_hmac_sha1_update(&zip->hctx,
++ zip->buf, remainder);
++ }
++ ret = __archive_write_output(a, zip->buf, remainder);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->entry_compressed_written += remainder;
++ zip->written_bytes += remainder;
++ zip->stream.bzip2.next_out = (char*)zip->buf;
++ if (zip->stream.bzip2.avail_out != 0)
++ finishing = 0;
++ zip->stream.bzip2.avail_out = (unsigned int)zip->len_buf;
++ } while (finishing);
++ BZ2_bzCompressEnd(&zip->stream.bzip2);
++ break;
++#endif
++#if defined(HAVE_ZSTD_H) && HAVE_ZSTD_compressStream
++ case COMPRESSION_ZSTD:
++ finishing = 1;
++ do {
++ size_t remainder;
++
++ size_t zret = ZSTD_endStream(zip->stream.zstd.context, &zip->stream.zstd.out);
++ if (zret == 0)
++ finishing = 0;
++ else if (ZSTD_isError(zret))
++ return (ARCHIVE_FATAL);
++ remainder = zip->len_buf - (zip->stream.zstd.out.size - zip->stream.zstd.out.pos);
++ if (zip->tctx_valid) {
++ trad_enc_encrypt_update(&zip->tctx,
++ zip->buf, remainder, zip->buf, remainder);
++ } else if (zip->cctx_valid) {
++ size_t outl = remainder;
++ ret = archive_encrypto_aes_ctr_update(
++ &zip->cctx, zip->buf, remainder,
++ zip->buf, &outl);
++ if (ret < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "Failed to encrypt file");
++ return (ARCHIVE_FAILED);
++ }
++ archive_hmac_sha1_update(&zip->hctx,
++ zip->buf, remainder);
++ }
++ ret = __archive_write_output(a, zip->buf, remainder);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->entry_compressed_written += remainder;
++ zip->written_bytes += remainder;
++ zip->stream.zstd.out.dst = zip->buf;
++ if (zip->stream.zstd.out.pos != zip->stream.zstd.out.size)
++ finishing = 0;
++ zip->stream.zstd.out.size = zip->len_buf;
++ } while (finishing);
++ ZSTD_freeCStream(zip->stream.zstd.context);
++ break;
++#endif
++#ifdef HAVE_LZMA_H
++ /* XZ and LZMA share clean-up code */
++ case COMPRESSION_LZMA:
++ case COMPRESSION_XZ:
++ finishing = 1;
++ do {
++ size_t remainder;
++
++ ret = lzma_code(&zip->stream.lzma.context, LZMA_FINISH);
++ if (ret == LZMA_STREAM_END)
++ finishing = 0;
++ else if (ret == LZMA_MEM_ERROR)
++ return (ARCHIVE_FATAL);
++ remainder = zip->len_buf - zip->stream.lzma.context.avail_out;
++ if (zip->tctx_valid) {
++ trad_enc_encrypt_update(&zip->tctx,
++ zip->buf, remainder, zip->buf, remainder);
++ } else if (zip->cctx_valid) {
++ size_t outl = remainder;
++ ret = archive_encrypto_aes_ctr_update(
++ &zip->cctx, zip->buf, remainder,
++ zip->buf, &outl);
++ if (ret < 0) {
++ archive_set_error(&a->archive,
++ ARCHIVE_ERRNO_MISC,
++ "Failed to encrypt file");
++ return (ARCHIVE_FAILED);
++ }
++ archive_hmac_sha1_update(&zip->hctx,
++ zip->buf, remainder);
++ }
++ ret = __archive_write_output(a, zip->buf, remainder);
++ if (ret != ARCHIVE_OK)
++ return (ret);
++ zip->entry_compressed_written += remainder;
++ zip->written_bytes += remainder;
++ zip->stream.lzma.context.next_out = zip->buf;
++ if (zip->stream.lzma.context.avail_out != 0)
++ finishing = 0;
++ zip->stream.lzma.context.avail_out = (unsigned int)zip->len_buf;
++ } while (finishing);
++ lzma_end(&zip->stream.lzma.context);
++ break;
++#endif
++ default:
++ break;
++ }
+ if (zip->hctx_valid) {
+ uint8_t hmac[20];
+ size_t hmac_len = 20;
+@@ -1366,7 +2181,6 @@
+ if (ret != ARCHIVE_OK)
+ return (ARCHIVE_FATAL);
+ zip->written_bytes += 20;
+-
+ }
+
+ /* Format and write end of central directory. */
+@@ -1413,44 +2227,6 @@
+ return (ARCHIVE_OK);
+ }
+
+-/* Convert into MSDOS-style date/time. */
+-static unsigned int
+-dos_time(const time_t unix_time)
+-{
+- struct tm *t;
+- unsigned int dt;
+-#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
+- struct tm tmbuf;
+-#endif
+-
+-#if defined(HAVE_LOCALTIME_S)
+- t = localtime_s(&tmbuf, &unix_time) ? NULL : &tmbuf;
+-#elif defined(HAVE_LOCALTIME_R)
+- t = localtime_r(&unix_time, &tmbuf);
+-#else
+- t = localtime(&unix_time);
+-#endif
+-
+- /* MSDOS-style date/time is only between 1980-01-01 and 2107-12-31 */
+- if (t->tm_year < 1980 - 1900)
+- /* Set minimum date/time '1980-01-01 00:00:00'. */
+- dt = 0x00210000U;
+- else if (t->tm_year > 2107 - 1900)
+- /* Set maximum date/time '2107-12-31 23:59:58'. */
+- dt = 0xff9fbf7dU;
+- else {
+- dt = 0;
+- dt += ((t->tm_year - 80) & 0x7f) << 9;
+- dt += ((t->tm_mon + 1) & 0x0f) << 5;
+- dt += (t->tm_mday & 0x1f);
+- dt <<= 16;
+- dt += (t->tm_hour & 0x1f) << 11;
+- dt += (t->tm_min & 0x3f) << 5;
+- dt += (t->tm_sec & 0x3e) >> 1; /* Only counting every 2 seconds. */
+- }
+- return dt;
+-}
+-
+ static size_t
+ path_length(struct archive_entry *entry)
+ {
+@@ -1518,7 +2294,6 @@
+ p[pathlen] = '/';
+ }
+
+-
+ static struct archive_string_conv *
+ get_sconv(struct archive_write *a, struct zip *zip)
+ {
+@@ -1576,7 +2351,6 @@
+ static int
+ trad_enc_init(struct trad_enc_ctx *ctx, const char *pw, size_t pw_len)
+ {
+-
+ ctx->keys[0] = 305419896L;
+ ctx->keys[1] = 591751049L;
+ ctx->keys[2] = 878082192L;
+--- contrib/libarchive/libarchive/archive_write_set_options.3.orig
++++ contrib/libarchive/libarchive/archive_write_set_options.3
+@@ -263,7 +263,7 @@
+ The value is interpreted as a decimal integer specifying the
+ number of threads for multi-threaded zstd compression.
+ If set to 0, zstd will attempt to detect and use the number
+-of physical CPU cores.
++of active physical CPU cores.
+ .El
+ .It Format 7zip
+ .Bl -tag -compact -width indent
+@@ -274,9 +274,10 @@
+ .Dq deflate ,
+ .Dq bzip2 ,
+ .Dq lzma1 ,
+-.Dq lzma2
++.Dq lzma2 ,
++.Dq ppmd ,
+ or
+-.Dq ppmd
++.Dq zstd
+ to indicate how the following entries should be compressed.
+ The values
+ .Dq store
+@@ -289,9 +290,16 @@
+ The value is interpreted as a decimal integer specifying the
+ compression level.
+ Values between 0 and 9 are supported, with the exception of bzip2
+-which only supports values between 1 and 9.
++which only supports values between 1 and 9, and zstd which may
++support negative values depending on the library version and
++commonly used values 1 through 22.
+ The interpretation of the compression level depends on the chosen
+ compression method.
++.It Cm threads
++The value is interpreted as a decimal integer specifying the
++number of threads for multi-threaded compression (for compressors
++like zstd that support it). If set to 0, an attempt will be made
++to discover the number of CPU cores.
+ .El
+ .It Format bin
+ .Bl -tag -compact -width indent
+@@ -632,9 +640,13 @@
+ .Bl -tag -compact -width indent
+ .It Cm compression
+ The value is either
+-.Dq store
++.Dq store ,
++.Dq deflate ,
++.Dq bzip2 ,
++.Dq lzma ,
++.Dq xz ,
+ or
+-.Dq deflate
++.Dq zstd
+ to indicate how the following entries should be compressed.
+ Note that this setting is ignored for directories, symbolic links,
+ and other special entries.
+@@ -645,8 +657,23 @@
+ A compression level of 0 switches the compression method to
+ .Dq store ,
+ other values will enable
+-.Dq deflate
+-compression with the given level.
++.Dq deflate ,
++.Dq bzip2 ,
++.Dq lzma ,
++or
++.Dq zstd
++compression (in order of priority, depending on what libraries
++are linked) with the given level.
++.It Cm threads
++The value is interpreted as a decimal integer specifying the
++number of threads to use for compression.
++It is supported only for
++.Dq xz
++or
++.Dq zstd
++compression and ignored for any other.
++A threads value of 0 is a special one requesting to detect and use as
++many threads as the number of active physical CPU cores.
+ .It Cm encryption
+ Enable encryption using traditional zip encryption.
+ .It Cm encryption Ns = Ns Ar type
+--- contrib/libarchive/libarchive/libarchive-formats.5.orig
++++ contrib/libarchive/libarchive/libarchive-formats.5
+@@ -327,10 +327,26 @@
+ Libarchive can read and write zip format archives that have
+ uncompressed entries and entries compressed with the
+ .Dq deflate
++,
++.Dq LZMA
++,
++.Dq XZ
++,
++.Dq BZIP2
++and
++.Dq ZSTD
++algorithms.
++Libarchive can also read, but not write, zip format archives that
++have entries compressed with the
++.Dq PPMd
+ algorithm.
+ Other zip compression algorithms are not supported.
+-It can extract jar archives, archives that use Zip64 extensions and
+-self-extracting zip archives.
++The extensions supported by libarchive are Zip64, Libarchive's
++extensions to better support streaming, PKZIP's traditional
++ZIP encryption, Info-ZIP's Unix extra fields, extra time, and
++Unicode path, as well as WinZIP's AES encryption.
++It can extract jar archives, __MACOSX resource forks extension
++for OS X, and self-extracting zip archives.
+ Libarchive can use either of two different strategies for
+ reading Zip archives:
+ a streaming strategy which is fast and can handle extremely
+--- contrib/libarchive/libarchive/test/read_open_memory.c.orig
++++ contrib/libarchive/libarchive/test/read_open_memory.c
+@@ -167,7 +167,7 @@
+
+ (void)a; /* UNUSED */
+ /* We can't skip by more than is available. */
+- if ((off_t)skip > (off_t)(mine->end - mine->p))
++ if (skip > mine->end - mine->p)
+ skip = mine->end - mine->p;
+ /* Always do small skips by prime amounts. */
+ if (skip > 71)
+--- contrib/libarchive/libarchive/test/test_7zip_filename_encoding.c.orig
++++ contrib/libarchive/libarchive/test/test_7zip_filename_encoding.c
+@@ -1,100 +1,100 @@
+-/*
+- * Copyright (c) 2003-2018
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer
+- * in this position and unchanged.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-#include "test.h"
+-
+-DEFINE_TEST(test_7zip_filename_encoding_UTF16_win)
+-{
+-#if !defined(_WIN32) || defined(__CYGWIN__)
+- skipping("This test is meant to verify unicode string handling"
+- " on Windows with UTF-16 names");
+- return;
+-#else
+- struct archive *a;
+- struct archive_entry *entry;
+- char buff[4096];
+- size_t used;
+-
+- /*
+- * Don't call setlocale because we're verifying that the '_w' functions
+- * work as expected
+- */
+-
+- a = archive_write_new();
+- assertEqualInt(ARCHIVE_OK, archive_write_set_format_7zip(a));
+- assertEqualInt(ARCHIVE_OK,
+- archive_write_open_memory(a, buff, sizeof(buff), &used));
+-
+- /* Part 1: file */
+- entry = archive_entry_new2(a);
+- archive_entry_copy_pathname_w(entry, L"\u8868.txt");
+- archive_entry_set_filetype(entry, AE_IFREG);
+- archive_entry_set_size(entry, 0);
+- assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));
+-
+- /* Part 2: directory */
+- archive_entry_clear(entry);
+- archive_entry_copy_pathname_w(entry, L"\u8868");
+- archive_entry_set_filetype(entry, AE_IFDIR);
+- archive_entry_set_size(entry, 0);
+- assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));
+-
+- /* Part 3: symlink */
+- archive_entry_clear(entry);
+- archive_entry_set_pathname(entry, "link.txt");
+- archive_entry_copy_symlink_w(entry, L"\u8868.txt");
+- archive_entry_set_filetype(entry, AE_IFLNK);
+- archive_entry_set_symlink_type(entry, AE_SYMLINK_TYPE_FILE);
+- archive_entry_set_size(entry, 0);
+- assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));
+-
+- /* NOTE: 7zip does not support hardlinks */
+-
+- archive_entry_free(entry);
+- assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+-
+- /* Ensure that the archive contents can be read properly */
+- /* NOTE: 7zip file contents are not in the order we wrote them! */
+- a = archive_read_new();
+- archive_read_support_format_all(a);
+- archive_read_support_filter_all(a);
+- assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, buff, used, 7));
+-
+- /* Read part 3: symlink */
+- assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));
+- assertEqualWString(L"\u8868.txt", archive_entry_symlink_w(entry));
+-
+- /* Read part 1: file */
+- assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));
+- assertEqualWString(L"\u8868.txt", archive_entry_pathname_w(entry));
+-
+- /* Read part 2: directory */
+- assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));
+- /* NOTE: Trailing slash added automatically for us */
+- assertEqualWString(L"\u8868/", archive_entry_pathname_w(entry));
+-
+- archive_read_free(a);
+-#endif
+-}
+\ No newline at end of file
++/*
++ * Copyright (c) 2003-2018
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer
++ * in this position and unchanged.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++#include "test.h"
++
++DEFINE_TEST(test_7zip_filename_encoding_UTF16_win)
++{
++#if !defined(_WIN32) || defined(__CYGWIN__)
++ skipping("This test is meant to verify unicode string handling"
++ " on Windows with UTF-16 names");
++ return;
++#else
++ struct archive *a;
++ struct archive_entry *entry;
++ char buff[4096];
++ size_t used;
++
++ /*
++ * Don't call setlocale because we're verifying that the '_w' functions
++ * work as expected
++ */
++
++ a = archive_write_new();
++ assertEqualInt(ARCHIVE_OK, archive_write_set_format_7zip(a));
++ assertEqualInt(ARCHIVE_OK,
++ archive_write_open_memory(a, buff, sizeof(buff), &used));
++
++ /* Part 1: file */
++ entry = archive_entry_new2(a);
++ archive_entry_copy_pathname_w(entry, L"\u8868.txt");
++ archive_entry_set_filetype(entry, AE_IFREG);
++ archive_entry_set_size(entry, 0);
++ assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));
++
++ /* Part 2: directory */
++ archive_entry_clear(entry);
++ archive_entry_copy_pathname_w(entry, L"\u8868");
++ archive_entry_set_filetype(entry, AE_IFDIR);
++ archive_entry_set_size(entry, 0);
++ assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));
++
++ /* Part 3: symlink */
++ archive_entry_clear(entry);
++ archive_entry_set_pathname(entry, "link.txt");
++ archive_entry_copy_symlink_w(entry, L"\u8868.txt");
++ archive_entry_set_filetype(entry, AE_IFLNK);
++ archive_entry_set_symlink_type(entry, AE_SYMLINK_TYPE_FILE);
++ archive_entry_set_size(entry, 0);
++ assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry));
++
++ /* NOTE: 7zip does not support hardlinks */
++
++ archive_entry_free(entry);
++ assertEqualInt(ARCHIVE_OK, archive_write_free(a));
++
++ /* Ensure that the archive contents can be read properly */
++ /* NOTE: 7zip file contents are not in the order we wrote them! */
++ a = archive_read_new();
++ archive_read_support_format_all(a);
++ archive_read_support_filter_all(a);
++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, buff, used, 7));
++
++ /* Read part 3: symlink */
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));
++ assertEqualWString(L"\u8868.txt", archive_entry_symlink_w(entry));
++
++ /* Read part 1: file */
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));
++ assertEqualWString(L"\u8868.txt", archive_entry_pathname_w(entry));
++
++ /* Read part 2: directory */
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &entry));
++ /* NOTE: Trailing slash added automatically for us */
++ assertEqualWString(L"\u8868/", archive_entry_pathname_w(entry));
++
++ archive_read_free(a);
++#endif
++}
+--- contrib/libarchive/libarchive/test/test_acl_pax.c.orig
++++ contrib/libarchive/libarchive/test/test_acl_pax.c
+@@ -287,7 +287,7 @@
+ failure("Basic ACLs shouldn't be stored as extended ACLs");
+ assert(0 == archive_entry_acl_reset(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS));
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+ /* Second item has a few ACLs */
+@@ -297,7 +297,7 @@
+ assertEntryCompareAcls(ae, acls1, sizeof(acls1)/sizeof(acls1[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0142);
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+ /* Third item has pretty extensive ACLs */
+@@ -307,7 +307,7 @@
+ assertEntryCompareAcls(ae, acls2, sizeof(acls2)/sizeof(acls2[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0543);
+ failure("Basic ACLs should set mode to 0543, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0543);
+
+ /* Fourth item has no ACLs */
+@@ -315,7 +315,7 @@
+ failure("Basic ACLs shouldn't be stored as extended ACLs");
+ assert(0 == archive_entry_acl_reset(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS));
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+ /* Close the archive. */
+--- contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c.orig
++++ contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c
+@@ -424,7 +424,7 @@
+ #if ARCHIVE_ACL_SUNOS_NFS4 || ARCHIVE_ACL_LIBRICHACL
+ if (flags & perms[i].machine)
+ #else
+- if (acl_get_flag_np(opaque_fs, perms[i].machine))
++ if (acl_get_flag_np(opaque_fs, (acl_flag_t)perms[i].machine))
+ #endif
+ flagset |= perms[i].portable;
+ return flagset;
+@@ -772,7 +772,8 @@
+ failure(" ACL entry %d missing from %s: "
+ "type=%#010x,permset=%#010x,tag=%d,qual=%d,name=``%s''\n",
+ marker[i], filename,
+- myacls[marker[i]].type, myacls[marker[i]].permset,
++ (unsigned int)myacls[marker[i]].type,
++ (unsigned int)myacls[marker[i]].permset,
+ myacls[marker[i]].tag, myacls[marker[i]].qual,
+ myacls[marker[i]].name);
+ assert(0); /* Record this as a failure. */
+@@ -824,7 +825,7 @@
+
+ failure("ACL entry on file that shouldn't be there: "
+ "type=%#010x,permset=%#010x,tag=%d,qual=%d",
+- type,permset,tag,qual);
++ (unsigned int)type, (unsigned int)permset, tag, qual);
+ assert(matched == 1);
+ }
+
+@@ -833,7 +834,8 @@
+ failure(" ACL entry %d missing from %s: "
+ "type=%#010x,permset=%#010x,tag=%d,qual=%d,name=``%s''\n",
+ marker[i], filename,
+- myacls[marker[i]].type, myacls[marker[i]].permset,
++ (unsigned int)myacls[marker[i]].type,
++ (unsigned int)myacls[marker[i]].permset,
+ myacls[marker[i]].tag, myacls[marker[i]].qual,
+ myacls[marker[i]].name);
+ assert(0); /* Record this as a failure. */
+--- contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c.orig
++++ contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c
+@@ -274,7 +274,8 @@
+ for (i = 0; i < n; ++i) {
+ failure(" ACL entry missing from file: "
+ "type=%#010x,permset=%#010x,tag=%d,qual=%d,name=``%s''\n",
+- myacls[marker[i]].type, myacls[marker[i]].permset,
++ (unsigned int)myacls[marker[i]].type,
++ (unsigned int)myacls[marker[i]].permset,
+ myacls[marker[i]].tag, myacls[marker[i]].qual,
+ myacls[marker[i]].name);
+ assert(0); /* Record this as a failure. */
+--- contrib/libarchive/libarchive/test/test_acl_posix1e.c.orig
++++ contrib/libarchive/libarchive/test/test_acl_posix1e.c
+@@ -119,7 +119,7 @@
+ failure("Basic ACLs shouldn't be stored as extended ACLs");
+ assert(0 == archive_entry_acl_reset(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS));
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+ /* With any extended ACL entry, we should read back a full set. */
+@@ -136,7 +136,7 @@
+ assertEntryCompareAcls(ae, acls1, sizeof(acls1)/sizeof(acls1[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0142);
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+
+@@ -146,7 +146,7 @@
+ assertEntryCompareAcls(ae, acls2, sizeof(acls2)/sizeof(acls2[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0543);
+ failure("Basic ACLs should set mode to 0543, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0543);
+
+ /*
+@@ -157,7 +157,7 @@
+ failure("Basic ACLs shouldn't be stored as extended ACLs");
+ assert(0 == archive_entry_acl_reset(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS));
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+ /*
+--- contrib/libarchive/libarchive/test/test_acl_text.c.orig
++++ contrib/libarchive/libarchive/test/test_acl_text.c
+@@ -132,7 +132,7 @@
+ ARCHIVE_ENTRY_ACL_EVERYONE, 0, "" },
+ };
+
+-const char* acltext[] = {
++static const char* acltext[] = {
+ "user::rwx\n"
+ "group::r-x\n"
+ "other::r-x\n"
+--- contrib/libarchive/libarchive/test/test_archive_getdate.c.orig
++++ contrib/libarchive/libarchive/test/test_archive_getdate.c
+@@ -1,88 +0,0 @@
+-/*-
+- * Copyright (c) 2003-2007 Tim Kientzle
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-#include "test.h"
+-
+-#include
+-
+-#define __LIBARCHIVE_BUILD 1
+-#include "archive_getdate.h"
+-
+-/*
+- * Verify that the getdate() function works.
+- */
+-
+-#define get_date __archive_get_date
+-
+-DEFINE_TEST(test_archive_getdate)
+-{
+- time_t now = time(NULL);
+-
+- assertEqualInt(get_date(now, "Jan 1, 1970 UTC"), 0);
+- assertEqualInt(get_date(now, "7:12:18-0530 4 May 1983"), 420900138);
+- assertEqualInt(get_date(now, "2004/01/29 513 mest"), 1075345980);
+- assertEqualInt(get_date(now, "99/02/17 7pm utc"), 919278000);
+- assertEqualInt(get_date(now, "02/17/99 7:11am est"), 919253460);
+- assertEqualInt(get_date(now, "now - 2 hours"),
+- get_date(now, "2 hours ago"));
+- assertEqualInt(get_date(now, "2 hours ago"),
+- get_date(now, "+2 hours ago"));
+- assertEqualInt(get_date(now, "now - 2 hours"),
+- get_date(now, "-2 hours"));
+- /* It's important that we handle ctime() format. */
+- assertEqualInt(get_date(now, "Sun Feb 22 17:38:26 PST 2009"),
+- 1235353106);
+- /* Basic relative offsets. */
+- /* If we use the actual current time as the reference, then
+- * these tests break around DST changes, so it's actually
+- * important to use a specific reference time here. */
+- assertEqualInt(get_date(0, "tomorrow"), 24 * 60 * 60);
+- assertEqualInt(get_date(0, "yesterday"), - 24 * 60 * 60);
+- assertEqualInt(get_date(0, "now + 1 hour"), 60 * 60);
+- assertEqualInt(get_date(0, "now + 1 hour + 1 minute"), 60 * 60 + 60);
+- /* Repeat the above for a different start time. */
+- now = 1231113600; /* Jan 5, 2009 00:00 UTC */
+- assertEqualInt(get_date(0, "Jan 5, 2009 00:00 UTC"), now);
+- assertEqualInt(get_date(now, "tomorrow"), now + 24 * 60 * 60);
+- assertEqualInt(get_date(now, "yesterday"), now - 24 * 60 * 60);
+- assertEqualInt(get_date(now, "now + 1 hour"), now + 60 * 60);
+- assertEqualInt(get_date(now, "now + 1 hour + 1 minute"),
+- now + 60 * 60 + 60);
+- assertEqualInt(get_date(now, "tomorrow 5:16am UTC"),
+- now + 24 * 60 * 60 + 5 * 60 * 60 + 16 * 60);
+- assertEqualInt(get_date(now, "UTC 5:16am tomorrow"),
+- now + 24 * 60 * 60 + 5 * 60 * 60 + 16 * 60);
+-
+- /* Jan 5, 2009 was a Monday. */
+- assertEqualInt(get_date(now, "monday UTC"), now);
+- assertEqualInt(get_date(now, "sunday UTC"), now + 6 * 24 * 60 * 60);
+- assertEqualInt(get_date(now, "tuesday UTC"), now + 24 * 60 * 60);
+- /* "next tuesday" is one week after "tuesday" */
+- assertEqualInt(get_date(now, "UTC next tuesday"),
+- now + 8 * 24 * 60 * 60);
+- /* "last tuesday" is one week before "tuesday" */
+- assertEqualInt(get_date(now, "last tuesday UTC"),
+- now - 6 * 24 * 60 * 60);
+- /* TODO: Lots more tests here. */
+-}
+--- contrib/libarchive/libarchive/test/test_archive_match_time.c.orig
++++ contrib/libarchive/libarchive/test/test_archive_match_time.c
+@@ -25,8 +25,7 @@
+
+ #include "test.h"
+
+-#define __LIBARCHIVE_BUILD 1
+-#include "archive_getdate.h"
++#define parse_date archive_parse_date
+
+ static void
+ test_newer_time(void)
+@@ -102,27 +101,27 @@
+
+ /* Test1: Allow newer time. */
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/2/1 0:0:1 UTC");
++ t = parse_date(now, "1980/2/1 0:0:1 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 1);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Its mtime should be excluded");
+@@ -143,20 +142,20 @@
+ "1980/2/1 0:0:0 UTC"));
+
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/2/1 0:0:1 UTC");
++ t = parse_date(now, "1980/2/1 0:0:1 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+@@ -190,27 +189,27 @@
+
+ /* Test1: Allow newer time. */
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/2/1 0:0:1 UTC");
++ t = parse_date(now, "1980/2/1 0:0:1 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 1);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Its mtime should be excluded");
+@@ -231,20 +230,20 @@
+ L"1980/2/1 0:0:0 UTC"));
+
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/2/1 0:0:1 UTC");
++ t = parse_date(now, "1980/2/1 0:0:1 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+@@ -569,37 +568,37 @@
+ ARCHIVE_MATCH_OLDER, "1980/2/1 0:0:0 UTC"));
+
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Its mtime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Its ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+@@ -612,20 +611,20 @@
+ "1980/2/1 0:0:0 UTC"));
+
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+@@ -659,37 +658,37 @@
+ ARCHIVE_MATCH_OLDER, L"1980/2/1 0:0:0 UTC"));
+
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Its mtime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+ assertEqualInt(1, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Its ctime should be excluded");
+ assertEqualInt(1, archive_match_time_excluded(m, ae));
+@@ -702,20 +701,20 @@
+ L"1980/2/1 0:0:0 UTC"));
+
+ archive_entry_copy_pathname(ae, "file1");
+- t = __archive_get_date(now, "1980/2/1 0:0:0 UTC");
++ t = parse_date(now, "1980/2/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+- t = __archive_get_date(now, "1980/1/1 0:0:0 UTC");
++ t = parse_date(now, "1980/1/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should not be excluded");
+ assertEqualInt(0, archive_match_time_excluded(m, ae));
+ assertEqualInt(0, archive_match_excluded(m, ae));
+
+- t = __archive_get_date(now, "1980/3/1 0:0:0 UTC");
++ t = parse_date(now, "1980/3/1 0:0:0 UTC");
+ archive_entry_set_mtime(ae, t, 0);
+ archive_entry_set_ctime(ae, t, 0);
+ failure("Both Its mtime and ctime should be excluded");
+--- /dev/null
++++ contrib/libarchive/libarchive/test/test_archive_parse_date.c
+@@ -0,0 +1,97 @@
++/*-
++ * Copyright (c) 2003-2007 Tim Kientzle
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++#include "test.h"
++
++#include
++
++/*
++ * Verify that the archive_parse_date() function works.
++ */
++
++#define get_date archive_parse_date
++
++DEFINE_TEST(test_archive_parse_date)
++{
++ time_t now = time(NULL);
++
++ assertEqualInt(get_date(now, "Jan 1, 1970 UTC"), 0);
++ assertEqualInt(get_date(now, "7:12:18-0530 4 May 1983"), 420900138);
++ assertEqualInt(get_date(now, "2004/01/29 513 mest"), 1075345980);
++ assertEqualInt(get_date(now, "99/02/17 7pm utc"), 919278000);
++ assertEqualInt(get_date(now, "02/17/99 7:11am est"), 919253460);
++ assertEqualInt(get_date(now, "now - 2 hours"),
++ get_date(now, "2 hours ago"));
++ assertEqualInt(get_date(now, "2 hours ago"),
++ get_date(now, "+2 hours ago"));
++ assertEqualInt(get_date(now, "now - 2 hours"),
++ get_date(now, "-2 hours"));
++ /* It's important that we handle ctime() format. */
++ assertEqualInt(get_date(now, "Sun Feb 22 17:38:26 PST 2009"),
++ 1235353106);
++ /* Basic relative offsets. */
++ /* If we use the actual current time as the reference, then
++ * these tests break around DST changes, so it's actually
++ * important to use a specific reference time here. */
++ assertEqualInt(get_date(0, "tomorrow"), 24 * 60 * 60);
++ assertEqualInt(get_date(0, "yesterday"), - 24 * 60 * 60);
++ assertEqualInt(get_date(0, "now + 1 hour"), 60 * 60);
++ assertEqualInt(get_date(0, "now + 1 hour + 1 minute"), 60 * 60 + 60);
++ /* Repeat the above for a different start time. */
++ now = 1231113600; /* Jan 5, 2009 00:00 UTC */
++ assertEqualInt(get_date(0, "Jan 5, 2009 00:00 UTC"), now);
++ assertEqualInt(get_date(now, "tomorrow"), now + 24 * 60 * 60);
++ assertEqualInt(get_date(now, "yesterday"), now - 24 * 60 * 60);
++ assertEqualInt(get_date(now, "now + 1 hour"), now + 60 * 60);
++ assertEqualInt(get_date(now, "now + 1 hour + 1 minute"),
++ now + 60 * 60 + 60);
++ assertEqualInt(get_date(now, "tomorrow 5:16am UTC"),
++ now + 24 * 60 * 60 + 5 * 60 * 60 + 16 * 60);
++ assertEqualInt(get_date(now, "UTC 5:16am tomorrow"),
++ now + 24 * 60 * 60 + 5 * 60 * 60 + 16 * 60);
++
++ /* Jan 5, 2009 was a Monday. */
++ assertEqualInt(get_date(now, "monday UTC"), now);
++ assertEqualInt(get_date(now, "sunday UTC"), now + 6 * 24 * 60 * 60);
++ assertEqualInt(get_date(now, "tuesday UTC"), now + 24 * 60 * 60);
++ /* "next tuesday" is one week after "tuesday" */
++ assertEqualInt(get_date(now, "UTC next tuesday"),
++ now + 8 * 24 * 60 * 60);
++ /* "last tuesday" is one week before "tuesday" */
++ assertEqualInt(get_date(now, "last tuesday UTC"),
++ now - 6 * 24 * 60 * 60);
++
++ /* Unix epoch timestamps */
++ assertEqualInt(get_date(now, "@0"), 0);
++ assertEqualInt(get_date(now, "@100"), 100);
++ assertEqualInt(get_date(now, "@+100"), 100);
++
++ assertEqualInt(get_date(now, "@"), -1);
++ assertEqualInt(get_date(now, "@-"), -1);
++ assertEqualInt(get_date(now, "@+"), -1);
++ assertEqualInt(get_date(now, "@tenth"), -1);
++ assertEqualInt(get_date(now, "@100 tomorrow"), -1);
++
++ /* TODO: Lots more tests here. */
++}
+--- contrib/libarchive/libarchive/test/test_archive_string_conversion.c.orig
++++ contrib/libarchive/libarchive/test/test_archive_string_conversion.c
+@@ -91,7 +91,7 @@
+ archive_be16enc(utf16+2, (uc & 0x3ff) + 0xDC00);
+ return (4);
+ } else {
+- archive_be16enc(utf16, uc);
++ archive_be16enc(utf16, (uint16_t)uc);
+ return (2);
+ }
+ }
+@@ -118,7 +118,7 @@
+ archive_le16enc(utf16+2, (uc & 0x3ff) + 0xDC00);
+ return (4);
+ } else {
+- archive_le16enc(utf16, uc);
++ archive_le16enc(utf16, (uint16_t)uc);
+ return (2);
+ }
+ }
+--- /dev/null
++++ contrib/libarchive/libarchive/test/test_compat_gtar_large.c
+@@ -0,0 +1,224 @@
++/*-
++ * Copyright (c) 2003-2024 Tim Kientzle
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++#include "test.h"
++
++/*
++ * Verify reading a GNU tar pax format archive with >8GB entry.
++ *
++ * Sample data created with GNU tar 1.35:
++ * $ dd if=/dev/zero of=test.bin bs=1048576 count=8192
++ * $ gnutar --format=posix -cvf test.tar test.bin
++ * $ hexdump -C -v test.tar | head -n 96
++ */
++
++static const unsigned char test_compat_gtar_large_data[] = {
++ /* 00000000 */ 0x2e, 0x2f, 0x50, 0x61, 0x78, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x74, 0x65, 0x73, /* |./PaxHeaders/tes| */
++ /* 00000010 */ 0x74, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |t.bin...........| */
++ /* 00000020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000030 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000040 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000050 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000060 */ 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x36, 0x34, 0x34, 0x00, 0x30, 0x30, 0x30, 0x30, /* |....0000644.0000| */
++ /* 00000070 */ 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x30, 0x30, /* |000.0000000.0000| */
++ /* 00000080 */ 0x30, 0x30, 0x30, 0x30, 0x31, 0x35, 0x35, 0x00, 0x31, 0x34, 0x37, 0x31, 0x31, 0x35, 0x36, 0x36, /* |0000155.14711566| */
++ /* 00000090 */ 0x30, 0x31, 0x33, 0x00, 0x30, 0x31, 0x31, 0x37, 0x35, 0x33, 0x00, 0x20, 0x78, 0x00, 0x00, 0x00, /* |013.011753. x...| */
++ /* 000000a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000000b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000000c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000000d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000000e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000000f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000100 */ 0x00, 0x75, 0x73, 0x74, 0x61, 0x72, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |.ustar.00.......| */
++ /* 00000110 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000120 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000130 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000140 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000150 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000160 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000170 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000180 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000190 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000001a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000001b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000001c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000001d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000001e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000001f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000200 */ 0x31, 0x39, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x38, 0x35, 0x38, 0x39, 0x39, 0x33, 0x34, 0x35, /* |19 size=85899345| */
++ /* 00000210 */ 0x39, 0x32, 0x0a, 0x33, 0x30, 0x20, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x3d, 0x31, 0x37, 0x33, 0x30, /* |92.30 mtime=1730| */
++ /* 00000220 */ 0x36, 0x30, 0x34, 0x30, 0x34, 0x33, 0x2e, 0x30, 0x34, 0x36, 0x38, 0x33, 0x33, 0x30, 0x31, 0x31, /* |604043.046833011| */
++ /* 00000230 */ 0x0a, 0x33, 0x30, 0x20, 0x61, 0x74, 0x69, 0x6d, 0x65, 0x3d, 0x31, 0x37, 0x33, 0x30, 0x36, 0x30, /* |.30 atime=173060| */
++ /* 00000240 */ 0x34, 0x30, 0x33, 0x39, 0x2e, 0x38, 0x30, 0x37, 0x30, 0x38, 0x31, 0x33, 0x31, 0x39, 0x0a, 0x33, /* |4039.807081319.3| */
++ /* 00000250 */ 0x30, 0x20, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x3d, 0x31, 0x37, 0x33, 0x30, 0x36, 0x30, 0x34, 0x30, /* |0 ctime=17306040| */
++ /* 00000260 */ 0x34, 0x33, 0x2e, 0x30, 0x34, 0x36, 0x38, 0x33, 0x33, 0x30, 0x31, 0x31, 0x0a, 0x00, 0x00, 0x00, /* |43.046833011....| */
++ /* 00000270 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000280 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000290 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000002a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000002b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000002c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000002d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000002e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000002f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000300 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000310 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000320 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000330 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000340 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000350 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000360 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000370 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000380 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000390 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000003a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000003b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000003c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000003d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000003e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000003f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000400 */ 0x74, 0x65, 0x73, 0x74, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |test.bin........| */
++ /* 00000410 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000420 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000430 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000440 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000450 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000460 */ 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x36, 0x34, 0x34, 0x00, 0x30, 0x30, 0x30, 0x30, /* |....0000644.0000| */
++ /* 00000470 */ 0x37, 0x36, 0x35, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x32, 0x34, 0x00, 0x30, 0x30, 0x30, 0x30, /* |765.0000024.0000| */
++ /* 00000480 */ 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x31, 0x34, 0x37, 0x31, 0x31, 0x35, 0x36, 0x36, /* |0000000.14711566| */
++ /* 00000490 */ 0x30, 0x31, 0x33, 0x00, 0x30, 0x31, 0x31, 0x32, 0x33, 0x35, 0x00, 0x20, 0x30, 0x00, 0x00, 0x00, /* |013.011235. 0...| */
++ /* 000004a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000004b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000004c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000004d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000004e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000004f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000500 */ 0x00, 0x75, 0x73, 0x74, 0x61, 0x72, 0x00, 0x30, 0x30, 0x74, 0x69, 0x6d, 0x00, 0x00, 0x00, 0x00, /* |.ustar.00tim....| */
++ /* 00000510 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000520 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x74, 0x61, 0x66, 0x66, 0x00, 0x00, /* |.........staff..| */
++ /* 00000530 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000540 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000550 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000560 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000570 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000580 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 00000590 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000005a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000005b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000005c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000005d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000005e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++ /* 000005f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* |................| */
++};
++
++/*
++ * Followed by 16777218 blocks, each consisting of 512 zeros:
++ * Entry is 8GB = 2^24 = 16777216 blocks
++ * Plus 2 zero blocks for end-of-archive
++ */
++
++struct my_reader {
++ const void *prefix;
++ int prefix_length;
++ int zero_blocks_remaining;
++ void *zero_block;
++};
++
++/*
++ * Custom reader returns first the prefix, then
++ * the expected number of zero blocks, then EOF.
++ */
++static ssize_t
++myread(struct archive *a, void *client_data, const void **buff)
++{
++ struct my_reader *reader = client_data;
++ (void)a; /* UNUSED */
++
++ if (reader->prefix != NULL) {
++ *buff = reader->prefix;
++ reader->prefix = NULL;
++ return reader->prefix_length;
++ } else if (reader->zero_blocks_remaining > 0) {
++ *buff = reader->zero_block;
++ reader->zero_blocks_remaining -= 1;
++ return 512;
++ } else {
++ return 0;
++ }
++}
++
++/*
++ * test_compat_gtar_large verifies that we can read
++ * the archive encoded above.
++ */
++DEFINE_TEST(test_compat_gtar_large)
++{
++ struct archive *a;
++ struct archive_entry *ae;
++ struct my_reader reader = {
++ test_compat_gtar_large_data,
++ sizeof(test_compat_gtar_large_data),
++ 16777218, /* 2^24 + 2 ; See above */
++ NULL
++ };
++ int r;
++
++ reader.zero_block = calloc(1, 512);
++
++ assert((a = archive_read_new()) != NULL);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_open(a, &reader, NULL, myread, NULL));
++
++ /* Read first entry. */
++ assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae));
++ if (r != ARCHIVE_OK) {
++ archive_read_free(a);
++ return;
++ }
++ assertEqualString("test.bin", archive_entry_pathname(ae));
++ assertEqualInt(1730604043, archive_entry_mtime(ae));
++ assertEqualInt(501, archive_entry_uid(ae));
++ assertEqualString("tim", archive_entry_uname(ae));
++ assertEqualInt(20, archive_entry_gid(ae));
++ assertEqualString("staff", archive_entry_gname(ae));
++ assertEqualInt(0100644, archive_entry_mode(ae));
++ assertEqualInt(8589934592LL, archive_entry_size(ae));
++
++ /* TODO: Read and verify contents: 8GB of zeros */
++
++ /* Verify the end-of-archive. */
++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++
++ /* Verify that the format detection worked. */
++ assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
++ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
++
++ /* Verify that the reader actually read to the end of data */
++ assertEqualInt(reader.zero_blocks_remaining, 0);
++
++ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++ free(reader.zero_block);
++}
+--- contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c.orig
++++ contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c
+@@ -229,7 +229,7 @@
+ assertEntryCompareAcls(ae, acls0, sizeof(acls0)/sizeof(acls0[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0644);
+ failure("Basic ACLs should set mode to 0644, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0644);
+
+ /* Second item has default and access ACLs */
+@@ -239,7 +239,7 @@
+ assertEntryCompareAcls(ae, acls1, sizeof(acls1)/sizeof(acls1[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0750);
+ failure("Basic ACLs should set mode to 0750, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0750);
+ assertEqualInt(6, archive_entry_acl_reset(ae,
+ ARCHIVE_ENTRY_ACL_TYPE_DEFAULT));
+--- contrib/libarchive/libarchive/test/test_compat_star_acl.c.orig
++++ contrib/libarchive/libarchive/test/test_compat_star_acl.c
+@@ -251,7 +251,7 @@
+ assertEntryCompareAcls(ae, acls0, sizeof(acls0)/sizeof(acls0[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0142);
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+ /* Second item has pretty extensive ACLs */
+@@ -261,7 +261,7 @@
+ assertEntryCompareAcls(ae, acls1, sizeof(acls1)/sizeof(acls1[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_ACCESS, 0543);
+ failure("Basic ACLs should set mode to 0543, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0543);
+
+ /* Third item has default ACLs */
+@@ -271,7 +271,7 @@
+ assertEntryCompareAcls(ae, acls2, sizeof(acls2)/sizeof(acls2[0]),
+ ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, 0142);
+ failure("Basic ACLs should set mode to 0142, not %04o",
+- archive_entry_mode(ae)&0777);
++ (unsigned int)archive_entry_mode(ae)&0777);
+ assert((archive_entry_mode(ae) & 0777) == 0142);
+
+ /* Close the archive. */
+--- contrib/libarchive/libarchive/test/test_entry.c.orig
++++ contrib/libarchive/libarchive/test/test_entry.c
+@@ -436,7 +436,7 @@
+ archive_entry_fflags(e, &set, &clear);
+ assertEqualInt(UF_HIDDEN, set);
+ assertEqualInt(UF_NODUMP | UF_IMMUTABLE | UF_APPEND, clear);
+-#elif defined(_WIN32) && !defined(CYGWIN)
++#elif defined(_WIN32) && !defined(__CYGWIN__)
+ archive_entry_copy_fflags_text_w(e, L"rdonly,hidden,nosystem");
+ archive_entry_fflags(e, &set, &clear);
+ assertEqualInt(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN, set);
+--- contrib/libarchive/libarchive/test/test_open_file.c.orig
++++ contrib/libarchive/libarchive/test/test_open_file.c
+@@ -31,14 +31,14 @@
+ struct archive *a;
+ FILE *f;
+
+- f = fopen("test.tar", "wb");
++ f = fopen("test.7z", "wb");
+ assert(f != NULL);
+ if (f == NULL)
+ return;
+
+ /* Write an archive through this FILE *. */
+ assert((a = archive_write_new()) != NULL);
+- assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_7zip(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_write_open_FILE(a, f));
+
+@@ -70,9 +70,10 @@
+ fclose(f);
+
+ /*
+- * Now, read the data back.
++ * Now, read the data back. 7z requiring seeking, that also
++ * tests that the seeking support works.
+ */
+- f = fopen("test.tar", "rb");
++ f = fopen("test.7z", "rb");
+ assert(f != NULL);
+ if (f == NULL)
+ return;
+--- contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c.orig
++++ contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c
+@@ -39,7 +39,7 @@
+ {
+ const char *fn = "fs_noatime";
+ struct stat st;
+-#if defined(_WIN32) && !defined(CYGWIN)
++#if defined(_WIN32) && !defined(__CYGWIN__)
+ char *buff = NULL;
+ char *ptr;
+ int r;
+--- contrib/libarchive/libarchive/test/test_read_format_7zip.c.orig
++++ contrib/libarchive/libarchive/test/test_read_format_7zip.c
+@@ -24,13 +24,16 @@
+ */
+ #include "test.h"
+
++#if HAVE_LZMA_H
++#include
++#endif
++
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ #define close _close
+ #define open _open
+ #endif
+
+ #define __LIBARCHIVE_BUILD
+-#include
+
+ /*
+ * Extract a non-encoded file.
+@@ -402,7 +405,7 @@
+ la_ssize_t bytes_read = archive_read_data(a, buff, sizeof(buff));
+ assert(bytes_read >= 0);
+ if (bytes_read == 0) break;
+- computed_crc = crc32(computed_crc, buff, bytes_read);
++ computed_crc = bitcrc32(computed_crc, buff, bytes_read);
+ }
+ assertEqualInt(computed_crc, expected_crc);
+
+@@ -929,6 +932,10 @@
+ if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
+ skipping(
+ "7zip:zstd decoding is not supported on this platform");
++ } else if (ARCHIVE_OK != archive_read_support_filter_xz(a)) {
++ // The directory header entries in the test file uses lzma.
++ skipping(
++ "7zip:lzma decoding is not supported on this platform");
+ } else {
+ test_extract_all_files_zstd("test_read_format_7zip_zstd.7z");
+ }
+@@ -946,6 +953,10 @@
+ if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
+ skipping(
+ "7zip:zstd decoding is not supported on this platform");
++ } else if (ARCHIVE_OK != archive_read_support_filter_xz(a)) {
++ // The directory header entries in the test file uses lzma.
++ skipping(
++ "7zip:lzma decoding is not supported on this platform");
+ } else {
+ test_extract_all_files_zstd("test_read_format_7zip_solid_zstd.7z");
+ }
+@@ -1063,7 +1074,7 @@
+ assertEqualString("hw-gnueabihf", archive_entry_pathname(ae));
+ assertEqualInt(sizeof(buff), archive_entry_size(ae));
+ assertEqualInt(sizeof(buff), archive_read_data(a, buff, sizeof(buff)));
+- computed_crc = crc32(computed_crc, buff, sizeof(buff));
++ computed_crc = bitcrc32(computed_crc, buff, sizeof(buff));
+ assertEqualInt(computed_crc, expected_crc);
+
+ assertEqualInt(1, archive_file_count(a));
+@@ -1137,7 +1148,7 @@
+ assertEqualString("hw-arm64", archive_entry_pathname(ae));
+ assertEqualInt(sizeof(buff), archive_entry_size(ae));
+ assertEqualInt(sizeof(buff), archive_read_data(a, buff, sizeof(buff)));
+- computed_crc = crc32(computed_crc, buff, sizeof(buff));
++ computed_crc = bitcrc32(computed_crc, buff, sizeof(buff));
+ assertEqualInt(computed_crc, expected_crc);
+
+ assertEqualInt(1, archive_file_count(a));
+@@ -1150,7 +1161,7 @@
+
+ DEFINE_TEST(test_read_format_7zip_lzma2_arm64)
+ {
+-#ifdef HAVE_LZMA_FILTER_ARM64
++#ifdef LZMA_FILTER_ARM64
+ struct archive *a;
+
+ assert((a = archive_read_new()) != NULL);
+@@ -1260,6 +1271,97 @@
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ }
+
++DEFINE_TEST(test_read_format_7zip_sfx_pe)
++{
++ /*
++ * This is a regular 7z SFX PE file
++ * created by 7z tool v22.01 on Windows 64-bit
++ */
++ struct archive *a;
++ struct archive_entry *ae;
++ int bs = 10240;
++ char buff[32];
++ const char reffile[] = "test_read_format_7zip_sfx_pe.exe";
++ const char test_txt[] = "123";
++ int size = sizeof(test_txt) - 1;
++
++ extract_reference_file(reffile);
++ assert((a = archive_read_new()) != NULL);
++ assertA(0 == archive_read_support_filter_all(a));
++ assertA(0 == archive_read_support_format_all(a));
++ assertA(0 == archive_read_open_filename(a, reffile, bs));
++
++ assertA(0 == archive_read_next_header(a, &ae));
++ assertEqualString("test.txt.txt", archive_entry_pathname(ae));
++
++ assertA(size == archive_read_data(a, buff, size));
++ assertEqualMem(buff, test_txt, size);
++
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
++
++DEFINE_TEST(test_read_format_7zip_sfx_modified_pe)
++{
++ /*
++ * This test simulates a modified 7z SFX PE
++ * the compressed data in the SFX file is still stored as PE overlay
++ * but the decompressor code is replaced
++ */
++ struct archive *a;
++ struct archive_entry *ae;
++ int bs = 10240;
++ char buff[32];
++ const char reffile[] = "test_read_format_7zip_sfx_modified_pe.exe";
++ const char test_txt[] = "123";
++ int size = sizeof(test_txt) - 1;
++
++ extract_reference_file(reffile);
++ assert((a = archive_read_new()) != NULL);
++ assertA(0 == archive_read_support_filter_all(a));
++ assertA(0 == archive_read_support_format_all(a));
++ assertA(0 == archive_read_open_filename(a, reffile, bs));
++
++ assertA(0 == archive_read_next_header(a, &ae));
++ assertEqualString("test.txt.txt", archive_entry_pathname(ae));
++
++ assertA(size == archive_read_data(a, buff, size));
++ assertEqualMem(buff, test_txt, size);
++
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
++
++DEFINE_TEST(test_read_format_7zip_sfx_elf)
++{
++ /*
++ * This is a regular 7z SFX ELF file
++ * created by 7z tool v16.02 on Ubuntu
++ */
++ struct archive *a;
++ struct archive_entry *ae;
++ int bs = 10240;
++ char buff[32];
++ const char reffile[] = "test_read_format_7zip_sfx_elf.elf";
++ const char test_txt[] = "123";
++ int size = sizeof(test_txt) - 1;
++
++ extract_reference_file(reffile);
++ assert((a = archive_read_new()) != NULL);
++ assertA(0 == archive_read_support_filter_all(a));
++ assertA(0 == archive_read_support_format_all(a));
++ assertA(0 == archive_read_open_filename(a, reffile, bs));
++
++ assertA(0 == archive_read_next_header(a, &ae));
++ assertEqualString("test.txt.txt", archive_entry_pathname(ae));
++
++ assertA(size == archive_read_data(a, buff, size));
++ assertEqualMem(buff, test_txt, size);
++
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
++
+ DEFINE_TEST(test_read_format_7zip_extract_second)
+ {
+ struct archive *a;
+@@ -1301,3 +1403,206 @@
+
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ }
++
++#ifdef LZMA_FILTER_RISCV
++static void
++test_riscv_filter(const char *refname)
++{
++ struct archive *a;
++ struct archive_entry *ae;
++ char buff[8488];
++ uint32_t computed_crc = 0;
++ uint32_t expected_crc = 0xf7ed24e7;
++
++ assert((a = archive_read_new()) != NULL);
++
++ extract_reference_file(refname);
++
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++ assert((a = archive_read_new()) != NULL);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++
++ assertEqualIntA(a, ARCHIVE_OK,
++ archive_read_open_filename(a, refname, 10240));
++
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++ assertEqualInt((AE_IFREG | 0775), archive_entry_mode(ae));
++ assertEqualString("hw-riscv64", archive_entry_pathname(ae));
++ assertEqualInt(sizeof(buff), archive_entry_size(ae));
++ assertEqualInt(sizeof(buff), archive_read_data(a, buff, sizeof(buff)));
++
++ computed_crc = bitcrc32(computed_crc, buff, sizeof(buff));
++ assertEqualInt(computed_crc, expected_crc);
++
++ assertEqualInt(1, archive_file_count(a));
++
++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++
++ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
++#endif
++
++DEFINE_TEST(test_read_format_7zip_lzma2_riscv)
++{
++#ifdef LZMA_FILTER_RISCV
++ struct archive *a;
++
++ assert((a = archive_read_new()) != NULL);
++
++ if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) {
++ skipping("7zip:lzma decoding is not supported on this platform");
++ } else {
++ test_riscv_filter("test_read_format_7zip_lzma2_riscv.7z");
++ }
++#else
++ skipping("This version of liblzma does not support LZMA_FILTER_RISCV");
++#endif
++}
++
++static void
++test_sparc_filter(const char *refname)
++{
++ struct archive *a;
++ struct archive_entry *ae;
++ size_t expected_entry_size = 1053016;
++ char *buff = malloc(expected_entry_size);
++ uint32_t computed_crc = 0;
++ uint32_t expected_crc = 0x6b5b364d;
++
++ assert((a = archive_read_new()) != NULL);
++
++ extract_reference_file(refname);
++
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++ assert((a = archive_read_new()) != NULL);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++
++ assertEqualIntA(a, ARCHIVE_OK,
++ archive_read_open_filename(a, refname, 10240));
++
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++ assertEqualInt((AE_IFREG | 0775), archive_entry_mode(ae));
++ assertEqualString("hw-sparc64", archive_entry_pathname(ae));
++ assertEqualInt(expected_entry_size, archive_entry_size(ae));
++ assertEqualInt(expected_entry_size, archive_read_data(a, buff, expected_entry_size));
++
++ computed_crc = bitcrc32(computed_crc, buff, expected_entry_size);
++ assertEqualInt(computed_crc, expected_crc);
++
++ assertEqualInt(1, archive_file_count(a));
++
++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++
++ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++
++ free(buff);
++}
++
++DEFINE_TEST(test_read_format_7zip_lzma2_sparc)
++{
++ struct archive *a;
++
++ assert((a = archive_read_new()) != NULL);
++
++ if (ARCHIVE_OK != archive_read_support_filter_lzma(a)) {
++ skipping(
++ "7zip:lzma decoding is not supported on this platform");
++ } else {
++ test_sparc_filter("test_read_format_7zip_lzma2_sparc.7z");
++ }
++
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
++
++DEFINE_TEST(test_read_format_7zip_zstd_sparc)
++{
++ struct archive *a;
++
++ assert((a = archive_read_new()) != NULL);
++
++ if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
++ skipping(
++ "7zip:zstd decoding is not supported on this platform");
++ } else {
++ test_sparc_filter("test_read_format_7zip_zstd_sparc.7z");
++ }
++
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
++
++static void
++test_powerpc_filter(const char *refname)
++{
++ struct archive *a;
++ struct archive_entry *ae;
++ size_t expected_entry_size = 68340;
++ char *buff = malloc(expected_entry_size);
++ uint32_t computed_crc = 0;
++ uint32_t expected_crc = 0x71fb03c9;
++
++ assert((a = archive_read_new()) != NULL);
++
++ extract_reference_file(refname);
++
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++ assert((a = archive_read_new()) != NULL);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++
++ assertEqualIntA(a, ARCHIVE_OK,
++ archive_read_open_filename(a, refname, 10240));
++
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++ assertEqualInt((AE_IFREG | 0775), archive_entry_mode(ae));
++ assertEqualString("hw-powerpc", archive_entry_pathname(ae));
++ assertEqualInt(expected_entry_size, archive_entry_size(ae));
++ assertEqualInt(expected_entry_size, archive_read_data(a, buff, expected_entry_size));
++
++ computed_crc = bitcrc32(computed_crc, buff, expected_entry_size);
++ assertEqualInt(computed_crc, expected_crc);
++
++ assertEqualInt(1, archive_file_count(a));
++
++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++
++ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++
++ free(buff);
++}
++
++DEFINE_TEST(test_read_format_7zip_deflate_powerpc)
++{
++ struct archive *a;
++
++ assert((a = archive_read_new()) != NULL);
++
++ if (ARCHIVE_OK != archive_read_support_filter_gzip(a)) {
++ skipping(
++ "7zip:deflate decoding is not supported on this platform");
++ } else {
++ test_powerpc_filter("test_read_format_7zip_deflate_powerpc.7z");
++ }
++
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
++
++DEFINE_TEST(test_read_format_7zip_lzma2_powerpc)
++{
++ struct archive *a;
++
++ assert((a = archive_read_new()) != NULL);
++
++ if (ARCHIVE_OK != archive_read_support_filter_gzip(a)) {
++ skipping(
++ "7zip:deflate decoding is not supported on this platform");
++ } else {
++ test_powerpc_filter("test_read_format_7zip_lzma2_powerpc.7z");
++ }
++
++ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++}
+--- /dev/null
++++ contrib/libarchive/libarchive/test/test_read_format_7zip_deflate_powerpc.7z.uu
+@@ -0,0 +1,55 @@
++begin 664 test_read_format_7zip_deflate_powerpc.7z
++M-WJ\KR<<``2:7;DH@`@```````!R`````````#:LFQ3LU$MK$U$4P/$SDZB1
++M)#)*%$'1$0,JB&\D14M,?56J]8%N=)%6(QJ,5FW%(BD97XC@HN(#7(@K@QO!
++MA6Y%-R*"7\$GKMQTX4*P.IX[*%#_!_U=.YMZYY][<5'/'LZ'I?AR2MI'2_G[/AO;S)NR8
++M8T.\*(PIHU'H1SQB/G]]]YPXM+M<8U7TO8[=I83B.7&H,1M3_^S!J7DVM+_%
++M1#)6&_JR1[_*]VSHO?E1_!G?*Y.PZWLZON^?_65,)/6M;-0/KVS45@P.K%AM
++M)MG[!7,NVWL/2->;^Z^F/4M_>]9U;/KU\&:^R;%2<:UQS7_.
++MSVS:3W+2+S[W/)YDK[.3QJSXXOW3WV:[R4J.GD7.K#=39(94=^RN#@[5ZJ>J
++MYP:/UN3TN:%!J5:ULB-ZN__L4/5D?_V4F+ZI<[ULW[FC:W-US8I5$ZVUZW3"
++ML9,#I^R$:ER%UN28OZB>)Y-O7OSJ:UY@X;YG<=TN!"UW6B[
++MLVT[K6E).Z,Y4?OVHG"LF7';HXX4;KV43-<#F=)Z[;;+[\3=\.YG)E@0CJ\,
++M1"K/)=,MZ8N!YC4SJ?9ES2TM$J\WB(^EN2P[O'^1K#?S1QZY[=+$VBFSMI3?
++MBMN9-VN.O[[Z:/Q#MQYCG^8DL;'/F7.Z>66&AG/G?W/[[-YN?91<^8/G7B]+
++MT>1LTISD++HEU=_ABV/JO:?C42
++MT;U)J3[%TS,[H^O(R.*>X8Z6^$%6TM%:7\/QD?Y#P[I6M)].K>?B"),0ERX?>.$S].-Z>GVLWLP<+%&_H]?0<+R9Q)XS_/
++MP:2_MRO.\:.-QL!R__S`V48M>LKFI!_127]B3RTKE?=X1
++M````````````````````````````````````````````````````````````
++M``````````````````````````````````````````````````````#PN]UJ
++M!Y$:BJ(WF5E===2L_R\,..`_C!\4Q,+9CQ_PA^X*-CXSF[@3G$G6)*.[%B*B
++MJ""B:*%6EEM:J+5@8R%BIZ4V%F*AH"(BCN?EW;CCD$8;FQPX\][)/;EY[[Z7
++MO,F0(4.&#!DR9,B0(4.&#!DR9/C?,"AO&)1[B:X&K@0+!NFOT7`+]`^TRJ?W6SR\&:1/H=^&^16BG0#]#.QT<`F>`!CB?%'*&3A+R
++MMP3.`Z>""W'_0]E'*_-U@V5P&E@8E4FTUF>_U?J)^!C:EAPSVH_0'OT#D*^]
++M#C?`V^`=0S]?0CN/.K"KKV];<=50M>E%S>*&3>8FL[Q^2S.6&\]MW&R6-Z_F
++MRY0*U&60@!R1QMIFK;.^PCK'>H)UGO4SUET$R'JSGL+:8SV5]1CK;M9)OFFL
++M'[*>SOHUZQE*YXJL"URC-ZQG*MU58#V+=>*?S7H[:X,`N8]8][#^P7I.LAZL
++MY[+^R'I>K'5*XO-9)\]?P+K$>B$Q6,LZ:<3(4^L3FFZN=U%3]9Z#^:XC"37?
++M91W^E8@?)T!7\=70-]KT=GZ/$GV(QZ-I:CS'DOEJ:KZ7Y+O7YK^9U$=3]7G0
++M_OR4\3Q"?:^QWR"@(_Y4[F..R_J\2.JKJ?J^2M:+U'J]E^\7Q^?)WP1SU%WK
++M#%V-H1CGTY8G]3:4+B7[8XY.,Z'7L#^);^W(MY,81:6'#%UU>_387^7]E>^)
++M]Y=V"O%5G&\A=)GWYV;D*T"?YO$D\0O\#N_F^&6.)_EOR?W.XYU!PT&TP?1)
++M"*OJBL@:H1$_$G6KZM1E*(R:)TZ8PV0[@3/BAI$3B*@AANN^YX2XQ_;%2-VO
++M6G5A1WX0"JLY1L-^8[3N1(YMEM,=XH3KN<(*`FM<.%X4C-.)P&HXPFXV&N.X
++MI4T).*,_K+4S&(T0.P]5]@V(@?W]0I`XW%\1O97#`^CV']U?V;>G#XY=^X?$
++MP&XV[NX_1&+7W@.]E;WBP,Z=AP<&Q6"E=Z^\0]3=ZK`((RN(1,-RO1V[]N[I
++M[1,;S4V;23BV%5D4#QA.*9231IM1F#CC>8XT?(^S"&D-?5&S/+OND-AS``';
++M]40S=&S"/&P8JF'(J>1#<6%P7Q_/)YXTD1F.-R*KBC8*5%M+>JZ'A1@ET_,C
++MQQSQFF:UZ=;M]:[-ERJ]>];+I8QC-2NLD6F/>\@7M\BB(J>=('1][P\A$`N<
++MNB6-W!NM1_*1+GXC9PR_LAR(^7%Q3*?&*U:S@TDE[TB63MW!?9G8:KC#>*J/
++M7"H'JD$F-DX#BTQ_@Z7\?=/5&2-),XG!,8D5X%3VV1232C2)/"EL:?-=(?Y.
++MIOCZSK2GS,_>`,]CVCF'20U+FEL<<`CX`YYZ[./"G_+[!OC&)2N>.Y$F=EGWT3%),*[?-@?9'[O>KLE*02^^:W
++M^:YS_BGJ&R-)_2GUNSWIRQ4IIO:$)F&0PKW$I[ZQDK0N)=]]]NGJVRE)/2F^
++MB39?D6+2LA3?XS;?=HI)@RD^.>998$Z=82#'&'GFS33]PO$\"^M1V^A'K;U8-(_4#^U^9U3MZ/:6!NTI>7/W=3GMOSIZ]+>KYW
++M^GX!`00&``$)B(``!PL!``(#!`$(!`,#`@4!``S!]`K!]`H`"`H!R0/[<0``
++M!0$9#P```````````````````!$7`&@`=P`M`'``;P!W`&4`<@!P`&,````9
++;!``````4"@$`>7-\NFY9VP$5!@$`((#]@0``
++`
++end
+--- contrib/libarchive/libarchive/test/test_read_format_7zip_extract_second.7z.uu.orig
++++ contrib/libarchive/libarchive/test/test_read_format_7zip_extract_second.7z.uu
+@@ -1,11 +1,11 @@
+-begin 644 test_read_format_7zip_extract_second.7z
+-M-WJ\KR<<``-N%=VX!@$````````B`````````*R\U.<`&`Q"DFIGO`[1,RO\
+-MN,RA7-QU1L&_]O_/$0MMLIEBUR3'BDX@M2C-5'VG./-4,5@W3Q@*__^7_,[H
+-MEO`DB'[ZI>@H2_E>/W.2G$$.P01-X!YN5";SS[3#7Z4Q1G/EF.0'^D*[S8&8
+-M[FV9DYX7,SA%^.Q\'?__P!@`````@3,'K@_4WV/Q0A7VLXG$X?GH4=5W^`UM
+-M$N_EX$)LE*?K$W5?WLP:X0T[Q%V^?A!0E\VZRBB,)(MO`C`LO[O!3(1YL)<:
+-MJ."`';WU;>GP5',%Z=6?*/H9*Z)&\*!2^,RV`R30UOBH8+5.;;2IKF
+-M0W://&'?"L?0L2!)`*]F30B0&/_'<4``%P9Z`0F`C``'"P$``2,#`0$%70``
+--@``,@*@*`6]FB2D`````
+-`
+-end
++begin 644 test_read_format_7zip_extract_second.7z
++M-WJ\KR<<``-N%=VX!@$````````B`````````*R\U.<`&`Q"DFIGO`[1,RO\
++MN,RA7-QU1L&_]O_/$0MMLIEBUR3'BDX@M2C-5'VG./-4,5@W3Q@*__^7_,[H
++MEO`DB'[ZI>@H2_E>/W.2G$$.P01-X!YN5";SS[3#7Z4Q1G/EF.0'^D*[S8&8
++M[FV9DYX7,SA%^.Q\'?__P!@`````@3,'K@_4WV/Q0A7VLXG$X?GH4=5W^`UM
++M$N_EX$)LE*?K$W5?WLP:X0T[Q%V^?A!0E\VZRBB,)(MO`C`LO[O!3(1YL)<:
++MJ."`';WU;>GP5',%Z=6?*/H9*Z)&\*!2^,RV`R30UOBH8+5.;;2IKF
++M0W://&'?"L?0L2!)`*]F30B0&/_'<4``%P9Z`0F`C``'"P$``2,#`0$%70``
++-@``,@*@*`6]FB2D`````
++`
++end
+--- /dev/null
++++ contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_powerpc.7z.uu
+@@ -0,0 +1,48 @@
++begin 664 libarchive/test/test_read_format_7zip_lzma2_powerpc.7z
++M-WJ\KR<<``3$^AU-00<```````!R`````````-SC-5?A"O,'.5T`/Y%%A&@T
++MB@D*0&*NI,NQR,0S-H]24V>HUJ)S8G8?UTBL>Q5
++MG.4VRG`GX;NVN!)QZV9EE-86\EX/-AGSD8"!_9OCIVXS85?#W'27\3@+6C5[
++MNF\X^*^Y;RXP>O=WDX`WFTS!C`ZZ+4=K-.AWX[@*@)]I$[S64O;XZL
++MAMD8<%,25+2ZFN6C=QD/7BQW"%!J\Q]5:/P\JOWIO1&Z)XJPAH]RU>Q=R:'"
++M1.D[?\\09!A4R'EED]]!$(`P\VJ>\*'QH^,1[W<'/KHPYR\>YQ>)7;$Q1$2Q
++MT;Y'@(N5GF.QDBD^[&@!Z7!)8T:A8G>LO#(-C]Q]RQ+RP8)+;A49<3:R@[<.
++M6QP1PPEA<]\\J&[Z4Q.3D4JF=[9(>PZ;PH1=9X$OB2+-JWD+(MY@9)+.RBE\
++M-(YGOM"(P#:$I2]OP+Z`!T:_-7`>%UH]^X%9I;=?%F'`?%@SZGPK7U7P.NY1
++MO^(M\S$TG0-!QBLO4NVWI'9=V=59:L$<)=R(B=><7E`EHU>+9U:R60*?H+;L:IXHASE[EX="AL9^\TE8<]4\'P<.8X63DC$%-'EF2+XYRU/NJEAQ8^I(QUY>=IH']H+>E?4H15L`[6A??
++MYQ%.OP=9FA1\3D^6X28B!N^S0C/K(YJNUH-"Z();:A$'BXD)LNBZ4M;S-:$<
++MD?F)EG-N&&1W;@208KQ-ROM$$L^-"LM93&YH!3<9G"EL[^E+P!=UCPJ6MX8E
++MD_G.B!(=0CA`.\TB&<%GU8CS!`4F_T$*IV'T;,6>X1#"0H?_EN"/R^EE'3BUH(JL&GR=V\DK6^W&
++MQ4&"6)M)";27.MU5=J:`5'\[Q
++MRGVNDF%%,496/=".O2\%0/:L/DYAK$@8N&Q-MB\(B,I&D44;Z$"5OEOZ&+[3
++MP<6Y""AA;7[-PHA'VM!.P?%2&UY&RV1PV8A%_E\W>C?4AZ$."9483$_WT@>?
++MP9Q@;):Q=!M6*6%B<=I/2O&&TR;`%8C,>AU);W2__21.`.E&3R*"#
++MF/E^)UDT^O^">DN`G0X?YMDA0(VD##Q!=#AJ2_GU(R]"BT\9=G]06IVXB*N>
++MD._HN.P#'34_+GN3+-R$,309TH/LS@S@U\MI$#2K3\^7&&MXU4$XN0"Q\X9"
++M@"F6:AQACT&WF>-H#X#L62S\U$Z^I@#R%"^PAU[*
++M_S%['0[X>],*)X36#OJ=S>JW>URI18]C)/IPC>%O$O87NK;/*'LSFF`&O=UON5U$^V>E]4BYF!=EJ=>W>!L!))2)WXN[6.R9KY6OYB_%D\LB@UJKV$X?$3X!__S,A$L(9TJ;'"/_KQD_`[B8%4
++M@:*M>W7>7:^#T%>UD!F&2U9MH!,&+NCL8_C0R1,V,<09?&_#YQ,:=OX`P`>Z
++M$F2Q3)V#BA^O*^SVX_H(":;Y1R\E%.2")3UKK[GS4LK?/)MTMK9O,;C_&^1Z
++M]YV_L72P)(`*4@G2BS"T#+0MFF+[2@%^L.Y+G;/_G;O3U]9V>BO?AA(@YY1T
++M(PZ_RW(H!:>:2"-VPA#,?7A`^W<*16&L'FSQ0>S*^?^%4M.0J!D;_PJV@M9U
++MX^RVHWG(^4T*27L?-?N_,&Z9_L+B`5FC2$7OSN:!R!T>@:PS.!&G%]<=TRUW
++MO$"BL"1/8WVCYVY[)O0#BGT7+'4)(8$#PDBKX[G8`5IV^HOM);AWVK;N2=?O
++M6Z(82J?PP3)M":X^V\^4P/`JLI6D3E(0Y,&R?38!2J\A?)$FA9N-)=C.8TM7
++M;NY.1S63C),^$)LC$@<'B:M(DW@!)1#8/",9(Z%V@<#;N=,QJ>GQ\7@6```!
++M!`8``0F'00`'"P$``B$A`0D$`P,"!0$`#,'T"L'T"@`("@')`_MQ```%`1D/
++M````````````````````$1<`:`!W`"T`<`!O`'<`90!R`'``8P```!D$````
++7`!0*`0!T7'CG;UG;`14&`0`@@/V!````
++`
++end
+--- /dev/null
++++ contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_riscv.7z.uu
+@@ -0,0 +1,49 @@
++begin 664 test_read_format_7zip_lzma2_riscv.7z
++M-WJ\KR<<``2#$,U9>P<```````!B`````````/NM+,3@(2<'5VNZVMMC.M1:6A'_@4B7D:$-^A7OC]^75)8S5[+EBS'O"X%U.;J
++MIP3!?I?]\-&D0*0_
++M8\P?X^=GN)?^"&<
++M8F?3+:T?=0[F$8D0,>.@/W@?.H_*3R#+OM.JM\::8JT52"_:`"T^IFT#HJ&E
++MG?=B5!4EX?D"/N"[9/+^W956RS)T4MN,MPSU'BH$'6>.O!%>MM[Q1M\*?-:,ZA.LC4S*%X\>2A
++M`A!MM\`L.#S5]OZSD.^1E^WI&^?6F,*]*G."0CI6H8W.9"#Z_6ZN<@;G-2.=
++MT][M[&X3["?7[V$_E354K.RAM%W%]K=@-LG+<"*P\S=2`=&JS5Y(DY7CT!03
++MHW%SJ900'-CH(?!5OE0H$4K#Z(2OI<]5&X]"W)0TM&W$$F3GQ;,]!=OAC50%
++M0^&+<+E;OMQ$NM:OT+PBPC.UIS`9V##GY2Q!&\VMUPK.(]I:2^O=\&*_+P2`
++MSQ;RDC)U?8.'V.H3CD<%HEJFBY@;9B.?>RSO`Z*LF3IYHBM#W"L')Q8P*'5$
++MI:[H>M4CA0P,'R?M%_JJIKVCEK0L=U<&@>F8]L'_HK6W*/B7\WE^E8NL5
++M+I?\#G/4K>2*9==_\M[[L0]5+C",0H-Q]@"S>,%VY+S&9RV_!NCCNRF8KO6(
++M28T%N->@QV&8E^W3$.1)I=N?7?EJJSC9/2,Q6"RQ1D!EYW_2]['@E-]V66+=
++MX+Y:#/L9;[2A/3DB2BM[%M73D]L=*T8RO&7\@Z7?RP]2SH52\,/YJ[5R5U%+
++M\C@I[JTT!7[J)502-;,3_4CD1LZ/[*M()M=BD%P8[$]0H=F[=E:3WCZZPVGS
++MD>(O_"VNIFCO;2\>S;\4GE8,#'FKL+O'E999,FO+U
++M7<$4N)[FL%?263W@TVD]/=,)<[Z9USX_P:N+(U@S[()YQ\?5,[P*IF0`EX<@
++M^.GX!Z\?!M76Q]9KJ.5J2VHC579C,X1RIE<60O#5%:9',_
++M*B24>2\83;TIM&K.XR'DB*?&[E[R*%\:Q[[G[7`KF`F5F"GRR;%3/96U
++M:,#>O*5M0,2^<..K%T*'C#.7>S8QPK;]>GJ20ZB]&P#K+\XL)Z!%).]9:1])
++MR\1H[/]I:U!ZX)^D+H-_B%48^]$&^>W09_2LD?(7X_,?`I%F(ZYPQVGI(><\
++M)S;)H(Z3?+J.>U1-^.1=Y_!_[\AU;E=5CTIR`9EED2T]PYY@&97N0+EW$`C5
++M50K)B)UG(Z5[<"$Y]:/>WF)'F4:'`\G^6@>.C_Q&S$7X(#A#:\HHDPNA3&Q[
++MGN._G\F.-KJD/R9IWQ#JQ3DBJX.RC+-W#,%&5$-W^>:=^63U;.?UHG"+IEJ<
++MM^F2KMRWL)07J'E:JU:B@6KD-2X@J&32G>R_PV
++MSJ\"11HX4^R3--6FN`]3E9[S\+$U!X0VOR)N1;HN#Y_Y&M2WYN`X)<(>`&W0
++M2SN#@M8>+=04++7&-!FD76*=WO:L99[,FZL>
++MO#5R7EMF=ZWCA#?>]5C)I=_E1H^SDQX72:*)?L)AVKW"Z=S\8$7;;"1R0H51
++M5I@-MLZ()+]B88&)P^C^S;8D62W$"V.Z-GU"DI\TBOGK&8BW*H4LOMG])),V
++MD\436(;$T\J.LQ[-]\&@2@!_UAZ\'\6,*A"R[6_QUV7%5=0M40X<0!#PYXZ'
++MZ":.-1>U'DD=JHOL]XD5B5K[/^D;$VQ6YD\E(L)O2SX*B?/\!KG%A>^4)"'P
++M9O\TIJ'OF%R%G7)H99X0_6_YDG$`RV4+ZNU**RUAOWUCW'6S(%)KCB&FT*J*
++M`&0U;``BUN4KQ<01(`"X)ED'5'57KXT,%'-!\.D71?[:@&6;[$X$SBATYB;"
++M7RH6L$VOJWCPADUR@>/DE]Y+FY'CP8*DV8XJO<;,.8,$EX:32RB_\T]13VFQ
++M<+#:+Z2/"T_B-````00&``$)AWL`!PL!``(A(0$#`0L!``RA**$H``@*`>'?U2E@?=@^5X!K6EVT<$4NCHF?DMTN)_D0A*']W)L'Z%[C!D#%Y!:S#"T[CWFG]LXC']WLL'!9\"+`GHW+D/-^/!QXPGPB*2!.
++M&?09NH<7;YVN5R,.-)TZ,3Z02@1?D6E^K*PC3[:&6'/!,LVQ%I$W&4[9AN4H
++M(CO]U]07P);P2!)3%9:,R>I3?`MRC-]B-0Q"VZZ/O5-9%`@K-K4V1BV(]-*\EV(]UK_[`!>/-93[9'TW>4C[PM_CL
++MD/O':;6X+-;Z,AK??'U1&%LC>HO773Q5J_0Y9--2OI+3=
++MQH_VD')4E65;)ZC;-27Z?WZ`QKO&#T#'A<1UYZ/
++MQR6=`OU_Q@1`D`""M0F.^4JB]:>K3E
++M.L"=A%OKG9\4]`](:-9)`_U74PFQ?5]B:'LYYX"!(O`?Z)O;ZYGAX+NX/^TX
++M0K75$*-U`.[W!@/&3>#LK>&,$^-7LYGR.NW.]OR5ZUID9$)KF83C3_(T`VC:+$#)>
++M_J)O-N(.,D9*@##LJ#L6)@"0(SIS23[971FJOCGB:F-@KH8
++M^NW=UPME7UOPB-B1R-20(%:V"C(Z6^LP$9O9*_5KJD2/(NU"#J(66A;9L[:@
++M:DQ*AA6U(]38*!(>D&:^#<2X.9/]B0Z[ER1POL6BS5EKD4]@6C465`N[(]*,
++M1]6:T99]16KXHV0E2G^R%J-\H(^K1V;-N5RH!KF8Z2U).4>YC.EJI#>:]WOP
++MU+8[3UBF4]5WKQ5W619%/BB*5WQ*JCJ19!*@4K]%=/7W0`@Z6-E1HN>[U7CE
++M]`%]W)W`!IA-F/W8K]60#\0E4_CUD38Q!:6P[F_!<$U'#-&1$:JM8!VZSK$G
++M&%Q9ANEF4EB^Z7:L6>3E6P4(^
++M`YH,USJ&*2&?3ML,ADZAK_>3'O!:"CB($W22J.O\G$CE..,RWP:DJL#='-?Y
++M*2W,E'ZN]S``7)5/K;EZA>=GJO:77RNU+S"3#]V\A^_.YDJTUN'\D&V.:+'M
++MX;1P_8RY.GKK:U['95&:`LQT2+^G+9DJ.'SBT($]6)6X>4%8E6R>QI9F&#%(
++MB*1]Q80;B^[*-X?J+PGIHY#5CZ1N,Q'MEK5W?+BE2'R6^D2A:W!POR\V79;)
++MM,8D?C2](B[0)SW)<3]RNOH4SEX?06<'J[<&OJDWA_MH@C)87X.(@/:FHB[`
++M,`9=MXE'=%I_EJ2UB:JTC;*.H\3]&GE^X"DQ2TM#53B$QR12B
++MEY?G$IQ57"8+OXW?3YF.%:61.T?Z->H2PWS!2AZ1IJY=:(*.UB?-JHMJ2?(%&IW=*:VRA\'=*T'"ZH5?UCU_5-H\VD9?(PNF;GJ;Z
++MIL_*^CQVY;0)8N:T3="V$US\M"[D)[YJ/YD;OG
++M@D+M+#Q3%@?=[)`;XS$B,2A*D?),85#?5^10N\2#"DKDL,,
++MA6NA6U>I0\:CP/E9,(`8^.8@7I94A`P5?74_%[NN#<4@18-TB>M\32JW*?&O
++M&=[=TN=VPE\@Y$8\&Z>Q>PAZ_GSR?Q/=.LDV\='/S7*`N*V0>BB"5_9JF?=,
++MB*\+@&D8[#W[^X*`ATPU[WRK">MUA3+YLZQ\?"F7!X.V0T9W4[?/_1+<+UZ?
++M:=0+KHF`W(I%SP1C%MDQJ^M*Y^5@TE1[83"SIQ_<'R'=AR4E7C5"EJ0YCT8D
++M4FI1(Y(H;#Y[A*;Y!Z7D=&&F^Z4ERQ>CQD$C;.GCY>JDTZPQ1?"4W0^D#T9`
++M)+,/HN?5_Y'H#_@M<,VE(0@(X\G3W(#_S4C>D-7S/E`Z3DS#+M**S]YQ%*N@9RMHM#M?<:\,=^D
++MA*_IR`W7;2OJK".[-`T'*-#209OXHBX0B%$P3#$5D+VE1/4$'J.D^9I[V+VH
++M&WN#Y"AO'3Q`6"T60J[ZCT,*T1(=4I;!&6+F4G!]D75J$F5>:'%?M'DE8&I@
++MQ_L``00&``$)A\P`!PL!``(A(0$1!`,#"`4!``S06!'06!$`"`H!339;:P``
++M!0$9#P```````````````````!$7`&@`=P`M`',`<`!A`'(`8P`V`#0````9
++;!``````4"@$`@,:@07(HVP$5!@$`((#]@0``
++`
++end
+--- /dev/null
++++ contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_elf.elf.uu
+@@ -0,0 +1,9442 @@
++begin 775 test_read_format_7zip_sfx_elf.elf
++M?T5,1@(!`0````````````,`/@`!````D`0!``````!``````````&!R!@``
++M`````````$``.``.`$``(0`@``8````$````0`````````!``````````$``
++M````````$`,````````0`P````````@``````````P````0```"4`P``````
++M`)0#````````E`,````````<`````````!P``````````0`````````!````
++M!````````````````````````````````````"B:````````*)H`````````
++M$`````````$````%`````*``````````H`````````"@````````/:@$````
++M```]J`0````````0`````````0````0`````4`4```````!0!0```````%`%
++M``````"`U@```````(#6`````````!`````````!````!@````@V!@``````
++M"#8&```````(-@8``````(@Z````````>)$`````````$`````````(````&
++M````N&H&``````"X:@8``````+AJ!@``````$`(````````0`@````````@`
++M````````!`````0```!0`P```````%`#````````4`,````````@````````
++M`"``````````"``````````$````!````'`#````````<`,```````!P`P``
++M`````"0`````````)``````````$``````````0````$````A"4&``````"$
++M)08``````(0E!@``````_`````````#\``````````0`````````4^5T9`0`
++M``!0`P```````%`#````````4`,````````@`````````"``````````"```
++M``````!0Y71D!````#![!0``````,'L%```````P>P4``````$P;````````
++M3!L````````$`````````%'E=&0&````````````````````````````````
++M`````````````````````````!``````````4N5T9`0````(-@8```````@V
++M!@``````"#8&``````#X.0```````/@Y`````````0`````````$````$```
++M``4```!'3E4``H``P`0````!``````````0````4`````P```$=.50"0T\R#
++MH+X,"UX.#8M-C0N0$``!(`````````````````````````M`(``!(`
++M````````````````````````G0(``!(`````````````````````````F`0`
++M`!$`````````````````````````=00``!(`````````````````````````
++M^0,``!$`````````````````````````)@(``!(`````````````````````
++M````,0$``!(`````````````````````````.P```!(`````````````````
++M````````_@(``!$`````````````````````````EP$``!(`````````````
++M````````````IP$``!(`````````````````````````S0$``!(`````````
++M````````````````@@0``!(`````````````````````````5@```!(`````
++M````````````````````^@```!(`````````````````````````?@```!(`
++M````````````````````````AP(``!(`````````````````````````>@(`
++M`!(`````````````````````````E@,``!$`````````````````````````
++MIP(``!(`````````````````````````,P```!(`````````````````````
++M````J00``!(`````````````````````````8`0``!(`````````````````
++M````````7`$``!(`````````````````````````N00``!$`````````````
++M`````````````P(``!(`````````````````````````IP```!(`````````
++M````````````````QP,``!(`````````````````````````\`$``!(`````
++M````````````````````.@(``!(`````````````````````````9`,``!$`
++M````````````````````````+@,``"``````````````````````````\P0`
++M`!(`````````````````````````$@,``!(`````````````````````````
++M\0(``!(`````````````````````````1P(``!(`````````````````````
++M````[P$``!(`````````````````````````30$``!(`````````````````
++M````````@`(``!(`````````````````````````'P,``"``````````````
++M````````````-`0``"(`````````````````````````2@,``"``````````
++M````````````````V````!(`````````````````````````;`(``!(`````
++M````````````````````<0$``!(`````````````````````````D`0``!(`
++M````````````````````````QP$``!(`````````````````````````$P``
++M`"(``````````````````````````%]?;&EB8U]S=&%R=%]M86EN`%]?8WAA
++M7V9I;F%L:7IE`%]?%]M96UA;&EG;@!P=&AR96%D7VUU=&5X7VQO8VL`<'1H%]U;FQO8VL`<'1H5]C:&L`7U]W;65M8W!Y7V-H:P!P=&AR96%D7VUU
++M=&5X7V1E0!F<'5T8P!F
++M<'5T7-C;VYF`'-Y0!W8W-C;7``
++M&%B:78Q,C%?7W9M:5]C;&%S7!E7VEN9F]%`%]:5$E02V,`7UI425!+
++M=P!?7V-X85]C86QL7W1E&%B:78Q,3=?7V-L87-S7W1Y<&5?:6YF
++M;T4`7UI45DXQ,%]?8WAX86)I=C$R,%]?&%?86QL
++M;V-A=&5?97AC97!T:6]N`%]?9WAX7W!E7!E
++M7VEN9F]%`%]?9V-C7W!E%P&```````X/`8```````@`````````(`X"
++M``````!`/`8```````@`````````H`X"``````!(/`8```````@`````````
++M`"@"``````!0/`8```````@`````````L`X"``````!@/`8```````@`````
++M````R%P&``````!H/`8```````@`````````0`,"``````!P/`8```````@`
++M````````P`,"``````!X/`8```````@`````````X&L"``````"`/`8`````
++M``@`````````4',"``````"(/`8```````@`````````P&X"``````"0/`8`
++M``````@`````````L'0"``````"@/`8```````@`````````>%T&``````"H
++M/`8```````@`````````D``"``````"P/`8```````@`````````D`("````
++M``"X/`8```````@`````````D&<"``````#`/`8```````@`````````4&P"
++M``````#(/`8```````@`````````@&T"``````#0/`8```````@`````````
++M$&X"``````#8/`8```````@`````````D&\"``````#@/`8```````@`````
++M````4'$"``````#H/`8```````@`````````$(X"``````#P/`8```````@`
++M````````,&\"````````/08```````@`````````>%T&```````(/08`````
++M``@`````````@`("```````0/08```````@`````````T`("```````8/08`
++M``````@``````````&L"```````@/08```````@`````````L&X"```````P
++M/08```````@`````````>%T&```````X/08```````@`````````<`("````
++M``!`/08```````@`````````P`("``````!(/08```````@`````````(&H"
++M``````!0/08```````@`````````0'$"``````!@/08```````@`````````
++M>%T&``````!H/08```````@`````````8`("``````!P/08```````@`````
++M````L`("``````!X/08```````@`````````0&D"``````"`/08```````@`
++M````````X'("``````"0/08```````@`````````>%T&``````"8/08`````
++M``@`````````4`("``````"@/08```````@`````````H`("``````"H/08`
++M``````@`````````8&@"``````"P/08```````@`````````P)$"``````"X
++M/08```````@`````````\'("``````#(/08```````@`````````8%X&````
++M``#0/08```````@`````````0`0"``````#8/08```````@`````````@/T!
++M``````#@/08```````@`````````L!,"``````#H/08```````@`````````
++MP(D"``````#P/08```````@`````````T`L"``````#X/08```````@`````
++M````8`L"````````/@8```````@`````````8`P"```````(/@8```````@`
++M````````\`P"```````0/@8```````@`````````,'T"```````8/@8`````
++M``@`````````$`D"```````@/@8```````@`````````H`D"```````H/@8`
++M``````@`````````P$X"```````P/@8```````@`````````\"0"```````X
++M/@8```````@`````````,`@"``````!`/@8```````@`````````4`@"````
++M``!(/@8```````@`````````8`T"``````!0/@8```````@`````````D`T"
++M``````!8/@8```````@`````````P`T"``````!@/@8```````@`````````
++M\`T"``````!P/@8```````@`````````8%X&``````!X/@8```````@`````
++M````(`@"``````"`/@8```````@`````````,/X!``````"(/@8```````@`
++M`````````","``````"0/@8```````@`````````$`P"``````"@/@8`````
++M``@`````````8%X&``````"H/@8```````@`````````$`@"``````"P/@8`
++M``````@`````````(/X!``````"X/@8```````@`````````D"$"``````#`
++M/@8```````@`````````D`L"``````#0/@8```````@`````````8%X&````
++M``#8/@8```````@```````````@"``````#@/@8```````@`````````$/X!
++M``````#H/@8```````@`````````("`"``````#P/@8```````@`````````
++ML`P"``````#X/@8```````@`````````,`T"```````(/P8```````@`````
++M````8%X&```````0/P8```````@`````````\`<"```````8/P8```````@`
++M`````````/X!```````@/P8```````@`````````P!X"```````H/P8`````
++M``@`````````P'\"```````X/P8```````@`````````8%X&``````!`/P8`
++M``````@`````````X`<"``````!(/P8```````@`````````\/T!``````!0
++M/P8```````@`````````4!T"``````!8/P8```````@`````````8`D"````
++M``!@/P8```````@`````````X`D"``````!P/P8```````@`````````8%X&
++M``````!X/P8```````@`````````T`<"``````"`/P8```````@`````````
++MX/T!``````"(/P8```````@`````````\!L"``````"0/P8```````@`````
++M````P$\"``````"@/P8```````@`````````8%X&``````"H/P8```````@`
++M````````P`<"``````"P/P8```````@`````````T/T!``````"X/P8`````
++M``@`````````D!H"``````#`/P8```````@`````````\"<"``````#0/P8`
++M``````@`````````8%X&``````#8/P8```````@`````````L`<"``````#@
++M/P8```````@`````````P/T!``````#H/P8```````@`````````,!D"````
++M``#P/P8```````@`````````0`@"``````#X/P8```````@`````````8`@"
++M```````(0`8```````@`````````8%X&```````00`8```````@`````````
++MH`<"```````80`8```````@`````````L/T!```````@0`8```````@`````
++M````T!<"```````H0`8```````@`````````@`T"```````X0`8```````@`
++M````````8%X&``````!`0`8```````@`````````D`<"``````!(0`8`````
++M``@`````````H/T!``````!00`8```````@`````````#\&``````"P1`8```````@`````````V#\&``````"X
++M1`8```````@`````````0$`&``````#`1`8```````@`````````,#8&````
++M``#(1`8```````@`````````R#8&``````#01`8```````@`````````*#<&
++M``````#81`8```````@`````````@`4!``````#@1`8```````@`````````
++M(`P!``````#H1`8```````@`````````,'$!``````#P1`8```````@`````
++M````6$,&``````#X1`8```````@`````````X$,&````````108```````@`
++M````````@$(&```````(108```````@`````````^$(&```````0108`````
++M``@`````````>&$&```````8108```````@`````````R$$&```````@108`
++M``````@`````````.$$&```````H108```````@`````````J$`&```````P
++M108```````@`````````J#P&```````X108```````@`````````.#T&````
++M``!(108```````@`````````:&(&``````!0108```````@`````````$,L#
++M``````!8108```````@`````````,,L#``````!@108```````@`````````
++M,!`$``````!H108```````@`````````P/0#``````!P108```````@`````
++M`````/4#``````!X108```````@`````````@/H#``````"`108```````@`
++M````````P/H#``````"0108```````@`````````@&(&``````"8108`````
++M``@`````````<,<#``````"@108```````@`````````L,H#``````"H108`
++M``````@`````````,/X#``````"P108```````@`````````,`\$``````"X
++M108```````@`````````L`\$``````#`108```````@`````````X.@#````
++M``#(108```````@`````````D`D$``````#0108```````@`````````L.T#
++M``````#8108```````@`````````$.0#``````#@108```````@`````````
++MP.X#``````#H108```````@`````````8#0$``````#P108```````@`````
++M````$/`#``````#X108```````@`````````X/`#````````1@8```````@`
++M````````\,L#```````(1@8```````@``````````.@#```````01@8`````
++M``@``````````/D#```````81@8```````@`````````$/L#```````@1@8`
++M``````@`````````T/L#```````P1@8```````@`````````@&(&```````X
++M1@8```````@``````````/`#``````!`1@8```````@`````````L$,$````
++M``!(1@8```````@`````````T/`#``````!01@8```````@`````````L/0#
++M``````!81@8```````@`````````$,P#``````!H1@8```````@`````````
++M@&(&``````!P1@8```````@`````````D,D#``````!X1@8```````@`````
++M````\,H#``````"`1@8```````@`````````(``$``````"(1@8```````@`
++M````````<.@#``````"81@8```````@`````````@&(&``````"@1@8`````
++M``@`````````<,@#``````"H1@8```````@`````````T,H#``````"P1@8`
++M``````@`````````(/\#``````"X1@8```````@`````````8/D#``````#(
++M1@8```````@`````````@&(&``````#01@8```````@`````````$,L#````
++M``#81@8```````@`````````,,L#``````#@1@8```````@`````````,!`$
++M``````#H1@8```````@`````````P/0#``````#P1@8```````@`````````
++M`/4#``````#X1@8```````@`````````H/P#````````1P8```````@`````
++M````8/T#```````01P8```````@`````````^&(&```````81P8```````@`
++M````````8"\#```````@1P8```````@`````````4#,#```````H1P8`````
++M``@`````````<(`#```````P1P8```````@`````````H$H#```````X1P8`
++M``````@`````````D#,#``````!`1P8```````@`````````T)T#``````!(
++M1P8```````@`````````P#8#``````!01P8```````@`````````H(<#````
++M``!81P8```````@`````````0,(#``````!@1P8```````@`````````(#<#
++M``````!H1P8```````@`````````<#0#``````!X1P8```````@`````````
++M^&(&``````"`1P8```````@`````````4#(#``````"(1P8```````@`````
++M````@#,#``````"01P8```````@`````````P'0#``````"81P8```````@`
++M````````$,8#``````"H1P8```````@`````````^&(&``````"P1P8`````
++M``@`````````4#$#``````"X1P8```````@`````````<#,#``````#`1P8`
++M``````@``````````'`#``````#(1P8```````@`````````$#@#``````#8
++M1P8```````@`````````^&(&``````#@1P8```````@`````````4#`#````
++M``#H1P8```````@`````````8#,#``````#P1P8```````@`````````,&L#
++M``````#X1P8```````@`````````D#0#```````(2`8```````@`````````
++M8&,&```````02`8```````@`````````D)@"```````82`8```````@`````
++M````()D"```````@2`8```````@`````````D!T#```````H2`8```````@`
++M````````$+<"```````X2`8```````@`````````P&,&``````!`2`8`````
++M``@`````````\)8"``````!(2`8```````@`````````<)@"``````!02`8`
++M``````@`````````\+P"``````!82`8```````@``````````-$"``````!@
++M2`8```````@`````````P+`"``````!H2`8```````@`````````H)D"````
++M``!P2`8```````@`````````4,$"``````!X2`8```````@``````````!X#
++M``````"`2`8```````@`````````\*$"``````"(2`8```````@`````````
++ML)D"``````"02`8```````@`````````P)D"``````"82`8```````@`````
++M````L)D"``````"@2`8```````@`````````P)D"``````"H2`8```````@`
++M````````()H"``````"P2`8```````@`````````8)H"``````"X2`8`````
++M``@`````````L)D"``````#`2`8```````@`````````X)D"``````#02`8`
++M``````@`````````P&,&``````#82`8```````@`````````L)<"``````#@
++M2`8```````@`````````@)@"``````#H2`8```````@`````````@+T"````
++M``#P2`8```````@`````````0)H"``````#X2`8```````@`````````T)H"
++M````````208```````@`````````T)D"```````(208```````@`````````
++M`)H"```````8208```````@`````````&&0&```````@208```````@`````
++M````8)8"```````H208```````@`````````X)8"```````P208```````@`
++M````````\)P"```````X208```````@`````````T*<"``````!(208`````
++M``@`````````4&0&``````!0208```````@`````````\)4"``````!8208`
++M``````@`````````4)8"``````!@208```````@`````````8*<"``````!P
++M208```````@`````````B&0&``````!X208```````@`````````0)4"````
++M``"`208```````@`````````P)4"``````"(208```````@`````````D)P"
++M``````"0208```````@`````````T)4"``````"@208```````@`````````
++MT&0&``````"H208```````@`````````L)("``````"P208```````@`````
++M````$),"``````"X208```````@`````````,),"``````#`208```````@`
++M````````\/`"``````#(208```````@`````````@/4"``````#0208`````
++M``@`````````8),"``````#8208```````@`````````0*X"``````#@208`
++M``````@`````````,*\"``````#H208```````@`````````0,<"``````#P
++M208```````@`````````P/D"``````#X208```````@`````````H),"````
++M````2@8```````@``````````*P"```````(2@8```````@`````````X*T"
++M```````82@8```````@`````````T&0&```````@2@8```````@`````````
++MT*T"```````H2@8```````@`````````$*X"```````P2@8```````@`````
++M````%P%``````"(3P8```````@`````````@5P%``````"0
++M3P8```````@`````````AUP%``````"83P8```````@`````````D5P%````
++M``"@3P8```````@`````````FUP%``````"H3P8```````@`````````J%P%
++M``````"P3P8```````@`````````M%P%``````"X3P8```````@`````````
++MQ%P%``````#`3P8```````@`````````2ET%``````#(3P8```````@`````
++M````R%P%``````#03P8```````@`````````\E@%``````#83P8```````@`
++M````````S5P%``````#@3P8```````@`````````U5P%``````#H3P8`````
++M``@`````````X5P%``````#P3P8```````@`````````YEP%``````#X3P8`
++M``````@`````````[%P%````````4`8```````@`````````WUX%```````(
++M4`8```````@`````````\EP%```````04`8```````@`````````^UP%````
++M```84`8```````@`````````!UT%```````@4`8```````@`````````#UT%
++M```````H4`8```````@`````````%5T%```````P4`8```````@`````````
++M'5T%```````X4`8```````@`````````)%T%``````!`4`8```````@`````
++M````2UH%``````!(4`8```````@`````````,%T%``````!04`8```````@`
++M````````-ET%``````!84`8```````@`````````/5T%``````!@4`8`````
++M``@`````````15T%``````!H4`8```````@`````````3UT%``````!P4`8`
++M``````@`````````5ET%``````!X4`8```````@`````````85T%``````"`
++M4`8```````@`````````MEX%``````"(4`8```````@`````````95T%````
++M``"04`8```````@`````````UT%
++M``````"@4`8```````@`````````BUT%``````"H4`8```````@`````````
++M15\%``````"P4`8```````@`````````FUT%``````"X4`8```````@`````
++M````IET%``````#`4`8```````@`````````NET%``````#(4`8```````@`
++M````````QET%``````#04`8```````@`````````RUT%``````#84`8`````
++M``@`````````.5P%``````#@4`8```````@`````````V5T%``````#H4`8`
++M``````@`````````Y%T%``````#P4`8```````@`````````[UT%``````#X
++M4`8```````@`````````_%T%````````408```````@``````````EX%````
++M```(408```````@`````````#5X%```````0408```````@`````````%EX%
++M```````8408```````@`````````(EX%```````@408```````@`````````
++M,UX%```````H408```````@`````````-UX%```````P408```````@`````
++M````/UX%```````X408```````@`````````1%X%``````!`408```````@`
++M````````2EX%``````!(408```````@`````````4EX%``````!0408`````
++M``@`````````'5L%``````!8408```````@`````````'5L%``````!@408`
++M``````@`````````75X%``````!H408```````@`````````9EX%``````!P
++M408```````@`````````>%X%``````!X408```````@`````````;EX%````
++M``"`408```````@`````````@%X%``````"(408```````@`````````EUX%
++M``````"0408```````@`````````I%X%``````"8408```````@`````````
++ML%X%``````"@408```````@`````````Q%X%``````"H408```````@`````
++M````T5X%``````"P408```````@`````````V5X%``````"X408```````@`
++M````````YUX%``````#`408```````@`````````\5X%``````#(408`````
++M``@`````````8&4%``````#0408```````@`````````!5\%``````#8408`
++M``````@`````````4EH%``````#@408```````@`````````&U\%``````#H
++M408```````@`````````U%T%``````#P408```````@`````````+E\%````
++M``#X408```````@`````````.%\%````````4@8```````@`````````/E\%
++M```````(4@8```````@`````````2%\%```````04@8```````@`````````
++M4E\%```````84@8```````@`````````6U\%```````@4@8```````@`````
++M````95\%```````H4@8```````@`````````<5\%```````P4@8```````@`
++M````````>%\%```````X4@8```````@`````````B5\%``````!`4@8`````
++M``@`````````D5\%``````!(4@8```````@`````````FE\%``````!04@8`
++M``````@`````````IU\%``````!84@8```````@`````````M%\%``````!@
++M4@8```````@`````````OE\%``````!H4@8```````@`````````F$4&````
++M``!P4@8```````@`````````<$8&``````!X4@8```````@`````````0$@&
++M``````"`4@8```````@`````````X&D&``````"(4@8```````@`````````
++M>&D&``````"H4@8```````@`````````B'`&``````"P4@8```````@`````
++M`````6`%``````"X4@8```````@``````````6`%``````#04@8```````@`
++M`````````&4#```````04P8```````@`````````^ED%```````84P8`````
++M``@`````````_5\%```````P4P8```````@`````````(*,"``````!@4P8`
++M``````@``````````&8"``````!X4P8```````@`````````!&`%``````"@
++M4P8```````@`````````4%`"``````"X4P8```````@`````````"F`%````
++M``#@4P8```````@`````````0$<"``````#X4P8```````@`````````#V`%
++M```````@5`8```````@`````````D$8"```````X5`8```````@`````````
++M%&`%``````!@5`8```````@`````````D%@!``````!X5`8```````@`````
++M````&F`%``````"@5`8```````@`````````(%@!``````"H5`8```````@`
++M````````(%@!``````"X5`8```````@`````````(&`%``````#@5`8`````
++M``@`````````T%#\&```````85P8```````@`````````V#\&```````@5P8`
++M``````@`````````0$`&```````H5P8```````@`````````F$4&```````P
++M5P8```````@`````````<$8&```````X5P8```````@`````````0$@&````
++M``!`5P8```````@`````````J$H&``````!(5P8```````@`````````2$L&
++M``````!05P8```````@`````````X$L&``````!@5P8```````@`````````
++M8%`%``````!H5P8```````@`````````@%L&``````!X5P8```````@`````
++M````@%`%``````"`5P8```````@`````````@%L&``````"05P8```````@`
++M````````H%`%``````"@5P8```````@`````````N%@&``````"P5P8`````
++M``@`````````2%D&``````#`5P8```````@`````````B%H&``````#05P8`
++M``````@`````````B%@&``````#@5P8```````@`````````6%H&``````#P
++M5P8```````@`````````<%<&````````6`8```````@`````````6%<&````
++M```06`8```````@`````````D%L&```````H6`8```````@`````````P%`%
++M```````X6`8```````@`````````X%`%``````!(6`8```````@`````````
++MX%D&``````!86`8```````@`````````2%D&``````!H6`8```````@`````
++M````D%L&``````!X6`8```````@`````````(%@&``````"06`8```````@`
++M`````````%$%``````"86`8```````@`````````@%L&``````"H6`8`````
++M``@`````````,%$%``````"P6`8```````@`````````@%L&``````#`6`8`
++M``````@`````````4%$%``````#(6`8```````@`````````@%L&``````#8
++M6`8```````@`````````<%$%``````#H6`8```````@`````````N%@&````
++M``#X6`8```````@`````````H%@&```````(608```````@`````````H%L&
++M```````8608```````@`````````B%H&```````H608```````@`````````
++MB%@&```````X608```````@`````````D%L&``````!0608```````@`````
++M````H%$%``````!8608```````@`````````@%L&``````!H608```````@`
++M````````T%$%``````!X608```````@`````````X%D&``````"(608`````
++M``@`````````2%D&``````"8608```````@`````````D%L&``````"P608`
++M``````@`````````\%$%``````#`608```````@`````````X%D&``````#0
++M608```````@`````````D%L&``````#H608```````@`````````$%(%````
++M``#P608```````@`````````@%L&````````6@8```````@`````````,%(%
++M```````06@8```````@`````````X%D&```````@6@8```````@`````````
++MD%L&```````X6@8```````@`````````4%(%``````!(6@8```````@`````
++M````@%(%``````!06@8```````@`````````,%H&``````!@6@8```````@`
++M````````L%(%``````!H6@8```````@`````````@%L&``````!X6@8`````
++M``@`````````X%(%``````"`6@8```````@`````````@%L&``````"06@8`
++M``````@`````````$%,%``````"86@8```````@`````````@%L&``````"H
++M6@8```````@`````````,%,%``````"P6@8```````@`````````@%L&````
++M``#`6@8```````@`````````4%,%``````#06@8```````@`````````H%H&
++M``````#@6@8```````@`````````B%H&``````#P6@8```````@`````````
++M<%H&````````6P8```````@`````````6%H&```````06P8```````@`````
++M````D%L&```````@6P8```````@`````````0%H&```````X6P8```````@`
++M````````<%,%``````!`6P8```````@`````````@%L&``````!06P8`````
++M``@`````````D%,%``````!@6P8```````@`````````,%L&``````!P6P8`
++M``````@`````````D%L&``````"(6P8```````@`````````J%,%``````"8
++M6P8```````@`````````P%,%``````"H6P8```````@`````````T%,%````
++M``"P6P8```````@`````````@%L&``````#`6P8```````@`````````\%,%
++M``````#06P8```````@`````````H%L&``````#@6P8```````@`````````
++MD%L&``````#X6P8```````@`````````J&@%```````(7`8```````@`````
++M````8%T&```````87`8```````@`````````D%L&```````P7`8```````@`
++M````````P&@%```````X7`8```````@`````````@%L&``````!(7`8`````
++M``@`````````X&@%``````!87`8```````@`````````*%P&``````!H7`8`
++M``````@`````````D%L&``````"`7`8```````@``````````&D%``````"0
++M7`8```````@`````````H%L&``````"@7`8```````@`````````D%L&````
++M``"X7`8```````@`````````(&D%``````#`7`8```````@`````````,%L&
++M``````#07`8```````@`````````,&D%``````#@7`8```````@`````````
++ML%P&``````#P7`8```````@`````````D%L&```````(708```````@`````
++M````4&D%```````0708```````@`````````@%L&```````@708```````@`
++M````````<&D%```````H708```````@`````````@%L&```````X708`````
++M``@`````````D&D%``````!`708```````@`````````@%L&``````!0708`
++M``````@`````````L&D%``````!8708```````@`````````@%L&``````!H
++M708```````@`````````R&D%``````!P708```````@`````````H%L&````
++M``"`708```````@`````````X&D%``````"0708```````@`````````8%T&
++M``````"@708```````@`````````2%T&``````"P708```````@`````````
++M,%T&``````#`708```````@`````````&%T&``````#0708```````@`````
++M`````%T&``````#@708```````@`````````D%L&``````#X708```````@`
++M````````\&D%```````(7@8```````@`````````$&H%```````07@8`````
++M``@`````````@%L&```````@7@8```````@`````````,&H%```````H7@8`
++M``````@`````````@%L&```````X7@8```````@`````````4&H%``````!`
++M7@8```````@`````````@%L&``````!07@8```````@`````````<&H%````
++M``!87@8```````@`````````@%L&``````!H7@8```````@`````````D&H%
++M``````!X7@8```````@`````````N%@&``````"(7@8```````@`````````
++M2%X&``````"87@8```````@`````````,%X&``````"H7@8```````@`````
++M````H%@&``````"X7@8```````@`````````H%L&``````#(7@8```````@`
++M````````&%X&``````#87@8```````@`````````,%L&``````#H7@8`````
++M``@``````````%X&``````#X7@8```````@`````````6%H&```````(7P8`
++M``````@`````````X%\&```````87P8```````@`````````<%\&```````H
++M7P8```````@`````````2%D&```````X7P8```````@`````````D%L&````
++M``!(7P8```````@`````````\%T&``````!@7P8```````@`````````H&H%
++M``````!H7P8```````@`````````B%\&``````!X7P8```````@`````````
++MP&H%``````"`7P8```````@`````````@%L&``````"07P8```````@`````
++M````X&H%``````"@7P8```````@`````````X%D&``````"P7P8```````@`
++M````````<%\&``````#`7P8```````@`````````D%L&``````#87P8`````
++M``@``````````&L%``````#H7P8```````@`````````(&L%``````#P7P8`
++M``````@`````````@%L&````````8`8```````@`````````0&L%```````0
++M8`8```````@`````````X%D&```````@8`8```````@`````````X%\&````
++M```P8`8```````@`````````D%L&``````!`8`8```````@`````````T%\&
++M``````!88`8```````@`````````8&L%``````!H8`8```````@`````````
++M^%\&``````!X8`8```````@`````````2%D&``````"08`8```````@`````
++M````@&L%``````"@8`8```````@`````````N%@&``````"P8`8```````@`
++M````````2%D&``````#`8`8```````@`````````B%H&``````#08`8`````
++M``@`````````B%@&``````#@8`8```````@`````````D%L&``````#X8`8`
++M``````@`````````H&L%```````(808```````@`````````N%@&```````8
++M808```````@`````````2%D&```````H808```````@`````````B%H&````
++M```X808```````@`````````B%@&``````!(808```````@`````````6%H&
++M``````!8808```````@`````````D%L&``````!P808```````@`````````
++M^%\&``````"0808```````@`````````\%T"``````"8808```````@`````
++M`````/P!``````"@808```````@``````````%T"``````#`808```````@`
++M````````^%\&``````#@808```````@`````````X%T"``````#P808`````
++M``@`````````\&T%````````8@8```````@`````````(&X%```````(8@8`
++M``````@`````````@%L&```````88@8```````@`````````4&X%```````H
++M8@8```````@`````````@&X%```````P8@8```````@`````````<&4&````
++M``!`8@8```````@`````````H&X%``````!(8@8```````@`````````@%L&
++M``````!88@8```````@`````````T&X%``````!@8@8```````@`````````
++M<&4&``````!P8@8```````@`````````\&X%``````!X8@8```````@`````
++M````Z&$&``````"(8@8```````@`````````$&\%``````"88@8```````@`
++M````````(&(&``````"H8@8```````@`````````$&(&``````"X8@8`````
++M``@`````````^&$&``````#(8@8```````@`````````B&4&``````#88@8`
++M``````@`````````:&(&``````#H8@8```````@`````````D%L&````````
++M8P8```````@`````````,&\%```````08P8```````@`````````4&(&````
++M```@8P8```````@`````````.&(&```````P8P8```````@`````````B&4&
++M``````!`8P8```````@`````````*%P&``````!08P8```````@`````````
++MD%L&``````!H8P8```````@`````````8&\%``````!X8P8```````@`````
++M````,%L&``````"(8P8```````@`````````D%L&``````"@8P8```````@`
++M````````H&\%``````"P8P8```````@`````````P&\%``````"X8P8`````
++M``@`````````@%L&``````#(8P8```````@`````````X&\%``````#88P8`
++M``````@`````````>&8&``````#H8P8```````@`````````J&,&``````#X
++M8P8```````@`````````D%L&```````(9`8```````@`````````F&,&````
++M```@9`8```````@``````````'`%```````P9`8```````@`````````H%L&
++M``````!`9`8```````@`````````D%L&``````!89`8```````@`````````
++M0'`%``````!H9`8```````@`````````@%L&``````!X9`8```````@`````
++M````D%L&``````"09`8```````@`````````<'`%``````"@9`8```````@`
++M````````*%P&``````"P9`8```````@`````````D%L&``````#(9`8`````
++M``@`````````D'`%``````#89`8```````@`````````L'`%``````#H9`8`
++M``````@`````````@%L&``````#X9`8```````@`````````P&0&```````(
++M908```````@`````````D%L&```````@908```````@`````````T'`%````
++M```P908```````@`````````Z'`%``````!`908```````@``````````'$%
++M``````!0908```````@`````````&&4&``````!@908```````@`````````
++M*&4&``````!X908```````@`````````('$%``````"`908```````@`````
++M````@%L&``````"0908```````@`````````,'$%``````"8908```````@`
++M````````@%L&``````"H908```````@`````````8'$%``````"P908`````
++M``@`````````@%L&``````#`908```````@`````````@'$%``````#(908`
++M``````@`````````@%L&``````#8908```````@`````````H'$%``````#@
++M908```````@`````````@%L&``````#P908```````@`````````P'$%````
++M````9@8```````@`````````T&4&```````09@8```````@`````````N&4&
++M```````@9@8```````@`````````H&4&```````P9@8```````@`````````
++MB&4&``````!`9@8```````@`````````<&4&``````!09@8```````@`````
++M````D%L&``````!H9@8```````@`````````X'$%``````!P9@8```````@`
++M````````@%L&``````"`9@8```````@`````````^'$%``````"(9@8`````
++M``@`````````@%L&``````"89@8```````@`````````$'(%``````"H9@8`
++M``````@`````````>&8&``````"X9@8```````@`````````8&8&``````#(
++M9@8```````@`````````D%L&``````#@9@8```````@`````````@&T%````
++M``#P9@8```````@`````````P&T%``````#X9@8```````@`````````V&8&
++M```````(9P8```````@`````````P&0&```````@9P8```````@`````````
++MP*,"``````!H9P8```````@`````````*&4&``````"09P8```````@`````
++M````4'0%``````"@9P8```````@`````````8%T&``````"P9P8```````@`
++M````````2%T&``````#`9P8```````@`````````D%L&``````#89P8`````
++M``@`````````<'0%``````#H9P8```````@`````````,%L&``````#X9P8`
++M``````@`````````D%L&```````0:`8```````@`````````B'0%```````@
++M:`8```````@`````````@%L&```````P:`8```````@`````````D%L&````
++M``!(:`8```````@`````````H'0%``````!8:`8```````@`````````,%L&
++M``````!H:`8```````@`````````D%L&``````"`:`8```````@`````````
++MJ&,&``````#(:`8```````@`````````>&8&``````!`:08```````@`````
++M````B&4&``````!P:08```````@`````````^&$&``````"@:08```````@`
++M````````$&(&``````#8:08```````@`````````(&(&```````P:@8`````
++M``@`````````>'@%``````!`:@8```````@`````````B'@%``````!0:@8`
++M``````@`````````H'@%``````!@:@8```````@`````````P'@%``````!P
++M:@8```````@`````````X'@%``````!X:@8```````@`````````.&H&````
++M``"(:@8```````@``````````'H%``````"8:@8```````@`````````H%L&
++M``````"H:@8```````@`````````D%L&```````(<`8```````@`````````
++M"'`&```````H<`8```````@``````````$(!```````P<`8```````@`````
++M````V&8&```````X<`8```````@`````````Z&8&``````!`<`8```````@`
++M````````6&H&``````!(<`8```````@`````````:&H&``````!0<`8`````
++M``@`````````*&H&``````!8<`8```````@`````````.&H&``````!@<`8`
++M``````@`````````2&H&``````!85P8```````$```!`````$`````````!P
++M5P8```````$```!`````$`````````"(6`8```````$```!`````$```````
++M``"@6`8```````$```!`````$`````````"X6`8```````$```!`````$```
++M``````!(608```````$```!`````$`````````#@608```````$```!`````
++M$`````````!`6@8```````$```!`````$`````````!86@8```````$```!`
++M````$`````````!P6@8```````$```!`````$`````````"(6@8```````$`
++M``!`````$`````````"@6@8```````$```!`````$``````````P6P8`````
++M``$```!`````$`````````"@6P8```````$```!`````$``````````H7`8`
++M``````$```!`````$`````````"P7`8```````$```!`````$```````````
++M708```````$```!`````$``````````8708```````$```!`````$```````
++M```P708```````$```!`````$`````````!(708```````$```!`````$```
++M``````!@708```````$```!`````$```````````7@8```````$```!`````
++M$``````````87@8```````$```!`````$``````````P7@8```````$```!`
++M````$`````````!(7@8```````$```!`````$`````````!87P8```````$`
++M``!`````$`````````!P7P8```````$```!`````$`````````#@7P8`````
++M``$```!`````$`````````#X808```````$```!`````$``````````@8@8`
++M``````$```!`````$``````````X8@8```````$```!`````$`````````!0
++M8@8```````$```!`````$`````````!H8@8```````$```!`````$```````
++M``"H8P8```````$```!`````$`````````!P908```````$```!`````$```
++M``````"(908```````$```!`````$`````````"@908```````$```!`````
++M$`````````"X908```````$```!`````$`````````#0908```````$```!`
++M````$`````````!@9@8```````$```!`````$`````````!X9@8```````$`
++M``!`````$`````````#H9@8```````$```!`````$`````````!H:@8`````
++M``$```!`````$`````````"(5P8```````$```!:````$``````````P6`8`
++M``````$```!:````$`````````#06`8```````$```!:````$`````````!@
++M608```````$```!:````$`````````"H608```````$```!:````$```````
++M``#X608```````$```!:````$`````````"X6@8```````$```!:````$```
++M``````!(6P8```````$```!:````$`````````"X6P8```````$```!:````
++M$`````````#P6P8```````$```!:````$`````````!`7`8```````$```!:
++M````$`````````!X7`8```````$```!:````$`````````#(7`8```````$`
++M``!:````$`````````!X708```````$```!:````$`````````!@7@8`````
++M``$```!:````$`````````"(7P8```````$```!:````$`````````#X7P8`
++M``````$```!:````$`````````!08`8```````$```!:````$`````````"(
++M8`8```````$```!:````$`````````#P8`8```````$```!:````$```````
++M``"`8@8```````$```!:````$`````````#X8@8```````$```!:````$```
++M``````!@8P8```````$```!:````$`````````#`8P8```````$```!:````
++M$``````````89`8```````$```!:````$`````````!09`8```````$```!:
++M````$`````````"(9`8```````$```!:````$`````````#09`8```````$`
++M``!:````$``````````X908```````$```!:````$`````````#H908`````
++M``$```!:````$`````````"09@8```````$```!:````$`````````"(9P8`
++M``````$```!:````$`````````#09P8```````$```!:````$``````````(
++M:`8```````$```!:````$`````````!`:`8```````$```!:````$```````
++M``"`:@8```````$```!:````$``````````@6`8```````$````<````$```
++M```````P6@8```````$````<````$`````````"`6P8```````$````<````
++M$`````````"06P8```````$````<````$`````````#P708```````$````<
++M````$`````````#07P8```````$````<````$`````````#H808```````$`
++M```<````$``````````08@8```````$````<````$`````````"88P8`````
++M``$````<````$`````````#`9`8```````$````<````$``````````8908`
++M``````$````<````$``````````H908```````$````<````$`````````#8
++M9@8```````$````<````$``````````H:@8```````$````<````$```````
++M```X:@8```````$````<````$`````````!8:@8```````$````<````$```
++M``````!X808```````$```!D``````````````"`808```````$```!D````
++M``````````"(808```````$```!D``````````````#(808```````$```!D
++M``````````````#0808```````$```!D``````````````#8808```````$`
++M``!D```````````````H9P8```````$```!D```````````````P9P8`````
++M``$```!D```````````````X9P8```````$```!D``````````````!`9P8`
++M``````$```!D``````````````!(9P8```````$```!D``````````````!0
++M9P8```````$```!D``````````````!89P8```````$```!D````````````
++M``"`9P8```````$```!D``````````````"(:`8```````$```!D````````
++M``````"0:`8```````$```!D``````````````"8:`8```````$```!D````
++M``````````"@:`8```````$```!D``````````````"H:`8```````$```!D
++M``````````````"P:`8```````$```!D``````````````"X:`8```````$`
++M``!D``````````````#0:`8```````$```!D``````````````#8:`8`````
++M``$```!D``````````````#@:`8```````$```!D``````````````#H:`8`
++M``````$```!D``````````````#P:`8```````$```!D``````````````#X
++M:`8```````$```!D````````````````:08```````$```!D````````````
++M```(:08```````$```!D```````````````0:08```````$```!D````````
++M```````8:08```````$```!D```````````````@:08```````$```!D````
++M```````````H:08```````$```!D```````````````P:08```````$```!D
++M``````````````!(:08```````$```!D``````````````!0:08```````$`
++M``!D``````````````!8:08```````$```!D``````````````!@:08`````
++M``$```!D``````````````!X:08```````$```!D``````````````"`:08`
++M``````$```!D``````````````"(:08```````$```!D``````````````"0
++M:08```````$```!D``````````````"H:08```````$```!D````````````
++M``"P:08```````$```!D``````````````"X:08```````$```!D````````
++M``````#`:08```````$```!D``````````````#(:08```````$```!D````
++M``````````#@:08```````$```!D``````````````#H:08```````$```!D
++M``````````````#P:08```````$```!D``````````````#X:08```````$`
++M``!D````````````````:@8```````$```!D```````````````(:@8`````
++M``$```!D```````````````0:@8```````$```!D```````````````8:@8`
++M``````$```!D```````````````@:@8```````$```!D``````````````!(
++M:@8```````$```!4````$`````````"@;P8```````8````"````````````
++M``"`<`8```````$````"``````````````"H;P8```````8````%````````
++M``````"P;P8```````8```!K``````````````"X;P8```````8````6````
++M``````````!H<`8```````$````6``````````````#`;P8```````8````>
++M``````````````#(;P8```````8````A``````````````#0;P8```````8`
++M``!$``````````````#8;P8```````8```!;``````````````#@;P8`````
++M``8```!C``````````````#H;P8```````8```!E```````````````8<`8`
++M``````$````(```````````````@<`8```````$```!2``````````````!P
++M<`8```````$```!.``````````````!X<`8```````$````^````````````
++M``#@;`8```````<````!``````````````#H;`8```````<````#````````
++M``````#P;`8```````<````$``````````````#X;`8```````<````&````
++M````````````;08```````<````'```````````````(;08```````<````)
++M```````````````0;08```````<````*```````````````8;08```````<`
++M```+```````````````@;08```````<````,```````````````H;08`````
++M``<````-```````````````P;08```````<````.```````````````X;08`
++M``````<````/``````````````!`;08```````<````0``````````````!(
++M;08```````<````1``````````````!0;08```````<````2````````````
++M``!8;08```````<````3``````````````!@;08```````<````4````````
++M``````!H;08```````<````5``````````````!P;08```````<````7````
++M``````````!X;08```````<````8``````````````"`;08```````<````9
++M``````````````"(;08```````<````:``````````````"0;08```````<`
++M```;``````````````"8;08```````<````=``````````````"@;08`````
++M``<````?``````````````"H;08```````<````@``````````````"P;08`
++M``````<````B``````````````"X;08```````<````C``````````````#`
++M;08```````<````D``````````````#(;08```````<````E````````````
++M``#0;08```````<````F``````````````#8;08```````<````G````````
++M``````#@;08```````<````H``````````````#H;08```````<````I````
++M``````````#P;08```````<````J``````````````#X;08```````<````K
++M````````````````;@8```````<````L```````````````(;@8```````<`
++M```M```````````````0;@8```````<````N```````````````8;@8`````
++M``<````O```````````````@;@8```````<````P```````````````H;@8`
++M``````<````Q```````````````P;@8```````<````R```````````````X
++M;@8```````<````S``````````````!`;@8```````<````T````````````
++M``!(;@8```````<````U``````````````!0;@8```````<````V````````
++M``````!8;@8```````<````W``````````````!@;@8```````<````X````
++M``````````!H;@8```````<````Y``````````````!P;@8```````<````Z
++M``````````````!X;@8```````<````[``````````````"`;@8```````<`
++M```\``````````````"(;@8```````<````]``````````````"0;@8`````
++M``<````_``````````````"8;@8```````<```!!``````````````"@;@8`
++M``````<```!"``````````````"H;@8```````<```!#``````````````"P
++M;@8```````<```!%``````````````"X;@8```````<```!&````````````
++M``#`;@8```````<```!'``````````````#(;@8```````<```!(````````
++M``````#0;@8```````<```!)``````````````#8;@8```````<```!*````
++M``````````#@;@8```````<```!+``````````````#H;@8```````<```!,
++M``````````````#P;@8```````<```!-``````````````#X;@8```````<`
++M``!/````````````````;P8```````<```!0```````````````(;P8`````
++M``<```!1```````````````0;P8```````<```!3```````````````8;P8`
++M``````<```!5```````````````@;P8```````<```!6```````````````H
++M;P8```````<```!7```````````````P;P8```````<```!8````````````
++M```X;P8```````<```!9``````````````!`;P8```````<```!<````````
++M``````!(;P8```````<```!=``````````````!0;P8```````<```!>````
++M``````````!8;P8```````<```!?``````````````!@;P8```````<```!@
++M``````````````!H;P8```````<```!A``````````````!P;P8```````<`
++M``!B``````````````!X;P8```````<```!F``````````````"`;P8`````
++M``<```!G``````````````"(;P8```````<```!H``````````````"0;P8`
++M``````<```!I``````````````"8;P8```````<```!J````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````````````````````````````````````````````````````````
++M`````````````/,/'OI(@^P(2(L%T<\%`$B%P'0"_]!(@\0(PP``````_S6J
++MS`4`_R6LS`4`#Q]``/\EJLP%`&@`````Z>#_____):+,!0!H`0```.G0____
++M_R6:S`4`:`(```#IP/____\EDLP%`&@#````Z;#_____)8K,!0!H!````.F@
++M_____R6"S`4`:`4```#ID/____\E>LP%`&@&````Z8#_____)7+,!0!H!P``
++M`.EP_____R5JS`4`:`@```#I8/____\E8LP%`&@)````Z5#_____)5K,!0!H
++M"@```.E`_____R52S`4`:`L```#I,/____\E2LP%`&@,````Z2#_____)4+,
++M!0!H#0```.D0_____R4ZS`4`:`X```#I`/____\E,LP%`&@/````Z?#^____
++M)2K,!0!H$````.G@_O___R4BS`4`:!$```#IT/[___\E&LP%`&@2````Z<#^
++M____)1+,!0!H$P```.FP_O___R4*S`4`:!0```#IH/[___\E`LP%`&@5````
++MZ9#^____)?K+!0!H%@```.F`_O___R7RRP4`:!<```#I++!0!H&0```.E0_O___R7:RP4`:!H```#I0/[___\ETLL%
++M`&@;````Z3#^____)````Z0#^____);++!0!H'P```.GP_?___R6JRP4`:"````#IX/W_
++M__\EHLL%`&@A````Z=#]____)9K+!0!H(@```.G`_?___R62RP4`:",```#I
++ML/W___\EBLL%`&@D````Z:#]____)8++!0!H)0```.F0_?___R5ZRP4`:"8`
++M``#I@/W___\E#\____)2++!0!H,0```.G0
++M_/___R4:RP4`:#(```#IP/S___\E$LL%`&@S````Z;#\____)0K+!0!H-```
++M`.F@_/___R4"RP4`:#4```#ID/S___\E^LH%`&@V````Z8#\____)?+*!0!H
++M-P```.EP_/___R7JR@4`:#@```#I8/S___\EXLH%`&@Y````Z5#\____)=K*
++M!0!H.@```.E`_/___R72R@4`:#L```#I,/S___\ERLH%`&@\````Z2#\____
++M)<+*!0!H/0```.D0_/___R6ZR@4`:#X```#I`/S___\ELLH%`&@_````Z?#[
++M____):K*!0!H0````.G@^____R6BR@4`:$$```#IT/O___\EFLH%`&A"````
++MZ<#[____)9+*!0!H0P```.FP^____R6*R@4`:$0```#IH/O___\E@LH%`&A%
++M````Z9#[____)7K*!0!H1@```.F`^____R5RR@4`:$<```#I
++M^E6_!````$B)Y>@^^___2(LUQ\D%`#'2QP#E!P``2(G'Z-?^___S#Q[Z2(7_
++M>0G&!BU(]]](_\:X_____T@YQW\%Z=8%`0#I`=X#`)!5OP0```!(B>7H\OK_
++M_TB+-7O)!0`QTL<`K"DS`4B)Q^B+_O__D%6_!````$B)Y>C,^O__2(LU5C4_/__3(GGOA@```#HI_O__TR)[^@?_O__
++MD+\$````Z#3Z__](BS6]R`4`,=+'`*PI,P%(BAD2"L$)2@```!U"$R)Y^C+_?__Z&;[__](
++MBT7(9$@K!"4H````=2;H@O[__[X0````3(GOZ"7[__]-A?9U1DB+1@L^___\P\>^DB)P^O>2(M%R&1(*P0E*````'7CZ#_^__^^$```
++M`$R)_^CB^O__Z[M,BW6PZ[5,B??H\OO__^NP2(G?Z$C]___S#Q[Z5;\$````
++M2(GEZ%;Y__](BS7?QP4`,=+'`*PI,P%(BA(^___2(M]P$B%_W0%Z#K[__](BT789$@K!"4H````=0A(
++MB=_H@_S__^@>^O__2(M]L$B%_W0%Z!#[__](BWW`2(7_=`7H`OO__TB+1=AD
++M2"L$)2@```!U"$B)W^A+_/__Z.;Y__](BWW`2(7_=`7HV/K__TB+?=!(A?]T
++M!>C*^O__2(M%Z&1(*P0E*````'4(2(G?Z!/\___HKOG__TB+?B@
++M^O__2(M]T$B%_W0%Z)+Z__](BT7H9$@K!"4H````=0A(B=_HV_O__^AV^?__
++M3(MUH$R)[^AJ^O__387V=`A,B??H7?K__TR)Y^A5^O__2(M%R&1(*P0E*```
++M`'4(2(G?Z)[[___H.?G__TB+?9B^$````.@+^?__387M=`A,B>_H'OK__TB+
++M1^DB)P^O-2(M%R&1(*P0E
++M*````'0%Z.3X___H#_S__TB+1/HF_C__^N.D.CC^___3(G_OD@```#HAOC__TB)W^C^^O__3(GGZ`8``0!(
++MBT7(9$@K!"4H````=3I(B=_HW_K__[X0````3(GGZ%+X__](BWVP2(7_=`7H
++M9/G__TB+1UT
++M"$R)[^@R^?__28L\)$B%_W0%Z"3Y__](BT7(9$@K!"4H````=0A(B=_H;?K_
++M_^@(^/__\P\>^E6_!````$B)Y>AV]O__2(LU_\0%`#'2QP`!````2(G'Z`_Z
++M__^0\P\>^E5(B>532(G[48L_@___=!/HU?K__XG",<"%TG4(QP/_____L`%:
++M6UW#2(M]L$B%_W0%Z*/X__](BWV@2(7_=`7HE?C__TB+1TB)W^C>^?__2(M]L$R+;9!(A?]T!>AL^/__2(-]@`!T"4B+?8#H7/C__TV%
++M[70(3(GOZ$_X__](BT7(9$@K!"4H````=1)(B=_HF/G__TB+1:!(B46`Z\+H
++M*??__TB+?;!(A?]T!>@;^/__2(M]H$B%_W2[Z`WX___KM.@&]___2(M]L$B%
++M_W21Z/CW___KBDB+?;!(A?]TTNCH]___Z\M(BWVP2(7_=,+HV/?__^N[2(M]
++ML$R+;9!(A?\/A&G____HP/?__^E?____3(MMD.E6____\P\>^E6_"````$B)
++MY>@@]?__2(LUP<,%`#'22(G'2(T%H:L$`$B)!^BU^/__D/,/'OI(BS](A?]T
++M#%5(BP=(B>7_4!!=P\.0Z)7Y__],B>>^2````.@X]O__2(G?Z+#X___H6_3_
++M_^@V^/__N`X`!X#IUK`!`$B+1^DB)P^L(
++M3(GGZ(?V__](C3W`!P8`0;P.``>`Z"7U__](B=_H#?3__^CH]___Z82S`0#H
++M[O7__S'`28E$)#!(BT789$@K!"4H````=07HR_W__^C.]?__\P\>^KY(````
++M3(GG28G%Z)KU__^^H````$B)W^B-]?__2(M%V&1(*P0E*````'4(3(GOZ/;W
++M___HD?7__Y#S#Q[Z2(L_2(7_=`Q52(L'2(GE_U`07@1]O__
++M2(U[+.@J_?__3(GGZ&#W___S#Q[Z2(L_2(7_=`Q52(L'2(GE_U`07@@_O__Z,WT__^02(G?OE````#HG_3__TR)]^@7]___
++MD.C__?__D.B[\O__Z);V__^X#@`'@.DQ`P(`28M%`$R)[_]0$$F+!"1,B>?_
++M4!!(BWV@Z._^__](B=_HA_+__^AB]O__N0X`!X#IR`4"`$R)_^C0_O__2(M%
++MR&1(*P0E*````'4(2(G?Z*GV___H1/3___,/'OI52(GE4TB)^U%(BW]82(7_
++M=`7H*?7__TB+>TA(A?]T!>@;]?__2(M[.$B%_W0%Z`WU__](BWL@2(7_=`7H
++M__3__TB+>Q!(A?]T!>CQ]/__2(L[2(7_=`A:6UWIX?3__UA;7<.0\P\>^E5(
++MB>532(G[44B+?Q!(A?]T!>C!]/__2(L[2(7_=`A:6UWIL?3__UA;7<.0\P\>
++M^DB+/TB%_W0,54B+!TB)Y?]0$%W#P_,/'OI5OP$```!(B>7H`?+__S'22(TU
++MP+<%`$B)Q^B@]?__\P\>^E6_`0```$B)Y>C>\?__,=)(C36MMP4`2(G'Z'WU
++M__^0Z+3___^02(M%R&1(*P0E*````'49Z)____](BT7(9$@K!"4H````=0KH
++MKO___^@9\___Z!3S___H?/___Y#H.?;__^@T]O__Z"_V___H*O;__^@E]O__
++MZ"#V___H^_#__\>#7`$```5``(!(BUWXR>G']/__D.@!]O__Z#G____H-/__
++M_^CR]?__2(M%R&1(*P0E*`````^%/`$``.C:]?__\P\>^DB+O=C]__])B<1)
++MB=7HY`\"`$B-O<#^___HV`\"`$B#O2#^__\`=`Q(B[T@_O__Z'+S__](@[WX
++M_?__`'0,2(N]^/W__^A<\___2(.]`/[__P!T#$B+O0#^___H1O/__TB+O2C^
++M___H7O[__TB+O8#^__](A?]T!>@I\___2(V]=,B>A(@_@"#X26````2(/X`P^$.@,``$F)_$B-O0#____HN?S_
++M_TB-O4#^___H`?[__TB+A3C^__](B[TH_O__2(F%X/[__^@C#0(`3(GGZ)OO
++M__],B?_HL_\!`.AN\___0;X.``>`Z1\C`@#H;O'__TB+1@:\___ZA#\___Z`[P__](BX6P_O__2(F%(/[__^EG_?__2(N%
++MD/[__TB)A0#^___I5/W__TB+A:#^__](B87X_?__Z4']__](B[W8_?__Z!D-
++M`@#I,/W__TB+1^DF)QDF)U>F<_?__Z)SO
++M___HE^____,/'OI)B<9)B=5,C:50_O__Z8C]__](BT7(9$@K!"4H````=75(
++MC85@_O__3(VE4/[__TB)A0C^___HQ?O__TB+1C4^___
++MZ#_O__](BT7(9$@K!"4H````=2E(C85@_O__3(VE4/[__TB)A0C^___H@_O_
++M__,/'OI(B<=(B=#I*_W__^@"[___Z/WN___H^.[___,/'OI(BS__T'&AP("```!Z&SP___I("4"`.AR[O__2(M%R&1(*P0E*````'4%
++MZ.[Z___H6>[__TB+1^DF)Q$F)U>E(_/__
++MZ#'N___H+.[__^@G[O__Z"+N___H'>[__Y!(BT7(9$@K!"4H````=37H./'_
++M__,/'OI(C7V@2(G#Z/CX__](C7V8Z&OW__](B=_H]^O__^C2[___N`X`!X#I
++MQSD"`.C3[?__D.C]\/__D.CW\/__Z/+P__](BT7(9$@K!"4H````=07HWO#_
++M_^BI[?__2(M]B$B%_W0&2(L'_U`02(M]@$B%_W0&2(L'_U`02(M%R&1(*P0E
++M*````'4(2(G?Z-3O___H;^W__Y!(BWV@2(7_=`7H8.[__TB+O7#___](A?]T
++M!>A/[O__2(N]8/___TB%_W0%Z#[N__](B[U0____2(7_=`7H+>[__TB+O4#_
++M__](A?]T!>@<[O__3(NE*/___TV%Y'0I28L$)$B-%>6.`@!(BT`02#G0#X7.
++M````08-L)"`!38UT)/@/A,<```!(B=]!O`X`!X#HZ>K__^C$[O__Z6=7`@!(
++MBT7(9$@K!"4H````=07HZ^___^BV[/__\P\>^DB+O0C___](B_O__Z#GM___IU/[__^@O[/__Z"KL__],B>?_T.DY____2(T%F90%
++M`$6+K"0(`0``\P]^!2&6!0!F2`]NV$B#P&A)B[PD``$``&8/;,-F2`]NX$B#
++MP#!!#Q%$)/CS#WX%_94%`$F)1"089@]LQ$$/$40D"$6%[71#08U%_TR+/,=)
++MB<5-A?]TZTF+?Q!(A?]T!>BK[/__28L_2(7_=`9(BP?_4!!,B?^^,````.AP
++MZ___28N\)``!``#KN$B%_W0%Z'SL__])B[PD\````$B%_W0%Z&KL__])BWPD
++M>$B%_W0%Z%OL__])BWPD:$B%_W0%Z$SL__])BWPD2$B%_W0%Z#WL__])BWPD
++M.$B%_W0%Z"[L__]%BVPD,$F+?"0H187M=#%!C47_3(L\QTF)Q4V%_W3K28L_
++M2(7_=`7H`NS__TR)_[X0````Z-7J__])BWPD*.O*2(7_=`7HY.O__[XH`0``
++M3(GWZ+?J___IZ_W__TB+?9!(A?]T!>C$Z___2(M]@$B%_P^%'/[__^E9_O__
++M2(M%R&1(*P0E*````'4%Z,[M___HF>K__TB+?9!,BW6`2(7_#X3E_?__Z(/K
++M___IV_W___,/'OI(BG__TB+NZ@```!%A?9URTB%_P^%]00``$B+NY@```!(A?\/
++MA>\$``!(B[N(````2(7_#X7I!```2(M[>$B%_P^%Y@0``$B+>W!(A?\/A>,$
++M``!,BWMH387_#X2^````28L'2(T5&T<#`$B+0!!(.=`/A=0$``!!@Z\@`0``
++M`4V-=_`/A94```!F#V^U\/[__V8/;[W@_O__2(T%E8T%`$F+OU@!``!)B4<0
++M00\1=_!!#Q$_2(7_#X6B!```28N_2`$``$B%_P^%G`0``$F+OS@!``!(A?\/
++MA98$``!)B[\H`0``2(7_#X60!```28N_$`$``$B-!;J+!0!)B4<02(7_#X5_
++M!```28U_&.@40`,`OL@!``!,B??HM^C__TB+6UA(A=L/A+<```!(BP-(C15@
++M1`,`2(M`$$@YT`^%$P0``(.K,`$```$/A9,```!F#V^M\/[__V8/;[7@_O__
++M2(T%SXP%`$B+NV@!``!(B4,@#Q$K#Q%S$$B%_P^%$`0``$B+NU@!``!(A?\/
++MA0H$``!(B[M(`0``2(7_#X4$!```2(N[.`$``$B%_P^%_@,``$B+NR`!``!(
++MC07VB@4`2(E#($B%_P^%[0,``$B->RCH4#\#`+[(`0``2(G?Z//G__^^"`(`
++M`$R)[^CFY___2(U]P.B-P0$`2(V]2/___^BM\___2(N]V/[__TB+!_]0$$B-
++MO2#___]!OPX`!X#HXET"`$R)Y^C:Y?__Z+7I___I3&0"`$B+1@#^__](
++MA=L/A"#___](BP-(C15,N0(`2(M`$$@YT`^%S@```(-K&`%,C6OX#X7[_O__
++M2(T%ZHL%`$B+N^`!``#S#WX%$Y$%`&9(#V[X2(/`8&8/;,=F2`]NZ`\10_CS
++M#WX%_9`%`&8/;,4/$4,(2(7_=`7HN^?__TR+L[`!``!(C15];`$`28L&2(M`
++M$$@YT`^$G````$R)]__01(NSJ`$``$B+NZ`!``!%A?8/A,4```!!C4;_3(L\
++MQTF)QDV%_W3G28M_.$B%_W0%Z&/G__],B?^^2````.@VYO__2(N[H`$``.O#
++M\P\>^DF)Q.FX_O__2(G?_]#I,?[__XN%//___S'VC5`!2,'B`NC3Y/__2(N]
++M,/___S'`B84X____2(7_#X2W^___Z`;G___IK?O__T&#;@@!#X5>____28M^
++M&$B-!6-_!0!)B09(A?]T!DB+!_]0$$F+?A!(A?]T!DB+!_]0$+XX````3(GW
++MZ*'E___I)/___TB%_W0%Z++F__]$B[.(`0``2(N[@`$``$6%]G0S08U&_TR+
++M/,=)B<9-A?]TZTF+/TB%_W0%Z(+F__],B?^^$````.A5Y?__2(N[@`$``.O(
++M2(7_=`7H8N;__TB+NW@!``!(A?]T!DB+!_]0$$B+NV`!``!(A?]T!>@_YO__
++M2(N[6`$``$B%_W0&2(L'_U`02(N[(`$``$B%_W0%Z!SF__](B[L(`0``2(7_
++M=`7H"^;__TB+N\````!(A?]T!>CZY?__1(NSL````$B+NZ@```#I_?K__^CB
++MY?__Z0'[___HV.7__^D'^___Z,[E___I#?O__^C$Y?__Z1#[__](BP?_4!#I
++M$OO__^BOY?__Z:SZ__],B?__T.G)^___2(G?_]#I@_S__^B1Y?__Z53[___H
++MA^7__^E:^___Z'WE___I8/O__^ASY?__Z6;[___H:>7__^EW^___Z%_E___I
++MYOO__^A5Y?__Z>S[___H2^7__^GR^___Z$'E___I^/O__^@WY?__Z0G\___H
++M/>+__^@8YO__N`X`!X#I(8T"`.@IXO__Z`3F__^X#@`'@.E=C0(`\P\>^E5(
++MB>5!54%428G\4U&+7PA)BSPDA=MT+(U#_TR++,=(B<--A>UTZ4F+?0!(A?]T
++M!>C1Y/__OA````!,B>_HI./__^O,2(7_=`Q:6T%<05U=Z;'D__]86T%<05U=
++MPY#S#Q[Z54B)Y4%505132(G[442+9QA(BWL0187D="Y!C40D_TR++,=)B<1-
++MA>UTYDF+?0!(A?]T!>AKY/__OA````!,B>_H/N/__^O)2(7_=`7H4N3__TB+
++M.TB%_W0,6EM!7$%=7>D^Y/__6%M!7$%=7<-,B>_H@N___TB)W^@VX?__NPX`
++M!X#H#.7__^G$C@(`2(M]P$B%_W0%Z`GD__](BT789$@K!"4H````=2U(B=_H
++M4N7__TB+?CDX___2(M%V&1(*P0E*````'4-2(G?Z"WE___HR.+_
++M_^C#XO__D$B+1>AD2"L$)2@```!U.NC\Z___\P\>^DB)PTB+?=!(A?]T!>B9
++MX___2(U]P.A`*`$`2(G?Z)C@___H<^3__[@.``>`Z5>0`@#H=.+__TB+1>AD
++M2"L$)2@```!U!>BNZ___Z%OB___S#Q[Z2(G#Z[GS#Q[Z54B)Y5-(B?M12(M_
++M*$B%_W0%Z#?C__](BWL82(7_=`A:6UWI)N/__UA;7<-(BWVP2(7_=`7H%./_
++M_TB+1C*XO__2(M%R&1(*P0E*````'42
++M2(G?Z!/D___HKN'__^BIX?__Z*3A___S#Q[Z5;\$````2(GEZ!+@__](BS6;
++MK@4`,=+'`)].`@!(B3__^C=[?__2(M%R&1(*P0E*````'5$
++MZ(SD__](BT7(9$@K!"4H````=2OHM>W___,/'OI,B>=(B'__TB+?:!(A?]T!>BSX?__2(M]F$B%
++M_W0%Z*7A__](BWV02(7_=`7HE^'__TB+?8A(A?]T!>B)X?__2(M]@$B%_W0%
++MZ'OA__](B[UX____2(7_=`7H:N'__TB+O7#___](A?]T!>A9X?__2(N]8/__
++M_TB%_W0%Z$CA__](B[U0____2(7_=`7H-^'__TB+O4C___](A?]T!>@FX?__
++M2(M%R&1(*P0E*````'4(2(G?Z&_B___H"N#__TB+1AC
++M[/__2(M%R&1(*P0E*````'4>Z$_L___HW=___TB+1TCH'O@!
++M`$B->T#HE>K__[XH`@``2(G?Z&C?__](BT7H9$@K!"4H````=0A,B??HT>'_
++M_^ALW___2(N[$`$``$B%_W0%Z%O@__](B[O(````2(7_=`7H2N#__TR)YTV)
++M[.B7^___2(N[D````$B%_W0%Z"[@__](B[N`````2(7_=`7H'>#__TB->WCH
++M:.O__TR+:W!-A>UT*DF+10!(C160/`,`2(M`$$@YT`^%X0```$&#K2`!```!
++M38UU\`^$V0```$B+>V#HN"D$`$R)Y^@PX?__2(N[N`$``$B+!_]0$$2+L[`!
++M``!(B[NH`0``187V=#1!C4;_3(L\QTF)QDV%_W3K28M_.$B%_W0%Z)+?__],
++MB?^^2````.AEWO__2(N[J`$``.O'2(7_=`7HA)W___2(V[8`$``.BMZ/__2(N[*`$`
++M`$B%_W0%Z"S?__](B[L0`0``2(7_#X3!_O__Z!??___IM_[__TR)[__0Z2?_
++M__](C06I@04`28N]6`$``/,/?@5JB04`9D@/;MA(@\!H9@]LPV9(#V[@2(/`
++M,$$/$47P\P]^!4^)!0!)B4409@]LQ$$/$44`2(7_=`7HN-[__TF+O4@!``!(
++MA?]T!>BGWO__28N].`$``$B%_W0%Z);>__])B[TH`0``2(7_=`7HA=[__TF+
++MO1`!``!(C04W@`4`28E%$$B%_W0%Z&G>__])C7T8Z)`T`P"^R`$``$R)]^@S
++MW?__Z6W^__](BWVP2(7_=`7H0-[__TB+?:!(A?]T!>@RWO__2(M%R&1(*P0E
++M*````'4(2(G?Z'O?___H%MW__TB+?:!(A?]T!>@(WO__2(M%V&1(*P0E*```
++M`'4(2(G?Z%'?___H[-S__^CWVO__Z-+>__^X#@`'@.F8P@(`O@@!``!,B??H
++MJ]S__TB+1ACW?__2(M]@$B%_W0%Z%7=__](B=]!OPX`!X#H5]K_
++M_^@RWO__Z2K+`@#H.-S___,/'OI(B<-(BWV@2(7_=`7H(]W__TB+?9!(A?]T
++MIDB+!_]0$.N>3(G_Z`KG___KE$B+1C?WO__2(M%R&1(*P0E*````'4DZ,O>___HEMO__TR)
++M]^B.YO__OC````!,B??H8=O__^E+____Z'?;__](BWVP2(7_=`7H:=S__TB+
++M1^DB)P^MKZ)/:__](C;U@_O__Z*GB__](
++MB[U`_O__2(7_=`7H=MO__TB+O1C___](A?]T'>AEV___ZQ9)C7T0Z'SB__^^
++M:````$R)[^@MVO__2(N],/[__TB%_W0XZ#S;___K,;Y(````3(GOZ`W:__],
++MB??H)=O__TB+O6#^__](A?\/A8(```!(C;U0_O__Z'GA``!(B[T@_O__2(7_
++M=`7H^-K__TB-O1#^___H7.3__TB)W^CTU___0;P.``>`Z,G;___I7-8"`/,/
++M'OI(C;U0_O__2(G#Z./A__](B[V8_O__2(7_#X2!`0``Z*S:__^+O6#^__^#
++M__\/A!;____HJ-S__^D,____Z([:___I=/___[X0````3(GOZ%S9__](B[U0
++M_O__2(7_#X1C____Z&?:___I6?___TB+O;#^__](A?\/A>C^___I`/___[X0
++M````3(GOZ"#9__](B[VP_O__2(7_#X0X____Z"O:___I+O___TB+O6#^__](
++MA?]T!>@5VO__2(N]4/[__TB%_P^$C_[__^@`VO__Z87^__](B[VP_O__2(7_
++M#X3&_O__Z.;9___IO/[__TB+1^DB)P^N$
++MZ+_8__],B??HM]G__^D\_O__2(N]8/[__TB%_W0%Z*'9__](B[U0_O__2(7_
++M#X0*_O__Z(S9___I`/[__TB+1AKX/__Z&[8__](B[T@
++M_O__2(7_#X1F_O__Z%G9___I7/[__TB+O9C^__](A?\/A9/^___ID_[__TF+
++M10!,B>__4!#IX_W__XN]8/[__^F(_O__D%5(B>532(G[44B+?RA(A?]T!>@-
++MV?__2(M[&$B%_W0(6EM=Z?S8__]86UW#2(M]H$B%_W0%Z.K8__](BT7(9$@K
++M!"4H````=0A(B=_H,]K__^C.U___2(N],/___TB%_W0%Z+W8__](BT7(9$@K
++M!"4H````=0A(B=_H!MK__^BAU___2(L%@NP%`$B%P'0.54B+.$B)Y>C9U___
++M7E+]```6T%<7<-(BWL82(7_
++M=`7H*-C__TR)]^B`V?__Z#/<__^02(M]L$B%_W0%Z`S8__](B=_HA-?__TB+
++M?9!(A?]T!>CVU___3(GOZ`[6__](BT789$@K!"4H````=0A(B=_H-]G__^C2
++MUO__2(N],/___TB%_W0%Z,'7__](BT7(9$@K!"4H````=0A(B=_H"MG__^BE
++MUO__D$R)Y^B\U?__2(G?NPX`!X#HG]3__^AZV/__Z3$M`P!,B>?HG=7__TB)
++MW[L.``>`Z(#4___H6]C__^ER+0,`2(M]D$B%_W5(3(GGZ%77__](BWV@2(7_
++M=`7H1]?__TV%[70(3(GOZ#K7__](BWV`2(7_=`7H+-?__TB+1@)UO__2(M%R&1(*P0E*````'4%Z"79___H
++M\-7__TB+1@,V?__\P\>^DB)PTB+O5#____HR=;__TB#
++MO6#___\`=`Q(B[U@____Z+/6__](@[U8____`'0,2(N]6/___^B=UO__2(M]
++MD$B%_W0%Z(_6__](BT7(9$@K!"4H````#X6(````2(G?Z-37___H;]7__TB+
++M1:!(B858____ZZ_S#Q[Z2(G#2(N]:/___^C_&@$`3(GOZ%T+``!(@[U0____
++M``^$^DB)PT4Q[>O$
++M,?](B;U@____Z\%(BT7(9$@K!"4H````=0KH4//__^COU/__Z.K4__],BZUP
++M____Z9?^__](BT7(9$@K!"4H````=0[H)O/___,/'OKI8____^B\U/__2(M]
++ML$B%_P^$:/[__^BJU?__Z5[^__^02(N[Z````$B%_W0%Z)/5__](C;N8````
++MZ#7R__](BWM(2(7_=`7H>=7__TB+>SA(A?]T!>AKU?__2(M[*$B%_W0%Z%W5
++M__](BWL8Z%0*``!(BWL0Z&<7``!(C7L(Z$+?__](BSOH4`H``$R)Y^B2UO__
++M2(N[L````$B%_W2?Z"'5___KF$B+?@1U?__2(M]L$B%_W0%Z`/5
++M__](BT789$@K!"4H````=0A(B=_H3-;__^CGT___3(N]8/___TV%_W0(3(G_
++MZ-/4__](B[UP____2(7_=`7HPM3__TB%VW0(2(G?Z+74__](BT7(9$@K!"4H
++M````=0A,B>?H_M7__^B9T___2(N=4/___^O.3(GWZ#@9`0!(BT7(9$@K!"4H
++M````=0A(B=_HT=7__^ALT___2(M]P$B%_W0%Z%[4__](BT789$@K!"4H````
++M=0A(B=_HI]7__^A"T___2(M%@$B%P'0)2(UX_.B@T___2(M%R&1(*P0E*```
++M``^%O@```$B)W^AUU?__2(M]@$B%_W0%Z`?4__](BT7(9$@K!"4H````=4!(
++MB=_H4-7__TB+O4C____HE!@!`$B+A7C___](A/SH/]/__TB+1B@T___2(M%
++MR&1(*P0E*````'4M2(G?Z.G4__](BWV`2(7_=`7H>]/__TB+1^DF)Q$B+O=#^__](A?]T..CXTO__ZS'H\='__TB+1/W__^BGJ@$`2(N](/W__TR)X^AXV```
++M2(N]&/W__^ALV```2(N]@/W__TB%_W0%Z.O1__](B[V0_?__2(7_=`7HVM'_
++M_TF)W$B-G2#^__](C;TX_O__Z*0%`P!(B=],B>/H20,#`.M_\P\>^DB)Q^GP
++M_O__Z*;1___I:O___TB+O;#^__](A?]U0$B-O9C^___H^=<``$B+O:#]__](
++MA?]T!>AXT?__2(N]$/W__^C
++M^DF)Q.G[_O__2(N]T/[__TB%_P^$]_[__^@)T?__Z>W^__](B[W0_O__2(7_
++M=`7H\]#__TB-A<#]__](B84@_?__Z@$T/__28M]&$B%_W5YOC@```!,B>_HSL[__XN=
++M`/___TB+O?C^__^%VP^$I0```(U#_TR++,=(B<--A>UTZ4F+?1!(A?]T!>B\
++MS___28M]`$B%_W0%Z*[/__],B>^^(````.B!SO__2(N]^/[__^NW\P\>^DB)
++MP^F__O__Z(?/___I8____^A]S___ZX!(BT7(9$@K!"4H````=3-(C870_O__
++M2(F%:/W__^B)T?__OA````!,B??H+,[__TB-A=#^__](B85H_?__Z6#^___H
++M-,[__TB%_W0%Z"K/__](B[WH_O__2(7_#X3W_/__Z!7/___I[?S__[\(````
++MZ(;,__](B<=(C058A@0`2(D'2(M%R&1(*P0E*````'4A2(LU"YL%`#'22(V=
++M(/[__^@%T/__\P\>^DF)Q.GY_/__Z,3-__](B=^^$````$R)X^B4S?__2(N]
++MT/[__TB%_P^$+/W__^B?SO__Z2+]___S#Q[Z2(G#Z]U(BT7(9$@K!"4H````
++M=23HK=#__TB)W^AUSO__2(M%R&1(*P0E*````'4-3(GGZ+[/___H629!0`QTNCESO__Z+#,__^^$````$B)W^B#S/__
++MZ97Z__](B[W0_O__2(7_#X2^^___Z(G-___IM/O__TB+O3#]___H.'X"`$B+
++MO0#^__](A?\/A"'[___H8\W__^D7^___2(N]`/___TB%_P^$(_O__^A)S?__
++MZ1G[__](B[M8`0``2(7_=`7H,\W__TB+NT@!``!(A?]T!>@BS?__2(N[.`$`
++M`$B%_W4:3(GOZ/XC`P"^R`$``$B)W^CAR___Z=GZ___H]\S__^O?3(GWZ!TC
++M`P#KW4R)YTV)[.B\\___2(N[J````$B%_W0%Z,_,__](B[N8````2(7_=`7H
++MOLS__TB+NX@```!(A?]T!>BMS/__2(M[>$B%_W0%Z)_,__],B??H<_/__^N'
++M28L\)$B%_W5ZOB````!,B>?H7\O__TB+O6#^__](A?]T!>ANS/__2(N]4/[_
++M_TB%_W5:2(N],/W__^C&T@``2(N]*/W__^BZT@``2(.]8/W__P!T#$B+O6#]
++M___H-,S__TB#O4C]__\`28G<#X0U_/__2(N]2/W__^@7S/__Z23\___H#@=SO__OP0```#H8\G__\<`
++M`4``@$B)QTB+1C#S?__Z([*__](BX7P_?__
++M2(F%8/W__^DQ____2(N%X/W__TB)A4C]___I*/___TB+O5#^__](A?\/A/;^
++M___H4\O__^GL_O__\P\>^DB)P^G#_O__Z*K6___HR-;__TB+.TB%_W0%Z"O+
++M__](BWW02(7_=`7H'AD2"L$)2@```!U"$R)Y^AFS/__Z`'*__^0
++M\P\>^DB%_W0,54B+!TB)Y?]0$%W#P_,/'OI(A?]T#%5(BP=(B>7_4!!=P\-(
++MBT7(9$@K!"4H````#X6@````Z.S,__](BT7(9$@K!"4H````=07HV,S__^BC
++MR?__3(GOZ+_5__](BT7(9$@K!"4H````=31(B=_HY,O___,/'OI(BWV@2(G#
++M2(7_=`7H;\K__TB+1]7__^CFR/__2(M%R&1(*P0E*````'4=Z&+5__](BT7(9$@K!"4H````
++M#X5D`0``Z$K5___HMCVU/__2(M%R&1(*P0E*````'4*Z`75___H<,C__^AKR/__
++M2(M%R&1(*P0E*````'4=Z.?4__](BT7(9$@K!"4H````#X4;`0``Z,_4___H
++M.LC__TB+1BVU/__2(M%R&1(*P0E*`````^%"`(``.B>
++MU/__Z`G(__](BT7(9$@K!"4H````=5_HA=3___,/'OI(B<-(@[TX____`'0,
++M2(N]./___^C8R/__2(.]6/___P!T#$B+O5C____HPLC__TB+O>C^___H!N4!
++M`$B+1C2T___2(M%R&1(*P0E*````'4/Z+[3
++M___H*A&T___2(M%
++MH$B)A3C____IV_[__^C$QO__Z+_&__](BT7(9$@K!"4H````=1WH.]/__TB+
++M1,/A#G___](B[WP
++M_O__Z++%___I*/___TF+?>A)@^T@2(7_#X1M____Z)?%___I8____TB+1@.T?__Z'G$__](BT7(9$@K!"4H````=2KHTM#__TB+1CAT/__\P\>^DB)P^DT____Z$#$___H.\3___,/'OI(BBET/__Z!#$__](BT7(9$@K!"4H
++M````=1GHC-#__TB+11T"DF+!"1,B>?_4!!(
++M@[W@_O__``^$=_W__TB+O>#^___H#,3__^EF_?__2(N]0/___^C;DP,`Z7']
++M__](B[U`____2(7_="*+5_PQ]H/B_.B-P?__2(N%0/___TB%P'0)2(UX_.@X
++MP___2(N]&/___TB%_P^$,_W__TB+!_]0$.DH_?__2(N%Z/[__S'22(E0>$B+
++M!"4`````#PM(BT7(9$@K!"4H````=2'HLL7___,/'OI(B[U`____2(G#2(7_
++M#X6T_?__Z>'\___H8<+__TB+`TB)WTR)X_]0$$R+I4C___]-A>1T'$F+!"1(
++MC15^;@``2(M`$$@YT'5[08-L)"`!='I(B[U`____2(7_#X28_/__2(L'_U`0
++MZ8W\__](BT7(9$@K!"4H````=1](C85@____2(F%`/___^@@Q?__\P\>^DB)
++MP^EU_/__Z-_!__](BT7(9$@K!"4H````=1'H6\[___,/'OI(B?H;\'_
++M_^E=____2(M%R&1(*P0E*`````^%10$``$B-A6#___](B84`____Z)3$__](
++MBT7(9$@K!"4H````#X76````2(V%8/___TB)A0#____H;L3__TB+1BZS?__Z"7!___HL,W___,/'OKIX/S__^@2P?__2(M%R&1(*P0E
++M*````'4=Z([-__](BT7(9$@K!"4H````#X6^````Z%/-___HX<#__S'_2(F]
++MP/[__[\$````Z$Z____'`&@#,P%(B<=(BT7(9$@K!"4H````=6=(BS6_C04`
++M,=+HV,+__TB+1\#__^AVP/__Z''`___S#Q[ZZ3'\__](BT7(9$@K!"4H````=07HY,S_
++M_^A/P/__Z$K`___S#Q[Z2(G#Z2W[___S#Q[Z2(G#Z;GZ___H+<#__^@HP/__
++M\P\>^NGH^___Z$K#__],B>>^&````.CMO___2(G?Z&7"__](BT7(9$@K!"4H
++M````=07H"<7__^CLO___2(M%R&1(*P0E*````'5%Z/#$__](BT7(9$@K!"4H
++M````=3'HW,3___,/'OI(BWVP2(G#2(7_=`7HK\#__TB+1HP%`#'2Z)/!__](BT7(9$@K!"4H````#X6\`0``Z'O"___H1K__
++M_TB+1C/O___2(N]$/___TB%_W0%Z+Z_
++M__](C;T`____Z"+&``!(@[W8_O__`'0,2(N]V/[__^B/H>K___TB+O5#___](A?]T!>AIO___2(N]
++M0/___TB%_P^%HP```#')2(F-V/[__^EK____Z$:^__](B[U0____2(7_=`7H
++M-;___TB)W^@MO___3(GC,=)(B978_O__Z1____]%,^DB)P^F^_O__Z+:]___HL;[_
++M_^E3____\P\>^DB+O<#^__](BU,B:W8_O__Z:W^___S#Q[Z2(N]P/[__TB)P^@(`P$`
++M3(GGZ*"<`@!,B>?HZ'0"`#'`28E$)"CI/_[__T4QY$R)I=C^___I7O[__TB+
++M15!5%-(BP=(B?M(BT`02#G0=6?_3PAU9/,/?@55<04`2(T%[F(%`$R-
++M9_AF2`]NR&8/;,$/$4?X3(GGZ+W*`0!(B[L(`@``2(7_=`7H?+W__TB->T#H
++M\]0!`$B+>SA(A?]T!DB+!_]0$%M,B>>^*`(``$%<7>DSO/___]!;05Q=P\.^
++M"`$``$R)[TR-O2#^___H%[S__TB-O>C[___HI\7__TB-O>#[___H'\?__TR)
++M_^@W@@(`2(.]$/O__P!T#$B+O1#[___H`;W__TB+O0#\__](A?\/A<\```!(
++MC;W0^___Z'77`0!(B[V@_/__2(7_#X6]````2(N]&/O__^B);0(`2(N]@/O_
++M_^A-@P(`2(N]B/W__TB%_P^%GP```$B-O<#[___HL3$"`$B#O3#[__\`=`Q(
++MB[TP^___Z(N\__](@[V0^___`'0,2(N]D/O__^AUO/__2(M%R&1(*P0E*```
++M`'5B2(G?Z+Z]__](B[VP_/__2(7_=`7H3;S__TB+O3#\__](A?]T!>@\O/__
++M2(N](/S__TB%_P^$]?[__^@GO/__Z>O^___H';S__^DG____Z!.\___I.?__
++M_^@)O/__Z5?____H_[K__TB+O;#\__](A?]T!>CNN___3(V](/[__^FK_O__
++M2(N](/[__TB%_W0%Z-&[__](B[VP_/__2(7_=`7HP+O__TB+O3#\__](A?\/
++MA,O^___HJ[O__^G!_O__2(M%R&1(*P0E*````'4%Z,*]___HC;K__[X0`0``
++M3(GGZ&"Z__](B[T0_?__2(7_=`7H;[O__TB+O2#\__](A?\/A>0```!,B?_H
++M=X`"`$B+O<#Z___H2\7__TB+OT/A!C^__])
++MBT4`2(T5Q+4!`$B+0!!(.=`/A6<$``!!@VT(`4V-9?@/A?']___S#WX%P&X%
++M`$B-!C=NO__28M]($B%_W0%
++MZ,^Z__]%BW4828M]$$6%]@^$/`0``$&-1O],BSS'28G&387_=.=)BS](A?]T
++M!DB+!_]0$$R)_[X(````Z'.Y__])BWT0Z\:^$`$``$R)Y^A@N?__Z5S]___H
++M=KK__^D2____2(M%R&1(*P0E*````'4%Z(V\___H6+G__TB+O=#^__](A?]T
++M).A'NO__ZQU(B[T(____2(7_=`7H-+K__TB-O;C^___HUM;__TB+O6C^__](
++MA?]T!>@7NO__2(N]6/[__TB%_W0%Z`:Z__](B[U(_O__2(7_=`7H];G__TB+
++MO3C^___HZ>[__TB+O3#^___H^?O__TB-O2C^___HTB-N?__2(N]2/[__TB%_W0%Z'RY__](B[TX_O__Z'#N__](B[TP
++M_O__Z(#[__](C;TH_O__Z%C#__](B[T@_O__Z&+N___I,/S___,/'OI(B@JN?__2(V]N/[__^C,U?__Z6K___](B[WX_?__
++M2(7_=`7H"+G__TB+O=#]__](A?]T!>CWN/__2(V]L/W__^A;OP``1(NEJ/W_
++M_TB+O:#]__]%A>1T-D&-1"3_3(LLQTF)Q$V%[73J3(GOZ-]]`@!,B>^^$`$`
++M`.B2M___2(N]H/W__^O,2(N](/[__TB%_P^$W/O__^B4N/__Z=+[___S#Q[Z
++M2(G#2(N](/[__TB%_W0%Z'>X__](B[VP_/__2(7_#X10^___Z&*X___I1OO_
++M_TB+A9C[__](B[B`````2(7_=`7H1;C__TB+A9C[__](BWAP2(7_=`7H,+C_
++M_TB+A9C[__](BWA02(7_=`7H&[C__TB+A9C[__](BWA`2(7_=`7H!KC__TB+
++MG9C[__](C7LPZ&:^``!(B=^^*`$``$R)X^C&MO__2(V%H/W__TB)A8#[___I
++M[OK__TB+A1#\__](B840^___2(N](/[__TB%_W0%Z+2W__](C86@_?__2(F%
++M@/O__^F*^O__2(N]\/K__[X(`@``Z'"V___IZOK__TB-A:#]__](B86`^___
++MZ6OZ__](B[V@_?__2(7_=`7H9[?__TB+O8C^__](A?\/A,SZ___H4K?__^G"
++M^O__\P\>^DB)P^O=2(M%R&1(*P0E*````'4,3(V](/[__^A9N?__Z"2V___S
++M#Q[Z2(G#Z?GY__^^$````$R)[^CKM?__Z7[^__],B[6P_/__387V=!Y)BP9(
++MC14@5@(`2(M`$$@YT'4P08-N&`%-C6[P='9(BYV8^___Z7'[__](BT7(9$@K
++M!"4H````=07H[+C__^BWM?__3(GW_]#KU$R)[__0Z8_Y__](B[WP^___2(7_
++M=`7HE;;__TB-A:#]__](B86`^___Z;GY__](A?]T!>AXMO__OE````!,B>?H
++M2[7__^E/^?__9@]OO>#Z__](C05O7@4`18NF``$``$F)1A!)B[[X````00\1
++M?O!F#V^]T/K__T$/$3Y%A>1T0T&-1"3_2(LCBM?__28N^Z````$B%_W0%Z-&U__])BWYP2(7_=`7HP[7__TF+?F!(A?]T
++M!>BUM?__28M^0$B%_W0%Z*>U__])BWXP2(7_=`7HF;7__T6+9BA)BWX@187D
++M=#%!C40D_TB+',=)B<1(A=MTZDB+.TB%_W0%Z&ZU__](B=^^$````.A!M/__
++M28M^(.O*2(7_=`7H4;7__[XH`0``3(GOZ"2T___I8_[__TB+?;!(A?]T!>@Q
++MM?__2(M]F.C8^0``2(M%R&1(*P0E*````'4(2(G?Z'&V___H#+3__V8N#Q^$
++M``````!FD/,/'OI5,<")P4B)Y5,/HEM=PV8N#Q^$```````/'T``\P\>^HL%
++M1L4%`(/X/W<4C5`!B14XQ04`2(T5,<,%`$B)/,+#9BX/'X0``````&:0\P\>
++M^E5(C05DR`4`2(GE05=!5D%508G]OP(```!!5%-(C1WIZ`(`2(/L2&1,BS0E
++M*````$R)=2(T%%,@%`$B)!47(!0#HN+/__TB#^/\/
++MA)D```!(B=Z_#P```$F)Q.B>L___2(G#2(/X_W1)3(GV1(GOZ%I4`P!!B<5,
++MB>:_`@```.AZL___2(G>OP\```#H;;/__TB+1A;05Q!74%>05]=P[\(````Z&*Q__](B<=(C07X=`0`2(D'2(M%R&1(*P0E
++M*````'0WZ,&R___S#Q[Z2(G'2(G0ZS2_"````.@KL?__2(G'2(T%F70$`$B)
++M!TB+1____
++MZ%"P__](@ST8QP4``$F)Q70C2(T])6L$`.BAVO__2(L]`,<%`$R)[NAXV0``
++M2(G'Z"#/``#H^[/__^NY\P\>^DF)Q>L32(M]D$B%_W0%Z/*R___HW;/__TR)
++MYK\"````Z$"R__](B=Z_#P```.@SLO__2(M%R&1(*P0E*`````^%^O[__TR)
++M[^@8M/__\P\>^DF)Q>N]Z+JO__](@SV"Q@4``$F)Q72-2(T]CVH$`.@+VO__
++M3(LU:L8%`$R)[TF+-NB?L?__3(GWZ(?.``#I8O___^A]K___28G%BP`]#@`'
++M@`^%TP$``$B-/9YS!`!!O0@```#HQ=G__^@VL___Z1K^___H3*___TB#/13&
++M!0``28G%#X0;____2(T]'6H$`.B9V?__28MU`$B+/?3%!0#H;]@``.GR_O__
++MZ!6O__]$BRCH7-G__TR+-=;%!0!-A?9TIDF+#KH2````3(U]H+X!````2(T]
++MV6D$`.BTL___26/]3(G^Z"*T__])BS9,B?_HWK#__TR)]^C&S0``Z6;____S
++M#Q[ZZ?3^___HLZ[__TB-/>1R!`!!O0@```#H"]G__^A\LO__Z6#]___HDJ[_
++M_TB#/5K%!0``1(LP#X2/````Z,O8__],BRU%Q04`NA(```!,C7V@O@$```!(
++MC3U0:00`28M-`.@GL___26/^3(G^Z)6S__])BW4`3(G_Z%"P__],B>_H.,T`
++M`.D3_O__Z"ZN__](C3WF:`0`28G%Z(G8__](BSWHQ`4`2(7_=!%)BW4`Z%K7
++M``!(BFN_/__\P\>^DF)
++MQ>M@Z->M__](@SV?Q`4``$F)Q0^$IOW__TB-/:AH!`#H)-C__TR+-8/$!0!)
++MBWT`28LVZ+>O__],B??HG\P``.EZ_?__/01``(!U(4B-/5]H!`!!O?\```#H
++MZ]?__^DA_O__Z%>Q___I=?W__TB#/3K$!0``=$)(C3U#:`0`Z,;7__]!BW4`
++M2(U]D$R+-1W$!0#HR.@``$B+=9!,B??HC-8``$B)Q^@TS```2(M]D$B%_W0%
++MZ!:P__]!O0(```#IP/W___,/'OKI3OW___,/'OI)B<7I]OS__V8/'T0``/,/
++M'OI5,?9(B>5!5D%53(TMZ\`%`$%43(GO3(TE1WP%`%-(@>S0````Z%*P__],
++MB>Y,C2TH@0$`3(GB3(GOZ"VN__^+!??`!0"`+9A\!0`!@_A'=S:)PDB-#0+!
++M!0!(C1V;7@4`2(D9D0/[]UF10]AXF9!#VG"9D4/;]%F10_;W&9!#W+R"&9!
++M#V_49D0/;V709@_?U69!#V_N9D4/Z]=F00_;W&8/[^QF00_KTV8/V^AF#]_$
++M9@]OXV9!#^_A9D0/;]YF#^O%9D$/EF#^O39D$/;]YF#^O%9D0/;[5@
++M____9@]R\Q!F#^O$9@_KTP\I@O`+```/*9+@"P``9@]O1O!F#V_09@]OR&8/
++M8-9F#VC.9D0/;]IF#VG79@]OV0\I59!F#^_29@]ISV8/8=]F#V30#RE=@&9$
++M#V'?9@]O?8!$#RE=P&9$#V]%P&9!#V_>9@]O=9`/*8UP____9@_OR68/9@_;V&8/W\9F#V_R9@]A]V8/Z\-F#VG79@]OWF9!#V_V9D$/
++M;_YF#^_U9@_;\V8/W]UF#V_I9D0/;^MF#W+U`69!#V_>9@_OW&9$#^ON9@]O
++M\&8/V]IF#]_49D$/V^I$#RFM4/___V9$#V_:9@]R]@%F#^_]9D0/Z]MF#V_>
++M9D$/;_=F#]OQ9D$/V]IF00]OU40/*9U`____9D$/=O%F#W+R`69!#V_C9D$/
++MV])F#W+T`69!#]OB9@_;[F8/W_=F00]O^68/Z_5F00]O[V8/V^AF1`]OQF9!
++M#V_V9D$/=NEF#^_S9@_;W68/W^YF#^OK9D$/;]UF1`]O[V9!#]O?9D0/;\UF
++M00]O[F8/=M]F#^_J9@_;TV8/W]UF00]O[F8/Z]IF00]OTV8/[^QF00_;UV8/
++M;_-F10]OWF8/=M=F#W+V`69!#V_Y9@]R]P%F00_;\F9!#]OZ9@_;XF8/W]5F
++M00]OZF8/Z]1F00]OX&8/9@_KYV9!#V__9D0/[]YF#]O[9D0/V_IF
++M10_O\F9!#W;]9@_;]V9!#]_[9D0/;UW`9@_K_F9!#V_W9D4/;_QF00]V]69$
++M#]O]9@_OWV9%#^_[9D0/;YU0____9D0/V]9F00_?]F9$#V]U@&9$#^_?9D$/
++MZ_)F10]OU&9$#]O49D0/[U609@_OUD0/*56P9D4/;]1F1`_;UV9%#^_R9D4/
++M;]1$#REUH&9%#V_T9D0/;^%F10_;VF9$#^_E9D0/[UV`9D0/V_9F10]O[&9$
++M#V_@9D$/[^AF1`_OY&9%#]OJ9D0/[VW`9D4/V^)F1`_O99!F00_OX69$#^^U
++M$````"2(T%%"0`
++M``^%[P(``$B-/2=2!0!(B07(L@4`3(TU^;(%`.AD[?__3(GB2(TUNK(%`$B-
++M/;-S`0!(QP6HL@4`(````$C'!:6R!0``````2,<%HK(%``````#HC:#__S'V
++M3(GWZ).B__],B>),B?9,B>_H=:#__TB-/?Y1!0#H">W__TB-/3)2!0#H_>S_
++M_TB-/692!0#H\>S__TB-/9I2!0#HY>S__TB-/S__TB-!8)3!0`Q
++M]HL5&K(%`$B-B,@```!(C3T,L`4`@_H_=PZ)UH/"`4B)!/>^`0```$B#P"A(
++M.O__X/X!@^'`@$``$B-!1$_
++M``"[!````$B-%05_!0!F#V\%_6($`$B)!1YM!0!F#V[3NP$```!(B==(B=!F
++M#V[K2(VR``0``&8/<-(`9@]P[0!FD&8/;\BY"````&8/_L(/'P!F#V_Q9@]R
++MT0%F#]OU9@]OWF8/