rpm/file
SHA256
1
0
Fork 0
forked from pool/file
Code Pull Requests Activity

Accepting request 238593 from Base:System

Browse Source 
- Update to file version 5.19
  * Misc buffer overruns and missing buffer size tests in cdf parsing
    (Francisco Alonso, Jan Kaluza)
  * Enforce limit of 8K on regex searches that have no limits
  * Allow the l modifier for regex to mean line count. Default
    to byte count. If line count is specified, assume a max
    of 80 characters per line to limit the byte count.
  * Don't allow conversions to be used for dates, allowing
    the mask field to be used as an offset.
  * Make the range operator limit the length of the
    regex search.
  * PR/347: Windows fixes
  * PR/352: Hangul word processor recognition
  * PR/354: Encoding irregularities in text files
  * Fix uninitialized title in CDF files (Jan Kaluza)
  * PR/351: Fix compilation of empty files 
  * Fix integer formats: We don't specify 'l' or
    'h' and 'hh' specifiers anymore, only 'll' for
    quads and nothing for the rest. This is so that
    magic writing is simpler.
  * PR/341: Jan Kaluza, fix memory leak
  * PR/342: Jan Kaluza, fix out of bounds read
  * Fix issue with long formats not matching fmtcheck
- Rename and change patch file-5.14-misc.dif to file-5.19-misc.dif
- Rename and change patch file-5.14-printf.dif to file-5.19-printf.dif 
- Rename and change patch file-5.07-biorad.dif to file-5.19-biorad.dif
- Rename and change patch file-5.19.dif to file-5.17.dif
- Rename and change patch file-4.24-cromfs.dif to file-5.19-cromfs.dif
- Rename and change patch file-4.24-solv.dif to file-5.19-solv.dif
- Rename and change patch file-5.12-zip2.0.dif to file-5.19-zip2.0.dif

OBS-URL: https://build.opensuse.org/request/show/238593
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=82
This commit is contained in:
Stephan Kulow 2014-06-26 13:07:11 +00:00 committed by Git OBS Bridge
commit 83d4e71475
16 changed files with 97 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
file-5.14-misc.dif
View File

@ -1,107 +0,0 @@
--- magic/Magdir/audio
+++ magic/Magdir/audio 2013-09-30 00:00:00.000000000 +0000
@@ -129,7 +129,7 @@
# Oct 31, 1995
# fixed by <doj@cubic.org> 2003-06-24
# Too short...
-#0 string MTM MultiTracker Module sound file
+#0 string MTM MultiTracker Module sound data
#0 string if Composer 669 Module sound data
#0 string JN Composer 669 Module sound data (extended format)
0 string MAS_U ULT(imate) Module sound data
--- magic/Magdir/bsdi
+++ magic/Magdir/bsdi 2013-09-30 00:00:00.000000000 +0000
@@ -11,7 +11,7 @@
>32 byte 0x6a (uses shared libs)
# same as in SunOS 4.x, except for static shared libraries
-0 belong&077777777 0600413 sparc demand paged
+0 belong&077777777 0600413 SPARC demand paged
>0 byte &0x80
>>20 belong <4096 shared library
>>20 belong =4096 dynamically linked executable
@@ -20,13 +20,13 @@
>16 belong >0 not stripped
>36 belong 0xb4100001 (uses shared libs)
-0 belong&077777777 0600410 sparc pure
+0 belong&077777777 0600410 SPARC pure
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
>36 belong 0xb4100001 (uses shared libs)
-0 belong&077777777 0600407 sparc
+0 belong&077777777 0600407 SPARC
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
--- magic/Magdir/mach
+++ magic/Magdir/mach 2013-09-30 00:00:00.000000000 +0000
@@ -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
--- magic/Magdir/netbsd
+++ magic/Magdir/netbsd 2013-09-30 00:00:00.000000000 +0000
@@ -100,25 +100,25 @@
0 belong&0377777777 045200507 a.out NetBSD/powerpc core
>12 string >\0 from '%s'
-0 belong&0377777777 042400413 a.out NetBSD/sparc demand paged
+0 belong&0377777777 042400413 a.out NetBSD/SPARC demand paged
>0 byte &0x80
>>20 belong <8192 shared library
>>20 belong =8192 dynamically linked executable
>>20 belong >8192 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
-0 belong&0377777777 042400410 a.out NetBSD/sparc pure
+0 belong&0377777777 042400410 a.out NetBSD/SPARC pure
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
-0 belong&0377777777 042400407 a.out NetBSD/sparc
+0 belong&0377777777 042400407 a.out NetBSD/SPARC
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80
>>0 byte &0x40 position independent
>>20 belong !0 executable
>>20 belong =0 object file
>16 belong >0 not stripped
-0 belong&0377777777 042400507 a.out NetBSD/sparc core
+0 belong&0377777777 042400507 a.out NetBSD/SPARC core
>12 string >\0 from '%s'
>32 belong !0 (signal %d)
--- magic/Magdir/sun
+++ magic/Magdir/sun 2013-09-30 00:00:00.000000000 +0000
@@ -9,7 +9,7 @@
# are in aout, as they're indistinguishable from other big-endian
# 32-bit a.out files.
#
-0 belong&077777777 0600413 a.out SunOS sparc demand paged
+0 belong&077777777 0600413 a.out SunOS SPARC demand paged
>0 byte &0x80
>>20 belong <4096 shared library
>>20 belong =4096 dynamically linked executable
@@ -17,12 +17,12 @@
>0 byte ^0x80 executable
>16 belong >0 not stripped
-0 belong&077777777 0600410 a.out SunOS sparc pure
+0 belong&077777777 0600410 a.out SunOS SPARC pure
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
-0 belong&077777777 0600407 a.out SunOS sparc
+0 belong&077777777 0600407 a.out SunOS SPARC
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped

