mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-17 06:23:00 +02:00
libarchive: Update to version 3.6.2
- Update from version 3.6.1 to 3.6.2
- Update of rootfile
- patch to fix glibc 2.36 headers is now part of the source code
- Changelog
Libarchive 3.6.2 is a bugfix and security release.
Important bug fixes:
include ZSTD in Windows builds (#1688)
SSL fixes on Windows (#1714, #1723, #1724)
rar5 reader: fix possible garbled output with bsdtar -O (#1745)
mtree reader: support reading mtree files with tabs (#1783)
various small fixes for issues found by CodeQL
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
committed by
Peter Müller
parent
aadc6c8a65
commit
bdfe675987
@@ -1,41 +0,0 @@
|
||||
From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 25 Jul 2022 10:56:53 -0700
|
||||
Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
|
||||
present
|
||||
|
||||
These headers are in conflict and only one is needed by
|
||||
archive_read_disk_posix.c therefore include linux/fs.h if it exists
|
||||
otherwise include sys/mount.h
|
||||
|
||||
It also helps compiling with glibc 2.36
|
||||
where sys/mount.h conflicts with linux/mount.h see [1]
|
||||
|
||||
[1] https://sourceware.org/glibc/wiki/Release/2.36
|
||||
---
|
||||
libarchive/archive_read_disk_posix.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
|
||||
index 2b39e672b..a96008db7 100644
|
||||
--- a/libarchive/archive_read_disk_posix.c
|
||||
+++ b/libarchive/archive_read_disk_posix.c
|
||||
@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
-#ifdef HAVE_SYS_MOUNT_H
|
||||
-#include <sys/mount.h>
|
||||
-#endif
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
|
||||
#endif
|
||||
#ifdef HAVE_LINUX_FS_H
|
||||
#include <linux/fs.h>
|
||||
+#elif HAVE_SYS_MOUNT_H
|
||||
+#include <sys/mount.h>
|
||||
#endif
|
||||
/*
|
||||
* Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
|
||||
Reference in New Issue
Block a user