pool/file
SHA256
6
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 31647 from Base:System

Browse Source 
Copy from Base:System/file based on submit request 31647 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/31647
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=34
This commit is contained in:
OBS User autobuild 2010-02-11 18:05:27 +00:00 committed by Git OBS Bridge
commit eb81384327
13 changed files with 273 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file-4.03-tex.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff --- magic/Localstuff
=================================================================== +++ magic/Localstuff 2003-07-01 16:58:32.000000000 +0000
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -5,3 +5,12 @@ @@ -5,3 +5,12 @@
# $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $
# Add any locally observed files here. Remember: # Add any locally observed files here. Remember:

12
file-4.24-autoconf.dif
View File

@ -1,7 +1,5 @@
Index: doc/Makefile.am --- doc/Makefile.am
=================================================================== +++ doc/Makefile.am 2003-12-15 12:04:19.000000000 +0000
--- doc/Makefile.am.orig
+++ doc/Makefile.am
@@ -5,7 +5,8 @@ else @@ -5,7 +5,8 @@ else
man_MAGIC = magic.4 man_MAGIC = magic.4
endif endif
@ -22,10 +20,8 @@ Index: doc/Makefile.am
@rm -f $@ @rm -f $@
sed -e s@__CSECTION__@1@g \ sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \ -e s@__FSECTION__@${fsect}@g \
Index: src/readelf.h --- src/readelf.h
=================================================================== +++ src/readelf.h 2003-07-01 14:53:55.000000000 +0000
--- src/readelf.h.orig
+++ src/readelf.h
@@ -34,7 +34,10 @@ @@ -34,7 +34,10 @@
#ifndef __fake_elf_h__ #ifndef __fake_elf_h__
#define __fake_elf_h__ #define __fake_elf_h__

157
file-5.02-exec.dif
View File

