commit 3ba061fc70f2a7ebbd6a2658be8def1b9b28bde1
Author: Jan Rękorajski <[email protected]>
Date: Mon Oct 12 00:26:08 2020 +0200
- silence spurious warnings about /etc/magic
- rel 3
file.spec | 2 +-
searchpath.patch | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/file.spec b/file.spec
index aa1b0fe..ce81b82 100644
--- a/file.spec
+++ b/file.spec
@@ -30,7 +30,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。
Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。
Name: file
Version: 5.39
-Release: 2
+Release: 3
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
diff --git a/searchpath.patch b/searchpath.patch
index 214d737..5382e38 100644
--- a/searchpath.patch
+++ b/searchpath.patch
@@ -23,3 +23,14 @@ still use ~/.magic by default
static char *default_magic;
char *home, *hmagicpath;
+--- a/src/apprentice.c
++++ b/src/apprentice.c
+@@ -460,7 +460,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int
action)
+ #ifndef COMPILE_ONLY
+ map = apprentice_map(ms, fn);
+ 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);
+ map = apprentice_load(ms, fn, action);
+ if (map == NULL)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/3ba061fc70f2a7ebbd6a2658be8def1b9b28bde1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
