The branch stable/12 has been updated by mm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=060bec6624fb36120f21bb2c5db5e4e97f7cf38e
commit 060bec6624fb36120f21bb2c5db5e4e97f7cf38e
Author: Martin Matuska <m...@freebsd.org>
AuthorDate: 2020-12-27 23:34:06 +0000
Commit: Martin Matuska <m...@freebsd.org>
CommitDate: 2021-01-11 01:25:32 +0000
contrib/libarchive: Import libarchive 3.5.1
(cherry picked from commit 69a18c5826c9633a6d77e18f9f34e02c83d22717)
---
contrib/libarchive/NEWS | 2 ++
contrib/libarchive/libarchive/archive.h | 4 ++--
contrib/libarchive/libarchive/archive_entry.h | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/libarchive/NEWS b/contrib/libarchive/NEWS
index 598cf75166b1..47cebdd4b9b7 100644
--- a/contrib/libarchive/NEWS
+++ b/contrib/libarchive/NEWS
@@ -1,3 +1,5 @@
+Dec 26, 2020: libarchive 3.5.1 released
+
Dec 01, 2020: libarchive 3.5.0 released
Oct 14, 2020: Support for system extended attributes
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
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
