CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 20:57:10 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
dedup


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/bsd/file/dist/magic/magdir/filesystems

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 10 20:57:10 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
dedup


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/bsd/file/dist/magic/magdir/filesystems

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/filesystems
diff -u src/external/bsd/file/dist/magic/magdir/filesystems:1.20 src/external/bsd/file/dist/magic/magdir/filesystems:1.21
--- src/external/bsd/file/dist/magic/magdir/filesystems:1.20	Sat Dec 10 11:22:21 2022
+++ src/external/bsd/file/dist/magic/magdir/filesystems	Sat Dec 10 15:57:10 2022
@@ -1,5 +1,5 @@
 #--
-# $File: filesystems,v 1.150 2022/07/04 16:40:33 christos Exp $
+# $File: filesystems,v 1.152 2022/12/10 20:56:50 christos Exp $
 # filesystems:  file(1) magic for different filesystems
 #
 0	name	partid
@@ -1596,7 +1596,8 @@
 >0x1e	lequad	x			%lld total clusters,
 >0x26	lequad	x			%lld clusters in use
 
-9564	lelong		0x00011954	Unix Fast File system [v1] (little-endian),
+
+0	name		ffsv1
 >8404	string		x		last mounted on %s,
 #>9504	ledate		x		last checked at %s,
 >8224	ledate		x		last written at %s,
@@ -1612,185 +1613,59 @@
 >8320	lelong		0		TIME optimization
 >8320	lelong		1		SPACE optimization
 
-42332	lelong		0x19540119	Unix Fast File system [v2] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-66908	lelong		0x19540119	Unix Fast File system [v2] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-42332	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
-
-66908	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
->&-1164	string		x		last mounted on %s,
->&-696	string		>\0		volume name %s,
->&-304	leqldate	x		last written at %s,
->&-1167	byte		x		clean flag %d,
->&-1168	byte		x		readonly flag %d,
->&-296	lequad		x		number of blocks %lld,
->&-288	lequad		x		number of data blocks %lld,
->&-1332	lelong		x		number of cylinder groups %d,
->&-1328	lelong		x		block size %d,
->&-1324	lelong		x		fragment size %d,
->&-180	lelong		x		average file size %d,
->&-176	lelong		x		average number of files in dir %d,
->&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %d,
->&-664	lequad		x		system-wide uuid %0llx,
->&-1316	lelong		x		minimum percentage of free blocks %d,
->&-1248	lelong		0		TIME optimization
->&-1248	lelong		1		SPACE optimization
+9564	lelong		0x00011954	Unix Fast File system [v1] (little-endian),
+>0	use		ffsv1
 
 9564	belong		0x00011954	Unix Fast File system [v1] (big-endian),
 >7168  

CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:22:21 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
Add magic to recognize FFSv2ea


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/bsd/file/dist/magic/magdir/filesystems

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/filesystems
diff -u src/external/bsd/file/dist/magic/magdir/filesystems:1.19 src/external/bsd/file/dist/magic/magdir/filesystems:1.20
--- src/external/bsd/file/dist/magic/magdir/filesystems:1.19	Sat Sep 24 20:21:46 2022
+++ src/external/bsd/file/dist/magic/magdir/filesystems	Sat Dec 10 16:22:21 2022
@@ -1652,6 +1652,46 @@
 >&-1248	lelong		0		TIME optimization
 >&-1248	lelong		1		SPACE optimization
 
