Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/file/dist from ftp.astron.com:
details: https://anonhg.NetBSD.org/src/rev/34bf3e1e771c
branches: trunk
changeset: 769644:34bf3e1e771c
user: christos <christos%NetBSD.org@localhost>
date: Fri Sep 16 20:37:23 2011 +0000
description:
from ftp.astron.com:
- elf seeking fixes
- improvements in cdf parsing
- waitpid only for our child
- magic fixes and additions
diffstat:
external/bsd/file/dist/ChangeLog | 30 ++++++++
external/bsd/file/dist/ltmain.sh | 8 +-
external/bsd/file/dist/magic/magdir/animation | 60 +++++++++++++++++-
external/bsd/file/dist/magic/magdir/audio | 12 +++-
external/bsd/file/dist/magic/magdir/database | 8 ++-
external/bsd/file/dist/magic/magdir/fusecompress | 12 +++
external/bsd/file/dist/magic/magdir/iff | 9 ++-
external/bsd/file/dist/magic/magdir/macintosh | 4 +-
external/bsd/file/dist/magic/magdir/marc21 | 28 ++++++++
external/bsd/file/dist/magic/magdir/msdos | 32 +++++---
external/bsd/file/dist/magic/magdir/printer | 4 +-
external/bsd/file/dist/magic/magdir/riff | 4 +-
external/bsd/file/dist/magic/magdir/rpm | 42 +++++++----
external/bsd/file/dist/magic/magdir/smile | 34 +++++++++
external/bsd/file/dist/magic/magdir/sniffer | 19 +++++-
external/bsd/file/dist/magic/magdir/xdelta | 4 +-
external/bsd/file/dist/src/apptype.c | 7 +-
external/bsd/file/dist/src/elfclass.h | 5 +-
external/bsd/file/dist/src/readelf.h | 83 +++++++++++++++--------
19 files changed, 326 insertions(+), 79 deletions(-)
diffs (truncated from 746 to 300 lines):
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/ChangeLog Fri Sep 16 20:37:23 2011 +0000
@@ -1,3 +1,33 @@
+2011-09-01 12:12 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Don't wait for any subprocess, just the one we forked.
+
+2011-08-26 16:40 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * If the application name is not set in a cdf file, try to see
+ if it has a directory with the application name on it.
+
+2011-08-17 14:32 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Fix ELF lseek(2) madness. Inspired by PR/134 by Jan Kaluza
+
+2011-08-14 09:03 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Don't use variable string formats.
+
+2011-07-12 12:32 Reuben Thomas <rrt%sc3d.org@localhost>
+
+ * Fix detection of Zip files (Mantis #128).
+ * Make some minor improvements to file(1).
+ * Rename MIME types for filesystem objects for consistency with
+ xdg-utils. Typically this means that application/x-foo becomes
+ inode/foo, but some names also change slightly, e.g.
+ application/x-character-device becomes inode/chardevice.
+
+2011-05-10 20:57 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * fix mingw compilation (Abradoks)
+
2011-05-10 20:57 Christos Zoulas <christos%zoulas.com@localhost>
* remove patchlevel.h
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/ltmain.sh
--- a/external/bsd/file/dist/ltmain.sh Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/ltmain.sh Fri Sep 16 20:37:23 2011 +0000
@@ -4522,7 +4522,7 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -6308,6 +6308,7 @@
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
+ versuffix2="$major.$age"
;;
osf)
@@ -6368,8 +6369,10 @@
esac
if test "$need_version" = no; then
versuffix=
+ versuffix2=
else
versuffix=".0.0"
+ versuffix2=".0.0"
fi
fi
@@ -6377,6 +6380,7 @@
if test "$avoid_version" = yes && test "$need_version" = no; then
major=
versuffix=
+ versuffix2=
verstring=""
fi
@@ -6476,7 +6480,7 @@
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/animation
--- a/external/bsd/file/dist/magic/magdir/animation Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/magic/magdir/animation Fri Sep 16 20:37:23 2011 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: animation,v 1.44 2010/11/25 15:00:12 christos Exp $
+# $File: animation,v 1.45 2011/09/06 11:00:06 christos Exp $
# animation: file(1) magic for animation/movie formats
#
# animation formats
@@ -835,3 +835,61 @@
# URL: http://wiki.multimedia.cx/index.php?title=NUT
# From: Adam Buchbinder <adam.buchbinder%gmail.com@localhost>
0 string nut/multimedia\ container\0 NUT multimedia container
+
+# Type: Nullsoft Video (NSV)
+# URL: http://wiki.multimedia.cx/index.php?title=Nullsoft_Video
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string NSVf Nullsoft Video
+
+# Type: REDCode Video
+# URL: http://www.red.com/ ; http://wiki.multimedia.cx/index.php?title=REDCode
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+4 string RED1 REDCode Video
+
+# Type: MTV Multimedia File
+# URL: http://wiki.multimedia.cx/index.php?title=MTV
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string AMVS MTV Multimedia File
+
+# Type: ARMovie
+# URL: http://wiki.multimedia.cx/index.php?title=ARMovie
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string ARMovie\012 ARMovie
+
+# Type: Interplay MVE Movie
+# URL: http://wiki.multimedia.cx/index.php?title=Interplay_MVE
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string Interplay\040MVE\040File\032 Interplay MVE Movie
+
+# Type: Windows Television DVR File
+# URL: http://wiki.multimedia.cx/index.php?title=WTV
+# From: Mike Melanson <mike%mutlimedia.cx@localhost>
+# This takes the form of a Windows-style GUID
+0 bequad 0xB7D800203749DA11
+>8 bequad 0xA64E0007E95EAD8D Windows Television DVR Media
+
+# Type: Sega FILM/CPK Multimedia
+# URL: http://wiki.multimedia.cx/index.php?title=Sega_FILM
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string FILM Sega FILM/CPK Multimedia,
+>32 belong x %d x
+>28 belong x %d
+
+# Type: Nintendo THP Multimedia
+# URL: http://wiki.multimedia.cx/index.php?title=THP
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string THP\0 Nintendo THP Multimedia
+
+# Type: BBC Dirac Video
+# URL: http://wiki.multimedia.cx/index.php?title=Dirac
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string BBCD BBC Dirac Video
+
+# Type: RAD Game Tools Smacker Multimedia
+# URL: http://wiki.multimedia.cx/index.php?title=Smacker
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string SMK RAD Game Tools Smacker Multimedia
+>3 byte x version %c,
+>4 lelong x %d x
+>8 lelong x %d,
+>12 lelong x %d frames
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/audio
--- a/external/bsd/file/dist/magic/magdir/audio Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/magic/magdir/audio Fri Sep 16 20:37:23 2011 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: audio,v 1.62 2011/04/05 20:27:13 christos Exp $
+# $File: audio,v 1.63 2011/09/06 11:00:06 christos Exp $
# audio: file(1) magic for sound formats (see also "iff")
#
# Jan Nicolai Langfeldt (janl%ifi.uio.no@localhost), Dan Quinlan (quinlan%yggdrasil.com@localhost),
@@ -625,3 +625,13 @@
# From: Mario Lang <mlang%debian.org@localhost>
0 string SCgf SuperCollider3 Synth Definition file,
>4 belong x version %d
+
+# Type: True Audio Lossless Audio
+# URL: http://wiki.multimedia.cx/index.php?title=True_Audio
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string TTA1 True Audio Lossless Audio
+
+# Type: WavPack Lossless Audio
+# URL: http://wiki.multimedia.cx/index.php?title=WavPack
+# From: Mike Melanson <mike%multimedia.cx@localhost>
+0 string wvpk WavPack Lossless Audio
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/database
--- a/external/bsd/file/dist/magic/magdir/database Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/magic/magdir/database Fri Sep 16 20:37:23 2011 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: database,v 1.26 2010/12/26 23:10:59 christos Exp $
+# $File: database,v 1.28 2011/09/16 19:40:40 christos Exp $
# database: file(1) magic for various databases
#
# extracted from header/code files by Graeme Wilford (eep2gw%ee.surrey.ac.uk@localhost)
@@ -287,3 +287,9 @@
# From: Benoit Sibaud <bsibaud%april.org@localhost>
0 string ToKyO\ CaBiNeT\n TokyoCabinet database
>14 string x (version %s)
+
+# From: Stéphane Blondon http://www.yaal.fr
+# Database file for Zope (done by FileStorage)
+0 string FS21 Zope Object Database File Storage (data)
+# Cache file for the database of Zope (done by ClientStorage)
+0 string ZEC3 Zope Object Database Client Cache File (data)
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/fusecompress
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/file/dist/magic/magdir/fusecompress Fri Sep 16 20:37:23 2011 +0000
@@ -0,0 +1,12 @@
+
+#------------------------------------------------------------------------------
+# $File: fusecompress,v 1.2 2011/08/08 09:05:55 christos Exp $
+# fusecompress: file(1) magic for fusecompress
+0 string \037\135\211 FuseCompress(ed) data
+>3 byte 0x00 (none format)
+>3 byte 0x01 (bz2 format)
+>3 byte 0x02 (gz format)
+>3 byte 0x03 (lzo format)
+>3 byte 0x04 (xor format)
+>3 byte >0x04 (unknown format)
+>4 long x uncompressed size: %d
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/iff
--- a/external/bsd/file/dist/magic/magdir/iff Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/magic/magdir/iff Fri Sep 16 20:37:23 2011 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: iff,v 1.12 2009/09/19 16:28:09 christos Exp $
+# $File: iff,v 1.13 2011/09/06 11:00:06 christos Exp $
# iff: file(1) magic for Interchange File Format (see also "audio" & "images")
#
# Daniel Quinlan (quinlan%yggdrasil.com@localhost) -- IFF was designed by Electronic
@@ -52,6 +52,13 @@
>8 string AMFF \b, AMFF AmigaMetaFile format
>8 string WZRD \b, WZRD StormWIZARD resource
>8 string DOC\ \b, DOC desktop publishing document
+>8 string WVQA \b, Westwood Studios VQA Multimedia,
+>>24 leshort x %d video frames,
+>>26 leshort x %d x
+>>28 leshort x %d
+>8 string MOVE \b, Wing Commander III Video
+>>12 string _PC_ \b, PC version
+>>12 string 3DO_ \b, 3DO version
# These go at the end of the iff rules
#
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/macintosh
--- a/external/bsd/file/dist/magic/magdir/macintosh Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/magic/magdir/macintosh Fri Sep 16 20:37:23 2011 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: macintosh,v 1.21 2010/09/20 19:19:17 rrt Exp $
+# $File: macintosh,v 1.22 2011/05/17 17:40:31 rrt Exp $
# macintosh description
#
# BinHex is the Macintosh ASCII-encoded file format (see also "apple")
@@ -285,7 +285,7 @@
>0x412 beshort x number of blocks: %d,
>0x424 pstring x volume name: %s
-# "BD" is has many false positives
+# "BD" gives many false positives
#0x400 beshort 0x4244 Macintosh HFS data
#>0 beshort 0x4C4B (bootable)
#>0x40a beshort &0x8000 (locked)
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/marc21
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/file/dist/magic/magdir/marc21 Fri Sep 16 20:37:23 2011 +0000
@@ -0,0 +1,28 @@
+#--------------------------------------------
+# marc21: file(1) magic for MARC 21 Format
+#
+# Kevin Ford (kefo%loc.gov@localhost)
+#
+# MARC21 formats are for the representation and communication
+# of bibliographic and related information in machine-readable
+# form. For more info, see http://www.loc.gov/marc/
+
+
+# leader position 20-21 must be 45
+20 string 45
+
+# leader starts with 5 digits, followed by codes specific to MARC format
+>0 regex/1 (^[0-9]{5})[acdnp][^bhlnqsu-z] MARC21 Bibliographic
+!:mime application/marc
+>0 regex/1 (^[0-9]{5})[acdnosx][z] MARC21 Authority
+!:mime application/marc
+>0 regex/1 (^[0-9]{5})[cdn][uvxy] MARC21 Holdings
+!:mime application/marc
+0 regex/1 (^[0-9]{5})[acdn][w] MARC21 Classification
+!:mime application/marc
+>0 regex/1 (^[0-9]{5})[cdn][q] MARC21 Community
+!:mime application/marc
+
+# leader position 22-23, should be "00" but is it?
+>0 regex/1 (^.{21})([^0]{2}) (non-conforming)
+!:mime application/marc
diff -r ef01a62fd4c3 -r 34bf3e1e771c external/bsd/file/dist/magic/magdir/msdos
--- a/external/bsd/file/dist/magic/magdir/msdos Fri Sep 16 18:51:44 2011 +0000
+++ b/external/bsd/file/dist/magic/magdir/msdos Fri Sep 16 20:37:23 2011 +0000
Home |
Main Index |
Thread Index |
Old Index