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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=17

Browse Source
This commit is contained in:
OBS User unknown 2008-04-14 17:32:36 +00:00 committed by Git OBS Bridge
parent 9b4f7de1be
commit b8efb157a3
18 changed files with 405 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
file-4.06-autoconf.dif
View File

@ -1,76 +0,0 @@
--- acinclude.m4
+++ acinclude.m4 Tue Jul 1 16:50:38 2003
@@ -124,11 +124,7 @@
[#if HAVE_STDINT_H
#include <stdint.h>
#endif
-#include <sys/types.h>
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#endif
-])
+$ac_includes_default])
])
--- configure.in
+++ configure.in Tue Jul 1 16:51:52 2003
@@ -81,12 +81,14 @@
AC_CHECK_TYPE_STDC(int32_t, int)
AC_C_LONG_LONG
if test $ac_cv_c_long_long = yes; then
- long64='unsigned long long';
+dnl long64='unsigned long long';
+ AC_CHECK_TYPE(uint64_t, unsigned long long)
else
- long64='unsigned long';
+dnl long64='unsigned long';
+ AC_CHECK_TYPE(uint64_t, unsigned long)
fi
dnl This needs a patch to autoconf 2.13 acgeneral.m4
-AC_CHECK_TYPE2_STDC(uint64_t, $long64)
+dnl AC_CHECK_TYPE2_STDC(uint64_t, $long64)
AC_CHECK_SIZEOF_STDC_HEADERS(uint8_t, 0)
AC_CHECK_SIZEOF_STDC_HEADERS(uint16_t, 0)
--- doc/Makefile.am
+++ doc/Makefile.am Mon Dec 15 13:04:19 2003
@@ -5,7 +5,8 @@
man_MAGIC = magic.4
endif
fsect = @fsect@
-man_MANS = file.1 $(man_MAGIC) libmagic.3
+#man_MANS = file.1 $(man_MAGIC) libmagic.3
+man_MANS = file.1 magic.5 libmagic.3
EXTRA_DIST = file.man magic.man libmagic.man
CLEANFILES = $(man_MANS)
@@ -17,7 +18,8 @@
-e s@__VERSION__@${VERSION}@g \
-e s@__MAGIC__@${MAGIC}@g $(srcdir)/file.man > $@
-magic.${fsect}: Makefile magic.man
+#magic.${fsect}: Makefile magic.man
+magic.5: Makefile magic.man
@rm -f $@
sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \
--- src/readelf.h
+++ src/readelf.h Tue Jul 1 16:53:55 2003
@@ -36,7 +36,10 @@
#ifndef __fake_elf_h__
#define __fake_elf_h__
+#include <features.h>
+
#if HAVE_STDINT_H
+__BEGIN_DECLS
#include <stdint.h>
#endif
@@ -233,4 +236,5 @@
#define GNU_OS_HURD 1
#define GNU_OS_SOLARIS 2
+__END_DECLS
#endif

30
file-4.12-pcp.dif
View File

@ -1,30 +0,0 @@
--- magic/Magdir/sgi
+++ magic/Magdir/sgi Fri Nov 26 15:09:36 2004
@@ -8,12 +8,12 @@
0 string PmNs PCP compiled namespace (V.0)
0 string PmN PCP compiled namespace
>3 string >\0 (V.%1.1s)
-3 lelong 0x84500526 PCP archive
+3 belong 0x84500526 PCP archive
>7 byte x (V.%d)
->20 lelong -2 temporal index
->20 lelong -1 metadata
->20 lelong 0 log volume #0
->20 lelong >0 log volume #%ld
+>20 belong -2 temporal index
+>20 belong -1 metadata
+>20 belong 0 log volume #0
+>20 belong >0 log volume #%ld
>24 string >\0 host: %s
0 string PCPFolio PCP
>9 string Version: Archive Folio
@@ -27,6 +27,9 @@
0 string #pmlogger PCP pmlogger config
>10 string Version
>18 string >\0 (V%1.1s)
+0 string #pmdahotproc PCP pmdahotproc config
+>13 string Version
+>21 string >\0 (V%-3.3s)
0 string PcPh PCP Help
>4 string 1 Index
>4 string 2 Text

17
file-4.13-netware.dif
View File

@ -1,17 +0,0 @@
--- magic/Magdir/netware
+++ magic/Magdir/netware
@@ -0,0 +1,4 @@
+#------------------------------------------------------------------------------
+# netware: file(1) magic for NetWare Loadable Modules (NLMs)
+
+0 string NetWare\ Loadable\ Module NetWare Loadable Module
--- magic/Makefile.am
+++ magic/Makefile.am
@@ -128,6 +128,7 @@
Magdir/ncr \
Magdir/netbsd \
Magdir/netscape \
+Magdir/netware \
Magdir/news \
Magdir/nitpicker \
Magdir/ocaml \

11
file-4.21-awk.dif
View File

