public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: FeRD (Frank Dana) <ferdnyc@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/file] rawhide: Update to 5.48, fixes zip file recognition
Date: Fri, 10 Jul 2026 10:35:10 GMT [thread overview]
Message-ID: <178367971042.1.6870588549306719950.rpms-file-7ae3dd6f9f3f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/file
Branch : rawhide
Commit : 7ae3dd6f9f3f50593ea3e0261984db35052ab049
Author : FeRD (Frank Dana) <ferdnyc@gmail.com>
Date : 2026-07-09T21:12:07-04:00
Stats : +8/-58 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/file/c/7ae3dd6f9f3f50593ea3e0261984db35052ab049?branch=rawhide
Log:
Update to 5.48, fixes zip file recognition
---
diff --git a/0001-PR-725-inliniac-Revert-previous-and-always-set-offse.patch b/0001-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
deleted file mode 100644
index 73e5760..0000000
--- a/0001-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c54605718190ad8fe9c25cb475f1f32ca7cd54f7 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sun, 12 Apr 2026 22:15:14 +0000
-Subject: [PATCH] PR/725: inliniac: Revert previous and always set offset.
-
----
- src/softmagic.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/softmagic.c b/src/softmagic.c
-index 9aaf8b3e..7cf7c798 100644
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1577,8 +1577,7 @@ normal:
- ms->offset = offset;
- ms->eoffset = 0;
- } else {
-- if (b->fd != -1)
-- ms->offset = ms->eoffset + offset;
-+ ms->offset = ms->eoffset + offset;
- }
- }
- if ((ms->flags & MAGIC_DEBUG) != 0) {
---
-2.53.0
-
diff --git a/file-5.47-python-magic-close-fix-whitespace.patch b/file-5.47-python-magic-close-fix-whitespace.patch
deleted file mode 100644
index f29b0dc..0000000
--- a/file-5.47-python-magic-close-fix-whitespace.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/python/magic.py
-+++ b/python/magic.py
-@@ -127,14 +127,14 @@
- class Magic(object):
- def __init__(self, ms):
- self._magic_t = ms
-- self._close = _close
-+ self._close = _close
-
- def close(self):
- """
- Closes the magic database and deallocates any resources used.
- """
-- if _close:
-- _close(self._magic_t)
-+ if self._close:
-+ self._close(self._magic_t)
-
- @staticmethod
- def __tostr(s):
diff --git a/file.spec b/file.spec
index 9e77be7..cf94d3a 100644
--- a/file.spec
+++ b/file.spec
@@ -14,8 +14,8 @@
Summary: Utility for determining file types
Name: file
-Version: 5.47
-Release: 3%{?dist}
+Version: 5.48
+Release: 1%{?dist}
# Main license is BSD-2-Clause-Darwin
# Shipped exceptions:
@@ -48,14 +48,6 @@ Patch3: file-5.45-readelf-limit-revert.patch
Patch4: file-5.46-fix-tests-rpm-magic.patch
-# Fix tabs->spaces in python/magic.py (upstream 5.47 used tabs; rhbz#2419719)
-Patch5: file-5.47-python-magic-close-fix-whitespace.patch
-
-# Fix 0000739: Possible regression in 5.47 related to compressed executables
-# https://bugs.astron.com/view.php?id=739
-# Upstream commit c546057
-Patch6: 0001-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
-
URL: https://www.darwinsys.com/file/
Requires: file-libs%{?_isa} = %{version}-%{release}
BuildRequires: zlib-devel
@@ -244,6 +236,10 @@ make -C tests check
%endif
%changelog
+* Fri Jul 03 2026 FeRD (Frank Dana) <ferdnyc@gmail.com> - 5.48-1
+- New upstream release 5.48; drop upstreamed patches
+- Fixes zipfile detection (rhbz#2427330)
+
* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 5.47-3
- Rebuilt for Python 3.15
diff --git a/sources b/sources
index 51fd0c6..c84d648 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (file-5.47.tar.gz) = a19c1f2b584bcfa70d4a02545667a90ff9e069523a5fc7b84d79b2b32cb7e59b73c555943784a13d56fa6d4618e18a254fd6102187def1a4a7d936b41ae7ce31
-SHA512 (file-5.47.tar.gz.asc) = 19dafce2906420855915493b7c20fdefdb6464090f96c8b431aa7b3c15899e2a57cdc96d586c2a3de113f5857c6b22f6ee9bc825275cdd7c26f6eb1eaaad7073
+SHA512 (file-5.48.tar.gz) = 9672504f9473e41ed047bb019f1a003965b3f12e16b77d090e819e094805e42d66d07582402eb9df6be98932161ee6a014a549dbcca9cef10c236b0a3a71a642
+SHA512 (file-5.48.tar.gz.asc) = a4501efcee2ee446f1e5e25d78c864a688ce1d40b5630392be5e286ba3fbe38ebb9b8366b8b48cbfa0de978b5a64ae2c67495e8ae37417a8f0d57c7a23b5cc08
reply other threads:[~2026-07-10 10:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178367971042.1.6870588549306719950.rpms-file-7ae3dd6f9f3f@fedoraproject.org \
--to=ferdnyc@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox