From dcb89611eb6f6b4084a59c345e95af378d29acb9 Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Fri, 28 Jun 2019 22:36:27 +0000
Subject: MFC r348993,349135: Sync libarchive with vendor including security
 fixes

r348993:
  - version bumped to 3.4.0
  - check_symlinks_fsobj() without chdir() and fchdir()
  - bsdtar.1 manpage fixes
  - patches from OpenBSD to libarchive_fe/passphrase.c

r349135:
  PR #1212: RAR5 reader - window_mask was not updated correctly
            (OSS-Fuzz 15278)
  OSS-Fuzz 15120: RAR reader - extend use after free bugfix
---
 usr.bin/bsdcat/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr.bin/bsdcat/Makefile')

diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile
index 987b51b3b232..f088c1a2cbb8 100644
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@@ -6,7 +6,7 @@ _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 _LIBARCHIVECONFDIR=	${SRCTOP}/lib/libarchive
 
 PROG=	bsdcat
-BSDCAT_VERSION_STRING=	3.3.3
+BSDCAT_VERSION_STRING=	3.4.0
 
 .PATH:	${_LIBARCHIVEDIR}/cat
 SRCS=	bsdcat.c cmdline.c
-- 
cgit v1.2.3