revert the upstream commit (regresssion)

This commit is contained in:
Vincent Mihalkovic 2021-04-12 23:45:10 +02:00
parent 2e5516b5e6
commit 532851e62e
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,18 @@
diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 64d11a7..d830c64 100644
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -264,12 +264,7 @@
>>5 lequad !0xffffffffffffffff non-streamed, size %lld
# http://tukaani.org/xz/xz-file-format.txt
-0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
->7 byte&0xf 0x0 NONE
->7 byte&0xf 0x1 CRC32
->7 byte&0xf 0x4 CRC64
->7 byte&0xf 0xa SHA-256
-
+0 ustring \xFD7zXZ\x00 XZ compressed data
!:strength * 2
!:mime application/x-xz

View File

@ -15,7 +15,7 @@
Summary: Utility for determining file types
Name: file
Version: 5.40
Release: 2%{?dist}
Release: 3%{?dist}
License: BSD
Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -26,6 +26,9 @@ Patch0: file-localmagic.patch
Patch1: file-4.17-rpm-name.patch
Patch2: file-5.04-volume_key.patch
# hotfix, revert the https://github.com/file/file/commit/4ebd747d commit.
Patch3: file-5.40-magic-xzip.patch
URL: https://www.darwinsys.com/file/
Requires: file-libs%{?_isa} = %{version}-%{release}
BuildRequires: zlib-devel
@ -204,6 +207,9 @@ cd %{py3dir}
%endif
%changelog
* Mon Apr 12 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.40-3
- revert the https://github.com/file/file/commit/3ebd747d commit (#1947317)
* Thu Apr 08 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.40-2
- make python{2,3}-magic depend on file-libs (#1947453)