From 509273bdb92fecfedbf6065944be0d6c052a5313 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 7 Aug 2022 15:51:31 +0200 Subject: core/libarchive: removed fix for FS#63765, added fix for FS#75533 (glibc 2.36) --- .../0003-no-sys_mount-linux_fs-includes.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/libarchive/0003-no-sys_mount-linux_fs-includes.patch (limited to 'core/libarchive/0003-no-sys_mount-linux_fs-includes.patch') diff --git a/core/libarchive/0003-no-sys_mount-linux_fs-includes.patch b/core/libarchive/0003-no-sys_mount-linux_fs-includes.patch new file mode 100644 index 00000000..4b19c7be --- /dev/null +++ b/core/libarchive/0003-no-sys_mount-linux_fs-includes.patch @@ -0,0 +1,43 @@ +From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 25 Jul 2022 10:56:53 -0700 +Subject: 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 2b39e672..a96008db 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 + #endif +-#ifdef HAVE_SYS_MOUNT_H +-#include +-#endif + #ifdef HAVE_SYS_STAT_H + #include + #endif +@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); + #endif + #ifdef HAVE_LINUX_FS_H + #include ++#elif HAVE_SYS_MOUNT_H ++#include + #endif + /* + * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. +-- +2.37.1 + -- cgit v1.2.3-70-g09d2