import file-5.39-12.1.el9_2

c9 imports/c9/file-5.39-12.1.el9_2
MSVSphere Packaging Team 2 years ago
parent 0fb489ebfb
commit 831da901c5

@ -0,0 +1,23 @@
From 85b7ab83257b3191a1a7ca044589a092bcef2bb3 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 25 Jun 2020 16:52:48 +0000
Subject: [PATCH] Include # (alternate format) to the list of uninteresting
formats Reported by Werner Fink
---
src/funcs.c | 2 ++--
1 file changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/funcs.c b/src/funcs.c
index 299b8f022..ecbfa28c5 100644
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt)
if (*++p == '%')
continue;
// Skip uninteresting.
- while (strchr("0.'+- ", *p) != NULL)
+ while (strchr("#0.'+- ", *p) != NULL)
p++;
if (*p == '*') {
if (msg)

@ -15,7 +15,7 @@
Summary: Utility for determining file types Summary: Utility for determining file types
Name: file Name: file
Version: 5.39 Version: 5.39
Release: 12%{?dist} Release: 12.1%{?dist}
License: BSD License: BSD
Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -53,6 +53,8 @@ Patch12: file-5.39-regex-optimalizations.patch
Patch13: file-5.39-floating-point-exception.patch Patch13: file-5.39-floating-point-exception.patch
# Upstream commit 363d7fcf703ad3ebf37b45693b2c9e43eb8b4176 (#2164834) # Upstream commit 363d7fcf703ad3ebf37b45693b2c9e43eb8b4176 (#2164834)
Patch14: file-5.39-static-PIE-binaries.patch Patch14: file-5.39-static-PIE-binaries.patch
# Upstream commit 85b7ab83257b3191a1a7ca044589a092bcef2bb3 (#2221659)
Patch15: file-5.39-wasm-magic.patch
URL: https://www.darwinsys.com/file/ URL: https://www.darwinsys.com/file/
Requires: file-libs%{?_isa} = %{version}-%{release} Requires: file-libs%{?_isa} = %{version}-%{release}
@ -232,6 +234,10 @@ cd %{py3dir}
%endif %endif
%changelog %changelog
* Mon Jul 03 2023 Vincent Mihalkovic <vmihalko@redhat.com> - 5.39-12.1
- fix recognition of wasm files
Resolves: #2221659
* Wed Feb 01 2023 Vincent Mihalkovic <vmihalko@redhat.com> - 5.39-12 * Wed Feb 01 2023 Vincent Mihalkovic <vmihalko@redhat.com> - 5.39-12
- fix detection of static-pie binaries - fix detection of static-pie binaries
Resolves: #2164834 Resolves: #2164834

Loading…
Cancel
Save