aboutsummaryrefslogtreecommitdiff
path: root/contrib/libarchive/libarchive
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2020-12-27 23:34:06 +0000
committerMartin Matuska <mm@FreeBSD.org>2020-12-27 23:34:06 +0000
commit69a18c5826c9633a6d77e18f9f34e02c83d22717 (patch)
tree4f95547afaa8dba714e5cd9f87451c85835fb60e /contrib/libarchive/libarchive
parentf2d48b5e2c3b45850585e4d7aee324fe148afbf2 (diff)
parent8be2bb3d35e232080b4e39244020e650bbe31562 (diff)
downloadsrc-69a18c5826c9633a6d77e18f9f34e02c83d22717.tar.gz
src-69a18c5826c9633a6d77e18f9f34e02c83d22717.zip
contrib/libarchive: Import libarchive 3.5.1
Merge commit '8be2bb3d35e232080b4e39244020e650bbe31562' into main
Diffstat (limited to 'contrib/libarchive/libarchive')
-rw-r--r--contrib/libarchive/libarchive/archive.h4
-rw-r--r--contrib/libarchive/libarchive/archive_entry.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/libarchive/libarchive/archive.h b/contrib/libarchive/libarchive/archive.h
index 7e55a926c740..55f0fad15730 100644
--- a/contrib/libarchive/libarchive/archive.h
+++ b/contrib/libarchive/libarchive/archive.h
@@ -36,7 +36,7 @@
* assert that ARCHIVE_VERSION_NUMBER >= 2012108.
*/
/* Note: Compiler will complain if this does not match archive_entry.h! */
-#define ARCHIVE_VERSION_NUMBER 3005000
+#define ARCHIVE_VERSION_NUMBER 3005001
#include <sys/stat.h>
#include <stddef.h> /* for wchar_t */
@@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(void);
/*
* Textual name/version of the library, useful for version displays.
*/
-#define ARCHIVE_VERSION_ONLY_STRING "3.5.0"
+#define ARCHIVE_VERSION_ONLY_STRING "3.5.1"
#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
__LA_DECL const char * archive_version_string(void);
diff --git a/contrib/libarchive/libarchive/archive_entry.h b/contrib/libarchive/libarchive/archive_entry.h
index 4b6cc257a63a..a1b9fe43fe22 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 3005000
+#define ARCHIVE_VERSION_NUMBER 3005001
/*
* Note: archive_entry.h is for use outside of libarchive; the