vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Fri Jun 19 14:51:28 2020 +0200| [eec3cd2399be0e5362e320fe0cf47ef4900ad47e] | committer: Steve Lhomme
contrib: libarchive: use upstream patch for statvfs fix (cherry picked from commit 68a71d9129042cb07eac0372b12e67a374ee37c1) Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=eec3cd2399be0e5362e320fe0cf47ef4900ad47e --- .../0001-Fix-build-failure-without-STATVFS.patch | 27 ---------------------- ...eving-incorrect-member-from-struct-statfs.patch | 26 +++++++++++++++++++++ contrib/src/libarchive/rules.mak | 2 +- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/contrib/src/libarchive/0001-Fix-build-failure-without-STATVFS.patch b/contrib/src/libarchive/0001-Fix-build-failure-without-STATVFS.patch deleted file mode 100644 index 6cfaef1acd..0000000000 --- a/contrib/src/libarchive/0001-Fix-build-failure-without-STATVFS.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a189efa30ad57c874997dc3ea2a3cef402b6a4ea Mon Sep 17 00:00:00 2001 -From: Thomas Guillem <[email protected]> -Date: Fri, 22 May 2015 14:44:28 +0200 -Subject: [PATCH] Fix build failure without STATVFS - ---- - libarchive/archive_read_disk_posix.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c -index a13dbbf..b93c198 100644 ---- a/libarchive/archive_read_disk_posix.c -+++ b/libarchive/archive_read_disk_posix.c -@@ -1640,7 +1640,9 @@ setup_current_filesystem(struct archive_read_disk *a) - } - - #elif defined(HAVE_SYS_STATFS_H) && defined(HAVE_LINUX_MAGIC_H) &&\ -- defined(HAVE_STATFS) && defined(HAVE_FSTATFS) -+ defined(HAVE_STATFS) && defined(HAVE_FSTATFS) &&\ -+ defined(HAVE_SYS_STATVFS_H) &&\ -+ (defined(HAVE_STATVFS) || defined(HAVE_FSTATVFS)) - /* - * Note: statfs is deprecated since LSB 3.2 - */ --- -2.1.4 - diff --git a/contrib/src/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch b/contrib/src/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch new file mode 100644 index 0000000000..6561422f9f --- /dev/null +++ b/contrib/src/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch @@ -0,0 +1,26 @@ +From 9b9e4ff23fa528d831f22d62d072db990b862a62 Mon Sep 17 00:00:00 2001 +From: Martin Matuska <[email protected]> +Date: Thu, 30 Apr 2020 03:46:05 +0200 +Subject: [PATCH] Fix retrieving incorrect member from struct statfs + +Fixes #1355 +--- + libarchive/archive_read_disk_posix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c +index 52fec7bb..95a8087a 100644 +--- a/libarchive/archive_read_disk_posix.c ++++ b/libarchive/archive_read_disk_posix.c +@@ -1840,7 +1840,7 @@ setup_current_filesystem(struct archive_read_disk *a) + #if defined(HAVE_STATVFS) + if (svfs.f_flag & ST_NOATIME) + #else +- if (sfs.f_flag & ST_NOATIME) ++ if (sfs.f_flags & ST_NOATIME) + #endif + t->current_filesystem->noatime = 1; + else +-- +2.26.0.windows.1 + diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak index 4592a0ec11..5324e448c4 100644 --- a/contrib/src/libarchive/rules.mak +++ b/contrib/src/libarchive/rules.mak @@ -16,7 +16,7 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz: libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive $(UNPACK) - $(APPLY) $(SRC)/libarchive/0001-Fix-build-failure-without-STATVFS.patch + $(APPLY) $(SRC)/libarchive/0001-Fix-retrieving-incorrect-member-from-struct-statfs.patch ifdef HAVE_ANDROID $(APPLY) $(SRC)/libarchive/android.patch endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
