bring in fixes from netbsd.

diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 8566c1fb8c59b519861e6f027d78209db4cc5460..f4fe4a47d5e0f447b09e47f39afbbca2b392ffe8 100644 (file)
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -94,7 +94,7 @@
 # bzip a block-sorting file compressor
 #      by Julian Seward <sewardj@cs.man.ac.uk> and others
 #
-0      string          BZ              bzip compressed data
+0      string          BZ              bzip compressed data
 >2     byte            x               \b, version: %c
 >3     string          =1              \b, compression block size 100k
 >3     string          =2              \b, compression block size 200k

diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index 4adc79f5292af883aac1b728995627a4048561bf..f890acf982455df30d427944dcce7be812cb3615 100644 (file)
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -63,6 +63,7 @@
 >>18   leshort         51              Stanford MIPS-X,
 >>18   leshort         52              Motorola Coldfire,
 >>18   leshort         53              Motorola M68HC12,
+>>18   leshort         75              Digital VAX,
 >>18   leshort         0x9026          Alpha (unofficial),
 >>20   lelong          0               invalid version
 >>20   lelong          1               version 1
@@ -137,6 +138,7 @@
 >>18   beshort         51              Stanford MIPS-X,
 >>18   beshort         52              Motorola Coldfire,
 >>18   beshort         53              Motorola M68HC12,
+>>18   beshort         75              Digital VAX,
 >>18   beshort         0x9026          Alpha (unofficial),
 >>20   belong          0               invalid version
 >>20   belong          1               version 1

diff --git a/magic/Magdir/lif b/magic/Magdir/lif
index f6d7901809b4e7285a7d5f21a913d96ec380e89c..cf20e4997d832f93b8fa7be95be63b7e4ab17614 100644 (file)
--- a/magic/Magdir/lif
+++ b/magic/Magdir/lif
@@ -2,6 +2,6 @@
 #------------------------------------------------------------------------------
 # lif:  file(1) magic for lif
 #
-# XXX - byte order?  (Probably beshort, Daniel Quinlan <quinlan@yggdrasil.com>)
+# (Daniel Quinlan <quinlan@yggdrasil.com>)
 #
-0      short           0x8000          lif file
+0      beshort         0x8000          lif file