+42332	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	leqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	lequad		x		number of blocks %lld,
+>&-288	lequad		x		number of data blocks %lld,
+>&-1332	lelong		x		number of cylinder groups %d,
+>&-1328	lelong		x		block size %d,
+>&-1324	lelong		x		fragment size %d,
+>&-180	lelong		x		average file size %d,
+>&-176	lelong		x		average number of files in dir %d,
+>&-272	lequad		x		pending blocks to free %lld,
+>&-264	lelong		x		pending inodes to free %d,
+>&-664	lequad		x		system-wide uuid %0llx,
+>&-1316	lelong		x		minimum percentage of free blocks %d,
+>&-1248	lelong		0		TIME optimization
+>&-1248	lelong		1		SPACE optimization
+
+66908	lelong		0x19012038	Unix Fast File system [v2ea] (little-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	leqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	lequad		x		number of blocks %lld,
+>&-288	lequad		x		number of data blocks %lld,
+>&-1332	lelong		x		number of cylinder groups %d,
+>&-1328	lelong		x		block size %d,
+>&-1324	lelong		x		fragment size %d,
+>&-180	lelong		x		average file size %d,
+>&-176	lelong		x		average number of files in dir %d,
+>&-272	lequad		x		pending blocks to free %lld,
+>&-264	lelong		x		pending inodes to free %d,
+>&-664	lequad		x		system-wide uuid %0llx,
+>&-1316	lelong		x		minimum percentage of free blocks %d,
+>&-1248	lelong		0		TIME optimization
+>&-1248	lelong		1		SPACE optimization
+
 9564	belong		0x00011954	Unix Fast File system [v1] (big-endian),
 >7168   belong		0x4c41424c	Apple UFS Volume
 >>7186  string		x		named %s,
@@ -1712,6 +1752,46 @@
 >&-1248	belong		0		TIME optimization
 >&-1248	belong		1		SPACE optimization
 
+42332	belong		0x19012038	Unix Fast File system [v2ea] (big-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	beqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	bequad		x		number of blocks %lld,
+>&-288	bequad		x		number of data blocks %lld,
+>&-1332	belong		x		number of cylinder groups %d,
+>&-1328	belong		x		block size %d,
+>&-1324	belong		x		fragment size %d,
+>&-180	belong		x		average file size %d,
+>&-176	belong		x		average number of files in dir %d,
+>&-272	bequad		x		pending blocks to free %lld,
+>&-264	belong		x		pending inodes to free %d,
+>&-664	bequad		x		system-wide uuid %0llx,
+>&-1316	belong		x		minimum percentage of free blocks %d,
+>&-1248	belong		0		TIME optimization
+>&-1248	belong		1		SPACE optimization
+
+66908	belong		0x19012038	Unix Fast File system [v2ea] (big-endian)
+>&-1164	string		x		last mounted on %s,
+>&-696	string		>\0		volume name %s,
+>&-304	beqldate	x		last written at %s,
+>&-1167	byte		x		clean flag %d,
+>&-1168	byte		x		readonly flag %d,
+>&-296	bequad		x		number of blocks %lld,
+>&-288	bequad		x		number of data blocks %lld,
+>&-1332	belong		x		number of cylinder groups %d,
+>&-1328	belong		x		block size %d,
+>&-1324	belong		x		fragment size %d,
+>&-180	belong		x		average file size %d,
+>&-176	belong		x		average number of files in dir %d,
+>&-272	bequad		x		pending blocks to free %lld,
+>&-264	belong		x		pending inodes to free %d,
+>&-664	bequad		x		system-wide uuid %0llx,
+>&-1316	belong		x		minimum percentage of free blocks %d,
+>&-1248	belong		0		TIME optimization
+>&-1248	belong		1		SPACE optimization
+
 0	ulequad		0xc8414d4dc5523031	HAMMER filesystem (little-endian),
 >0x90	lelong+1	x			volume %d
 >0x94	lelong		x			(of %d),



CVS commit: src/external/bsd/file/dist/magic/magdir

2022-12-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sat Dec 10 16:22:21 UTC 2022

Modified Files:
src/external/bsd/file/dist/magic/magdir: filesystems

Log Message:
Add magic to recognize FFSv2ea


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/bsd/file/dist/magic/magdir/filesystems

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2020-03-08 Thread Ignatios Souvatzis
Module Name:src
Committed By:   is
Date:   Sun Mar  8 17:54:23 UTC 2020

Modified Files:
src/external/bsd/file/dist/magic/magdir: parix

Log Message:
mask was too loose, creating false positives.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/parix

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2020-03-08 Thread Ignatios Souvatzis
Module Name:src
Committed By:   is
Date:   Sun Mar  8 17:54:23 UTC 2020

Modified Files:
src/external/bsd/file/dist/magic/magdir: parix

Log Message:
mask was too loose, creating false positives.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/parix

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/parix
diff -u src/external/bsd/file/dist/magic/magdir/parix:1.1.1.2 src/external/bsd/file/dist/magic/magdir/parix:1.2
--- src/external/bsd/file/dist/magic/magdir/parix:1.1.1.2	Thu May 12 20:47:04 2011
+++ src/external/bsd/file/dist/magic/magdir/parix	Sun Mar  8 17:54:23 2020
@@ -5,7 +5,7 @@
 # Parix COFF executables
 # From: Ignatios Souvatzis 
 #
-0	beshort&0xfff	0xACE	PARIX
+0	beshort&0xefff	0x8ACE	PARIX
 >0	byte&0xf0	0x80	T800
 >0	byte&0xf0	0x90	T9000
 >19	byte&0x02	0x02	executable



CVS commit: src/external/bsd/file/dist/magic/magdir

2018-12-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Jan  1 03:12:31 UTC 2019

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
bring detail from HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/netbsd
diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.6 src/external/bsd/file/dist/magic/magdir/netbsd:1.7
--- src/external/bsd/file/dist/magic/magdir/netbsd:1.6	Sun Apr 15 15:45:32 2018
+++ src/external/bsd/file/dist/magic/magdir/netbsd	Mon Dec 31 22:12:30 2018
@@ -9,184 +9,149 @@
 # in aout.
 #
 
-0	belong&03	041400413	a.out NetBSD/i386 demand paged
+0	name	netbsd-detail
+>20	lelong	x		@%#x
+>4	lelong	>0		\b+T=%d
+>8	lelong	>0		\b+D=%d
+>12	lelong	>0		\b+B=%d
+>16	lelong	>0		\b+S=%d
+>24	lelong	>0		\b+TR=%d
+>28	lelong	>0		\b+TD=%d
+
+0	name			netbsd-4096
 >0	byte			&0x80
 >>20	lelong			<4096		shared library
 >>20	lelong			=4096		dynamically linked executable
 >>20	lelong			>4096		dynamically linked executable
 >0	byte			^0x80		executable
 >16	lelong			>0		not stripped
-0	belong&03	041400410	a.out NetBSD/i386 pure
->0	byte			&0x80		dynamically linked executable
+
+0	name			netbsd-8192
+>0	byte			&0x80
+>>20	lelong			<8192		shared library
+>>20	lelong			=8192		dynamically linked executable
+>>20	lelong			>8192		dynamically linked executable
 >0	byte			^0x80		executable
 >16	lelong			>0		not stripped
-0	belong&03	041400407	a.out NetBSD/i386
+>0	use			netbsd-detail
+
+0	name			netbsd-normal
 >0	byte			&0x80		dynamically linked executable
 >0	byte			^0x80
 >>0	byte			&0x40		position independent
 >>20	lelong			!0		executable
 >>20	lelong			=0		object file
 >16	lelong			>0		not stripped
-0	belong&03	041400507	a.out NetBSD/i386 core
+>0	use			netbsd-detail
+
+0	name			netbsd-pure
+>0	byte			&0x80		dynamically linked executable
+>0	byte			^0x80		executable
+>16	lelong			>0		not stripped
+>0	use			netbsd-detail
+
+0	name			netbsd-core
 >12	string			>\0		from '%s'
 >32	lelong			!0		(signal %d)
 
+0	belong&03	041400413	a.out NetBSD/i386 demand paged
+>0	use			netbsd-4096
+
+0	belong&03	041400410	a.out NetBSD/i386 pure
+>0	use			netbsd-pure
+
+0	belong&03	041400407	a.out NetBSD/i386
+>0	use			netbsd-normal
+
+0	belong&03	041400507	a.out NetBSD/i386 core
+>0	use			netbsd-core
+
 0	belong&03	041600413	a.out NetBSD/m68k demand paged
->0	byte			&0x80
->>20	belong			<8192		shared library
->>20	belong			=8192		dynamically linked executable
->>20	belong			>8192		dynamically linked executable
->0	byte			^0x80		executable
->16	belong			>0		not stripped
+>0	use			\^netbsd-8192
+
 0	belong&03	041600410	a.out NetBSD/m68k pure
->0	byte			&0x80		dynamically linked executable
->0	byte			^0x80		executable
->16	belong			>0		not stripped
+>0	use			\^netbsd-pure
+
 0	belong&03	041600407	a.out NetBSD/m68k
->0	byte			&0x80		dynamically linked executable
->0	byte			^0x80
->>0	byte			&0x40		position independent
->>20	belong			!0		executable
->>20	belong			=0		object file
->16	belong			>0		not stripped
+>0	use			\^netbsd-normal
+
 0	belong&03	041600507	a.out NetBSD/m68k core
->12	string			>\0		from '%s'
->32	belong			!0		(signal %d)
+>0	use			\^netbsd-core
 
 0	belong&03	042000413	a.out NetBSD/m68k4k demand paged
->0	byte			&0x80
->>20	belong			<4096		shared library
->>20	belong			=4096		dynamically linked executable
->>20	belong			>4096		dynamically linked executable
->0	byte			^0x80		executable
->16	belong			>0		not stripped
+>0	use			\^netbsd-4096
+
 0	belong&03	042000410	a.out NetBSD/m68k4k pure
->0	byte			&0x80		dynamically linked executable
->0	byte			^0x80		executable
->16	belong			>0		not stripped
+>0	use			\^netbsd-pure
+
 0	belong&03	042000407	a.out NetBSD/m68k4k
->0	byte			&0x80		dynamically linked executable
->0	byte			^0x80
->>0	byte			&0x40		position independent
->>20	belong			!0		executable
->>20	belong			=0		object file
->16	belong			>0		not stripped
+>0	use			\^netbsd-normal
+
 0	belong&03	042000507	a.out NetBSD/m68k4k core
->12	string			>\0		from '%s'
->32	belong			!0		(signal %d)
+>0	use			\^netbsd-core
 
 0	belong&03	042200413	a.out NetBSD/ns32532 demand paged
->0	byte			&0x80
->>20	lelong			<4096		shared library
->>20	lelong			=4096		dynamically linked executable
->>20	lelong			>4096		dynamically linked executable
->0	byte			^0x80		executable
->16	lelong			>0		not stripped
+>0	use			netbsd-4096
+
 0	belong&03	042200410	a.out NetBSD/ns32532 pure
->0	byte			&0x80		dynamically linked executable
->0	byte			^0x80		executable
->16	lelong			>0		not stripped
+>0	use			netbsd-pure
+
 0	belong&03	042200407	a.out NetBSD/ns32532
->0	byte			&0x80		dynamically linked executable
->0	byte			^0x80

CVS commit: src/external/bsd/file/dist/magic/magdir

2018-12-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Jan  1 03:12:31 UTC 2019

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
bring detail from HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2017-09-27 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Wed Sep 27 21:04:05 UTC 2017

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
fix offset of segment count in NetBSD crashdump header.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/netbsd
diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.4 src/external/bsd/file/dist/magic/magdir/netbsd:1.5
--- src/external/bsd/file/dist/magic/magdir/netbsd:1.4	Thu May 25 00:11:26 2017
+++ src/external/bsd/file/dist/magic/magdir/netbsd	Wed Sep 27 21:04:05 2017
@@ -285,7 +285,7 @@
 >0	belong&0xfc00 0x1000	\b, STACK
 >4	leshort	x			\b, (headersize = %d
 >6	leshort	x			\b, segmentsize = %d
->6	lelong	x			\b, segments = %d)
+>8	lelong	x			\b, segments = %d)
 
 # little endian only for now.
 0	name		ktrace



CVS commit: src/external/bsd/file/dist/magic/magdir

2017-09-27 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Wed Sep 27 21:04:05 UTC 2017

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
fix offset of segment count in NetBSD crashdump header.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2015-01-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  2 23:27:46 UTC 2015

Modified Files:
src/external/bsd/file/dist/magic/magdir: jpeg

Log Message:
fix recursion


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/file/dist/magic/magdir/jpeg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/jpeg
diff -u src/external/bsd/file/dist/magic/magdir/jpeg:1.1.1.6 src/external/bsd/file/dist/magic/magdir/jpeg:1.2
--- src/external/bsd/file/dist/magic/magdir/jpeg:1.1.1.6	Fri Jan  2 15:34:28 2015
+++ src/external/bsd/file/dist/magic/magdir/jpeg	Fri Jan  2 18:27:46 2015
@@ -1,6 +1,6 @@
 
 #--
-# $File: jpeg,v 1.25 2015/01/02 16:56:50 christos Exp $
+# $File: jpeg,v 1.26 2015/01/02 22:40:27 christos Exp $
 # JPEG images
 # SunOS 5.5.1 had
 #
@@ -41,7 +41,8 @@
 # This uses recursion...
 0		name		jpeg_segment
 0	beshort		0xFFFE
-(2.S+2)	use			jpeg_segment
+# Recursion handled by FFE0
+#(2.S+2)	use			jpeg_segment
 2	pstring/HJ	x		\b, comment: %s
 
 0	beshort		0xFFC0
@@ -70,6 +71,7 @@
 (2.S+2)	use			jpeg_segment
 
 0	beshort		0xFFE1		
+# Recursion handled by FFE0
 #(2.S+2)	use			jpeg_segment
 4	string		Exif		\b, Exif Standard: [
 10	indirect/r	x		
@@ -85,7 +87,8 @@
 # D9: End of image
 # Dn: Restart
 0	beshort0xFFD0	=0xFFD0
-(2.S+2)	use			jpeg_segment
+0	beshort0xFFE0	!0xFFE0
+(2.S+2)	use			jpeg_segment
 
 #0	beshort		x		unknown 0x%x
 #(2.S+2)	use			jpeg_segment



CVS commit: src/external/bsd/file/dist/magic/magdir

2015-01-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  2 23:38:45 UTC 2015

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
add a clear that did not merge.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/elf
diff -u src/external/bsd/file/dist/magic/magdir/elf:1.12 src/external/bsd/file/dist/magic/magdir/elf:1.13
--- src/external/bsd/file/dist/magic/magdir/elf:1.12	Mon Oct 20 17:48:57 2014
+++ src/external/bsd/file/dist/magic/magdir/elf	Fri Jan  2 18:38:45 2015
@@ -30,6 +30,7 @@
 #(0x38+0xcc) string	\0		of '%s'
 #(0x38+0x10) lelong	0		(signal %d),
 16	leshort		0xff00		processor-specific,
+18	clear		x
 18	leshort		0		no machine,
 18	leshort		1		ATT WE32100,
 18	leshort		2		SPARC,



CVS commit: src/external/bsd/file/dist/magic/magdir

2015-01-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  2 23:38:45 UTC 2015

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
add a clear that did not merge.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2015-01-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  2 23:27:46 UTC 2015

Modified Files:
src/external/bsd/file/dist/magic/magdir: jpeg

Log Message:
fix recursion


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/file/dist/magic/magdir/jpeg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2014-12-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Dec  8 20:54:33 UTC 2014

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
fix bogus kernel core magic entries from file HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/file/dist/magic/magdir/netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/netbsd
diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.1.1.5 src/external/bsd/file/dist/magic/magdir/netbsd:1.2
--- src/external/bsd/file/dist/magic/magdir/netbsd:1.1.1.5	Thu Jun 12 21:48:25 2014
+++ src/external/bsd/file/dist/magic/magdir/netbsd	Mon Dec  8 15:54:33 2014
@@ -1,6 +1,6 @@
 
 #--
-# $File: netbsd,v 1.21 2014/03/29 15:40:34 christos Exp $
+# $File: netbsd,v 1.22 2014/12/08 20:53:52 christos Exp $
 # netbsd:  file(1) magic for NetBSD objects
 #
 # All new-style magic numbers are in network byte order.
@@ -247,7 +247,7 @@
 # Kernel core dump format
 0	belong0x 0x8fca	NetBSD kernel core file
 0	belong0x03ff 0x	\b, Unknown
-0	belong0x03ff 0x1000	\b, sun 68010/68020
+0	belong0x03ff 0x0001	\b, sun 68010/68020
 0	belong0x03ff 0x0002	\b, sun 68020
 0	belong0x03ff 0x0064	\b, 386 PC
 0	belong0x03ff 0x0086	\b, i386 BSD
@@ -262,20 +262,24 @@
 0	belong0x03ff 0x008f	\b, arm6 BSD
 0	belong0x03ff 0x0090	\b, m68k BSD (2K pages)
 0	belong0x03ff 0x0091	\b, sh3 BSD
-0	belong0x03ff 0x0092	\b, ppc BSD (Big Endian)
-0	belong0x03ff 0x0093	\b, vax BSD (4K pages)
-0	belong0x03ff 0x0094	\b, mips1 BSD
-0	belong0x03ff 0x0095	\b, mips2 BSD
-0	belong0x03ff 0x0096	\b, parisc BSD
-0	belong0x03ff 0x0097	\b, sh5/64 BSD
-0	belong0x03ff 0x0098	\b, SPARC/64 BSD
-0	belong0x03ff 0x0099	\b, amd64 BSD
-0	belong0x03ff 0x009a	\b, hp200 (68010) BSD
-0	belong0x03ff 0x009b	\b, hp300 (68020+68881) BSD
-0	belong0x03ff 0x009b	\b, hp300 (68020+68881) BSD
-0	belong0x03ff 0x00c8	\b, hp200
-0	belong0x03ff 0x020b	\b, hp300 (68020+68881) HP-UX
-0	belong0x03ff 0x020c	\b, hp300 (68020+68881) HP-UX
+0	belong0x03ff 0x0095	\b, ppc BSD (Big Endian)
+0	belong0x03ff 0x0096	\b, vax BSD (4K pages)
+0	belong0x03ff 0x0097	\b, mips1 BSD
+0	belong0x03ff 0x0098	\b, mips2 BSD
+0	belong0x03ff 0x0099	\b, m88k BSD
+0	belong0x03ff 0x0092	\b, parisc BSD
+0	belong0x03ff 0x009b	\b, sh5/64 BSD
+0	belong0x03ff 0x009c	\b, SPARC/64 BSD
+0	belong0x03ff 0x009d	\b, amd64 BSD
+0	belong0x03ff 0x009e	\b, sh5/32 BSD
+0	belong0x03ff 0x009f	\b, ia64 BSD
+0	belong0x03ff 0x00b7	\b, aarch64 BSD
+0	belong0x03ff 0x00b8	\b, or1k BSD
+0	belong0x03ff 0x00b9	\b, Risk-V BSD
+0	belong0x03ff 0x00c8	\b, hp200 BSD
+0	belong0x03ff 0x012c	\b, hp300 BSD
+0	belong0x03ff 0x020b	\b, hp800 HP-UX
+0	belong0x03ff 0x020c	\b, hp200/hp300 HP-UX
 0	belong0xfc00 0x0400	\b, CPU
 0	belong0xfc00 0x0800	\b, DATA
 0	belong0xfc00 0x1000	\b, STACK



CVS commit: src/external/bsd/file/dist/magic/magdir

2014-12-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Dec  8 20:54:33 UTC 2014

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
fix bogus kernel core magic entries from file HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/file/dist/magic/magdir/netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2014-09-19 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Sep 19 08:59:38 UTC 2014

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Add UCB RISC-V EM value


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/elf
diff -u src/external/bsd/file/dist/magic/magdir/elf:1.9 src/external/bsd/file/dist/magic/magdir/elf:1.10
--- src/external/bsd/file/dist/magic/magdir/elf:1.9	Fri Jun 13 02:08:06 2014
+++ src/external/bsd/file/dist/magic/magdir/elf	Fri Sep 19 08:59:38 2014
@@ -257,6 +257,7 @@
 18	leshort		216		Cognitive Smart Memory,
 18	leshort		217		iCelero CoolEngine,
 18	leshort		218		Nanoradio Optimized RISC,
+18	leshort		243		UCB RISC-V
 18	leshort		0x1057		AVR (unofficial),
 18	leshort		0x1059		MSP430 (unofficial),
 18	leshort		0x1223		Adapteva Epiphany (unofficial),



CVS commit: src/external/bsd/file/dist/magic/magdir

2014-09-19 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Sep 19 08:59:38 UTC 2014

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Add UCB RISC-V EM value


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-08-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sun Aug  4 07:49:07 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Print out BE8 and LE8 for arm elf


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/elf
diff -u src/external/bsd/file/dist/magic/magdir/elf:1.6 src/external/bsd/file/dist/magic/magdir/elf:1.7
--- src/external/bsd/file/dist/magic/magdir/elf:1.6	Sat Mar 23 16:23:46 2013
+++ src/external/bsd/file/dist/magic/magdir/elf	Sun Aug  4 07:49:07 2013
@@ -109,6 +109,8 @@
 4	byte		1
 36	lelong0xff00	0x0400	EABI4
 36	lelong0xff00	0x0500	EABI5
+36	lelong		0x0080	BE8
+36	lelong		0x0040	LE8
 18	leshort		41		Alpha,
 18	leshort		0xa390		IBM S/390 (obsolete),
 18	leshort		42		Renesas SH,



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-08-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sun Aug  4 07:49:07 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Print out BE8 and LE8 for arm elf


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-03-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Mar 23 16:23:46 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
remove extra space


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/elf
diff -u src/external/bsd/file/dist/magic/magdir/elf:1.5 src/external/bsd/file/dist/magic/magdir/elf:1.6
--- src/external/bsd/file/dist/magic/magdir/elf:1.5	Sat Mar 23 12:15:58 2013
+++ src/external/bsd/file/dist/magic/magdir/elf	Sat Mar 23 12:23:46 2013
@@ -189,9 +189,9 @@
 4	byte		1		32-bit
 4	byte		2		64-bit
 5	byte		0		invalid byte order
-5	byte		1		LSB 
+5	byte		1		LSB
 0	use		elf-le
-5	byte		2		MSB 
+5	byte		2		MSB
 0	use		\^elf-le
 # Up to now only 0, 1 and 2 are defined; I've seen a file with 0x83, it seemed
 # like proper ELF, but extracting the string had bad results.



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-03-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Mar 23 16:23:46 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
remove extra space


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-01-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  4 17:33:01 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: assembler

Log Message:
fix quoting.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/file/dist/magic/magdir/assembler

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/assembler
diff -u src/external/bsd/file/dist/magic/magdir/assembler:1.1.1.2 src/external/bsd/file/dist/magic/magdir/assembler:1.2
--- src/external/bsd/file/dist/magic/magdir/assembler:1.1.1.2	Thu Jan  3 11:27:53 2013
+++ src/external/bsd/file/dist/magic/magdir/assembler	Fri Jan  4 12:33:01 2013
@@ -2,17 +2,17 @@
 # $File: assembler,v 1.2 2012/10/31 18:41:42 christos Exp $
 # make:  file(1) magic for assembler source
 #
-0	regex	\^[\020\t]*\.asciiz\?		assembler source text
+0	regex	\^[\020\t]*\\.asciiz		assembler source text
 !:mime	text/x-asm
-0	regex	\^[\020\t]*\.byte		assembler source text
+0	regex	\^[\020\t]*\\.byte		assembler source text
 !:mime	text/x-asm
-0	regex	\^[\020\t]*\.even		assembler source text
+0	regex	\^[\020\t]*\\.even		assembler source text
 !:mime	text/x-asm
-0	regex	\^[\020\t]*\.globl		assembler source text
+0	regex	\^[\020\t]*\\.globl		assembler source text
 !:mime	text/x-asm
-0	regex	\^[\020\t]*\.text		assembler source text
+0	regex	\^[\020\t]*\\.text		assembler source text
 !:mime	text/x-asm
-0	regex	\^[\020\t]*\.file		assembler source text
+0	regex	\^[\020\t]*\\.file		assembler source text
 !:mime	text/x-asm
-0	regex	\^[\020\t]*\.type		assembler source text
+0	regex	\^[\020\t]*\\.type		assembler source text
 !:mime	text/x-asm



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-01-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  4 17:33:01 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: assembler

Log Message:
fix quoting.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/file/dist/magic/magdir/assembler

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-01-03 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  4 00:49:45 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: geo

Log Message:
magic bug.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/geo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/geo
diff -u src/external/bsd/file/dist/magic/magdir/geo:1.1.1.2 src/external/bsd/file/dist/magic/magdir/geo:1.2
--- src/external/bsd/file/dist/magic/magdir/geo:1.1.1.2	Thu Jan  3 11:27:54 2013
+++ src/external/bsd/file/dist/magic/magdir/geo	Thu Jan  3 19:49:44 2013
@@ -106,12 +106,12 @@
 
 # Geospatial Designs http://www.geospatialdesigns.com/surfer6_format.htm
 0	string		DSBB	Surfer 6 binary grid file
-4	leshort		x	\b, %d
-6	leshort		x	\bx%d
-8	ledouble	x	\b, minx=%g
-16	ledouble	x	\b, maxx=%g
-24	ledouble	x	\b, miny=%g
-32	ledouble	x	\b, maxy=%g
-40	ledouble	x	\b, minz=%g
-48	ledouble	x	\b, maxz=%g
+4	leshort		x	\b, %d
+6	leshort		x	\bx%d
+8	ledouble	x	\b, minx=%g
+16	ledouble	x	\b, maxx=%g
+24	ledouble	x	\b, miny=%g
+32	ledouble	x	\b, maxy=%g
+40	ledouble	x	\b, minz=%g
+48	ledouble	x	\b, maxz=%g
 



CVS commit: src/external/bsd/file/dist/magic/magdir

2013-01-03 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jan  4 00:49:45 UTC 2013

Modified Files:
src/external/bsd/file/dist/magic/magdir: geo

Log Message:
magic bug.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/geo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2012-08-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Aug  4 15:51:20 UTC 2012

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Add EABI4 and EABI5 for arm


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/elf
diff -u src/external/bsd/file/dist/magic/magdir/elf:1.2 src/external/bsd/file/dist/magic/magdir/elf:1.3
--- src/external/bsd/file/dist/magic/magdir/elf:1.2	Wed Feb 22 18:25:12 2012
+++ src/external/bsd/file/dist/magic/magdir/elf	Sat Aug  4 15:51:20 2012
@@ -101,6 +101,9 @@
 18	leshort		38		TRW RH-32,
 18	leshort		39		Motorola RCE,
 18	leshort		40		ARM,
+4	byte		1
+36  lelong0xff00	0x0400	EABI4
+36  lelong0xff00	0x0500	EABI5
 18	leshort		41		Alpha,
 18	leshort		0xa390		IBM S/390 (obsolete),
 18	leshort		42		Renesas SH,
@@ -254,6 +257,9 @@
 18	beshort		38		TRW RH-32,
 18	beshort		39		Motorola RCE,
 18	beshort		40		ARM,
+4	byte		2
+36  belong0xff00	0x0400	EABI4
+36  belong0xff00	0x0500	EABI5
 18	beshort		41		Alpha,
 18	beshort		42		Renesas SH,
 18	beshort		43		SPARC V9,



CVS commit: src/external/bsd/file/dist/magic/magdir

2012-08-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Aug  4 15:51:20 UTC 2012

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Add EABI4 and EABI5 for arm


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2012-02-22 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Feb 22 18:25:12 UTC 2012

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Look at the proper offsets for MD info, depending on the size of the binary
32 or 64.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/elf
diff -u src/external/bsd/file/dist/magic/magdir/elf:1.1.1.3 src/external/bsd/file/dist/magic/magdir/elf:1.2
--- src/external/bsd/file/dist/magic/magdir/elf:1.1.1.3	Wed Feb 22 12:48:32 2012
+++ src/external/bsd/file/dist/magic/magdir/elf	Wed Feb 22 13:25:12 2012
@@ -40,9 +40,10 @@
 18	leshort		2		SPARC - invalid byte order,
 18	leshort		3		Intel 80386,
 18	leshort		4		Motorola
-36	lelong		0x0100	68000 - invalid byte order,
-36	lelong		0x0081	CPU32 - invalid byte order,
-36	lelong		0		68020 - invalid byte order,
+4	byte		1
+36	lelong		0x0100	68000 - invalid byte order,
+36	lelong		0x0081	CPU32 - invalid byte order,
+36	lelong		0		68020 - invalid byte order,
 18	leshort		5		Motorola 88000 - invalid byte order,
 18	leshort		6		Intel 80486,
 18	leshort		7		Intel 80860,
@@ -50,9 +51,11 @@
 # The second number (#10) will be deprecated later. For now, we still
 # say something if #10 is encountered, but only gory details for #8.
 18	leshort		8		MIPS,
-36	lelong		0x20		N32
+4	byte		1
+36	lelong		0x20		N32
 18	leshort		10		MIPS,
-36	lelong		0x20		N32
+4	byte		1
+36	lelong		0x20		N32
 18	leshort		8
 # only for 32-bit
 4	byte		1
@@ -80,8 +83,14 @@
 18	leshort		10		MIPS (deprecated),
 18	leshort		11		RS6000 - invalid byte order,
 18	leshort		15		PA-RISC - invalid byte order,
-50	leshort		0x0214		2.0
-48	leshort		0x0008		(LP64),
+# only for 32-bit
+4	byte		1
+38	leshort		0x0214		2.0
+36	leshort		0x0008		(LP64)
+# only for 64-bit
+4	byte		2
+50	leshort		0x0214		2.0
+48	leshort		0x0008		(LP64)
 18	leshort		16		nCUBE,
 18	leshort		17		Fujitsu VPP500,
 18	leshort		18		SPARC32PLUS - invalid byte order,
@@ -157,7 +166,6 @@
 18	leshort		0x9026		Alpha (unofficial),
 20	lelong		0		invalid version
 20	lelong		1		version 1
-36	lelong		1		MathCoPro/FPU/MAU Required
 5	byte		2		MSB
 16	beshort		0		no file type,
 !:mime	application/octet-stream
@@ -177,17 +185,20 @@
 18	beshort		2		SPARC,
 18	beshort		3		Intel 80386 - invalid byte order,
 18	beshort		4		Motorola
-36	belong		0x0100	68000,
-36	belong		0x0081	CPU32,
-36	belong		0		68020,
+4	byte		1
+36	belong		0x0100	68000,
+36	belong		0x0081	CPU32,
+36	belong		0		68020,
 18	beshort		5		Motorola 88000,
 18	beshort		6		Intel 80486 - invalid byte order,
 18	beshort		7		Intel 80860,
 # only for MIPS - see comment in little-endian section above.
 18	beshort		8		MIPS,
-36	belong		0x20		N32
+4	byte		1
+36	belong		0x20		N32
 18	beshort		10		MIPS,
-36	belong		0x20		N32
+4	byte		1
+36	belong		0x20		N32
 18	beshort		8
 # only for 32-bit
 4	byte		1
@@ -215,15 +226,23 @@
 18	beshort		10		MIPS (deprecated),
 18	beshort		11		RS6000,
 18	beshort		15		PA-RISC
-50	beshort		0x0214		2.0
-48	beshort		0x0008		(LP64)
+# only for 32-bit
+4	byte		1
+38	beshort		0x0214		2.0
+36	beshort		0x0008		(LP64)
+# only for 64-bit
+4	byte		2
+50	beshort		0x0214		2.0
+48	beshort		0x0008		(LP64)
 18	beshort		16		nCUBE,
 18	beshort		17		Fujitsu VPP500,
 18	beshort		18		SPARC32PLUS,
-36	belong0x00	0x000100	V8+ Required,
-36	belong0x00	0x000200	Sun UltraSPARC1 Extensions Required,
-36	belong0x00	0x000400	HaL R1 Extensions Required,
-36	belong0x00	0x000800	Sun UltraSPARC3 Extensions Required,
+# only for 32-bit
+4	byte		1
+36	belong0x00	0x000100	V8+ Required,
+36	belong0x00	0x000200	Sun UltraSPARC1 Extensions Required,
+36	belong0x00	0x000400	HaL R1 Extensions Required,
+36	belong0x00	0x000800	Sun UltraSPARC3 Extensions Required,
 18	beshort		20		PowerPC or cisco 4500,
 18	beshort		21		64-bit PowerPC or cisco 7500,
 18	beshort		22		IBM S/390,
@@ -238,12 +257,13 @@
 18	beshort		41		Alpha,
 18	beshort		42		Renesas SH,
 18	beshort		43		SPARC V9,
-48	belong0x00	0x000200	Sun UltraSPARC1 Extensions Required,
-48	belong0x00	0x000400	HaL R1 Extensions Required,
-48	belong0x00	0x000800	Sun UltraSPARC3 Extensions Required,
-48	belong0x3	0		total store ordering,
-48	belong0x3	1		partial store ordering,
-48	belong0x3	2		relaxed memory ordering,
+4	byte		2
+48	belong0x00	0x000200	Sun UltraSPARC1 Extensions Required,
+48	belong0x00	0x000400	HaL R1 Extensions Required,
+48	belong0x00	0x000800	Sun UltraSPARC3 Extensions Required,
+48	belong0x3	0		total store ordering,
+48	belong0x3	1		partial store ordering,
+48	belong0x3	2		relaxed memory ordering,
 18	beshort		44		Siemens Tricore Embedded Processor,
 18	beshort		45		Argonaut RISC Core, Argonaut Technologies Inc.,
 18	beshort		46		Renesas H8/300,
@@ -268,9 +288,10 

CVS commit: src/external/bsd/file/dist/magic/magdir

2012-02-22 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Feb 22 18:25:12 UTC 2012

Modified Files:
src/external/bsd/file/dist/magic/magdir: elf

Log Message:
Look at the proper offsets for MD info, depending on the size of the binary
32 or 64.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/file/dist/magic/magdir/elf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2011-09-28 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Sep 28 13:50:52 UTC 2011

Modified Files:
src/external/bsd/file/dist/magic/magdir: archive

Log Message:
comment out weak magic, from file HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/archive

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/archive
diff -u src/external/bsd/file/dist/magic/magdir/archive:1.4 src/external/bsd/file/dist/magic/magdir/archive:1.5
--- src/external/bsd/file/dist/magic/magdir/archive:1.4	Fri Sep 16 17:06:25 2011
+++ src/external/bsd/file/dist/magic/magdir/archive	Wed Sep 28 09:50:52 2011
@@ -183,7 +183,7 @@
 # MAR
 2	string	=-ah MAR archive data
 # ACB
-0	belong0x00f800ff	0x0080 ACB archive data
+#0	belong0x00f800ff	0x0080 ACB archive data
 # CPZ
 # TODO, this is what idarc says: 0	string	\0\0\0 CPZ archive data
 # JRC



CVS commit: src/external/bsd/file/dist/magic/magdir

2011-09-28 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Sep 28 13:50:52 UTC 2011

Modified Files:
src/external/bsd/file/dist/magic/magdir: archive

Log Message:
comment out weak magic, from file HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/archive

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/bsd/file/dist/magic/magdir

2009-09-13 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sun Sep 13 22:16:45 UTC 2009

Modified Files:
src/external/bsd/file/dist/magic/magdir: diff

Log Message:
Recognize bsdiff(1) files.
Patch already sent upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/magic/magdir/diff

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/diff
diff -u src/external/bsd/file/dist/magic/magdir/diff:1.1.1.1 src/external/bsd/file/dist/magic/magdir/diff:1.2
--- src/external/bsd/file/dist/magic/magdir/diff:1.1.1.1	Fri May  8 16:35:08 2009
+++ src/external/bsd/file/dist/magic/magdir/diff	Sun Sep 13 22:16:45 2009
@@ -12,3 +12,8 @@
 
 0	search/1	Index:		RCS/CVS diff output text
 !:mime	text/x-diff
+#
+#--
+# bsdiff:  file(1) magic for bsdiff(1) output
+#
+0	string		BSDIFF40	bsdiff(1) patch file