[packages/file] up to 5.48

[atler]

commit 14eaeb34eaceccc4054b2fac91c0921f8a051dda
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jun 8 20:34:52 2026 +0200

    up to 5.48
    
    upstream ftp server is back but switch to upstream https

 automake.patch                               |  2 +-
 file-python-magic-close-fix-whitespace.patch | 20 --------------------
 file.spec                                    | 10 ++++------
 searchpath.patch                             |  2 +-
 4 files changed, 6 insertions(+), 28 deletions(-)
---
diff --git a/file.spec b/file.spec
index 27b4497..a8c5d25 100644
--- a/file.spec
+++ b/file.spec
@@ -34,13 +34,12 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.47
+Version:	5.48
 Release:	1
 License:	distributable
 Group:		Applications/File
-#Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-Source0:	https://distfiles.macports.org/file/%{name}-%{version}.tar.gz
-# Source0-md5:	1023ef52a2fb64acdf80211e469d6939
+Source0:	https://astron.com/pub/file/%{name}-%{version}.tar.gz
+# Source0-md5:	423686e97f731d8c24e9cd1a22b03dec
 Source1:	http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:	%{name}-zisofs.magic
@@ -50,13 +49,13 @@ Patch0:		searchpath.patch
 Patch1:		automake.patch
 Patch2:		%{name}-gettext-no-random-translations.patch
 Patch3:		name-use-count.patch
-Patch4:		%{name}-python-magic-close-fix-whitespace.patch
 URL:		http://www.darwinsys.com/file/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 %{?with_seccomp:BuildRequires:	libseccomp-devel}
 BuildRequires:	libtool >= 2:2.0
+BuildRequires:	linux-libc-headers >= 7:5.13
 BuildRequires:	lzlib-devel
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.751
@@ -292,7 +291,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
 %patch -P 1 -p1
 %patch -P 2 -p1
 %patch -P 3 -p1
-%patch -P 4 -p1
 
 %if "%{_ver_lt '%{cc_version}' '3.4'}" == "1"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
diff --git a/automake.patch b/automake.patch
index d06951b..90f3088 100644
--- a/automake.patch
+++ b/automake.patch
@@ -13,9 +13,9 @@
 +$(MAGIC_FILES)
 +
 +MAGIC_FILES = \
+ $(MAGIC_FRAGMENT_DIR)/a2ml \
  $(MAGIC_FRAGMENT_DIR)/acorn \
  $(MAGIC_FRAGMENT_DIR)/adi \
- $(MAGIC_FRAGMENT_DIR)/adventure \
 @@ -189,6 +189,7 @@
  $(MAGIC_FRAGMENT_DIR)/modulefile \
  $(MAGIC_FRAGMENT_DIR)/motorola \
diff --git a/file-python-magic-close-fix-whitespace.patch b/file-python-magic-close-fix-whitespace.patch
deleted file mode 100644
index 01b805f..0000000
--- a/file-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/searchpath.patch b/searchpath.patch
index 1003c69..a45c78c 100644
--- a/searchpath.patch
+++ b/searchpath.patch
@@ -21,7 +21,7 @@ still use ~/.magic by default
 -	static const char hmagic[] = "/.magic/magic.mgc";
 +	static const char hmagic[] = "/.magic";
  	static char *default_magic;
- 	char *home, *hmagicpath;
+ 	char *home, *hmagicpath, *tmp_magic;
  
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/14eaeb34eaceccc4054b2fac91c0921f8a051dda