@ -1,11 +0,0 @@
--- magic/Magdir/commands
+++ magic/Magdir/commands 2007-08-31 17:24:19.872921232 +0200
@@ -29,7 +29,7 @@
0 string/b #!\ /bin/awk awk script text
0 string/b #!\ /usr/bin/awk awk script text
# update to distinguish from *.vcf files
-0 regex BEGIN[[:space:]]*[{] awk script text
+0 regex =^\\s*BEGIN\\s*[{] awk script text
# AT&T Bell Labs' Plan 9 shell
0 string/b #!\ /bin/rc Plan 9 rc shell script text

3
file-4.21.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44158449344566035756efaa1921cfda625f7081c10fd034f37919ece9db762c
size 415270

41
file-4.24-autoconf.dif Normal file
View File

@ -0,0 +1,41 @@
--- doc/Makefile.am
+++ doc/Makefile.am 2003-12-15 13:04:19.000000000 +0100
@@ -5,7 +5,8 @@ else
man_MAGIC = magic.4
endif
fsect = @fsect@
-man_MANS = file.1 $(man_MAGIC) libmagic.3
+#man_MANS = file.1 $(man_MAGIC) libmagic.3
+man_MANS = file.1 magic.5 libmagic.3
EXTRA_DIST = file.man magic.man libmagic.man
CLEANFILES = $(man_MANS)
@@ -17,7 +18,8 @@ file.1: Makefile file.man
-e s@__VERSION__@${VERSION}@g \
-e s@__MAGIC__@${MAGIC}@g $(srcdir)/file.man > $@
-magic.${fsect}: Makefile magic.man
+#magic.${fsect}: Makefile magic.man
+magic.5: Makefile magic.man
@rm -f $@
sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \
--- src/readelf.h
+++ src/readelf.h 2003-07-01 16:53:55.000000000 +0200
@@ -34,7 +34,10 @@
#ifndef __fake_elf_h__
#define __fake_elf_h__
+#include <features.h>
+
#if HAVE_STDINT_H
+__BEGIN_DECLS
#include <stdint.h>
#endif
@@ -233,4 +236,5 @@ typedef struct {
#define GNU_OS_KFREEBSD 3
#define GNU_OS_KNETBSD 4
+__END_DECLS
#endif

10
file-4.24-awk.dif Normal file
View File

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

19
file-4.24-cromfs.dif Normal file
View File

@ -0,0 +1,19 @@
--- magic/Localstuff
+++ magic/Localstuff 2008-04-14 16:59:45.741454927 +0200
@@ -36,3 +36,16 @@
# File magic for X11 cursor data files
0 string Xcur\020\000 X11 cursor data
+
+# File magic for CROM File System
+
+0 string CROMFS CROMFS
+>6 string >\0 \b version %2.2s,
+>8 ulequad >0 \b block data at %lld,
+>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,
+>48 ulequad >0 \b bytes = %lld
+

8
file-4.18-elf.dif → file-4.24-elf.dif
View File

@ -1,6 +1,6 @@
--- src/readelf.c --- src/readelf.c
+++ src/readelf.c 2006-11-22 15:54:30.000000000 +0100 +++ src/readelf.c 2008-04-14 16:43:48.082574211 +0200
@@ -621,7 +621,7 @@ core: @@ -663,7 +663,7 @@ core:
default: default:
if (xnh_type == NT_PRPSINFO) { if (xnh_type == NT_PRPSINFO) {
@ -9,7 +9,7 @@
unsigned char c; unsigned char c;
/* /*
* Extract the program name. We assume * Extract the program name. We assume
@@ -633,7 +633,9 @@ core: @@ -675,7 +675,9 @@ core:
* If the characters aren't all printable, * If the characters aren't all printable,
* reject it. * reject it.
*/ */
@ -17,6 +17,6 @@
+ if (os_style == OS_STYLE_SVR4) + if (os_style == OS_STYLE_SVR4)
+ m = 1; + m = 1;
+ for (i = m; i < NOFFSETS; i++) { + for (i = m; i < NOFFSETS; i++) {
unsigned char *cname, *cp;
size_t reloffset = prpsoffsets(i); size_t reloffset = prpsoffsets(i);
size_t noffset = doff + reloffset; size_t noffset = doff + reloffset;
for (j = 0; j < 16; j++, noffset++,

123
file-4.20-exec.dif → file-4.24-exec.dif
View File

@ -1,56 +1,77 @@
--- magic/Magdir/commands --- magic/Magdir/commands
+++ magic/Magdir/commands 2006-03-24 14:59:41.000000000 +0100 +++ magic/Magdir/commands 2008-04-14 17:27:49.969133137 +0200
@@ -3,56 +3,56 @@ @@ -3,81 +3,81 @@
# commands: file(1) magic for various shells and interpreters # commands: file(1) magic for various shells and interpreters
# #
0 string : shell archive or script for antique kernel text #0 string : shell archive or script for antique kernel text
-0 string/b #!\ /bin/sh Bourne shell script text executable -0 string/b #!\ /bin/sh POSIX shell script text executable
+0 string/b #!\ /bin/sh POSIX shell script text
!:mime application/x-shellscript
-0 string/b #!\ /bin/csh C shell script text executable -0 string/b #!\ /bin/csh C shell script text executable
+0 string/b #!\ /bin/sh Bourne shell script text
+0 string/b #!\ /bin/csh C shell script text +0 string/b #!\ /bin/csh C shell script text
!:mime application/x-shellscript
# korn shell magic, sent by George Wu, gwu@clyde.att.com # 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 executable
-0 string/b #!\ /bin/tcsh Tenex C shell script text executable
-0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable
-0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable
-0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable
+0 string/b #!\ /bin/ksh Korn shell script text +0 string/b #!\ /bin/ksh Korn shell script text
!:mime application/x-shellscript
-0 string/b #!\ /bin/tcsh Tenex C shell script text executable
+0 string/b #!\ /bin/tcsh Tenex C shell script text +0 string/b #!\ /bin/tcsh Tenex C shell script text
!:mime application/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 +0 string/b #!\ /usr/bin/tcsh Tenex C shell script text
!:mime application/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 +0 string/b #!\ /usr/local/tcsh Tenex C shell script text
!:mime application/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 +0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text
!:mime application/x-shellscript
# #
# zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson) # 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 executable
-0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text executable
-0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable
-0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text executable
-0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text executable
-0 string/b #!\ /bin/nawk new awk script text executable
-0 string/b #!\ /usr/bin/nawk new awk script text executable
-0 string/b #!\ /usr/local/bin/nawk new awk script text executable
-0 string/b #!\ /bin/gawk GNU awk script text executable
-0 string/b #!\ /usr/bin/gawk GNU awk script text executable
-0 string/b #!\ /usr/local/bin/gawk GNU awk script text executable
+0 string/b #!\ /bin/zsh Paul Falstad's zsh script text +0 string/b #!\ /bin/zsh Paul Falstad's zsh script text
!:mime application/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 +0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text
!:mime application/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 +0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text
!:mime application/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 +0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text
!:mime application/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 +0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text
!:mime application/x-shellscript
-0 string/b #!\ /bin/nawk new awk script text executable
+0 string/b #!\ /bin/nawk new awk script text +0 string/b #!\ /bin/nawk new awk script text
!:mime application/x-nawk
-0 string/b #!\ /usr/bin/nawk new awk script text executable
+0 string/b #!\ /usr/bin/nawk new awk script text +0 string/b #!\ /usr/bin/nawk new awk script text
!:mime application/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 +0 string/b #!\ /usr/local/bin/nawk new awk script text
!:mime application/x-nawk
-0 string/b #!\ /bin/gawk GNU awk script text executable
+0 string/b #!\ /bin/gawk GNU awk script text +0 string/b #!\ /bin/gawk GNU awk script text
!:mime application/x-gawk
-0 string/b #!\ /usr/bin/gawk GNU awk script text executable
+0 string/b #!\ /usr/bin/gawk GNU awk script text +0 string/b #!\ /usr/bin/gawk GNU awk script text
!:mime application/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 +0 string/b #!\ /usr/local/bin/gawk GNU awk script text
!:mime application/x-gawk
# #
-0 string/b #!\ /bin/awk awk script text executable -0 string/b #!\ /bin/awk awk script text executable
-0 string/b #!\ /usr/bin/awk awk script text executable
+0 string/b #!\ /bin/awk awk script text +0 string/b #!\ /bin/awk awk script text
!:mime application/x-awk
-0 string/b #!\ /usr/bin/awk awk script text executable
+0 string/b #!\ /usr/bin/awk awk script text +0 string/b #!\ /usr/bin/awk awk script text
!:mime application/x-awk
# update to distinguish from *.vcf files # update to distinguish from *.vcf files
0 regex BEGIN[[:space:]]*[{] awk script text # this is broken because postscript has /EBEGIN{ for example.
#0 search/Bb BEGIN { 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 executable -0 string/b #!\ /bin/rc Plan 9 rc shell script text executable
@ -58,13 +79,17 @@
# 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/b #!\ /bin/bash Bourne-Again shell script text executable
+0 string/b #!\ /bin/bash Bourne-Again shell script text
!:mime application/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 executable
-0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable
-0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable
+0 string/b #!\ /bin/bash Bourne-Again shell script text
+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text +0 string/b #!\ /usr/bin/bash Bourne-Again shell script text
!:mime application/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 +0 string/b #!\ /usr/local/bash Bourne-Again shell script text
!:mime application/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 +0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text
!:mime application/x-shellscript
# using env # using env
0 string #!/usr/bin/env a 0 string #!/usr/bin/env a
@ -76,34 +101,37 @@
# PHP scripts # PHP scripts
# Ulf Harnhammar <ulfh@update.uu.se> # Ulf Harnhammar <ulfh@update.uu.se>
0 string/c =<?php PHP script text 0 search/1/c =<?php PHP script text
0 string =<?\n PHP script text 0 search/1 =<?\n PHP script text
0 string =<?\r PHP script text 0 search/1 =<?\r PHP script text
-0 string/b #!\ /usr/local/bin/php PHP script text executable -0 search/1/b #!\ /usr/local/bin/php PHP script text executable
-0 string/b #!\ /usr/bin/php PHP script text executable -0 search/1/b #!\ /usr/bin/php PHP script text executable
+0 string/b #!\ /usr/local/bin/php PHP script text +0 search/1/b #!\ /usr/local/bin/php PHP script text
+0 string/b #!\ /usr/bin/php PHP script text +0 search/1/b #!\ /usr/bin/php PHP script text
0 string Zend\x00 PHP script Zend Optimizer data 0 string Zend\x00 PHP script Zend Optimizer data
--- magic/Magdir/perl --- magic/Magdir/perl
+++ magic/Magdir/perl 2006-03-24 14:51:26.000000000 +0100 +++ magic/Magdir/perl 2008-04-14 17:27:55.265811334 +0200
@@ -5,12 +5,12 @@ @@ -4,15 +4,15 @@
# The ``eval'' line recognizes an outrageously clever hack for USG systems. # The `eval' lines recognizes an outrageously clever hack.
# Keith Waclena <keith@cerberus.uchicago.edu> # Keith Waclena <keith@cerberus.uchicago.edu>
# Send additions to <perl5-porters@perl.org> # Send additions to <perl5-porters@perl.org>
-0 string/b #!\ /bin/perl perl script text executable -0 search/1/b #!\ /bin/perl Perl script text executable
+0 string/b #!\ /bin/perl perl script text +0 search/1/b #!\ /bin/perl Perl script text
0 string eval\ "exec\ /bin/perl perl script text !:mime application/x-perl
-0 string/b #!\ /usr/bin/perl perl script text executable 0 search/1 eval\ "exec\ /bin/perl Perl script text
+0 string/b #!\ /usr/bin/perl perl script text !:mime application/x-perl
0 string eval\ "exec\ /usr/bin/perl perl script text -0 search/1/b #!\ /usr/bin/perl Perl script text executable
0 string/b #!\ /usr/local/bin/perl perl script text +0 search/1/b #!\ /usr/bin/perl Perl script text
-0 string eval\ "exec\ /usr/local/bin/perl perl script text executable !:mime application/x-perl
+0 string eval\ "exec\ /usr/local/bin/perl perl script text 0 search/1 eval\ "exec\ /usr/bin/perl Perl script text
0 string eval\ '(exit\ $?0)'\ &&\ eval\ 'exec perl script text !:mime application/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 application/x-perl
0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text
!:mime application/x-perl
--- magic/Magdir/python --- magic/Magdir/python
+++ magic/Magdir/python 2006-03-24 14:51:26.000000000 +0100 +++ magic/Magdir/python 2006-03-24 14:51:26.000000000 +0100
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
@ -117,7 +145,7 @@
0 belong 0x994e0d0a python 1.5/1.6 byte-compiled 0 belong 0x994e0d0a python 1.5/1.6 byte-compiled
--- magic/Magdir/varied.script --- magic/Magdir/varied.script
+++ magic/Magdir/varied.script 2007-03-21 11:22:09.000000000 +0100 +++ magic/Magdir/varied.script 2007-03-21 11:22:09.000000000 +0100
@@ -2,11 +2,11 @@ @@ -2,12 +2,12 @@
# varied.script: file(1) magic for various interpreter scripts # varied.script: file(1) magic for various interpreter scripts
0 string #!\ / a 0 string #!\ / a
@ -133,3 +161,4 @@
+0 string #!\ script text +0 string #!\ script text
>3 string >\0 for %s >3 string >\0 for %s
# From: arno <arenevier@fdn.fr>

70
file-4.16-mips.dif → file-4.24-mips.dif
View File

@ -1,6 +1,6 @@
--- magic/Magdir/elf --- magic/Magdir/elf
+++ magic/Magdir/elf 2005-10-19 15:10:09.000000000 +0200 +++ magic/Magdir/elf 2008-04-14 16:57:32.740393508 +0200
@@ -46,26 +46,26 @@ @@ -51,26 +51,26 @@
>>18 leshort 8 >>18 leshort 8
# only for 32-bit # only for 32-bit
>>>4 byte 1 >>>4 byte 1
@ -9,19 +9,19 @@
->>>>36 lelong&0xf0000000 0x20000000 MIPS-III ->>>>36 lelong&0xf0000000 0x20000000 MIPS-III
->>>>36 lelong&0xf0000000 0x30000000 MIPS-IV ->>>>36 lelong&0xf0000000 0x30000000 MIPS-IV
->>>>36 lelong&0xf0000000 0x40000000 MIPS-V ->>>>36 lelong&0xf0000000 0x40000000 MIPS-V
->>>>36 lelong&0xf0000000 0x60000000 MIPS32 ->>>>36 lelong&0xf0000000 0x50000000 MIPS32
->>>>36 lelong&0xf0000000 0x70000000 MIPS64 ->>>>36 lelong&0xf0000000 0x60000000 MIPS64
->>>>36 lelong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>36 lelong&0xf0000000 0x70000000 MIPS32 rel2
->>>>36 lelong&0xf0000000 0x90000000 MIPS64 rel2 ->>>>36 lelong&0xf0000000 0x80000000 MIPS64 rel2
+#>>>>36 lelong&0xf0000000 0x00000000 MIPS-I +#>>>>36 lelong&0xf0000000 0x00000000 MIPS-I
+#>>>>36 lelong&0xf0000000 0x10000000 MIPS-II +#>>>>36 lelong&0xf0000000 0x10000000 MIPS-II
+#>>>>36 lelong&0xf0000000 0x20000000 MIPS-III +#>>>>36 lelong&0xf0000000 0x20000000 MIPS-III
+#>>>>36 lelong&0xf0000000 0x30000000 MIPS-IV +#>>>>36 lelong&0xf0000000 0x30000000 MIPS-IV
+#>>>>36 lelong&0xf0000000 0x40000000 MIPS-V +#>>>>36 lelong&0xf0000000 0x40000000 MIPS-V
+#>>>>36 lelong&0xf0000000 0x60000000 MIPS32 +#>>>>36 lelong&0xf0000000 0x50000000 MIPS32
+#>>>>36 lelong&0xf0000000 0x70000000 MIPS64 +#>>>>36 lelong&0xf0000000 0x60000000 MIPS64
+#>>>>36 lelong&0xf0000000 0x80000000 MIPS32 rel2 +#>>>>36 lelong&0xf0000000 0x70000000 MIPS32 rel2
+#>>>>36 lelong&0xf0000000 0x90000000 MIPS64 rel2 +#>>>>36 lelong&0xf0000000 0x80000000 MIPS64 rel2
# only for 64-bit # only for 64-bit
>>>4 byte 2 >>>4 byte 2
->>>>48 lelong&0xf0000000 0x00000000 MIPS-I ->>>>48 lelong&0xf0000000 0x00000000 MIPS-I
@ -29,23 +29,23 @@
->>>>48 lelong&0xf0000000 0x20000000 MIPS-III ->>>>48 lelong&0xf0000000 0x20000000 MIPS-III
->>>>48 lelong&0xf0000000 0x30000000 MIPS-IV ->>>>48 lelong&0xf0000000 0x30000000 MIPS-IV
->>>>48 lelong&0xf0000000 0x40000000 MIPS-V ->>>>48 lelong&0xf0000000 0x40000000 MIPS-V
->>>>48 lelong&0xf0000000 0x60000000 MIPS32 ->>>>48 lelong&0xf0000000 0x50000000 MIPS32
->>>>48 lelong&0xf0000000 0x70000000 MIPS64 ->>>>48 lelong&0xf0000000 0x60000000 MIPS64
->>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>48 lelong&0xf0000000 0x70000000 MIPS32 rel2
->>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2 ->>>>48 lelong&0xf0000000 0x80000000 MIPS64 rel2
+#>>>>48 lelong&0xf0000000 0x00000000 MIPS-I +#>>>>48 lelong&0xf0000000 0x00000000 MIPS-I
+#>>>>48 lelong&0xf0000000 0x10000000 MIPS-II +#>>>>48 lelong&0xf0000000 0x10000000 MIPS-II
+#>>>>48 lelong&0xf0000000 0x20000000 MIPS-III +#>>>>48 lelong&0xf0000000 0x20000000 MIPS-III
+#>>>>48 lelong&0xf0000000 0x30000000 MIPS-IV +#>>>>48 lelong&0xf0000000 0x30000000 MIPS-IV
+#>>>>48 lelong&0xf0000000 0x40000000 MIPS-V +#>>>>48 lelong&0xf0000000 0x40000000 MIPS-V
+#>>>>48 lelong&0xf0000000 0x60000000 MIPS32 +#>>>>48 lelong&0xf0000000 0x50000000 MIPS32
+#>>>>48 lelong&0xf0000000 0x70000000 MIPS64 +#>>>>48 lelong&0xf0000000 0x60000000 MIPS64
+#>>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2 +#>>>>48 lelong&0xf0000000 0x70000000 MIPS32 rel2
+#>>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2 +#>>>>48 lelong&0xf0000000 0x80000000 MIPS64 rel2
>>18 leshort 9 Amdahl - invalid byte order, >>18 leshort 9 Amdahl - invalid byte order,
>>18 leshort 10 MIPS (deprecated), >>18 leshort 10 MIPS (deprecated),
>>18 leshort 11 RS6000 - invalid byte order, >>18 leshort 11 RS6000 - invalid byte order,
@@ -132,26 +132,26 @@ @@ -181,26 +181,26 @@
>>18 beshort 8 >>18 beshort 8
# only for 32-bit # only for 32-bit
>>>4 byte 1 >>>4 byte 1
@ -54,19 +54,19 @@
->>>>36 belong&0xf0000000 0x20000000 MIPS-III ->>>>36 belong&0xf0000000 0x20000000 MIPS-III
->>>>36 belong&0xf0000000 0x30000000 MIPS-IV ->>>>36 belong&0xf0000000 0x30000000 MIPS-IV
->>>>36 belong&0xf0000000 0x40000000 MIPS-V ->>>>36 belong&0xf0000000 0x40000000 MIPS-V
->>>>36 belong&0xf0000000 0x60000000 MIPS32 ->>>>36 belong&0xf0000000 0x50000000 MIPS32
->>>>36 belong&0xf0000000 0x70000000 MIPS64 ->>>>36 belong&0xf0000000 0x60000000 MIPS64
->>>>36 belong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>36 belong&0xf0000000 0x70000000 MIPS32 rel2
->>>>36 belong&0xf0000000 0x90000000 MIPS64 rel2 ->>>>36 belong&0xf0000000 0x80000000 MIPS64 rel2
+#>>>>36 belong&0xf0000000 0x00000000 MIPS-I +#>>>>36 belong&0xf0000000 0x00000000 MIPS-I
+#>>>>36 belong&0xf0000000 0x10000000 MIPS-II +#>>>>36 belong&0xf0000000 0x10000000 MIPS-II
+#>>>>36 belong&0xf0000000 0x20000000 MIPS-III +#>>>>36 belong&0xf0000000 0x20000000 MIPS-III
+#>>>>36 belong&0xf0000000 0x30000000 MIPS-IV +#>>>>36 belong&0xf0000000 0x30000000 MIPS-IV
+#>>>>36 belong&0xf0000000 0x40000000 MIPS-V +#>>>>36 belong&0xf0000000 0x40000000 MIPS-V
+#>>>>36 belong&0xf0000000 0x60000000 MIPS32 +#>>>>36 belong&0xf0000000 0x50000000 MIPS32
+#>>>>36 belong&0xf0000000 0x70000000 MIPS64 +#>>>>36 belong&0xf0000000 0x60000000 MIPS64
+#>>>>36 belong&0xf0000000 0x80000000 MIPS32 rel2 +#>>>>36 belong&0xf0000000 0x70000000 MIPS32 rel2
+#>>>>36 belong&0xf0000000 0x90000000 MIPS64 rel2 +#>>>>36 belong&0xf0000000 0x80000000 MIPS64 rel2
# only for 64-bit # only for 64-bit
>>>4 byte 2 >>>4 byte 2
->>>>48 belong&0xf0000000 0x00000000 MIPS-I ->>>>48 belong&0xf0000000 0x00000000 MIPS-I
@ -74,19 +74,19 @@
->>>>48 belong&0xf0000000 0x20000000 MIPS-III ->>>>48 belong&0xf0000000 0x20000000 MIPS-III
->>>>48 belong&0xf0000000 0x30000000 MIPS-IV ->>>>48 belong&0xf0000000 0x30000000 MIPS-IV
->>>>48 belong&0xf0000000 0x40000000 MIPS-V ->>>>48 belong&0xf0000000 0x40000000 MIPS-V
->>>>48 belong&0xf0000000 0x60000000 MIPS32 ->>>>48 belong&0xf0000000 0x50000000 MIPS32
->>>>48 belong&0xf0000000 0x70000000 MIPS64 ->>>>48 belong&0xf0000000 0x60000000 MIPS64
->>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2 ->>>>48 belong&0xf0000000 0x70000000 MIPS32 rel2
->>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2 ->>>>48 belong&0xf0000000 0x80000000 MIPS64 rel2
+#>>>>48 belong&0xf0000000 0x00000000 MIPS-I +#>>>>48 belong&0xf0000000 0x00000000 MIPS-I
+#>>>>48 belong&0xf0000000 0x10000000 MIPS-II +#>>>>48 belong&0xf0000000 0x10000000 MIPS-II
+#>>>>48 belong&0xf0000000 0x20000000 MIPS-III +#>>>>48 belong&0xf0000000 0x20000000 MIPS-III
+#>>>>48 belong&0xf0000000 0x30000000 MIPS-IV +#>>>>48 belong&0xf0000000 0x30000000 MIPS-IV
+#>>>>48 belong&0xf0000000 0x40000000 MIPS-V +#>>>>48 belong&0xf0000000 0x40000000 MIPS-V
+#>>>>48 belong&0xf0000000 0x60000000 MIPS32 +#>>>>48 belong&0xf0000000 0x50000000 MIPS32
+#>>>>48 belong&0xf0000000 0x70000000 MIPS64 +#>>>>48 belong&0xf0000000 0x60000000 MIPS64
+#>>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2 +#>>>>48 belong&0xf0000000 0x70000000 MIPS32 rel2
+#>>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2 +#>>>>48 belong&0xf0000000 0x80000000 MIPS64 rel2
>>18 beshort 9 Amdahl, >>18 beshort 9 Amdahl,
>>18 beshort 10 MIPS (deprecated), >>18 beshort 10 MIPS (deprecated),
>>18 beshort 11 RS6000, >>18 beshort 11 RS6000,

33
file-4.18-misc.dif → file-4.24-misc.dif
View File

@ -1,13 +1,15 @@
--- magic/Magdir/audio --- magic/Magdir/audio
+++ magic/Magdir/audio 2003-12-08 17:50:33.000000000 +0100 +++ magic/Magdir/audio 2008-04-14 16:17:58.871499001 +0200
@@ -96,13 +96,13 @@ @@ -116,7 +116,7 @@
# Real Audio (Magic .ra\0375) # Real Audio (Magic .ra\0375)
0 belong 0x2e7261fd RealAudio sound file 0 belong 0x2e7261fd RealAudio sound file
!:mime audio/x-pn-realaudio
-0 string .RMF RealMedia file -0 string .RMF RealMedia file
+0 string .RMF\0\0\0 RealMedia file +0 string .RMF\0\0\0 RealMedia file
!:mime application/vnd.rn-realmedia
# MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert@dialin.ind.net] #video/x-pn-realvideo
#video/vnd.rn-realvideo
@@ -127,7 +127,7 @@
# Oct 31, 1995 # Oct 31, 1995
# fixed by <doj@cubic.org> 2003-06-24 # fixed by <doj@cubic.org> 2003-06-24
# Too short... # Too short...
@ -44,24 +46,27 @@
>0 byte ^0x80 executable >0 byte ^0x80 executable
>16 belong >0 not stripped >16 belong >0 not stripped
--- magic/Magdir/commands --- magic/Magdir/commands
+++ magic/Magdir/commands 2003-12-08 17:50:03.000000000 +0100 +++ magic/Magdir/commands 2008-04-14 16:19:46.441325515 +0200
@@ -8,6 +8,7 @@ @@ -12,6 +12,8 @@
# korn shell magic, sent by George Wu, gwu@clyde.att.com !:mime application/x-shellscript
0 string/b #!\ /bin/ksh Korn shell script text executable
0 string/b #!\ /bin/tcsh Tenex C shell script text executable 0 string/b #!\ /bin/tcsh Tenex C shell script text executable
!:mime application/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 executable
+!:mime application/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 executable
!:mime application/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 executable
@@ -56,6 +58,10 @@
@@ -35,6 +36,8 @@
# 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/b #!\ /bin/bash Bourne-Again shell script text executable
!:mime application/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 executable
+!:mime application/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 executable
+!:mime application/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 executable
!:mime application/x-shellscript
# using env
--- 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
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
@ -75,7 +80,7 @@
>4 belong 17 rs6000 >4 belong 17 rs6000
--- magic/Magdir/msdos --- magic/Magdir/msdos
+++ magic/Magdir/msdos 2005-07-25 15:24:04.000000000 +0200 +++ magic/Magdir/msdos 2005-07-25 15:24:04.000000000 +0200
@@ -248,7 +248,7 @@ @@ -256,7 +256,7 @@
# a few unknown ZIP sfxes, no idea if they are needed or if they are # a few unknown ZIP sfxes, no idea if they are needed or if they are
# already captured by the generic patterns above # already captured by the generic patterns above

8
file-4.21-reg_dos.dif → file-4.24-reg_dos.dif
View File

@ -1,15 +1,11 @@
--- magic/Magdir/msdos --- magic/Magdir/msdos
+++ magic/Magdir/msdos 2007-06-06 16:42:16.380856618 +0200 +++ magic/Magdir/msdos 2008-04-14 16:49:45.464433688 +0200
@@ -14,12 +14,10 @@ @@ -14,8 +14,10 @@
# OS/2 batch files are REXX. the second regex is a bit generic, oh well # OS/2 batch files are REXX. the second regex is a bit generic, oh well
# the matched commands seem to be common in REXX and uncommon elsewhere # the matched commands seem to be common in REXX and uncommon elsewhere
-100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text -100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
-100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text -100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
-
-
-100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
-100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
+100 search/0xffff rxfuncadd +100 search/0xffff rxfuncadd
+>100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text +>100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
+100 search/0xffff say +100 search/0xffff say

210
file-4.21.dif → file-4.24.dif
View File

@ -1,21 +1,3 @@
--- .pkgextract
+++ .pkgextract 2006-03-27 13:29:19.000000000 +0200
@@ -0,0 +1,15 @@
+patch -p0 -s --suffix=.misc < ../file-4.18-misc.dif
+patch -p0 -s --suffix=.pcp < ../file-4.12-pcp.dif
+patch -p0 -s --suffix=.exec < ../file-4.20-exec.dif
+patch -p0 -s --suffix=.conf < ../file-4.06-autoconf.dif
+patch -p0 -s --suffix=.tex < ../file-4.03-tex.dif
+patch -p0 -s --suffix=.ntwr < ../file-4.13-netware.dif
+patch -p0 -s --suffix=.pm < ../file-4.20-ssd.dif
+patch -p0 -s --suffix=.xen < ../file-4.20-xen.dif
+patch -p0 -s --suffix=.elf < ../file-4.18-elf.dif
+patch -p0 -s --suffix=.prtf < ../file-4.18-printf.dif
+patch -p0 -s --suffix=.reg < ../file-4.21-reg_dos.dif
+patch -p0 -s --suffix=.opt < ../file-4.21-option.dif
+patch -p0 -s --suffix=.scri < ../file-4.21-scribus.dif
+patch -p0 -s --suffix=.awk < ../file-4.21-awk.dif
+patch -p0 -s --suffix=.xcur < ../file-4.21-xcursor.dif
--- magic/Header --- magic/Header
+++ magic/Header 2006-03-27 13:29:19.000000000 +0200 +++ magic/Header 2006-03-27 13:29:19.000000000 +0200
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@ -30,66 +12,108 @@
+# 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 2006-03-27 13:29:19.000000000 +0200 +++ magic/Makefile.am 2008-04-14 18:09:04.858253210 +0200
@@ -38,7 +38,6 @@ Magdir/amanda \ @@ -1,7 +1,7 @@
Magdir/amigaos \ MAGIC_FRAGMENT_BASE = Magdir
Magdir/animation \ MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
Magdir/apl \
-Magdir/apple \ -pkgdata_DATA = magic.mgc
Magdir/applix \ +pkgdata_DATA = magic.mgc magic
Magdir/archive \
Magdir/asterix \ EXTRA_DIST = Header Localstuff \
@@ -82,7 +81,6 @@ Magdir/encore \ $(MAGIC_FRAGMENT_DIR)/acorn \
Magdir/epoc \ @@ -14,7 +14,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \
Magdir/esri \ $(MAGIC_FRAGMENT_DIR)/amigaos \
Magdir/fcs \ $(MAGIC_FRAGMENT_DIR)/animation \
-Magdir/filesystems \ $(MAGIC_FRAGMENT_DIR)/apl \
Magdir/flash \ -$(MAGIC_FRAGMENT_DIR)/apple \
Magdir/fonts \ $(MAGIC_FRAGMENT_DIR)/applix \
Magdir/frame \ $(MAGIC_FRAGMENT_DIR)/archive \
@@ -108,14 +106,14 @@ Magdir/island \ $(MAGIC_FRAGMENT_DIR)/asterix \
Magdir/ispell \ @@ -61,7 +60,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
Magdir/java \ $(MAGIC_FRAGMENT_DIR)/erlang \
Magdir/jpeg \ $(MAGIC_FRAGMENT_DIR)/esri \
+Magdir/linux \ $(MAGIC_FRAGMENT_DIR)/fcs \
+Magdir/filesystems \ -$(MAGIC_FRAGMENT_DIR)/filesystems \
Magdir/karma \ $(MAGIC_FRAGMENT_DIR)/flash \
Magdir/lecter \ $(MAGIC_FRAGMENT_DIR)/fonts \
Magdir/lex \ $(MAGIC_FRAGMENT_DIR)/fortran \
Magdir/lif \ @@ -91,18 +89,18 @@ $(MAGIC_FRAGMENT_DIR)/island \
-Magdir/linux \ $(MAGIC_FRAGMENT_DIR)/ispell \
Magdir/lisp \ $(MAGIC_FRAGMENT_DIR)/java \
Magdir/mach \ $(MAGIC_FRAGMENT_DIR)/jpeg \
-Magdir/macintosh \ +$(MAGIC_FRAGMENT_DIR)/linux \
Magdir/magic \ +$(MAGIC_FRAGMENT_DIR)/filesystems \
Magdir/mail.news \ $(MAGIC_FRAGMENT_DIR)/karma \
Magdir/maple \ $(MAGIC_FRAGMENT_DIR)/kde \
@@ -129,11 +127,11 @@ Magdir/misctools \ $(MAGIC_FRAGMENT_DIR)/lecter \
Magdir/mkid \ $(MAGIC_FRAGMENT_DIR)/lex \
Magdir/mlssa \ $(MAGIC_FRAGMENT_DIR)/lif \
Magdir/mmdf \ -$(MAGIC_FRAGMENT_DIR)/linux \
-Magdir/modem \ $(MAGIC_FRAGMENT_DIR)/lisp \
+Magdir/msad \ $(MAGIC_FRAGMENT_DIR)/llvm \
Magdir/motorola \ $(MAGIC_FRAGMENT_DIR)/lua \
Magdir/msdos \ $(MAGIC_FRAGMENT_DIR)/luks \
+Magdir/modem \ $(MAGIC_FRAGMENT_DIR)/mach \
Magdir/msvc \ -$(MAGIC_FRAGMENT_DIR)/macintosh \
-Magdir/mup \ $(MAGIC_FRAGMENT_DIR)/magic \
Magdir/natinst \ $(MAGIC_FRAGMENT_DIR)/mail.news \
Magdir/ncr \ $(MAGIC_FRAGMENT_DIR)/maple \
Magdir/netbsd \ @@ -118,10 +116,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -167,6 +165,8 @@ Magdir/pyramid \ $(MAGIC_FRAGMENT_DIR)/mkid \
Magdir/python \ $(MAGIC_FRAGMENT_DIR)/mlssa \
Magdir/revision \ $(MAGIC_FRAGMENT_DIR)/mmdf \
Magdir/riff \ -$(MAGIC_FRAGMENT_DIR)/modem \
+Magdir/apple \ $(MAGIC_FRAGMENT_DIR)/motorola \
+Magdir/macintosh \ $(MAGIC_FRAGMENT_DIR)/mozilla \
Magdir/rpm \ $(MAGIC_FRAGMENT_DIR)/msdos \
Magdir/rtf \ +$(MAGIC_FRAGMENT_DIR)/modem \
Magdir/sc \ $(MAGIC_FRAGMENT_DIR)/msvc \
$(MAGIC_FRAGMENT_DIR)/mup \
$(MAGIC_FRAGMENT_DIR)/natinst \
@@ -158,6 +156,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
+$(MAGIC_FRAGMENT_DIR)/apple \
+$(MAGIC_FRAGMENT_DIR)/macintosh \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
$(MAGIC_FRAGMENT_DIR)/sc \
@@ -210,8 +210,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
$(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel
+RAW = magic
MAGIC = magic.mgc
-CLEANFILES = ${MAGIC}
+CLEANFILES = ${MAGIC} ${RAW}
+
+${RAW}: Header Localstuff $(EXTRA_DIST)
+ cat /dev/null > $@
+ for frag in $(EXTRA_DIST); do \
+ if test -f $(srcdir)/$$frag; then \
+ f=$(srcdir)/$$frag; \
+ else \
+ f=$$frag; \
+ fi; \
+ cat $$f; \
+ done >> $@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file
@@ -221,6 +233,5 @@ else
FILE_COMPILE = $(top_builddir)/src/file
endif
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE)
- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
- @mv $(MAGIC_FRAGMENT_BASE).mgc $@
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE) $(RAW)
+ $(FILE_COMPILE) -C -m $(RAW)
--- magic/Magdir/elf --- magic/Magdir/elf
+++ magic/Magdir/elf 2006-11-22 15:57:15.000000000 +0100 +++ magic/Magdir/elf 2006-11-22 15:57:15.000000000 +0100
@@ -92,7 +92,7 @@ @@ -97,7 +97,7 @@
>>18 leshort 47 Renesas H8/300H, >>18 leshort 47 Renesas H8/300H,
>>18 leshort 48 Renesas H8S, >>18 leshort 48 Renesas H8S,
>>18 leshort 49 Renesas H8/500, >>18 leshort 49 Renesas H8/500,
@ -98,7 +122,7 @@
>>18 leshort 51 Stanford MIPS-X, >>18 leshort 51 Stanford MIPS-X,
>>18 leshort 52 Motorola Coldfire, >>18 leshort 52 Motorola Coldfire,
>>18 leshort 53 Motorola M68HC12, >>18 leshort 53 Motorola M68HC12,
@@ -186,7 +186,7 @@ @@ -234,7 +234,7 @@
>>18 beshort 47 Renesas H8/300H, >>18 beshort 47 Renesas H8/300H,
>>18 beshort 48 Renesas H8S, >>18 beshort 48 Renesas H8S,
>>18 beshort 49 Renesas H8/500, >>18 beshort 49 Renesas H8/500,
@ -109,7 +133,7 @@
>>18 beshort 53 Motorola M68HC12, >>18 beshort 53 Motorola M68HC12,
--- magic/Magdir/linux --- magic/Magdir/linux
+++ magic/Magdir/linux 2006-03-27 13:29:19.000000000 +0200 +++ magic/Magdir/linux 2006-03-27 13:29:19.000000000 +0200
@@ -82,21 +82,43 @@ @@ -81,21 +81,43 @@
# and Nicolás Lichtmaier <nick@debian.org> # and Nicolás Lichtmaier <nick@debian.org>
# All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
# Linux kernel boot images (i386 arch) (Wolfram Kleff) # Linux kernel boot images (i386 arch) (Wolfram Kleff)
@ -193,15 +217,15 @@
+4 string Standard\ Jet\ DB Microsoft Access Database +4 string Standard\ Jet\ DB Microsoft Access Database
--- magic/Magdir/msdos --- magic/Magdir/msdos
+++ magic/Magdir/msdos 2006-11-22 16:01:01.000000000 +0100 +++ magic/Magdir/msdos 2006-11-22 16:01:01.000000000 +0100
@@ -62,6 +62,7 @@ @@ -65,6 +65,7 @@
>>&0 leshort 0x290 PA-RISC >>&0 leshort 0x290 PA-RISC
>>&18 leshort&0x0100 >0 32-bit >>&18 leshort&0x0100 >0 32-bit
>>&18 leshort&0x1000 >0 system file >>&18 leshort&0x1000 >0 system file
+>>&228 lelong >0 \b, Mono/.Net assembly +>>&228 lelong >0 \b, Mono/.Net assembly
>>&0xf4 search/0x140 \x0\x40\x1\x0 >>&0xf4 search/0x140 \x0\x40\x1\x0
>>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive
>30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive
@@ -86,7 +87,7 @@ @@ -94,7 +95,7 @@
>>>>(0x3c.l+4) leshort 0x290 PA-RISC >>>>(0x3c.l+4) leshort 0x290 PA-RISC
>>>>(0x3c.l+22) leshort&0x0100 >0 32-bit >>>>(0x3c.l+22) leshort&0x0100 >0 32-bit
>>>>(0x3c.l+22) leshort&0x1000 >0 system file >>>>(0x3c.l+22) leshort&0x1000 >0 system file
@ -210,7 +234,7 @@
>>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed >>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed
>>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed >>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed
@@ -472,6 +473,13 @@ @@ -503,6 +504,13 @@
# Acroread or something files wrongly identified as G3 .pfm # Acroread or something files wrongly identified as G3 .pfm
# these have the form \000 \001 any? \002 \000 \000 # these have the form \000 \001 any? \002 \000 \000
# or \000 \001 any? \022 \000 \000 # or \000 \001 any? \022 \000 \000
@ -225,13 +249,13 @@
#>3 string \022\000\000Copyright\ yes #>3 string \022\000\000Copyright\ yes
#>3 string \002\000\000Copyright\ yes #>3 string \002\000\000Copyright\ yes
--- src/Makefile.am --- src/Makefile.am
+++ src/Makefile.am 2006-03-27 13:29:19.000000000 +0200 +++ src/Makefile.am 2008-04-14 17:14:56.330076493 +0200
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-MAGIC = $(pkgdatadir)/magic -MAGIC = $(pkgdatadir)/magic
+MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
lib_LTLIBRARIES = libmagic.la lib_LTLIBRARIES = libmagic.la
include_HEADERS = magic.h include_HEADERS = magic.h
EXTRA_DIST = test.c EXTRA_DIST = getopt_long.c
--- src/dcore.c --- src/dcore.c
+++ src/dcore.c 2006-03-27 13:29:19.000000000 +0200 +++ src/dcore.c 2006-03-27 13:29:19.000000000 +0200
@@ -0,0 +1,207 @@ @@ -0,0 +1,207 @@
@ -442,17 +466,3 @@
+ exit(0); + exit(0);
+} +}
+ +
--- src/funcs.c
+++ src/funcs.c 2007-06-06 15:05:14.000000000 +0000
@@ -41,9 +41,9 @@
#endif
#ifndef SIZE_T_MAX
#ifdef __LP64__
-#define SIZE_T_MAX (size_t)0xfffffffffffffffffU
+#define SIZE_T_MAX (size_t)0xffffffffffffffffUL
#else
-#define SIZE_T_MAX (size_t)0xffffffffU
+#define SIZE_T_MAX (size_t)0xffffffffUL
#endif
#endif

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0657da6b1b430b36cf4d91575e7a83aa8dd00f26d96f1c56144074287e8ac6ee
size 432065

38
file.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Mon Apr 14 17:35:43 CEST 2008 - werner@suse.de
- Add CROM File System to Localstuff (bnc#379027)
- Update to file bugfix version 4.24
* ELF core file command name/line bug fixes and enhancements
* Change strength of ! from MULT to 0, as it matches almost anything (Reuben Thomas)
* Clarify UTF-8 BOM message (Reuben Thomas)
* Add HTML comment to token list in names.h
* !:mime annotations in magic files (Reuben Thomas)
* zero out utime/utimes structs (Gavin Atkinson)
* reduce writable data from Diego "Flameeyes" Petten
* strtof detection
* remove bogus regex magic that could cause a DoS
* better mismatch version message
* bring back some fixes from OpenBSD
* treat ELF dynamic objects as executables
* fix gcc warnings
* make sure we have zlib.h and libz to compile the builtin
decompress code
* float and double magic support (Behan Webster)
* Convert fortran to a soft test (Reuben Thomas)
* Add --with-filename, and --no-filename (Reuben Thomas)
* Rest of the mime split (Reuben Thomas)
* Make usage message generated from the flags so that
they stay consistent (Reuben Thomas)
* typo in comment, missing ifdef QUICK, remove unneeded code
* Fix problem printing -\012 in some entries
* Separate magic type and encoding flags (Reuben Thomas)
* configure fix for int64 and strndup (Reuben Thomas)
* Add magic_descriptor() function.
* Fix regression in elf reading code where the core name was
not being printed.
* Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson)
* Make mime format consistent so that it can
Remove 7/8bit classifications, since they were arbitrary
and not based on the file data.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de

63
file.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package file (Version 4.21) # spec file for package file (Version 4.24)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -17,29 +17,28 @@ Url: http://www.darwinsys.com/file/
License: Other uncritical OpenSource License License: Other uncritical OpenSource License
Group: Productivity/File utilities Group: Productivity/File utilities
AutoReqProv: on AutoReqProv: on
Version: 4.21 Version: 4.24
Release: 46 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
Patch: file-%{version}.dif Patch: file-%{version}.dif
Patch1: file-4.18-misc.dif Patch1: file-4.24-misc.dif
Patch2: file-4.12-pcp.dif Patch3: file-4.24-exec.dif
Patch3: file-4.20-exec.dif Patch4: file-4.24-autoconf.dif
Patch4: file-4.06-autoconf.dif
Patch5: file-4.03-tex.dif Patch5: file-4.03-tex.dif
Patch6: file-4.13-netware.dif
Patch7: file-4.20-ssd.dif Patch7: file-4.20-ssd.dif
Patch8: file-4.20-xen.dif Patch8: file-4.20-xen.dif
Patch9: file-4.18-elf.dif Patch9: file-4.24-elf.dif
Patch10: file-4.18-printf.dif Patch10: file-4.18-printf.dif
Patch11: file-4.21-reg_dos.dif Patch11: file-4.24-reg_dos.dif
Patch12: file-4.21-option.dif Patch12: file-4.21-option.dif
Patch13: file-4.21-scribus.dif Patch13: file-4.21-scribus.dif
Patch14: file-4.21-awk.dif Patch14: file-4.24-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.16-mips.dif Patch20: file-4.24-mips.dif
Patch21: file-4.16-python.dif Patch21: file-4.16-python.dif
Patch22: file-4.24-cromfs.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc
%global _miscdir %{_datadir}/misc %global _miscdir %{_datadir}/misc
@ -79,11 +78,9 @@ Authors:
%prep %prep
%setup -q -n file-%{version} %setup -q -n file-%{version}
%patch1 -p0 -b .misc %patch1 -p0 -b .misc
%patch2 -p0 -b .pcp
%patch3 -p0 -b .exec %patch3 -p0 -b .exec
%patch4 -p0 -b .conf %patch4 -p0 -b .conf
%patch5 -p0 -b .tex %patch5 -p0 -b .tex
%patch6 -p0 -b .ntwr
%patch7 -p0 -b .ssd %patch7 -p0 -b .ssd
%patch8 -p0 -b .xen %patch8 -p0 -b .xen
%patch9 -p0 -b .elf %patch9 -p0 -b .elf
@ -100,6 +97,7 @@ Authors:
%if 0%{?build_python_bindings:1} %if 0%{?build_python_bindings:1}
%patch21 -p0 -b .python %patch21 -p0 -b .python
%endif %endif
%patch22 -p0 -b .cromfs
%patch %patch
%build %build
@ -151,8 +149,6 @@ unset LD_LIBRARY_PATH
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_miscdir}/magic %{_miscdir}/magic
%{_miscdir}/magic.mgc %{_miscdir}/magic.mgc
%{_miscdir}/magic.mime
%{_miscdir}/magic.mime.mgc
%attr(644,root,root) %{_mandir}/man1/file.1.gz %attr(644,root,root) %{_mandir}/man1/file.1.gz
%attr(644,root,root) %{_mandir}/man5/magic.5.gz %attr(644,root,root) %{_mandir}/man5/magic.5.gz
@ -165,6 +161,41 @@ unset LD_LIBRARY_PATH
%attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz
%changelog %changelog
* Mon Apr 14 2008 werner@suse.de
- Add CROM File System to Localstuff (bnc#379027)
- Update to file bugfix version 4.24
* ELF core file command name/line bug fixes and enhancements
* Change strength of ! from MULT to 0, as it matches almost anything (Reuben Thomas)
* Clarify UTF-8 BOM message (Reuben Thomas)
* Add HTML comment to token list in names.h
* !:mime annotations in magic files (Reuben Thomas)
* zero out utime/utimes structs (Gavin Atkinson)
* reduce writable data from Diego "Flameeyes" Petten
* strtof detection
* remove bogus regex magic that could cause a DoS
* better mismatch version message
* bring back some fixes from OpenBSD
* treat ELF dynamic objects as executables
* fix gcc warnings
* make sure we have zlib.h and libz to compile the builtin
decompress code
* float and double magic support (Behan Webster)
* Convert fortran to a soft test (Reuben Thomas)
* Add --with-filename, and --no-filename (Reuben Thomas)
* Rest of the mime split (Reuben Thomas)
* Make usage message generated from the flags so that
they stay consistent (Reuben Thomas)
* typo in comment, missing ifdef QUICK, remove unneeded code
* Fix problem printing -\012 in some entries
* Separate magic type and encoding flags (Reuben Thomas)
* configure fix for int64 and strndup (Reuben Thomas)
* Add magic_descriptor() function.
* Fix regression in elf reading code where the core name was
not being printed.
* Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson)
* Make mime format consistent so that it can
Remove 7/8bit classifications, since they were arbitrary
and not based on the file data.
* Thu Apr 10 2008 ro@suse.de * Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages - added baselibs.conf file to build xxbit packages
for multilib support for multilib support

2
python-magic.spec
View File

@ -20,7 +20,7 @@ License: Other uncritical OpenSource License
Group: Development/Languages/Python Group: Development/Languages/Python
AutoReqProv: on AutoReqProv: on
Version: 4.21 Version: 4.21
Release: 51 Release: 53
Summary: Python module to use libmagic Summary: Python module to use libmagic
%py_requires %py_requires
Source99: file.spec Source99: file.spec