summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2021-04-21 11:41:58 +0200
committerLars Wendler <polynomial-c@gentoo.org>2021-04-21 11:42:48 +0200
commitbb949123596216a8af1a18b1ba4f396919a2d976 (patch)
tree775dcde4c785651cf7df406b27dea3b30546f8e1 /sys-apps/file/files
parentdev-java/commons-collections: removed obsolete 3.2.1-r[23] (diff)
downloadgentoo-bb949123596216a8af1a18b1ba4f396919a2d976.tar.gz
gentoo-bb949123596216a8af1a18b1ba4f396919a2d976.tar.bz2
gentoo-bb949123596216a8af1a18b1ba4f396919a2d976.zip
sys-apps/file: Revbump to fix xz magic
Thanks-to: Mike Auty <ikelos@gentoo.org> Closes: https://bugs.gentoo.org/784773 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-apps/file/files')
-rw-r--r--sys-apps/file/files/file-5.40-xz_magic.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/sys-apps/file/files/file-5.40-xz_magic.patch b/sys-apps/file/files/file-5.40-xz_magic.patch
new file mode 100644
index 000000000000..e4fed0421f78
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-xz_magic.patch
@@ -0,0 +1,37 @@
+From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 19 Apr 2021 17:01:45 +0000
+Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
+
+---
+ magic/Magdir/compress | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 64d11a736..41a65738f 100644
+--- a/magic/Magdir/compress
++++ b/magic/Magdir/compress
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
++# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
+ # compress: file(1) magic for pure-compression formats (no archives)
+ #
+ # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
+@@ -265,14 +265,13 @@
+
+ # http://tukaani.org/xz/xz-file-format.txt
+ 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
++!:strength * 2
++!:mime application/x-xz
+ >7 byte&0xf 0x0 NONE
+ >7 byte&0xf 0x1 CRC32
+ >7 byte&0xf 0x4 CRC64
+ >7 byte&0xf 0xa SHA-256
+
+-!:strength * 2
+-!:mime application/x-xz
+-
+ # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
+ 0 string LRZI LRZIP compressed data
+ >4 byte x - version %d