1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
|
From: Johan Gunnarsson <johan.gunnarsson@gmail.com>
Date: Sun, 3 Nov 2019 00:23:00 +0100
Subject: archive: Add support for RAR 5.0 format
libarchive 3.4.0 adds support for RAR 5.0. See
https://www.rarlab.com/technote.htm#rarsign for description of signatures.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 059f6f5690005853f3e3160f5f896301b2f52ecd)
---
modules/stream_extractor/archive.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/modules/stream_extractor/archive.c b/modules/stream_extractor/archive.c
index af69a29..75bbe01 100644
--- a/modules/stream_extractor/archive.c
+++ b/modules/stream_extractor/archive.c
@@ -454,7 +454,10 @@ static int probe( stream_t* source )
} const magicbytes[] = {
/* keep heaviest at top */
{ 257, 5, "ustar" }, //TAR
- { 0, 7, "Rar!\x1A\x07" }, //RAR
+#if ARCHIVE_VERSION_NUMBER >= 3004000
+ { 0, 8, "Rar!\x1A\x07\x01" }, //RAR5.0
+#endif
+ { 0, 7, "Rar!\x1A\x07" }, //RAR4.x
{ 0, 6, "7z\xBC\xAF\x27\x1C" }, //7z
{ 0, 4, "xar!" }, //XAR
{ 0, 4, "PK\x03\x04" }, //ZIP
|