commit file for openSUSE:Factory
Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at Thu Feb 11 19:05:23 CET 2010. -------- --- file/file.changes 2009-12-12 22:08:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file.changes 2010-02-05 17:16:27.000000000 +0100 @@ -1,0 +2,28 @@ +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) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- file-4.24-awk.dif file-5.02-exec.dif file-5.02-zip2.0.dif file-5.03.dif file-5.03.tar.bz2 New: ---- file-5.04-awk.dif file-5.04-exec.dif file-5.04-zip2.0.dif file-5.04.dif file-5.04.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -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 # remain the property of their copyright owners, unless otherwise agreed @@ -30,14 +30,14 @@ %endif # # Set Version also in python-magic.spec -Version: 5.03 -Release: 4 +Version: 5.04 +Release: 1 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Source2: baselibs.conf Patch: file-%{version}.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 Patch5: file-4.03-tex.dif Patch7: file-4.20-ssd.dif @@ -47,7 +47,7 @@ Patch11: file-4.24-reg_dos.dif Patch12: file-5.02-option.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 Patch16: file-4.21-reiserfs.dif Patch20: file-4.24-mips.dif @@ -56,7 +56,7 @@ Patch24: file-4.24-warn.dif Patch25: file-5.02-javacheck.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -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 # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,8 @@ License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python AutoReqProv: on -Version: 5.03 -Release: 4 +Version: 5.04 +Release: 1 Summary: Python module to use libmagic %py_requires Source99: file.spec ++++++ file-4.03-tex.dif ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -1,7 +1,5 @@ -Index: magic/Localstuff -=================================================================== ---- magic/Localstuff.orig -+++ magic/Localstuff +--- magic/Localstuff ++++ magic/Localstuff 2003-07-01 16:58:32.000000000 +0000 @@ -5,3 +5,12 @@ # $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # Add any locally observed files here. Remember: ++++++ file-4.24-autoconf.dif ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -1,7 +1,5 @@ -Index: doc/Makefile.am -=================================================================== ---- doc/Makefile.am.orig -+++ doc/Makefile.am +--- doc/Makefile.am ++++ doc/Makefile.am 2003-12-15 12:04:19.000000000 +0000 @@ -5,7 +5,8 @@ else man_MAGIC = magic.4 endif @@ -22,10 +20,8 @@ @rm -f $@ sed -e s@__CSECTION__@1@g \ -e s@__FSECTION__@${fsect}@g \ -Index: src/readelf.h -=================================================================== ---- src/readelf.h.orig -+++ src/readelf.h +--- src/readelf.h ++++ src/readelf.h 2003-07-01 14:53:55.000000000 +0000 @@ -34,7 +34,10 @@ #ifndef __fake_elf_h__ #define __fake_elf_h__ ++++++ file-5.02-misc.dif ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -49,25 +49,25 @@ +++ magic/Magdir/commands 2009-05-05 13:57:30.778196178 +0200 @@ -12,6 +12,8 @@ !: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 -+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 - 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 - 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 @@ - 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) --0 string/b #!\ /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 ++0 string/w #!\ /bin/bash Bourne-Again shell script text executable +!: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 -+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 - 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 --- magic/Magdir/mach +++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100 ++++++ file-4.24-awk.dif -> file-5.04-awk.dif ++++++ --- file/file-4.24-awk.dif 2008-04-14 19:32:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04-awk.dif 2010-02-05 17:16:35.000000000 +0100 @@ -1,10 +1,10 @@ --- magic/Magdir/commands -+++ magic/Magdir/commands 2008-04-14 17:05:54.968746122 +0200 -@@ -51,6 +51,7 @@ ++++ magic/Magdir/commands 2010-02-05 14:32:12.093297356 +0000 +@@ -52,6 +52,7 @@ # update to distinguish from *.vcf files # 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 # 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 ++++++ file-5.02-exec.dif -> file-5.04-exec.dif ++++++ --- file/file-5.02-exec.dif 2009-05-05 14:43:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04-exec.dif 2010-02-05 17:16:35.000000000 +0100 @@ -1,144 +1,169 @@ --- magic/Magdir/commands -+++ magic/Magdir/commands 2009-05-05 14:01:03.253902298 +0200 -@@ -3,66 +3,66 @@ ++++ 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/b #!\ /bin/sh POSIX shell script text executable -+0 string/b #!\ /bin/sh POSIX shell script 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/b #!\ /bin/csh C shell script text executable -+0 string/b #!\ /bin/csh C shell script text +-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/b #!\ /bin/ksh Korn shell script text executable -+0 string/b #!\ /bin/ksh Korn shell script text +-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/b #!\ /bin/tcsh Tenex C shell script text executable -+0 string/b #!\ /bin/tcsh Tenex C shell script text +-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/b #!\ /usr/bin/tcsh Tenex C shell script text executable -+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text +-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/b #!\ /usr/local/tcsh Tenex C shell script text executable -+0 string/b #!\ /usr/local/tcsh Tenex C shell script text +-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/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/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/b #!\ /bin/zsh Paul Falstad's zsh script text executable -+0 string/b #!\ /bin/zsh Paul Falstad's zsh script text +-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/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/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/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/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/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/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/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/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/b #!\ /bin/nawk new awk script text executable -+0 string/b #!\ /bin/nawk new awk script text +-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/b #!\ /usr/bin/nawk new awk script text executable -+0 string/b #!\ /usr/bin/nawk new awk script text +-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/b #!\ /usr/local/bin/nawk new awk script text executable -+0 string/b #!\ /usr/local/bin/nawk new awk script text +-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/b #!\ /bin/gawk GNU awk script text executable -+0 string/b #!\ /bin/gawk GNU awk script text +-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/b #!\ /usr/bin/gawk GNU awk script text executable -+0 string/b #!\ /usr/bin/gawk GNU awk script text +-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/b #!\ /usr/local/bin/gawk GNU awk script text executable -+0 string/b #!\ /usr/local/bin/gawk GNU awk script text +-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/b #!\ /bin/awk awk script text executable -+0 string/b #!\ /bin/awk awk script text +-0 string/w #!\ /bin/awk awk script text executable ++0 string/w #!\ /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 +-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/Bb BEGIN { awk script text + #0 search/Ww 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 +-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/b #!\ /bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /bin/bash Bourne-Again shell script text +-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/b #!\ /usr/bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text +-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/b #!\ /usr/local/bash Bourne-Again shell script text executable -+0 string/b #!\ /usr/local/bash Bourne-Again shell script text +-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/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/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 -@@ -79,9 +79,9 @@ + 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/b #!\ /usr/local/bin/php PHP script text executable -+0 search/1/b #!\ /usr/local/bin/php PHP script text +-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/b #!\ /usr/bin/php PHP script text executable -+0 search/1/b #!\ /usr/bin/php PHP script text +-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 14:01:33.658402106 +0200 -@@ -4,15 +4,15 @@ ++++ 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/b #!\ /bin/perl Perl script text executable -+0 search/1/b #!\ /bin/perl Perl script text +-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/b #!\ /usr/bin/perl Perl script text executable -+0 search/1/b #!\ /usr/bin/perl Perl script text +-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/b #!\ /usr/local/bin/perl Perl script text executable -+0 search/1/b #!\ /usr/local/bin/perl Perl script text +-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 2006-03-24 14:51:26.000000000 +0100 -@@ -4,7 +4,7 @@ ++++ 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.3.0a) + # 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" - 0 belong 0x994e0d0a python 1.5/1.6 byte-compiled +@@ -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 11:22:09.000000000 +0100 -@@ -2,12 +2,12 @@ ++++ 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 ++++++ file-5.02-zip2.0.dif -> file-5.04-zip2.0.dif ++++++ --- file/file-5.02-zip2.0.dif 2009-05-07 17:46:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04-zip2.0.dif 2010-02-05 17:16:36.000000000 +0100 @@ -1,8 +1,8 @@ --- magic/Magdir/archive -+++ magic/Magdir/archive 2009-05-07 17:43:15.549950181 +0200 -@@ -575,6 +575,10 @@ - >4 byte 0x14 - >>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract ++++ magic/Magdir/archive 2010-02-05 15:43:36.517302304 +0000 +@@ -581,6 +581,10 @@ + !:mime application/zip + >>4 byte 0x14 Zip archive data, at least v2.0 to extract !:mime application/zip +>>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract +>>>34 ubelong 0x74797065 \b, mime type ++++++ file-4.24-awk.dif -> file-5.04.dif ++++++ --- file/file-4.24-awk.dif 2008-04-14 19:32:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04.dif 2010-02-05 17:16:35.000000000 +0100 @@ -1,10 +1,470 @@ ---- 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 +--- magic/Header ++++ magic/Header 2006-03-27 13:29:19.000000000 +0200 +@@ -1,5 +1,7 @@ + # Magic + # Magic data for file(1) command. +-# Machine-generated from src/cmd/file/magdir/*; edit there only! +-# Format is described in magic(files), where: +-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID. ++# Format is described in magic(5). ++# ++# Note: If you have edited this file you may run `file -C' ++# to make a pre-compiled magic.mgc for faster execution ++# +--- magic/Makefile.am ++++ magic/Makefile.am 2010-02-05 16:37:45.805297766 +0100 +@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir + MAGIC_DIR = $(top_srcdir)/magic + MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) - # AT&T Bell Labs' Plan 9 shell - 0 string/b #!\ /bin/rc Plan 9 rc shell script text +-pkgdata_DATA = magic.mgc ++pkgdata_DATA = magic.mgc magic + + EXTRA_DIST = \ + $(MAGIC_DIR)/Header \ +@@ -20,7 +20,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \ + $(MAGIC_FRAGMENT_DIR)/amigaos \ + $(MAGIC_FRAGMENT_DIR)/animation \ + $(MAGIC_FRAGMENT_DIR)/apl \ +-$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/applix \ + $(MAGIC_FRAGMENT_DIR)/archive \ + $(MAGIC_FRAGMENT_DIR)/asterix \ +@@ -67,7 +66,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/erlang \ + $(MAGIC_FRAGMENT_DIR)/esri \ + $(MAGIC_FRAGMENT_DIR)/fcs \ +-$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/flash \ + $(MAGIC_FRAGMENT_DIR)/fonts \ + $(MAGIC_FRAGMENT_DIR)/fortran \ +@@ -98,19 +96,19 @@ $(MAGIC_FRAGMENT_DIR)/island \ + $(MAGIC_FRAGMENT_DIR)/ispell \ + $(MAGIC_FRAGMENT_DIR)/java \ + $(MAGIC_FRAGMENT_DIR)/jpeg \ ++$(MAGIC_FRAGMENT_DIR)/linux \ ++$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/karma \ + $(MAGIC_FRAGMENT_DIR)/kde \ + $(MAGIC_FRAGMENT_DIR)/kml \ + $(MAGIC_FRAGMENT_DIR)/lecter \ + $(MAGIC_FRAGMENT_DIR)/lex \ + $(MAGIC_FRAGMENT_DIR)/lif \ +-$(MAGIC_FRAGMENT_DIR)/linux \ + $(MAGIC_FRAGMENT_DIR)/lisp \ + $(MAGIC_FRAGMENT_DIR)/llvm \ + $(MAGIC_FRAGMENT_DIR)/lua \ + $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/mach \ +-$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/magic \ + $(MAGIC_FRAGMENT_DIR)/mail.news \ + $(MAGIC_FRAGMENT_DIR)/maple \ +@@ -126,10 +124,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/mkid \ + $(MAGIC_FRAGMENT_DIR)/mlssa \ + $(MAGIC_FRAGMENT_DIR)/mmdf \ +-$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/motorola \ + $(MAGIC_FRAGMENT_DIR)/mozilla \ + $(MAGIC_FRAGMENT_DIR)/msdos \ ++$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/msvc \ + $(MAGIC_FRAGMENT_DIR)/mup \ + $(MAGIC_FRAGMENT_DIR)/natinst \ +@@ -165,6 +163,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)/ruby \ +@@ -223,8 +223,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ + $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/zyxel + ++RAW = magic + MAGIC = magic.mgc +-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ++CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} ++ ++${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/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 +@@ -236,7 +248,5 @@ FILE_COMPILE = $(top_builddir)/src/file + FILE_COMPILE_DEP = $(FILE_COMPILE) + endif + +-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- @mkdir magic && cp -p $(EXTRA_DIST) magic +- $(FILE_COMPILE) -C -m magic +- @rm -fr magic ++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) ++ $(FILE_COMPILE) -C -m $(RAW) +--- magic/Magdir/elf ++++ magic/Magdir/elf 2006-11-22 15:57:15.000000000 +0100 +@@ -101,7 +101,7 @@ + >>18 leshort 47 Renesas H8/300H, + >>18 leshort 48 Renesas H8S, + >>18 leshort 49 Renesas H8/500, +->>18 leshort 50 IA-64, ++>>18 leshort 50 IA-64 (Intel 64 bit architecture), + >>18 leshort 51 Stanford MIPS-X, + >>18 leshort 52 Motorola Coldfire, + >>18 leshort 53 Motorola M68HC12, +@@ -246,7 +246,7 @@ + >>18 beshort 47 Renesas H8/300H, + >>18 beshort 48 Renesas H8S, + >>18 beshort 49 Renesas H8/500, +->>18 beshort 50 IA-64, ++>>18 beshort 50 IA-64 (Intel 64 bit architecture), + >>18 beshort 51 Stanford MIPS-X, + >>18 beshort 52 Motorola Coldfire, + >>18 beshort 53 Motorola M68HC12, +--- magic/Magdir/linux ++++ magic/Magdir/linux 2009-05-05 14:25:20.898401425 +0200 +@@ -81,21 +81,43 @@ + # 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 + # Linux kernel boot images (i386 arch) (Wolfram Kleff) +-514 string HdrS Linux kernel +->510 leshort 0xAA55 x86 boot executable +->>518 leshort >0x1ff +->>>529 byte 0 zImage, +->>>529 byte 1 bzImage, +->>>(526.s+0x200) string >\0 version %s, +->>498 leshort 1 RO-rootFS, +->>498 leshort 0 RW-rootFS, +->>508 leshort >0 root_dev 0x%X, +->>502 leshort >0 swap_dev 0x%X, +->>504 leshort >0 RAMdisksize %u KB, +->>506 leshort 0xFFFF Normal VGA +->>506 leshort 0xFFFE Extended VGA +->>506 leshort 0xFFFD Prompt for Videomode +->>506 leshort >0 Video mode %d ++514 string HdrS Linux ++>510 leshort 0xAA55 \b/x86 Kernel ++>510 leshort <0xAA55 Kernel ++>510 leshort >0xAA55 Kernel ++>518 leshort 0x0105 \b, Setup Version 0x105, zImage ++>518 leshort >0x0105 \b, Setup Version %#hx ++>>529 byte 0 \b, zImage ++>>529 byte 1 \b, bzImage ++>>>(526.s+0x205) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x205) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x208) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %8.8s ++>>>(526.s+0x209) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %9.9s ++>>>(526.s+0x20a) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %10.10s ++>>>(526.s+0x20b) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %11.11s ++>>498 leshort 1 \b, RO-rootFS ++>>498 leshort 0 \b, RW-rootFS ++>>508 leshort >0 \b, root_dev 0x%X ++>>502 leshort >0 \b, swap_dev 0x%X ++>>504 leshort >0 \b, RAMdisksize %u KB ++>>506 leshort 0xFFFF \b, Normal VGA ++>>506 leshort 0xFFFE \b, Extended VGA ++>>506 leshort 0xFFFD \b, Prompt for Videomode ++>>506 leshort >0 \b, Video mode %d + # This also matches new kernels, which were caught above by "HdrS". + 0 belong 0xb8c0078e Linux kernel + >0x1e3 string Loading version 1.3.79 or older +--- magic/Magdir/modem ++++ magic/Magdir/modem 2006-03-27 13:29:19.000000000 +0200 +@@ -2,9 +2,9 @@ + # modem: file(1) magic for modem programs + # + # From: Florian La Roche <florian@knorke.saar.de> +-4 string Research, Digifax-G3-File +->29 byte 1 , fine resolution +->29 byte 0 , normal resolution ++1 string PC\ Research,\ Inc Digifax-G3-File ++>29 byte 1 \b, fine resolution ++>29 byte 0 \b, normal resolution + + 0 short 0x0100 raw G3 data, byte-padded + 0 short 0x1400 raw G3 data +--- magic/Magdir/msad ++++ magic/Magdir/msad 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,5 @@ ++#------------------------------------------------------------------------------ ++# msad: file(1) magic for msad ++# Microsoft visual C ++# This must precede the heuristic for raw G3 data ++4 string Standard\ Jet\ DB Microsoft Access Database +--- magic/Magdir/msdos ++++ magic/Magdir/msdos 2009-05-05 14:29:29.646404153 +0200 +@@ -70,6 +70,7 @@ + >>&0 leshort 0x290 PA-RISC + >>&18 leshort&0x0100 >0 32-bit + >>&18 leshort&0x1000 >0 system file ++>>&228 lelong >0 \b, Mono/.Net assembly + >>&0xf4 search/0x140 \x0\x40\x1\x0 + >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive + >30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive +@@ -107,7 +108,7 @@ + >>>(0x3c.l+4) leshort 0x200 Intel Itanium + >>>(0x3c.l+22) leshort&0x0100 >0 32-bit + >>>(0x3c.l+22) leshort&0x1000 >0 system file +->>>(0x3c.l+232) lelong >0 Mono/.Net assembly ++>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly + + >>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed + >>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed +@@ -520,6 +521,13 @@ + # Acroread or something files wrongly identified as G3 .pfm + # these have the form \000 \001 any? \002 \000 \000 + # or \000 \001 any? \022 \000 \000 ++0 belong&0xffff00ff 0x00010012 PFM data ++>4 string \000\000 ++>6 string >\060 - %s ++ ++0 belong&0xffff00ff 0x00010002 PFM data ++>4 string \000\000 ++>6 string >\060 - %s + #0 string \000\001 pfm? + #>3 string \022\000\000Copyright\ yes + #>3 string \002\000\000Copyright\ yes +--- src/Makefile.am ++++ src/Makefile.am 2008-04-14 17:14:56.000000000 +0200 +@@ -1,4 +1,4 @@ +-MAGIC = $(pkgdatadir)/magic ++MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic + lib_LTLIBRARIES = libmagic.la + include_HEADERS = magic.h + +--- src/dcore.c ++++ src/dcore.c 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,207 @@ ++/* ++ * Show goo about ELF core files ++ * Jeremy Fitzhardinge <jeremy@zip.com.au> 1996 ++ */ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <string.h> ++#if defined __GLIBC__ && __GLIBC__ >= 2 ++#include <elf.h> ++#include <sys/procfs.h> ++# ifndef NT_PRFPREG ++# define NT_PRFPREG 2 ++# endif ++# ifndef NT_TASKSTRUCT ++# define NT_TASKSTRUCT 4 ++# endif ++#else ++#include <linux/elf.h> ++#include <linux/elfcore.h> ++#endif ++ ++static void fperror(const char *str) ++{ ++ perror(str); ++ exit(1); ++} ++ ++static size_t myread(int fd, void *buf, size_t sz) ++{ ++ size_t ret; ++ ++ if ((ret = read(fd, buf, sz)) != sz) ++ fperror("read failed"); ++ return ret; ++} ++ ++static void print_prstatus(const prstatus_t *pr) ++{ ++ unsigned i; ++ static const char *regs[] = { "ebx", "ecx", "edx", "esi", "edi", "ebp", ++ "eax", "ds", "es", "fs", "gs", ++ "orig_eax", "eip", "cs", ++ "efl", "uesp", "ss"}; ++ ++ printf(" pid=%d ppid=%d pgrp=%d sid=%d\n", ++ pr->pr_pid, pr->pr_ppid, pr->pr_pgrp, pr->pr_sid); ++ for(i = 0; i < NGREG; i++) ++ { ++ unsigned long val = pr->pr_reg[i]; ++ printf(" %-2u %-5s=%08lx %lu\n", i, regs[i], val, val); ++ } ++} ++ ++static void print_prpsinfo(const prpsinfo_t *ps) ++{ ++ printf(" uid=%d gid=%d\n", ps->pr_uid, ps->pr_gid); ++ printf(" comm=%s\n", ps->pr_fname); ++ printf(" psargs=%s\n", ps->pr_psargs); ++} ++ ++#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) ++ ++static void do_note(int fd, Elf32_Phdr *phdr) ++{ ++ off_t here = lseek(fd, 0, SEEK_CUR); ++ int size = phdr->p_filesz; ++ char *raw = alloca(size), *end; ++ end = raw+size; ++ ++ lseek(fd, phdr->p_offset, SEEK_SET); ++ myread(fd, raw, size); ++ ++ while(raw < end) ++ { ++ Elf32_Nhdr *note = (Elf32_Nhdr *)raw; ++ const char *str; ++ const char *name, *desc; ++ ++ raw += sizeof(*note); ++ name = raw; ++ raw += roundup(note->n_namesz, sizeof(long)); ++ desc = raw; ++ raw += roundup(note->n_descsz, sizeof(long)); ++ ++ printf(" name=%.*s", (int)note->n_namesz, name); ++ ++ if(strncmp(name, "CORE", note->n_namesz) != 0) ++ { ++ printf("\n"); ++ continue; ++ } ++ ++ switch(note->n_type) ++ { ++#define X(x) case x: str = #x; break; ++ X(NT_PRSTATUS); ++ X(NT_PRFPREG); ++ X(NT_PRPSINFO); ++ X(NT_TASKSTRUCT); ++#undef X ++ default: ++ str = "???"; ++ } ++ printf(" n_type=%s n_descsz=%ld\n", ++ str, note->n_descsz); ++ switch(note->n_type) ++ { ++ case NT_PRSTATUS: ++ print_prstatus((prstatus_t *)desc); ++ break; ++ case NT_PRPSINFO: ++ print_prpsinfo((prpsinfo_t *)desc); ++ break; ++ } ++ } ++ lseek(fd, here, SEEK_SET); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int fd; ++ Elf32_Ehdr elf; ++ int i; ++ ++ if (argc != 2) ++ { ++ fprintf(stderr, "Usage: %s corefile\n", argv[0]); ++ exit(1); ++ } ++ ++ if ((fd = open(argv[1], O_RDONLY)) == -1) ++ fperror("open of core"); ++ ++ myread(fd, &elf, sizeof(elf)); ++ ++ if (memcmp(ELFMAG, elf.e_ident, SELFMAG) != 0) ++ printf("bad magic\n"); ++ ++ if (elf.e_ident[EI_CLASS] != ELFCLASS32) ++ printf("wrong class\n"); ++ ++ if (elf.e_ident[EI_DATA] != ELFDATA2LSB) ++ printf("wrong endianess\n"); ++ ++ if (elf.e_ident[EI_VERSION] != EV_CURRENT) ++ printf("wrong version\n"); ++ ++ { ++ const char *str; ++ switch(elf.e_type) ++ { ++#define C(x) case ET_##x: str = #x; break; ++ C(NONE); ++ C(REL); ++ C(EXEC); ++ C(DYN); ++ C(CORE); ++#undef C ++ default: str = "???"; break; ++ } ++ printf("elf file type ET_%s\n", str); ++ } ++ ++ if (elf.e_machine != EM_386 && elf.e_machine != EM_486) ++ printf("not i386 or i486\n"); ++ ++ if (elf.e_ehsize != sizeof(elf)) ++ printf("wrong header size\n"); ++ ++ if (elf.e_phentsize != sizeof(Elf32_Phdr)) ++ printf("wrong phdr size\n"); ++ ++ if (lseek(fd, elf.e_phoff, SEEK_SET) != (off_t)elf.e_phoff) ++ fperror("lseek to phdr failed\n"); ++ ++ for(i = 0; i < elf.e_phnum; i++) ++ { ++ Elf32_Phdr phdr; ++ const char *str; ++ ++ myread(fd, &phdr, sizeof(phdr)); ++ switch(phdr.p_type) ++ { ++#define C(x) case PT_##x: str = #x; break; ++ C(NULL); ++ C(LOAD); ++ C(DYNAMIC); ++ C(INTERP); ++ C(NOTE); ++ C(SHLIB); ++ C(PHDR); ++#undef C ++ default: ++ str = "???"; break; ++ } ++ printf("type PT_%s off=%ld vaddr=%lx filesz=%ld flags=%lx\n", ++ str, phdr.p_offset, phdr.p_vaddr, phdr.p_filesz, ++ (unsigned long)phdr.p_flags); ++ if (phdr.p_type == PT_NOTE) ++ do_note(fd, &phdr); ++ } ++ exit(0); ++} ++ ++++++ file-5.03.tar.bz2 -> file-5.04.tar.bz2 ++++++ ++++ 5367 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de