- up to 5.06

Changed files:
    file.spec -> 1.176
    searchpath.patch -> 1.2

diff --git a/file.spec b/file.spec
index be34e21e8d5db3846e76407a78884ffe28da5cb7..2eead9a2ab6353074c451e7c8302e4f052fb268e 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -28,12 +28,12 @@ Summary(uk.UTF-8):  Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):  判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
-Version:       5.05
+Version:       5.06
 Release:       1
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 0b429063710457be2bd17a18389cb018
+# Source0-md5: deb12b0fb9d09e7681be72bad6eba4e0
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: c157a183b64156f8baafaefd9cbf04c1
 Source2:       %{name}-zisofs.magic

diff --git a/searchpath.patch b/searchpath.patch
index 71e387559b727b88d7204d7e4d42d29f45e3cde3..0bd0937c2f85b6db9e8d92a6cc30ef101cf443cb 100644 (file)
--- a/searchpath.patch
+++ b/searchpath.patch
@@ -12,12 +12,14 @@ still use ~/.magic by default
  AM_CFLAGS = @WARNINGS@
  
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
---- file-5.04/src/magic.c~     2009-09-14 20:50:38.000000000 +0300
-+++ file-5.04/src/magic.c      2010-09-20 17:14:49.000000000 +0300
-@@ -84,5 +89,5 @@
+--- 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 *
  get_default_magic(void)
  {
 -      static const char hmagic[] = "/.magic/magic.mgc";
 +      static const char hmagic[] = "/.magic";
-       static char default_magic[2 * MAXPATHLEN + 2];
+       static char *default_magic;
+       char *home, *hmagicpath;
+