From cb028392d17c9e99f0f97d1ecdcf2c90b0ceac08 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 8 Nov 2023 14:40:33 +0300 Subject: [PATCH] import file-5.39-14.el9 --- ...1-pdf-deflate-not-password-protected.patch | 31 +++++++++++++++ SPECS/file.spec | 39 +++++++++++-------- 2 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 SOURCES/file-5.41-pdf-deflate-not-password-protected.patch diff --git a/SOURCES/file-5.41-pdf-deflate-not-password-protected.patch b/SOURCES/file-5.41-pdf-deflate-not-password-protected.patch new file mode 100644 index 0000000..5f0da5d --- /dev/null +++ b/SOURCES/file-5.41-pdf-deflate-not-password-protected.patch @@ -0,0 +1,31 @@ +From ea6256a346adbd65ac1d646d716e7b51ea0b9232 Mon Sep 17 00:00:00 2001 +From: Ville-Pekka Vainio +Date: Fri, 9 Jun 2023 12:00:27 +0300 +Subject: [PATCH] FlateDecode does not mean password protected + +Have the patch apply against file-5.39 in EL9 +Upstream bug: https://bugs.astron.com/view.php?id=275 +Upstream commit: https://github.com/file/file/commit/239852073ad3a5ba5cf62b21e95565f122869f6a +Original author: pwinckles + +Signed-off-by: Ville-Pekka Vainio +--- + magic/Magdir/pdf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/magic/Magdir/pdf b/magic/Magdir/pdf +index e386f454..7aa7a24d 100644 +--- a/magic/Magdir/pdf ++++ b/magic/Magdir/pdf +@@ -5,7 +5,7 @@ + # + + 0 name pdf +->8 search/512 /Filter/FlateDecode/ (password protected) ++>8 search/512 /Filter/FlateDecode/ (zip deflate encoded) + + 0 string %PDF- PDF document + !:mime application/pdf +-- +2.40.1 + diff --git a/SPECS/file.spec b/SPECS/file.spec index 0a4a16c..125a820 100644 --- a/SPECS/file.spec +++ b/SPECS/file.spec @@ -15,7 +15,7 @@ Summary: Utility for determining file types Name: file Version: 5.39 -Release: 12.1%{?dist} +Release: 14%{?dist} License: BSD Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -32,29 +32,32 @@ Patch3: file-5.39-CLOEXEC.patch # Upstream commit 7d9b0f0d853957ad88dae0f440fecd58d2740ca7 (#1963892) Patch4: file-5.40-magic-python.patch +# Upstream commit 239852073ad3a5ba5cf62b21e95565f122869f6a (#2213761) +Patch5: file-5.41-pdf-deflate-not-password-protected.patch + # not yet upstream -Patch5: file-5.33-fix-compression.patch +Patch6: file-5.33-fix-compression.patch # Upstream commit 4c8a4d8dbab1e73bfb30e391dcec49fcf269f84d (#2120692) -Patch6: file-5.39-regex-caching-1.patch +Patch7: file-5.39-regex-caching-1.patch # Upstream commit 7d438e28c16773e28a3707935c8e5d9927a515a7 (#2120692) -Patch7: file-5.39-regex-caching-2.patch +Patch8: file-5.39-regex-caching-2.patch # Upstream commit d1a00ae92b2cf09298615cf3aba474d8fec7380f (#2120692) -Patch8: file-5.39-regex-caching-3.patch +Patch9: file-5.39-regex-caching-3.patch # Upstream commit 4254a0afecfd2ae200c694dfcf93f4b4ac21652e (#2120692) -Patch9: file-5.39-regex-caching-4.patch +Patch10: file-5.39-regex-caching-4.patch # Upstream commit a4b3abc4104d8a4eeb84a6242f2f1a830204a539 (#2120692) -Patch10: file-5.39-regex-combinations.patch +Patch11: file-5.39-regex-combinations.patch # Upstream commit d17d8e9ff8ad8e95fdf66239ccdcc2133d1ce5ce (#2120692) -Patch11: file-5.39-regex-escape.patch +Patch12: file-5.39-regex-escape.patch # Upstream commit 14b5d7aa0b55275969809fdf84e8a8caee857c0f (#2120692) -Patch12: file-5.39-regex-optimalizations.patch +Patch13: file-5.39-regex-optimalizations.patch # Upstream commit 709dfecf25c2eb2822f7e0b8c30d6329cd2d97fb (#2164840) -Patch13: file-5.39-floating-point-exception.patch +Patch14: file-5.39-floating-point-exception.patch # Upstream commit 363d7fcf703ad3ebf37b45693b2c9e43eb8b4176 (#2164834) -Patch14: file-5.39-static-PIE-binaries.patch -# Upstream commit 85b7ab83257b3191a1a7ca044589a092bcef2bb3 (#2221659) -Patch15: file-5.39-wasm-magic.patch +Patch15: file-5.39-static-PIE-binaries.patch +# Upstream commit 85b7ab83257b3191a1a7ca044589a092bcef2bb3 (#2219392) +Patch16: file-5.39-wasm-magic.patch URL: https://www.darwinsys.com/file/ Requires: file-libs%{?_isa} = %{version}-%{release} @@ -234,11 +237,15 @@ cd %{py3dir} %endif %changelog -* Mon Jul 03 2023 Vincent Mihalkovic - 5.39-12.1 +* Tue Jul 11 2023 Ville-Pekka Vainio - 5.39-14 +- fix detection of deflate encoded PDFs + Resolves: #2213761 + +* Mon Jul 03 2023 Vincent Mihalkovic - 5.39-13 - fix recognition of wasm files - Resolves: #2221659 + Resolves: #2219392 -* Wed Mar 15 2023 MSVSphere Packaging Team - 5.39-10 +* Wed Mar 15 2023 MSVSphere Packaging Team - 5.39-12 - Rebuilt for MSVSphere 9.1. * Wed Feb 01 2023 Vincent Mihalkovic - 5.39-12