From 7226bd0b4189cdb5b66108f6f8a271011efc7bd4 Mon Sep 17 00:00:00 2001
From: Vincent Mihalkovic <vmihalko@redhat.com>
Date: Mon, 9 Aug 2021 16:58:41 +0200
Subject: [PATCH] Resolves #1963892 - do not classify python bytecode files as
 text

---
 file-5.40-magic-python.patch | 319 +++++++++++++++++++++++++++++++++++
 file.spec                    |   9 +-
 2 files changed, 327 insertions(+), 1 deletion(-)
 create mode 100644 file-5.40-magic-python.patch

diff --git a/file-5.40-magic-python.patch b/file-5.40-magic-python.patch
new file mode 100644
index 0000000..4b38590
--- /dev/null
+++ b/file-5.40-magic-python.patch
@@ -0,0 +1,319 @@
+diff --git a/magic/Magdir/python b/magic/Magdir/python
+index 9d306c0..bc5163e 100644
+--- a/magic/Magdir/python
++++ b/magic/Magdir/python
+@@ -10,211 +10,211 @@
+ # MAGIC as specified in Python/import.c (1.0 to 3.7)
+ # two bytes of magic followed by "\r\n" in little endian order
+ 0	belong		0x02099900	python 1.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x03099900	python 1.1/1.2 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x892e0d0a	python 1.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x04170d0a	python 1.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x994e0d0a	python 1.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xfcc40d0a	python 1.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xfdc40d0a	python 1.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x87c60d0a	python 2.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x88c60d0a	python 2.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2aeb0d0a	python 2.1 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2beb0d0a	python 2.1 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2ded0d0a	python 2.2 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2eed0d0a	python 2.2 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x3bf20d0a	python 2.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x3cf20d0a	python 2.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x45f20d0a	python 2.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x59f20d0a	python 2.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x63f20d0a	python 2.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x6df20d0a	python 2.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x6ef20d0a	python 2.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x77f20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x81f20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x8bf20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x8cf20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x95f20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x9ff20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xa9f20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xb3f20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xb4f20d0a	python 2.5 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xc7f20d0a	python 2.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xd1f20d0a	python 2.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xd2f20d0a	python 2.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xdbf20d0a	python 2.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xe5f20d0a	python 2.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xeff20d0a	python 2.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xf9f20d0a	python 2.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x03f30d0a	python 2.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x04f30d0a	python 2.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xb80b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xc20b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xcc0b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xd60b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xe00b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xea0b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xf40b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xf50b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xff0b0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x090c0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x130c0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x1d0c0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x1f0c0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x270c0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x3b0c0d0a	python 3.0 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x450c0d0a	python 3.1 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x4f0c0d0a	python 3.1 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x580c0d0a	python 3.2 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x620c0d0a	python 3.2 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x6c0c0d0a	python 3.2 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x760c0d0a	python 3.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x800c0d0a	python 3.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x8a0c0d0a	python 3.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x940c0d0a	python 3.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x9e0c0d0a	python 3.3 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xb20c0d0a	python 3.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xbc0c0d0a	python 3.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xc60c0d0a	python 3.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xd00c0d0a	python 3.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xda0c0d0a	python 3.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xe40c0d0a	python 3.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xee0c0d0a	python 3.4 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0xf80c0d0a	python 3.5.1- byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x020d0d0a	python 3.5.1- byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x0c0d0d0a	python 3.5.1- byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x160d0d0a	python 3.5.1- byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x170d0d0a	python 3.5.2+ byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x200d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x210d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2a0d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2b0d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2c0d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2d0d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x2f0d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x300d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x310d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x320d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x330d0d0a	python 3.6 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x3e0d0d0a	python 3.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x3f0d0d0a	python 3.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x400d0d0a	python 3.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x410d0d0a	python 3.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x420d0d0a	python 3.7 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x480d0d0a	python 3.8 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x490d0d0a	python 3.8 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x520d0d0a	python 3.8 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x530d0d0a	python 3.8 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x540d0d0a	python 3.8 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x550d0d0a	python 3.8 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x5c0d0d0a	python 3.9 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x5d0d0d0a	python 3.9 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x5e0d0d0a	python 3.9 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x5f0d0d0a	python 3.9 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x600d0d0a	python 3.9 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 0	belong		0x610d0d0a	python 3.9 byte-compiled
+-!:mime text/x-bytecode.python
++!:mime application/x-bytecode.python
+ 
+ 0	search/1/w	#!\040/usr/bin/python	Python script text executable
+ !:strength + 15
diff --git a/file.spec b/file.spec
index 79b8661..5d20374 100644
--- a/file.spec
+++ b/file.spec
@@ -15,7 +15,7 @@
 Summary: Utility for determining file types
 Name: file
 Version: 5.39
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz
 
@@ -29,6 +29,9 @@ Patch2: file-5.04-volume_key.patch
 # Fix close_on_exec multithreaded decompression issue (#1906751)
 Patch3: file-5.39-CLOEXEC.patch
 
+# Upstream commit 7d9b0f0d853957ad88dae0f440fecd58d2740ca7 (#1963892)
+Patch4: file-5.40-magic-python.patch
+
 URL: https://www.darwinsys.com/file/
 Requires: file-libs%{?_isa} = %{version}-%{release}
 BuildRequires: zlib-devel
@@ -207,6 +210,10 @@ cd %{py3dir}
 %endif
 
 %changelog
+* Mon Aug 9 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.39-7
+- do not classify python bytecode files as text.
+  Resolves: #1963892
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 5.39-6
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937