Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / file
Commits: 8004cbb7 by Christian Hesse at 2025-01-04T23:19:00+01:00 upgpkg: 5.46-3: fix misclassified zip files Fixes: https://gitlab.archlinux.org/archlinux/packaging/packages/file/-/issues/3 - - - - - 3 changed files: - .SRCINFO - + 0002-PR-571-jschleus-Some-zip-files-are-misclassified-as-data.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = file pkgdesc = File type identification utility pkgver = 5.46 - pkgrel = 2 + pkgrel = 3 url = https://www.darwinsys.com/file/ arch = x86_64 license = custom @@ -18,9 +18,11 @@ pkgbase = file source = https://astron.com/pub/file/file-5.46.tar.gz source = https://astron.com/pub/file/file-5.46.tar.gz.asc source = 0001-PR-579-net147-Fix-stack-overrun.patch + source = 0002-PR-571-jschleus-Some-zip-files-are-misclassified-as-data.patch validpgpkeys = BE04995BA8F90ED0C0C176C471112AB16CB33B3A sha256sums = c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088 sha256sums = SKIP sha256sums = 2db041dcadaf8500a8e10d914890963f27a5b716e97f0baf839e01f7c3d8b576 + sha256sums = c93c8ae784ba27c2eec02a94db7bc7080d1b116d4c8e4a9191bd67b4288f2b0e pkgname = file ===================================== 0002-PR-571-jschleus-Some-zip-files-are-misclassified-as-data.patch ===================================== @@ -0,0 +1,52 @@ +From 60b2032b96fc185b37fb0f2152e834efb2edad6e Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <chris...@zoulas.com> +Date: Thu, 5 Dec 2024 19:41:12 +0000 +Subject: PR/571: jschleus: Some zip files are misclassified as data + +--- + magic/Magdir/archive | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +diff --git a/magic/Magdir/archive b/magic/Magdir/archive +index e6ff4570..e560523c 100644 +--- a/magic/Magdir/archive ++++ b/magic/Magdir/archive +@@ -1795,6 +1795,17 @@ + !:ext zip/cbz + + ++# Generic zip archives (Greg Roelofs, c/o zip-b...@wkuvx1.wku.edu) ++# Next line excludes specialized formats: ++0 name zipgeneric ++>4 beshort x Zip archive data, at least ++!:mime application/zip ++>4 use zipversion ++>4 beshort x to extract ++>8 beshort x \b, compression method= ++>8 use zipcompression ++>0x161 string WINZIP \b, WinZIP self-extracting ++ + 0 string PK\003\004 + !:strength +1 + # IOS/IPadOS IPA file (Zip archive) +@@ -2132,17 +2143,11 @@ + >>>>>>(-6.l) search/9000 kmp.json Keyman Compiled Package File + !:mime application/vnd.keyman.kmp+zip + !:ext kmp ++>>>>>+4 default x ++>>>>>>0 use zipgeneric + +-# Generic zip archives (Greg Roelofs, c/o zip-b...@wkuvx1.wku.edu) +-# Next line excludes specialized formats: + >>>>+4 default x +->>>>>4 beshort x Zip archive data, at least +-!:mime application/zip +->>>>>4 use zipversion +->>>>>4 beshort x to extract +->>>>>8 beshort x \b, compression method= +->>>>>8 use zipcompression +->>>>>0x161 string WINZIP \b, WinZIP self-extracting ++>>>>>0 use zipgeneric + + # Zip archives (Greg Roelofs, c/o zip-b...@wkuvx1.wku.edu) + 0 string PK\005\006 Zip archive data (empty) ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgname=file pkgver=5.46 -pkgrel=2 +pkgrel=3 pkgdesc='File type identification utility' arch=('x86_64') license=('custom') @@ -13,11 +13,13 @@ depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so' 'zstd' 'libzst provides=('libmagic.so') options=('!emptydirs') source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc} - '0001-PR-579-net147-Fix-stack-overrun.patch') + '0001-PR-579-net147-Fix-stack-overrun.patch' + '0002-PR-571-jschleus-Some-zip-files-are-misclassified-as-data.patch') validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas sha256sums=('c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088' 'SKIP' - '2db041dcadaf8500a8e10d914890963f27a5b716e97f0baf839e01f7c3d8b576') + '2db041dcadaf8500a8e10d914890963f27a5b716e97f0baf839e01f7c3d8b576' + 'c93c8ae784ba27c2eec02a94db7bc7080d1b116d4c8e4a9191bd67b4288f2b0e') prepare() { cd $pkgname-$pkgver View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/file/-/commit/8004cbb712a714a4ce834c9d5dee6e1c8dbf8ff1 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/file/-/commit/8004cbb712a714a4ce834c9d5dee6e1c8dbf8ff1 You're receiving this email because of your account on gitlab.archlinux.org.
