core/file to 5.40-3

This commit is contained in:
Kevin Mihelich 2021-05-11 02:05:35 +00:00
parent 406b37ac83
commit 6555a2dbc1
2 changed files with 3 additions and 34 deletions

View file

@ -1,31 +0,0 @@
From b258a4e460569678cd554236cb75027897a42858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net>
Date: Mon, 12 Apr 2021 18:15:33 +0200
Subject: [PATCH] Revert "Add checksum for XZ"
This reverts commit 3ebd747de661b244f1acec29495d676dd52e71d5.
---
magic/Magdir/compress | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 64d11a73..a364a880 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
--
2.31.1

View file

@ -8,7 +8,7 @@
pkgname=file
pkgver=5.40
pkgrel=2
pkgrel=3
pkgdesc='File type identification utility'
arch=('x86_64')
license=('custom')
@ -17,11 +17,11 @@ url='https://www.darwinsys.com/file/'
depends=('glibc' 'zlib' 'xz' 'bzip2')
provides=('libmagic.so')
source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}
'0001-Revert-Add-checksum-for-XZ.patch')
"https://github.com/file/file/commit/9b0459afab309a82aa4e46f73a4e50dd641f3d39.patch")
validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
sha256sums=('167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57'
'SKIP'
'bd3633ffb41e4a8f9831bcda6e8e4589f67647ec33240d68d5a53bac4a82b594')
'f5d9c964233b75d6b5ac1b95fe4cc23143fbc6070d3b136e91b542021959e7dd')
prepare() {
cd $pkgname-$pkgver