- silence spurious warnings about /etc/magic

- rel 3

diff --git a/file.spec b/file.spec
index aa1b0fe297a2a46f1edf6d91895e81134d7fbfa9..ce81b82c030760b4cd5a134d608990dfa1044ea4 100644 (file)
--- 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 214d737d7211f8d4d04886caa94409352a208dda..5382e38b130267e7d3546523a09aec3c49190fd6 100644 (file)
--- 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)