From: Johan Gunnarsson <johan.gunnarsson@gmail.com>
Date: Sat, 2 Nov 2019 23:23:00 +0000 (+0100)
Subject: archive: Add support for RAR 5.0 format
X-Git-Tag: archive/raspbian/3.0.21-7+rpi1^2~65
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=479bd394151f48ed2499297fa98944d424db9d83;p=vlc.git

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)

Gbp-Pq: Name 0061-archive-Add-support-for-RAR-5.0-format.patch
---

diff --git a/modules/stream_extractor/archive.c b/modules/stream_extractor/archive.c
index af69a290..75bbe018 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