@ -1,157 +0,0 @@
--- magic/Magdir/commands
+++ magic/Magdir/commands 2009-05-05 14:01:03.253902298 +0200
@@ -3,66 +3,66 @@
# commands: file(1) magic for various shells and interpreters
#
#0 string : shell archive or script for antique kernel text
-0 string/b #!\ /bin/sh POSIX shell script text executable
+0 string/b #!\ /bin/sh POSIX shell script text
!:mime text/x-shellscript
-0 string/b #!\ /bin/csh C shell script text executable
+0 string/b #!\ /bin/csh C shell script text
!:mime text/x-shellscript
# korn shell magic, sent by George Wu, gwu@clyde.att.com
-0 string/b #!\ /bin/ksh Korn shell script text executable
+0 string/b #!\ /bin/ksh Korn shell script text
!:mime text/x-shellscript
-0 string/b #!\ /bin/tcsh Tenex C shell script text executable
+0 string/b #!\ /bin/tcsh Tenex C shell script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable
+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable
+0 string/b #!\ /usr/local/tcsh Tenex C shell script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable
+0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text
!:mime text/x-shellscript
#
# zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson)
-0 string/b #!\ /bin/zsh Paul Falstad's zsh script text executable
+0 string/b #!\ /bin/zsh Paul Falstad's zsh script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text executable
+0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable
+0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text executable
+0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text executable
+0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text
!:mime text/x-shellscript
-0 string/b #!\ /bin/nawk new awk script text executable
+0 string/b #!\ /bin/nawk new awk script text
!:mime text/x-nawk
-0 string/b #!\ /usr/bin/nawk new awk script text executable
+0 string/b #!\ /usr/bin/nawk new awk script text
!:mime text/x-nawk
-0 string/b #!\ /usr/local/bin/nawk new awk script text executable
+0 string/b #!\ /usr/local/bin/nawk new awk script text
!:mime text/x-nawk
-0 string/b #!\ /bin/gawk GNU awk script text executable
+0 string/b #!\ /bin/gawk GNU awk script text
!:mime text/x-gawk
-0 string/b #!\ /usr/bin/gawk GNU awk script text executable
+0 string/b #!\ /usr/bin/gawk GNU awk script text
!:mime text/x-gawk
-0 string/b #!\ /usr/local/bin/gawk GNU awk script text executable
+0 string/b #!\ /usr/local/bin/gawk GNU awk script text
!:mime text/x-gawk
#
-0 string/b #!\ /bin/awk awk script text executable
+0 string/b #!\ /bin/awk awk script text
!:mime text/x-awk
-0 string/b #!\ /usr/bin/awk awk script text executable
+0 string/b #!\ /usr/bin/awk awk script text
!:mime text/x-awk
# update to distinguish from *.vcf files
# this is broken because postscript has /EBEGIN{ for example.
#0 search/Bb BEGIN { awk script text
# AT&T Bell Labs' Plan 9 shell
-0 string/b #!\ /bin/rc Plan 9 rc shell script text executable
+0 string/b #!\ /bin/rc Plan 9 rc shell script text
# bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
-0 string/b #!\ /bin/bash Bourne-Again shell script text executable
+0 string/b #!\ /bin/bash Bourne-Again shell script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable
+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable
+0 string/b #!\ /usr/local/bash Bourne-Again shell script text
!:mime text/x-shellscript
-0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable
+0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text
!:mime text/x-shellscript
# using env
@@ -79,9 +79,9 @@
!:mime text/x-php
0 search/1 =<?\r PHP script text
!:mime text/x-php
-0 search/1/b #!\ /usr/local/bin/php PHP script text executable
+0 search/1/b #!\ /usr/local/bin/php PHP script text
!:mime text/x-php
-0 search/1/b #!\ /usr/bin/php PHP script text executable
+0 search/1/b #!\ /usr/bin/php PHP script text
!:mime text/x-php
0 string Zend\x00 PHP script Zend Optimizer data
--- magic/Magdir/perl
+++ magic/Magdir/perl 2009-05-05 14:01:33.658402106 +0200
@@ -4,15 +4,15 @@
# The `eval' lines recognizes an outrageously clever hack.
# Keith Waclena <keith@cerberus.uchicago.edu>
# Send additions to <perl5-porters@perl.org>
-0 search/1/b #!\ /bin/perl Perl script text executable
+0 search/1/b #!\ /bin/perl Perl script text
!:mime text/x-perl
0 search/1 eval\ "exec\ /bin/perl Perl script text
!:mime text/x-perl
-0 search/1/b #!\ /usr/bin/perl Perl script text executable
+0 search/1/b #!\ /usr/bin/perl Perl script text
!:mime text/x-perl
0 search/1 eval\ "exec\ /usr/bin/perl Perl script text
!:mime text/x-perl
-0 search/1/b #!\ /usr/local/bin/perl Perl script text executable
+0 search/1/b #!\ /usr/local/bin/perl Perl script text
!:mime text/x-perl
0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text
!:mime text/x-perl
--- magic/Magdir/python
+++ magic/Magdir/python 2006-03-24 14:51:26.000000000 +0100
@@ -4,7 +4,7 @@
#
# From: David Necas <yeti@physics.muni.cz>
# often the module starts with a multiline string
-0 string """ a python script text executable
+0 string """ a python script text
# MAGIC as specified in Python/import.c (1.5 to 2.3.0a)
# 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n"
0 belong 0x994e0d0a python 1.5/1.6 byte-compiled
--- magic/Magdir/varied.script
+++ magic/Magdir/varied.script 2007-03-21 11:22:09.000000000 +0100
@@ -2,12 +2,12 @@
# varied.script: file(1) magic for various interpreter scripts
0 string #!\ / a
->3 string >\0 %s script text executable
+>3 string >\0 %s script text
0 string #!\t/ a
->3 string >\0 %s script text executable
+>3 string >\0 %s script text
0 string #!/ a
->2 string >\0 %s script text executable
-0 string #!\ script text executable
+>2 string >\0 %s script text
+0 string #!\ script text
>3 string >\0 for %s
# From: arno <arenevier@fdn.fr>

20
file-5.02-misc.dif
View File

