diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2019-12-31 00:05:06 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2019-12-31 00:05:06 +0000 |
| commit | 79085fd3b922771b329bc3d218b6d52daab8a9a4 (patch) | |
| tree | 0be388c5a494e0a83ddf62335683817eb15a27d0 /contrib/libarchive/libarchive/archive_entry.h | |
| parent | 140da6f8feffc58c77f66c9fca487b74ede0afa5 (diff) | |
| parent | 6922acad9a482c17c7af1acdb4d11d03f19bb1dc (diff) | |
| download | src-79085fd3b922771b329bc3d218b6d52daab8a9a4.tar.gz src-79085fd3b922771b329bc3d218b6d52daab8a9a4.zip | |
MFV r356163,r356197:
Update libarchive to 3.4.1
Relevant vendor changes since last update:
Issue #351: Refactor and implement private state logic for write filters
PR #1252: RAR5 reader - verify window size for solid files (OSS-Fuzz 15482)
PR #1255: zip writer - don't append unused NUL for directories
PR #1260: Fix sparse file offset overflow on 32-bit systems
PR #1263: UNICODE filename support for reading lha/lzh format
Issue #1276: Bugfix and optimize archive_wstring_append_from_mbs()
PR #1288: Add the "xattrhdr" option to pax write options
PR #1295: 7z reader - fix reading archives with digests in PackInfo
PR #1296: RAR5 reader - verify window size for multivolume archives
PR #1297: ZIP reader - support LZMA_STREAM_END marker in 'lzma alone' files
Issue #1298: Fix a heap-buffer-overflow in archive_string_append_from_wcs()
OSS-Fuzz 19360, 19362: LHA reader - plug two memory leaks on error
Fix possible off-by-one when dealing with readlink(2)
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=356212
Diffstat (limited to 'contrib/libarchive/libarchive/archive_entry.h')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_entry.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/contrib/libarchive/libarchive/archive_entry.h b/contrib/libarchive/libarchive/archive_entry.h index 5a6df1ad6a16..d76d6077677e 100644 --- a/contrib/libarchive/libarchive/archive_entry.h +++ b/contrib/libarchive/libarchive/archive_entry.h @@ -30,7 +30,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3004000 +#define ARCHIVE_VERSION_NUMBER 3004001 /* * Note: archive_entry.h is for use outside of libarchive; the @@ -524,9 +524,6 @@ __LA_DECL int archive_entry_acl_reset(struct archive_entry *, int /* want_type __LA_DECL int archive_entry_acl_next(struct archive_entry *, int /* want_type */, int * /* type */, int * /* permset */, int * /* tag */, int * /* qual */, const char ** /* name */); -__LA_DECL int archive_entry_acl_next_w(struct archive_entry *, int /* want_type */, - int * /* type */, int * /* permset */, int * /* tag */, - int * /* qual */, const wchar_t ** /* name */); /* * Construct a text-format ACL. The flags argument is a bitmask that |