[packages/file] up to 5.44

atler atler at pld-linux.org
Mon Dec 26 23:21:09 CET 2022


commit 4291c010fec470048de8abf3cbd57870ee70c87a
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Dec 26 23:19:38 2022 +0100

    up to 5.44

 file.spec        | 8 ++++++--
 searchpath.patch | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/file.spec b/file.spec
index b63d794..0321443 100644
--- a/file.spec
+++ b/file.spec
@@ -34,12 +34,12 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.43
+Version:	5.44
 Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	8effd70da368210a6c6eece037f978eb
+# Source0-md5:	a60d586d49d015d842b9294864a89c7a
 Source1:	http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:	%{name}-zisofs.magic
@@ -52,8 +52,10 @@ Patch3:		name-use-count.patch
 URL:		http://www.darwinsys.com/file/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	bzip2-devel
 BuildRequires:	libseccomp-devel
 BuildRequires:	libtool >= 2:2.0
+BuildRequires:	lzlib-devel
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.751
 %if %{with python2}
@@ -68,7 +70,9 @@ BuildRequires:	python3-modules
 BuildRequires:	python3-setuptools
 BuildRequires:	rpm-pythonprov
 %endif
+BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
 Requires(pretrans):	coreutils
 Requires:	libmagic = %{version}-%{release}
 Conflicts:	rpm-build < 4.4.1-9
diff --git a/searchpath.patch b/searchpath.patch
index 649c6cb..d816223 100644
--- a/searchpath.patch
+++ b/searchpath.patch
@@ -15,7 +15,7 @@ still use ~/.magic by default
 --- file-5.06/src/magic.c~	2011-04-07 22:20:30.000000000 +0300
 +++ file-5.06/src/magic.c	2011-04-18 11:56:38.611292743 +0300
 @@ -107,7 +107,7 @@
- private const char *
+ file_private const char *
  get_default_magic(void)
  {
 -	static const char hmagic[] = "/.magic/magic.mgc";
@@ -31,6 +31,6 @@ still use ~/.magic by default
  	if (map == NULL) {
 -		if (ms->flags & MAGIC_CHECK)
 +		if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
- 			file_magwarn(ms, "using regular magic file `%s'", fn);
+ 			file_magwarn(NULL, "using regular magic file `%s'", fn);
  		map = apprentice_load(ms, fn, action);
  		if (map == NULL)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/0e2e204a7a2e728797af8ead98204ad2a23ebdf6



More information about the pld-cvs-commit mailing list