29
file-5.14-printf.dif
View File

@ -1,29 +0,0 @@
--- src/apprentice.c
+++ src/apprentice.c 2013-09-30 00:00:00.000000000 +0000
@@ -2072,8 +2072,16 @@ check_format_type(const char *ptr, int t
quad = 1;
/*FALLTHROUGH*/
case FILE_FMT_NUM:
+ if (*ptr == '#')
+ ptr++;
+ if (*ptr == ' ')
+ ptr++;
if (*ptr == '-')
ptr++;
+ if (*ptr == '+')
+ ptr++;
+ if (*ptr == '\'')
+ ptr++;
if (*ptr == '.')
ptr++;
while (isdigit((unsigned char)*ptr)) ptr++;
@@ -2115,6 +2123,9 @@ check_format_type(const char *ptr, int t
default:
return -1;
}
+ case 'o':
+ case 'x':
+ case 'X':
case 'd':
return 0;
default:

3
file-5.18.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07
size 715461

6
file-5.07-biorad.dif → file-5.19-biorad.dif
View File

@ -1,6 +1,6 @@
--- magic/Magdir/images
+++ magic/Magdir/images 2013-09-30 00:00:00.000000000 +0000
@@ -640,6 +640,8 @@
+++ magic/Magdir/images 2014-06-24 16:36:26.658235329 +0000
@@ -655,6 +655,8 @@
# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
# Samples: http://www.loci.wisc.edu/software/sample-data
14 leshort <2
@ -8,4 +8,4 @@
+>49 byte 0
>62 leshort <2
>>54 leshort 12345 Bio-Rad .PIC Image File
>>>0 leshort >0 %hd x
>>>0 leshort >0 %d x

2
file-5.07-clicfs.dif → file-5.19-clicfs.dif
View File

@ -3,7 +3,7 @@
@@ -53,3 +53,11 @@
0 string SOLV Sat-solver solv file,
>4 belong x version %ld
>4 belong x version %d
+
+# coolo's clicfs
+

6
file-4.24-cromfs.dif → file-5.19-cromfs.dif
View File

@ -1,5 +1,5 @@
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
+++ magic/Localstuff 2014-06-25 08:49:53.486735323 +0000
@@ -36,3 +36,16 @@
# File magic for X11 cursor data files
@ -13,7 +13,7 @@
+>16 ulequad >0 \b fblock table at %lld,
+>24 ulequad >0 \b inode table at %lld,
+>32 ulequad >0 \b root at %lld,
+>40 ulelong >0 \b fblock size = %ld,
+>44 ulelong >0 \b block size = %ld,
+>40 ulelong >0 \b fblock size = %d,
+>44 ulelong >0 \b block size = %d,
+>48 ulequad >0 \b bytes = %lld
+

11
file-5.19-misc.dif Normal file
View File

@ -0,0 +1,11 @@
--- magic/Magdir/audio
+++ magic/Magdir/audio 2013-09-30 00:00:00.000000000 +0000
@@ -129,7 +129,7 @@
# Oct 31, 1995
# fixed by <doj@cubic.org> 2003-06-24
# Too short...
-#0 string MTM MultiTracker Module sound file
+#0 string MTM MultiTracker Module sound data
#0 string if Composer 669 Module sound data
#0 string JN Composer 669 Module sound data (extended format)
0 string MAS_U ULT(imate) Module sound data

19
file-5.19-printf.dif Normal file
View File

@ -0,0 +1,19 @@
--- src/apprentice.c
+++ src/apprentice.c 2014-06-24 16:33:48.770235732 +0000
@@ -2173,8 +2173,16 @@ check_format_type(const char *ptr, int t
}
} else
h = 0;
+ if (*ptr == '#')
+ ptr++;
+ if (*ptr == ' ')
+ ptr++;
if (*ptr == '-')
ptr++;
+ if (*ptr == '+')
+ ptr++;
+ if (*ptr == '\'')
+ ptr++;
if (*ptr == '.')
ptr++;
while (isdigit((unsigned char)*ptr)) ptr++;