@ -49,25 +49,25 @@
+++ magic/Magdir/commands 2009-05-05 13:57:30.778196178 +0200 +++ magic/Magdir/commands 2009-05-05 13:57:30.778196178 +0200
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
!:mime text/x-shellscript !:mime text/x-shellscript
0 string/b #!\ /bin/tcsh Tenex C shell script text executable 0 string/w #!\ /bin/tcsh Tenex C shell script text executable
!:mime text/x-shellscript !:mime text/x-shellscript
+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable +0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable
+!:mime text/x-shellscript +!:mime text/x-shellscript
0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable 0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable
!:mime text/x-shellscript !:mime text/x-shellscript
0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable 0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable
@@ -54,7 +56,11 @@ @@ -54,7 +56,11 @@
0 string/b #!\ /bin/rc Plan 9 rc shell script text executable 0 string/w #!\ /bin/rc Plan 9 rc shell script text executable
# bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de) # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
-0 string/b #!\ /bin/bash Bourne-Again shell script text executable -0 string/w #!\ /bin/bash Bourne-Again shell script text executable
+0 string/b #!\ /bin/bash Bourne-Again shell script text executable +0 string/w #!\ /bin/bash Bourne-Again shell script text executable
+!:mime text/x-shellscript +!:mime text/x-shellscript
+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable +0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable
+!:mime text/x-shellscript +!:mime text/x-shellscript
+0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable +0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable
!:mime text/x-shellscript !:mime text/x-shellscript
0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable 0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable
!:mime text/x-shellscript !:mime text/x-shellscript
--- magic/Magdir/mach --- magic/Magdir/mach
+++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100 +++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100

3
file-5.03.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57b78d8319e2eb065e7bf656f7e4137a16d94dc9d12e6ff026324f1d53fae425
size 471570

8
file-4.24-awk.dif → file-5.04-awk.dif
View File

