From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Aug 2023 18:31:20 +0000 (+0000)
Subject: libarchive: Update to 3.7.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e5bdeb9482c0d04af07f45e21221be49ef84c40;p=ipfire-3.x.git

libarchive: Update to 3.7.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/libarchive/libarchive.nm b/libarchive/libarchive.nm
index 337c9afae..f04a02fac 100644
--- a/libarchive/libarchive.nm
+++ b/libarchive/libarchive.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libarchive
-version    = 3.6.1
-release    = 2
+version    = 3.7.1
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.libarchive.org/
diff --git a/libarchive/patches/libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch b/libarchive/patches/libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
deleted file mode 100644
index 0ce2d8d82..000000000
--- a/libarchive/patches/libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
+++ /dev/null
@@ -1,40 +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 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 <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.