6
file-4.24-solv.dif → file-5.19-solv.dif
View File

@ -1,10 +1,10 @@
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
+++ magic/Localstuff 2014-06-25 08:53:43.110735387 +0000
@@ -49,3 +49,7 @@
>44 ulelong >0 \b block size = %ld,
>44 ulelong >0 \b block size = %d,
>48 ulequad >0 \b bytes = %lld
+# libsatsolver solv file
+
+0 string SOLV Sat-solver solv file,
+>4 belong x version %ld
+>4 belong x version %d

6
file-5.12-zip2.0.dif → file-5.19-zip2.0.dif
View File

@ -1,12 +1,12 @@
--- magic/Magdir/archive
+++ magic/Magdir/archive 2013-09-30 00:00:00.000000000 +0000
@@ -585,6 +585,10 @@
+++ magic/Magdir/archive 2014-06-25 08:56:37.758234870 +0000
@@ -586,6 +586,10 @@
# PKZIP multi-volume archive
0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract
!:mime application/zip
+>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract
+>>34 ubelong 0x74797065 \b, mime type
+>>>38 regex application/[a-z\+\-]+ \b %s
+>>>38 regex application/[a-z+-]+ \b %s
+!:mime application/unknown+zip
# Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)

2
file-5.17.dif → file-5.19.dif
View File

@ -37,7 +37,7 @@
+>510 leshort <0xAA55 Kernel
+>510 leshort >0xAA55 Kernel
+>518 leshort 0x0105 \b, Setup Version 0x105, zImage
+>518 leshort >0x0105 \b, Setup Version %#hx
+>518 leshort >0x0105 \b, Setup Version %#x
+>518 leshort >0x1ff
+>>529 byte 0 \b, zImage
+>>529 byte 1 \b, bzImage

3
file-5.19.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9484b3bbda1acc7b13a4f71031a85ce10c77bd0ffec7226741a219ef587e3a7c
size 719158