@ -1,10 +1,10 @@
--- magic/Magdir/commands --- magic/Magdir/commands
+++ magic/Magdir/commands 2008-04-14 17:05:54.968746122 +0200 +++ magic/Magdir/commands 2010-02-05 14:32:12.093297356 +0000
@@ -51,6 +51,7 @@ @@ -52,6 +52,7 @@
# update to distinguish from *.vcf files # update to distinguish from *.vcf files
# this is broken because postscript has /EBEGIN{ for example. # this is broken because postscript has /EBEGIN{ for example.
#0 search/Bb BEGIN { awk script text #0 search/Ww BEGIN { awk script text
+0 regex =^\\s*BEGIN\\s*[{] awk script text +0 regex =^\\s*BEGIN\\s*[{] awk script text
# AT&T Bell Labs' Plan 9 shell # AT&T Bell Labs' Plan 9 shell
0 string/b #!\ /bin/rc Plan 9 rc shell script text 0 string/w #!\ /bin/rc Plan 9 rc shell script text

182
file-5.04-exec.dif Normal file
View File

@ -0,0 +1,182 @@
--- magic/Magdir/commands
+++ magic/Magdir/commands 2010-02-05 14:28:46.657297767 +0000
@@ -4,73 +4,73 @@
# commands: file(1) magic for various shells and interpreters
#
#0 string : shell archive or script for antique kernel text
-0 string/w #!\ /bin/sh POSIX shell script text executable
+0 string/w #!\ /bin/sh POSIX shell script text
!:mime text/x-shellscript
-0 string/w #!\ /bin/csh C shell script text executable
+0 string/w #!\ /bin/csh C shell script text
!:mime text/x-shellscript
# korn shell magic, sent by George Wu, gwu@clyde.att.com
-0 string/w #!\ /bin/ksh Korn shell script text executable
+0 string/w #!\ /bin/ksh Korn shell script text
!:mime text/x-shellscript
-0 string/w #!\ /bin/tcsh Tenex C shell script text executable
+0 string/w #!\ /bin/tcsh Tenex C shell script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable
+0 string/w #!\ /usr/bin/tcsh Tenex C shell script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable
+0 string/w #!\ /usr/local/tcsh Tenex C shell script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable
+0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text
!:mime text/x-shellscript
#
# zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson)
-0 string/w #!\ /bin/zsh Paul Falstad's zsh script text executable
+0 string/w #!\ /bin/zsh Paul Falstad's zsh script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/bin/zsh Paul Falstad's zsh script text executable
+0 string/w #!\ /usr/bin/zsh Paul Falstad's zsh script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable
+0 string/w #!\ /usr/local/bin/zsh Paul Falstad's zsh script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/local/bin/ash Neil Brown's ash script text executable
+0 string/w #!\ /usr/local/bin/ash Neil Brown's ash script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/local/bin/ae Neil Brown's ae script text executable
+0 string/w #!\ /usr/local/bin/ae Neil Brown's ae script text
!:mime text/x-shellscript
-0 string/w #!\ /bin/nawk new awk script text executable
+0 string/w #!\ /bin/nawk new awk script text
!:mime text/x-nawk
-0 string/w #!\ /usr/bin/nawk new awk script text executable
+0 string/w #!\ /usr/bin/nawk new awk script text
!:mime text/x-nawk
-0 string/w #!\ /usr/local/bin/nawk new awk script text executable
+0 string/w #!\ /usr/local/bin/nawk new awk script text
!:mime text/x-nawk
-0 string/w #!\ /bin/gawk GNU awk script text executable
+0 string/w #!\ /bin/gawk GNU awk script text
!:mime text/x-gawk
-0 string/w #!\ /usr/bin/gawk GNU awk script text executable
+0 string/w #!\ /usr/bin/gawk GNU awk script text
!:mime text/x-gawk
-0 string/w #!\ /usr/local/bin/gawk GNU awk script text executable
+0 string/w #!\ /usr/local/bin/gawk GNU awk script text
!:mime text/x-gawk
#
-0 string/w #!\ /bin/awk awk script text executable
+0 string/w #!\ /bin/awk awk script text
!:mime text/x-awk
-0 string/w #!\ /usr/bin/awk awk script text executable
+0 string/w #!\ /usr/bin/awk awk script text
!:mime text/x-awk
# update to distinguish from *.vcf files
# this is broken because postscript has /EBEGIN{ for example.
#0 search/Ww BEGIN { awk script text
# AT&T Bell Labs' Plan 9 shell
-0 string/w #!\ /bin/rc Plan 9 rc shell script text executable
+0 string/w #!\ /bin/rc Plan 9 rc shell script text
# bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
-0 string/w #!\ /bin/bash Bourne-Again shell script text executable
+0 string/w #!\ /bin/bash Bourne-Again shell script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable
+0 string/w #!\ /usr/bin/bash Bourne-Again shell script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable
+0 string/w #!\ /usr/local/bash Bourne-Again shell script text
!:mime text/x-shellscript
-0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable
+0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text
!:mime text/x-shellscript
# using env
0 string #!/usr/bin/env a
->15 string >\0 %s script text executable
+>15 string >\0 %s script text
0 string #!\ /usr/bin/env a
->16 string >\0 %s script text executable
+>16 string >\0 %s script text
# PHP scripts
# Ulf Harnhammar <ulfh@update.uu.se>
@@ -80,9 +80,9 @@
!:mime text/x-php
0 search/1 =<?\r PHP script text
!:mime text/x-php
-0 search/1/w #!\ /usr/local/bin/php PHP script text executable
+0 search/1/w #!\ /usr/local/bin/php PHP script text
!:mime text/x-php
-0 search/1/w #!\ /usr/bin/php PHP script text executable
+0 search/1/w #!\ /usr/bin/php PHP script text
!:mime text/x-php
0 string Zend\x00 PHP script Zend Optimizer data
--- magic/Magdir/perl
+++ magic/Magdir/perl 2009-05-05 12:01:34.000000000 +0000
@@ -6,15 +6,15 @@
# The `eval' lines recognizes an outrageously clever hack.
# Keith Waclena <keith@cerberus.uchicago.edu>
# Send additions to <perl5-porters@perl.org>
-0 search/1/w #!\ /bin/perl Perl script text executable
+0 search/1/w #!\ /bin/perl Perl script text
!:mime text/x-perl
0 search/1 eval\ "exec\ /bin/perl Perl script text
!:mime text/x-perl
-0 search/1/w #!\ /usr/bin/perl Perl script text executable
+0 search/1/w #!\ /usr/bin/perl Perl script text
!:mime text/x-perl
0 search/1 eval\ "exec\ /usr/bin/perl Perl script text
!:mime text/x-perl
-0 search/1/w #!\ /usr/local/bin/perl Perl script text executable
+0 search/1/w #!\ /usr/local/bin/perl Perl script text
!:mime text/x-perl
0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text
!:mime text/x-perl
--- magic/Magdir/python
+++ magic/Magdir/python 2010-02-05 14:29:13.101297655 +0000
@@ -5,7 +5,7 @@
#
# From: David Necas <yeti@physics.muni.cz>
# often the module starts with a multiline string
-0 string """ a python script text executable
+0 string """ a python script text
# MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming
# that Py_UnicodeFlag is off for Python 2)
# 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n"
@@ -20,11 +20,11 @@
0 belong 0x3b0c0d0a python 3.0 byte-compiled
0 belong 0x4f0c0d0a python 3.1 byte-compiled
-0 search/1/w #!\ /usr/bin/python Python script text executable
+0 search/1/w #!\ /usr/bin/python Python script text
!:mime text/x-python
-0 search/1/w #!\ /usr/local/bin/python Python script text executable
+0 search/1/w #!\ /usr/local/bin/python Python script text
!:mime text/x-python
-0 search/1 #!/usr/bin/env\ python Python script text executable
+0 search/1 #!/usr/bin/env\ python Python script text
!:mime text/x-python
-0 search/1 #!\ /usr/bin/env\ ruby Python script text executable
+0 search/1 #!\ /usr/bin/env\ ruby Python script text
!:mime text/x-python
--- magic/Magdir/varied.script
+++ magic/Magdir/varied.script 2007-03-21 10:22:09.000000000 +0000
@@ -4,12 +4,12 @@
# varied.script: file(1) magic for various interpreter scripts
0 string #!\ / a
->3 string >\0 %s script text executable
+>3 string >\0 %s script text
0 string #!\t/ a
->3 string >\0 %s script text executable
+>3 string >\0 %s script text
0 string #!/ a
->2 string >\0 %s script text executable
-0 string #!\ script text executable
+>2 string >\0 %s script text
+0 string #!\ script text
>3 string >\0 for %s
# From: arno <arenevier@fdn.fr>

8
file-5.02-zip2.0.dif → file-5.04-zip2.0.dif
View File

@ -1,8 +1,8 @@
--- magic/Magdir/archive --- magic/Magdir/archive
+++ magic/Magdir/archive 2009-05-07 17:43:15.549950181 +0200 +++ magic/Magdir/archive 2010-02-05 15:43:36.517302304 +0000
@@ -575,6 +575,10 @@ @@ -581,6 +581,10 @@
>4 byte 0x14 !:mime application/zip
>>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract >>4 byte 0x14 Zip archive data, at least v2.0 to extract
!:mime application/zip !:mime application/zip
+>>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract +>>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract
+>>>34 ubelong 0x74797065 \b, mime type +>>>34 ubelong 0x74797065 \b, mime type

37
file-5.03.dif → file-5.04.dif
View File

@ -12,17 +12,17 @@
+# to make a pre-compiled magic.mgc for faster execution +# to make a pre-compiled magic.mgc for faster execution
+# +#
--- magic/Makefile.am --- magic/Makefile.am
+++ magic/Makefile.am 2009-05-05 14:17:32.181901712 +0200 +++ magic/Makefile.am 2010-02-05 16:37:45.805297766 +0100
@@ -4,7 +4,7 @@ @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE) MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
-pkgdata_DATA = magic.mgc -pkgdata_DATA = magic.mgc
+pkgdata_DATA = magic.mgc magic +pkgdata_DATA = magic.mgc magic
EXTRA_DIST = Header Localstuff \ EXTRA_DIST = \
$(MAGIC_FRAGMENT_DIR)/acorn \ $(MAGIC_DIR)/Header \
@@ -17,7 +17,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \ @@ -20,7 +20,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \
$(MAGIC_FRAGMENT_DIR)/amigaos \ $(MAGIC_FRAGMENT_DIR)/amigaos \
$(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/apl \ $(MAGIC_FRAGMENT_DIR)/apl \
@ -30,7 +30,7 @@
$(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \ $(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/asterix \ $(MAGIC_FRAGMENT_DIR)/asterix \
@@ -64,7 +63,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ @@ -67,7 +66,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \ $(MAGIC_FRAGMENT_DIR)/fcs \
@ -38,7 +38,7 @@
$(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/fonts \ $(MAGIC_FRAGMENT_DIR)/fonts \
$(MAGIC_FRAGMENT_DIR)/fortran \ $(MAGIC_FRAGMENT_DIR)/fortran \
@@ -95,19 +93,19 @@ $(MAGIC_FRAGMENT_DIR)/island \ @@ -98,19 +96,19 @@ $(MAGIC_FRAGMENT_DIR)/island \
$(MAGIC_FRAGMENT_DIR)/ispell \ $(MAGIC_FRAGMENT_DIR)/ispell \
$(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/jpeg \ $(MAGIC_FRAGMENT_DIR)/jpeg \
@ -60,7 +60,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/maple \ $(MAGIC_FRAGMENT_DIR)/maple \
@@ -123,10 +121,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ @@ -126,10 +124,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \ $(MAGIC_FRAGMENT_DIR)/mmdf \
@ -72,7 +72,7 @@
$(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msvc \
$(MAGIC_FRAGMENT_DIR)/mup \ $(MAGIC_FRAGMENT_DIR)/mup \
$(MAGIC_FRAGMENT_DIR)/natinst \ $(MAGIC_FRAGMENT_DIR)/natinst \
@@ -163,6 +161,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ @@ -165,6 +163,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \ $(MAGIC_FRAGMENT_DIR)/riff \
@ -81,16 +81,16 @@
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rtf \
$(MAGIC_FRAGMENT_DIR)/ruby \ $(MAGIC_FRAGMENT_DIR)/ruby \
@@ -220,8 +220,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ @@ -223,8 +223,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
$(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
+RAW = magic +RAW = magic
MAGIC = magic.mgc MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} -CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+CLEANFILES = ${MAGIC} ${RAW} +CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW}
+ +
+${RAW}: Header Localstuff $(EXTRA_DIST) +${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST)
+ cat /dev/null > $@ + cat /dev/null > $@
+ for frag in $(EXTRA_DIST); do \ + for frag in $(EXTRA_DIST); do \
+ if test -f $(srcdir)/$$frag; then \ + if test -f $(srcdir)/$$frag; then \
@ -103,13 +103,14 @@
# FIXME: Build file natively as well so that it can be used to compile # FIXME: Build file natively as well so that it can be used to compile
# the target's magic file # the target's magic file
@@ -233,6 +245,5 @@ FILE_COMPILE = $(top_builddir)/src/file @@ -236,7 +248,5 @@ FILE_COMPILE = $(top_builddir)/src/file
FILE_COMPILE_DEP = $(FILE_COMPILE) FILE_COMPILE_DEP = $(FILE_COMPILE)
endif endif
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) -${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR) - @mkdir magic && cp -p $(EXTRA_DIST) magic
- @mv $(MAGIC_FRAGMENT_BASE).mgc $@ - $(FILE_COMPILE) -C -m magic
- @rm -fr magic
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) +${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
+ $(FILE_COMPILE) -C -m $(RAW) + $(FILE_COMPILE) -C -m $(RAW)
--- magic/Magdir/elf --- magic/Magdir/elf

3
file-5.04.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45631a0885784f83fa39c54c01afd23a24dbafb3428b27d1049a657f32f54874
size 475598

28
file.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Fri Feb 5 17:15:51 CET 2010 - werner@suse.de
- Update to file version 5.04
* print proper mime for crystal reports file
* print the last summary information of a cdf document, not the
first so that nested documents print the right info
* ctime/asctime can return NULL on some OS's although
they should not (Toshit Antani)
* Centralize magic path handling routines and remove the
special-casing from file.c so that the python module for
example comes up with the same magic path (Fixes ~/.magic
handling) (from Gab)
* When magic argument is a directory, read the files in
strcmp-sorted order (fixes Debian bug #488562 and our own FIXME).
* Combine overlapping epoc and psion magic files into one (epoc).
* Add some more EPOC MIME types.
* Fix 3 bugs (From Ian Darwin):
- file_showstr could move one past the end of the array
- parse_apple did not nul terminate the string in the overflow case
- parse_mime truncated the wrong string in the overflow case
* Add the necessary field handling for crystal reports files to work
* Stop "(if" identifying Lisp files, that's plain dumb!
* Add a couple of missing MP3 MIME types.
* Add full range of hash-bang tests for Python and Ruby.
* Add MIME types for Python and Ruby scripts.
* off by one in parsing hw capabilities in elf (Cheng Renquan)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Dec 12 22:08:00 CET 2009 - jengelh@medozas.de Sat Dec 12 22:08:00 CET 2009 - jengelh@medozas.de

14
file.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package file (Version 5.03) # spec file for package file (Version 5.04)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,14 +30,14 @@ Obsoletes: file-64bit
%endif %endif
# #
# Set Version also in python-magic.spec # Set Version also in python-magic.spec
Version: 5.03 Version: 5.04
Release: 4 Release: 1
Summary: A Tool to Determine File Types Summary: A Tool to Determine File Types
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
Patch: file-%{version}.dif Patch: file-%{version}.dif
Patch1: file-5.02-misc.dif Patch1: file-5.02-misc.dif
Patch3: file-5.02-exec.dif Patch3: file-5.04-exec.dif
Patch4: file-4.24-autoconf.dif Patch4: file-4.24-autoconf.dif
Patch5: file-4.03-tex.dif Patch5: file-4.03-tex.dif
Patch7: file-4.20-ssd.dif Patch7: file-4.20-ssd.dif
@ -47,7 +47,7 @@ Patch10: file-4.18-printf.dif
Patch11: file-4.24-reg_dos.dif Patch11: file-4.24-reg_dos.dif
Patch12: file-5.02-option.dif Patch12: file-5.02-option.dif
Patch13: file-4.21-scribus.dif Patch13: file-4.21-scribus.dif
Patch14: file-4.24-awk.dif Patch14: file-5.04-awk.dif
Patch15: file-4.21-xcursor.dif Patch15: file-4.21-xcursor.dif
Patch16: file-4.21-reiserfs.dif Patch16: file-4.21-reiserfs.dif
Patch20: file-4.24-mips.dif Patch20: file-4.24-mips.dif
@ -56,7 +56,7 @@ Patch22: file-4.24-cromfs.dif
Patch24: file-4.24-warn.dif Patch24: file-4.24-warn.dif
Patch25: file-5.02-javacheck.dif Patch25: file-5.02-javacheck.dif
Patch26: file-4.24-solv.dif Patch26: file-4.24-solv.dif
Patch27: file-5.02-zip2.0.dif Patch27: file-5.04-zip2.0.dif
Patch28: file-5.03-iso9660.dif Patch28: file-5.03-iso9660.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc

8
python-magic.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-magic (Version 5.03) # spec file for package python-magic (Version 5.04)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,8 +26,8 @@ Url: http://www.darwinsys.com/file/
License: BSD 3 Clause, BSD 4 Clause License: BSD 3 Clause, BSD 4 Clause
Group: Development/Languages/Python Group: Development/Languages/Python
AutoReqProv: on AutoReqProv: on
Version: 5.03 Version: 5.04
Release: 4 Release: 1
Summary: Python module to use libmagic Summary: Python module to use libmagic
%py_requires %py_requires
Source99: file.spec Source99: file.spec