- fix #656395 - "string" magic directive supports longer strings

This commit is contained in:
Jan Kaluza 2010-11-24 11:13:44 +01:00
parent c332c32955
commit 7a5a11f5a7
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,19 @@
diff --git a/src/file.h b/src/file.h
index c07f2d4..7086092 100644
--- a/src/file.h
+++ b/src/file.h
@@ -104,11 +104,11 @@
#define MAXMAGIS 8192 /* max entries in any one magic file
or directory */
#define MAXDESC 64 /* max leng of text description/MIME type */
-#define MAXstring 32 /* max leng of "string" types */
+#define MAXstring 64 /* max leng of "string" types */
#define MAGICNO 0xF11E041C
-#define VERSIONNO 7
-#define FILE_MAGICSIZE 200
+#define VERSIONNO 8
+#define FILE_MAGICSIZE 232
#define FILE_LOAD 0
#define FILE_CHECK 1

View File

@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.04
Release: 16%{?dist}
Release: 17%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -26,6 +26,7 @@ Patch12: file-5.04-core-prpsinfo.patch
Patch13: file-5.04-python-2.7.patch
Patch14: file-5.04-webm.patch
Patch15: file-5.04-zip64.patch
Patch16: file-5.04-string-size.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -108,6 +109,8 @@ file(1) command.
%patch14 -p1
#fixes #637785
%patch15 -p1
#fixes #656395
%patch16 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@ -185,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Wed Nov 24 2010 Jan Kaluza <jkaluza@redhat.com> - 5.04-17
- fix #656395 - "string" magic directive supports longer strings
* Wed Aug 29 2010 Jan Kaluza <jkaluza@redhat.com> - 5.04-16
- fix #637785 - support for zip64 format