35
file.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Tue Jun 24 16:27:38 UTC 2014 - werner@suse.de
- Update to file version 5.19
* Misc buffer overruns and missing buffer size tests in cdf parsing
(Francisco Alonso, Jan Kaluza)
* Enforce limit of 8K on regex searches that have no limits
* Allow the l modifier for regex to mean line count. Default
to byte count. If line count is specified, assume a max
of 80 characters per line to limit the byte count.
* Don't allow conversions to be used for dates, allowing
the mask field to be used as an offset.
* Make the range operator limit the length of the
regex search.
* PR/347: Windows fixes
* PR/352: Hangul word processor recognition
* PR/354: Encoding irregularities in text files
* Fix uninitialized title in CDF files (Jan Kaluza)
* PR/351: Fix compilation of empty files
* Fix integer formats: We don't specify 'l' or
'h' and 'hh' specifiers anymore, only 'll' for
quads and nothing for the rest. This is so that
magic writing is simpler.
* PR/341: Jan Kaluza, fix memory leak
* PR/342: Jan Kaluza, fix out of bounds read
* Fix issue with long formats not matching fmtcheck
- Rename and change patch file-5.14-misc.dif to file-5.19-misc.dif
- Rename and change patch file-5.14-printf.dif to file-5.19-printf.dif
- Rename and change patch file-5.07-biorad.dif to file-5.19-biorad.dif
- Rename and change patch file-5.19.dif to file-5.17.dif
- Rename and change patch file-4.24-cromfs.dif to file-5.19-cromfs.dif
- Rename and change patch file-4.24-solv.dif to file-5.19-solv.dif
- Rename and change patch file-5.12-zip2.0.dif to file-5.19-zip2.0.dif
- Rename and change patch file-5.07-clicfs.dif to file-5.19-clicfs.dif
-------------------------------------------------------------------
Thu May 8 19:56:07 UTC 2014 - crrodriguez@opensuse.org

18
file.spec
View File

@ -30,33 +30,33 @@ Obsoletes: file-64bit
%endif
#
# Set Version also in python-magic.spec
Version: 5.18
Version: 5.19
Release: 0
Summary: A Tool to Determine File Types
License: BSD-2-Clause
Group: Productivity/File utilities
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
Source2: baselibs.conf
Patch: file-5.17.dif
Patch1: file-5.14-misc.dif
Patch: file-5.19.dif
Patch1: file-5.19-misc.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif
Patch7: file-4.20-ssd.dif
Patch8: file-4.20-xen.dif
Patch9: file-5.18-elf.dif
Patch10: file-5.14-printf.dif
Patch10: file-5.19-printf.dif
Patch11: file-5.12-zip.dif
Patch12: file-5.17-option.dif
Patch13: file-4.21-scribus.dif
Patch15: file-4.21-xcursor.dif
Patch20: file-4.24-mips.dif
Patch22: file-4.24-cromfs.dif
Patch22: file-5.19-cromfs.dif
Patch25: file-5.18-javacheck.dif
Patch26: file-4.24-solv.dif
Patch27: file-5.12-zip2.0.dif
Patch26: file-5.19-solv.dif
Patch27: file-5.19-zip2.0.dif
Patch28: file-5.07-iso9660.dif
Patch31: file-5.07-biorad.dif
Patch32: file-5.07-clicfs.dif
Patch31: file-5.19-biorad.dif
Patch32: file-5.19-clicfs.dif
Patch33: file-5.16-ocloexec.patch
Patch34: file-5.18-endian.patch
Patch35: file-5.12-nitpick.dif

5
python-magic.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 25 09:07:13 UTC 2014 - werner@suse.de
- adapt version in specfile to 5.19
-------------------------------------------------------------------
Fri Feb 28 11:17:12 CET 2014 - ro@suse.de

2
python-magic.spec
View File

@ -23,7 +23,7 @@ BuildRequires: libtool
BuildRequires: python-devel
BuildRequires: zlib-devel
Url: http://www.darwinsys.com/file/
Version: 5.18
Version: 5.19
Release: 0
Summary: Python module to use libmagic
License: BSD-3-Clause and BSD-4-Clause