[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

[Lars Wendler]

commit:     bb949123596216a8af1a18b1ba4f396919a2d976
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 09:41:58 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 09:42:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb949123

sys-apps/file: Revbump to fix xz magic

Thanks-to: Mike Auty <ikelos <AT> gentoo.org>
Closes: https://bugs.gentoo.org/784773
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../file/{file-5.40.ebuild => file-5.40-r1.ebuild} |  1 +
 sys-apps/file/files/file-5.40-xz_magic.patch       | 37 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/sys-apps/file/file-5.40.ebuild b/sys-apps/file/file-5.40-r1.ebuild
similarity index 98%
rename from sys-apps/file/file-5.40.ebuild
rename to sys-apps/file/file-5.40-r1.ebuild
index 67c33d9f485..a901c2a4003 100644
--- a/sys-apps/file/file-5.40.ebuild
+++ b/sys-apps/file/file-5.40-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.40-xz_magic.patch" #784773
 )
 
 src_prepare() {

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 00000000000..e4fed0421f7
--- /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@××××××.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