up to 5.14, release intended to fix 5.13 bugs

http://mx.gw.com/pipermail/file/2013/001154.html

diff --git a/cdf-pread.patch b/cdf-pread.patch
deleted file mode 100644 (file)
index 059427e..0000000
--- a/cdf-pread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- file-5.13/src/cdf.c~       2013-02-18 20:33:14.000000000 +0200
-+++ file-5.13/src/cdf.c        2013-02-26 15:29:26.285712309 +0200
-@@ -296,8 +296,6 @@
-       if (info->i_fd == -1)
-               return -1;
- 
--              return -1;
--
-       if (pread(info->i_fd, buf, len, off) != (ssize_t)len)
-               return -1;
- 

diff --git a/file-sparc.patch b/file-sparc.patch
index 2c3aec8e77ec6b876d0ec208c56ebe4d7e904f92..9e799a379f79140b373471dcaf8c3d1f05ad6438 100644 (file)
--- a/file-sparc.patch
+++ b/file-sparc.patch
@@ -26,17 +26,17 @@ diff -Nru file-4.02.bak/magic/Magdir/bsdi file-4.02/magic/Magdir/bsdi
  >0    byte            &0x80           dynamically linked executable
  >0    byte            ^0x80           executable
  >16   belong          >0              not stripped
---- file-5.13/magic/Magdir/mach~       2013-01-05 01:35:53.000000000 +0200
-+++ file-5.13/magic/Magdir/mach        2013-02-26 15:21:04.862538450 +0200
-@@ -122,7 +122,7 @@
- >>>8          belong&0x00ffffff       1       mc88100
- >>>8          belong&0x00ffffff       2       mc88110
- >>>8          belong&0x00ffffff       >2      mc88000 subarchitecture=%ld
-->>4   belong&0x00ffffff       14      sparc
-+>>4   belong&0x00ffffff       14      SPARC
- >>4   belong&0x00ffffff       15      i860g
- >>4   belong&0x00ffffff       16      alpha
- >>4   belong&0x00ffffff       17      rs6000
+--- file-5.14/magic/Magdir/mach~       2013-03-21 19:45:14.000000000 +0200
++++ file-5.14/magic/Magdir/mach        2013-03-22 13:22:26.517457818 +0200
+@@ -121,7 +121,7 @@
+ >>>4          belong&0x00ffffff       1       mc88100
+ >>>4          belong&0x00ffffff       2       mc88110
+ >>>4          belong&0x00ffffff       >2      mc88000 subarchitecture=%ld
+->>0   belong&0x00ffffff       14      sparc
++>>0   belong&0x00ffffff       14      SPARC
+ >>0   belong&0x00ffffff       15      i860g
+ >>0   belong&0x00ffffff       16      alpha
+ >>0   belong&0x00ffffff       17      rs6000
 diff -Nru file-4.02.bak/magic/Magdir/netbsd file-4.02/magic/Magdir/netbsd
 --- file-4.02.bak/magic/Magdir/netbsd  Tue Apr  1 01:53:37 2003
 +++ file-4.02/magic/Magdir/netbsd      Thu Apr  3 09:17:09 2003

diff --git a/file.spec b/file.spec
index 868b65abf08f7bfcfc0674ba6032fb2c78f5db1f..8197bcda20777a575c9839df14abc3605886c072 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.13
-Release:       2
+Version:       5.14
+Release:       1
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: d60c1364ba956eff7d21f8250808fc6d
+# Source0-md5: c26625f1d6773ad4bc5a87c0e315632c
 Source1:       http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:       %{name}-zisofs.magic
@@ -44,8 +44,6 @@ Patch1:               %{name}-selinux.patch
 Patch2:                searchpath.patch
 Patch3:                automake.patch
 Patch4:                sticky-bit.patch
-Patch5:                cdf-pread.patch
-Patch6:                macho-crash.patch
 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -254,8 +252,6 @@ Wiązania Pythona dla libmagic.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac

diff --git a/macho-crash.patch b/macho-crash.patch
deleted file mode 100644 (file)
index 69f3957..0000000
--- a/macho-crash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-See file mailinglist thread:
-http://mx.gw.com/pipermail/file/2013/001138.html
-
-From cf289f23851ba3eb017576be1ba65c0a0f0e16a9 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 26 Feb 2013 18:24:43 +0000
-Subject: [PATCH] - avoid 0 offset causing an infinite loop. - XXX: should
- limit indirect nesting.
-
----
- src/softmagic.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/softmagic.c b/src/softmagic.c
-index c42ca19..22d1a27 100644
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1617,6 +1617,12 @@ private int mcopy(struct magic_set *, union VALUETYPE *, int, int,
- 
-               if (m->flag & INDIROFFADD) {
-                       offset += ms->c.li[cont_level-1].off;
-+                      if (offset == 0) {
-+                              if ((ms->flags & MAGIC_DEBUG) != 0)
-+                                      fprintf(stderr,
-+                                          "indirect *zero* offset\n");
-+                              return 0;
-+                      }
-                       if ((ms->flags & MAGIC_DEBUG) != 0)
-                               fprintf(stderr, "indirect +offs=%u\n", offset);
-               }
--- 
-1.8.1.5
-