diff --git a/dist/file/ChangeLog b/dist/file/ChangeLog index 31a69035fab1..e2c8418e371f 100644 --- a/dist/file/ChangeLog +++ b/dist/file/ChangeLog @@ -1,3 +1,24 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) + +2007-03-15 10:51 Christos Zoulas + + * fix fortran and nroff reversed tests (Dmitry V. Levin) + + * fix exclude option (Dmitry V. Levin) 2007-02-08 17:30 Christos Zoulas diff --git a/dist/file/magic/magdir/console b/dist/file/magic/magdir/console index cf164d733a7e..40a3c2e4c63e 100644 --- a/dist/file/magic/magdir/console +++ b/dist/file/magic/magdir/console @@ -168,3 +168,26 @@ # From Gürkan Sengün , www.linuks.mine.nu 0 string GBS Nintendo Gameboy Music/Audio Data 12 string GameBoy\ Music\ Module Nintendo Gameboy Music Module + +# Playstations Patch Files from: From: Thomas Klausner +0 string PPF30 Playstation Patch File version 3.0 +>5 byte 0 \b, PPF 1.0 patch +>5 byte 1 \b, PPF 2.0 patch +>5 byte 2 \b, PPF 3.0 patch +>>56 byte 0 \b, Imagetype BIN (any) +>>56 byte 1 \b, Imagetype GI (PrimoDVD) +>>57 byte 0 \b, Blockcheck disabled +>>57 byte 1 \b, Blockcheck enabled +>>58 byte 0 \b, Undo data not available +>>58 byte 1 \b, Undo data available +>6 string x \b, description: %s + +0 string PPF20 Playstation Patch File version 2.0 +>5 byte 0 \b, PPF 1.0 patch +>5 byte 1 \b, PPF 2.0 patch +>>56 lelong >0 \b, size of file to patch %d +>6 string x \b, description: %s + +0 string PPF10 Playstation Patch File version 1.0 +>5 byte 0 \b, Simple Encoding +>6 string x \b, description: %s diff --git a/dist/file/magic/magdir/elf b/dist/file/magic/magdir/elf index cf91132b3b66..52b5e4cd2169 100644 --- a/dist/file/magic/magdir/elf +++ b/dist/file/magic/magdir/elf @@ -101,6 +101,7 @@ >>18 leshort 88 Renesas M32R, >>18 leshort 94 Tensilica Xtensa, >>18 leshort 97 NatSemi 32k, +>>18 leshort 106 Analog Devices Blackfin, >>18 leshort 0x9026 Alpha (unofficial), >>20 lelong 0 invalid version >>20 lelong 1 version 1 diff --git a/dist/file/magic/magdir/fonts b/dist/file/magic/magdir/fonts index 6a1ad34b2ea4..cf6e0d7cc140 100644 --- a/dist/file/magic/magdir/fonts +++ b/dist/file/magic/magdir/fonts @@ -59,3 +59,6 @@ # Opentype font data from Avi Bercovich 0 string OTTO OpenType font data +# Gürkan Sengün , www.linuks.mine.nu +0 string SplineFontDB: Spline Font Database +>14 string x version %s diff --git a/dist/file/magic/magdir/images b/dist/file/magic/magdir/images index f04ccdb578a8..fd9e14f9fd2b 100644 --- a/dist/file/magic/magdir/images +++ b/dist/file/magic/magdir/images @@ -307,6 +307,10 @@ >5 byte 0x00 (white background) >5 byte 0xFF (black background) +# Gürkan Sengün , www.linuks.mine.nu +# http://www.atarimax.com/jindroush.atari.org/afmtatr.html +0 leshort 0x0296 Atari ATR image + # XXX: # This is bad magic 0x5249 == 'RI' conflicts with RIFF and other # magic. diff --git a/dist/file/magic/magdir/linux b/dist/file/magic/magdir/linux index fc0c42d40cf7..fe68013a1653 100644 --- a/dist/file/magic/magdir/linux +++ b/dist/file/magic/magdir/linux @@ -236,3 +236,13 @@ >20 lelong 1 MLS >24 lelong x %d symbols >28 lelong x %d ocons + +# LUKS: Linux Unified Key Setup, On-Disk Format, http://luks.endorphin.org/spec +# Anthon van der Neut (anthon@mnt.org) +0 string LUKS\xba\xbe LUKS encrypted file, +>6 beshort x ver %d +>8 string x [%s, +>40 string x %s, +>72 string x %s] +>168 string x UUID: %s + diff --git a/dist/file/magic/magdir/lisp b/dist/file/magic/magdir/lisp index c72b06cba662..e9c8ba8ec4e6 100644 --- a/dist/file/magic/magdir/lisp +++ b/dist/file/magic/magdir/lisp @@ -10,12 +10,14 @@ # lisp files are mainly created on unix system with LF as line end >2 search/2048 !\r Lisp/Scheme program text >2 search/2048 \r Windows INF file -0 string ( ->1 string if\ Lisp/Scheme program text ->1 string setq\ Lisp/Scheme program text ->1 string defvar\ Lisp/Scheme program text ->1 string autoload\ Lisp/Scheme program text ->1 string custom-set-variables Lisp/Scheme program text + +0 search/256 (if\ Lisp/Scheme program text +0 search/256 (setq\ Lisp/Scheme program text +0 search/256 (defvar\ Lisp/Scheme program text +0 search/256 (defparam\ Lisp/Scheme program text +0 search/256 (defun\ Lisp/Scheme program text +0 search/256 (autoload\ Lisp/Scheme program text +0 search/256 (custom-set-variables\ Lisp/Scheme program text # Emacs 18 - this is always correct, but not very magical. 0 string \012( Emacs v18 byte-compiled Lisp data diff --git a/dist/file/magic/magdir/os400 b/dist/file/magic/magdir/os400 index bee366065123..3dc05bf906e7 100644 --- a/dist/file/magic/magdir/os400 +++ b/dist/file/magic/magdir/os400 @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ # os400: file(1) magic for IBM OS/400 files - +# # IBM OS/400 (i5/OS) Save file (SAVF) - gerardo.cacciari@gmail.com # In spite of its quite variable format (due to internal memory page # length differences between CISC and RISC versions of the OS) the @@ -9,24 +9,29 @@ # so we must search in a somewhat large area for a particular string # that represents the EBCDIC encoding of 'QSRDSSPC' (save/restore # descriptor space) preceded by a two byte constant. -40 string @@@@@@@@ ->1089 search/7394 \x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3 IBM OS/400 save file data ->>&212 byte 0x01 \b, created with SAVOBJ ->>&212 byte 0x02 \b, created with SAVLIB ->>&212 byte 0x07 \b, created with SAVCFG ->>&212 byte 0x0B \b, created with SAVDLO ->>&213 byte 0x43 \b, at least V5R3 to open ->>&213 byte 0x42 \b, at least V5R2 to open ->>&213 byte 0x41 \b, at least V5R1 to open ->>&213 byte 0x40 \b, at least V4R5 to open ->>&213 byte 0x3F \b, at least V4R4 to open ->>&213 byte 0x3E \b, at least V4R3 to open ->>&213 byte 0x3C \b, at least V4R2 to open ->>&213 byte 0x3D \b, at least V4R1M4 to open ->>&213 byte 0x3B \b, at least V4R1 to open ->>&213 byte 0x3A \b, at least V3R7 to open ->>&213 byte 0x35 \b, at least V3R6 to open ->>&213 byte 0x36 \b, at least V3R2 to open ->>&213 byte 0x34 \b, at least V3R1 to open ->>&213 byte 0x31 \b, at least V3R0M5 to open ->>&213 byte 0x30 \b, at least V2R3 to open +# +1090 search/7393 \x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3 IBM OS/400 save file data +>&212 byte 0x01 \b, created with SAVOBJ +>&212 byte 0x02 \b, created with SAVLIB +>&212 byte 0x07 \b, created with SAVCFG +>&212 byte 0x08 \b, created with SAVSECDTA +>&212 byte 0x0A \b, created with SAVSECDTA +>&212 byte 0x0B \b, created with SAVDLO +>&212 byte 0x0D \b, created with SAVLICPGM +>&212 byte 0x11 \b, created with SAVCHGOBJ +>&213 byte 0x44 \b, at least V5R4 to open +>&213 byte 0x43 \b, at least V5R3 to open +>&213 byte 0x42 \b, at least V5R2 to open +>&213 byte 0x41 \b, at least V5R1 to open +>&213 byte 0x40 \b, at least V4R5 to open +>&213 byte 0x3F \b, at least V4R4 to open +>&213 byte 0x3E \b, at least V4R3 to open +>&213 byte 0x3C \b, at least V4R2 to open +>&213 byte 0x3D \b, at least V4R1M4 to open +>&213 byte 0x3B \b, at least V4R1 to open +>&213 byte 0x3A \b, at least V3R7 to open +>&213 byte 0x35 \b, at least V3R6 to open +>&213 byte 0x36 \b, at least V3R2 to open +>&213 byte 0x34 \b, at least V3R1 to open +>&213 byte 0x31 \b, at least V3R0M5 to open +>&213 byte 0x30 \b, at least V2R3 to open diff --git a/dist/file/magic/magdir/revision b/dist/file/magic/magdir/revision index 36a829ba0ad5..e47416ab68d0 100644 --- a/dist/file/magic/magdir/revision +++ b/dist/file/magic/magdir/revision @@ -2,4 +2,8 @@ #------------------------------------------------------------------------------ # file(1) magic for revision control files # From Hendrik Scholz -0 string /1\ :pserver: cvs password text file +0 string /1\ :pserver: cvs password text file + +# Conary changesets +# From: Jonathan Smith +0 belong 0xea3f81bb Conary changeset data