rpms/file
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix mismatching gzip files and text files as animations

Browse Source
This commit is contained in:
Tomas Smetana 2008-02-01 11:18:38 +00:00
parent 52496b2cd3
commit 7dea88215c
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
file-4.23-mismatch.patch Normal file
View File

@ -0,0 +1,33 @@
diff -up file-4.23/magic/Magdir/animation.mismatch file-4.23/magic/Magdir/animation
--- file-4.23/magic/Magdir/animation.mismatch 2007-11-08 01:28:03.000000000 +0100
+++ file-4.23/magic/Magdir/animation 2008-02-01 12:16:13.000000000 +0100
@@ -570,7 +570,8 @@
>>4 byte&0x78 0x18 \b, 3 streams
>>4 byte &0x20 \b, 4 or more streams
>>4 byte &0x40 \b, 8 or more streams
-0 beshort 0x4DE1 MPEG-4 LO-EP audio stream
+# Matches text files
+#0 beshort 0x4DE1 MPEG-4 LO-EP audio stream
# FLI animation format
4 leshort 0xAF11 FLI file
@@ -580,12 +581,13 @@
>12 leshort x depth=%d,
>16 leshort x ticks/frame=%d
# FLC animation format
-4 leshort 0xAF12 FLC file
->6 leshort x - %d frames
->8 leshort x width=%d pixels,
->10 leshort x height=%d pixels,
->12 leshort x depth=%d,
->16 leshort x ticks/frame=%d
+4 leshort 0xAF12
+>0 string !\037\213 FLC file
+>>6 leshort x - %d frames
+>>8 leshort x width=%d pixels,
+>>10 leshort x height=%d pixels,
+>>12 leshort x depth=%d,
+>>16 leshort x ticks/frame=%d
# DL animation format
# XXX - collision with most `mips' magic

11
file.spec
View File

@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 4.23
Release: 3%{?dist}
Release: 4%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -25,7 +25,8 @@ patch12: file-4.23-msoffice.patch
patch13: file-4.21-efi.patch
patch14: file-4.21-pybuild.patch
patch15: file-4.23-tryelf.patch
patch15: file-4.23-ext4.patch
patch16: file-4.23-ext4.patch
patch17: file-4.23-mismatch.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -85,6 +86,9 @@ file(1) command.
%patch13 -p1 -b .efi
%patch14 -p1 -b .pybuild
%patch15 -p1 -b .tryelf
%patch16 -p1 -b .ext4
%patch17 -p1 -b .mismatch
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@ -157,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Fri Feb 01 2008 Tomas Smetana <tsmetana@redhat.com> - 4.23-4
- fix mismatching gzip files and text files as animations
* Fri Feb 01 2008 Tomas Smetana <tsmetana@redhat.com> - 4.23-3
- fix #430927 - detect ext4 filesystems