head	1.2;
access;
symbols
	perseant-exfatfs-base-20250801:1.2
	perseant-exfatfs-base-20240630:1.2
	perseant-exfatfs:1.2.0.22
	perseant-exfatfs-base:1.2
	cjep_sun2x:1.2.0.20
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	cjep_staticlib_x:1.2.0.18
	cjep_staticlib_x-base:1.2
	phil-wifi-20200421:1.2
	phil-wifi-20200411:1.2
	phil-wifi-20200406:1.2
	pgoyette-compat-merge-20190127:1.2
	pgoyette-compat-20190127:1.2
	pgoyette-compat-20190118:1.2
	pgoyette-compat-1226:1.2
	pgoyette-compat-1126:1.2
	pgoyette-compat-1020:1.2
	pgoyette-compat-0930:1.2
	pgoyette-compat-0906:1.2
	pgoyette-compat-0728:1.2
	pgoyette-compat-0625:1.2
	pgoyette-compat-0521:1.2
	pgoyette-compat-0502:1.2
	pgoyette-compat-0422:1.2
	pgoyette-compat-0415:1.2
	pgoyette-compat-0407:1.2
	pgoyette-compat-0330:1.2
	pgoyette-compat-0322:1.2
	pgoyette-compat-0315:1.2
	pgoyette-compat:1.2.0.16
	pgoyette-compat-base:1.2
	prg-localcount2-base3:1.2
	prg-localcount2-base2:1.2
	prg-localcount2-base1:1.2
	prg-localcount2:1.2.0.14
	prg-localcount2-base:1.2
	pgoyette-localcount-20170426:1.2
	bouyer-socketcan-base1:1.2
	pgoyette-localcount-20170320:1.2
	bouyer-socketcan:1.2.0.12
	bouyer-socketcan-base:1.2
	pgoyette-localcount-20170107:1.2
	pgoyette-localcount-20161104:1.2
	localcount-20160914:1.2
	pgoyette-localcount-20160806:1.2
	pgoyette-localcount-20160726:1.2
	pgoyette-localcount:1.2.0.10
	pgoyette-localcount-base:1.2
	netbsd-5-2-3-RELEASE:1.1.1.4
	netbsd-5-1-5-RELEASE:1.1.1.4
	yamt-pagecache-base9:1.2
	yamt-pagecache-tag8:1.2
	tls-earlyentropy:1.2.0.6
	tls-earlyentropy-base:1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base3:1.2
	netbsd-5-2-2-RELEASE:1.1.1.4
	netbsd-5-1-4-RELEASE:1.1.1.4
	netbsd-5-2-1-RELEASE:1.1.1.4
	netbsd-5-1-3-RELEASE:1.1.1.4
	agc-symver:1.2.0.8
	agc-symver-base:1.2
	tls-maxphys-base:1.2
	yamt-pagecache-base8:1.2
	netbsd-5-2:1.1.1.4.0.2
	yamt-pagecache-base7:1.2
	netbsd-5-2-RELEASE:1.1.1.4
	netbsd-5-2-RC1:1.1.1.4
	yamt-pagecache-base6:1.2
	yamt-pagecache-base5:1.2
	yamt-pagecache-base4:1.2
	netbsd-5-1-2-RELEASE:1.1.1.4
	netbsd-5-1-1-RELEASE:1.1.1.4
	yamt-pagecache-base3:1.2
	yamt-pagecache-base2:1.2
	yamt-pagecache:1.2.0.4
	yamt-pagecache-base:1.2
	bouyer-quota2-nbase:1.2
	bouyer-quota2:1.2.0.2
	bouyer-quota2-base:1.2
	matt-nb5-mips64-premerge-20101231:1.1.1.4
	matt-nb5-pq3:1.1.1.4.0.14
	matt-nb5-pq3-base:1.1.1.4
	netbsd-5-1:1.1.1.4.0.12
	netbsd-5-1-RELEASE:1.1.1.4
	netbsd-5-1-RC4:1.1.1.4
	matt-nb5-mips64-k15:1.1.1.4
	netbsd-5-1-RC3:1.1.1.4
	netbsd-5-1-RC2:1.1.1.4
	netbsd-5-1-RC1:1.1.1.4
	netbsd-5-0-2-RELEASE:1.1.1.4
	matt-nb5-mips64-premerge-20091211:1.1.1.4
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1.1.4
	matt-nb4-mips64-k7-u2a-k9b:1.1.1.4
	matt-nb5-mips64-u1-k1-k5:1.1.1.4
	matt-nb5-mips64:1.1.1.4.0.10
	netbsd-5-0-1-RELEASE:1.1.1.4
	jym-xensuspend-nbase:1.1.1.4
	netbsd-5-0:1.1.1.4.0.8
	netbsd-5-0-RELEASE:1.1.1.4
	netbsd-5-0-RC4:1.1.1.4
	netbsd-5-0-RC3:1.1.1.4
	netbsd-5-0-RC2:1.1.1.4
	jym-xensuspend:1.1.1.4.0.6
	jym-xensuspend-base:1.1.1.4
	netbsd-5-0-RC1:1.1.1.4
	netbsd-5:1.1.1.4.0.4
	netbsd-5-base:1.1.1.4
	matt-mips64-base2:1.1.1.4
	matt-mips64:1.1.1.3.0.22
	netbsd-4-0-1-RELEASE:1.1.1.3
	wrstuden-revivesa-base-3:1.1.1.4
	wrstuden-revivesa-base-2:1.1.1.4
	wrstuden-fixsa-newbase:1.1.1.3
	FILE4_26:1.1.1.4
	wrstuden-revivesa-base-1:1.1.1.3
	yamt-pf42-base4:1.1.1.3
	yamt-pf42-base3:1.1.1.3
	hpcarm-cleanup-nbase:1.1.1.3
	yamt-pf42-baseX:1.1.1.3
	yamt-pf42-base2:1.1.1.3
	wrstuden-revivesa:1.1.1.3.0.20
	wrstuden-revivesa-base:1.1.1.3
	yamt-pf42:1.1.1.3.0.18
	yamt-pf42-base:1.1.1.3
	keiichi-mipv6:1.1.1.3.0.16
	keiichi-mipv6-base:1.1.1.3
	matt-armv6-nbase:1.1.1.3
	matt-armv6-prevmlocking:1.1.1.3
	wrstuden-fixsa-base-1:1.1.1.3
	netbsd-4-0:1.1.1.3.0.14
	netbsd-4-0-RELEASE:1.1.1.3
	cube-autoconf:1.1.1.3.0.12
	cube-autoconf-base:1.1.1.3
	netbsd-4-0-RC5:1.1.1.3
	netbsd-4-0-RC4:1.1.1.3
	netbsd-4-0-RC3:1.1.1.3
	netbsd-4-0-RC2:1.1.1.3
	netbsd-4-0-RC1:1.1.1.3
	matt-armv6:1.1.1.3.0.10
	matt-armv6-base:1.1.1.3
	matt-mips64-base:1.1.1.3
	hpcarm-cleanup:1.1.1.3.0.8
	hpcarm-cleanup-base:1.1.1.3
	netbsd-3-1-1-RELEASE:1.1.1.2.6.1
	netbsd-3-0-3-RELEASE:1.1.1.2.4.1
	FILE4_21:1.1.1.3
	wrstuden-fixsa:1.1.1.3.0.6
	wrstuden-fixsa-base:1.1.1.3
	FILE4_20:1.1.1.3
	abandoned-netbsd-4-base:1.1.1.3
	abandoned-netbsd-4:1.1.1.3.0.2
	FILE4_18:1.1.1.3
	netbsd-3-1:1.1.1.2.0.6
	netbsd-3-1-RELEASE:1.1.1.2
	netbsd-3-0-2-RELEASE:1.1.1.2
	netbsd-3-1-RC4:1.1.1.2
	netbsd-3-1-RC3:1.1.1.2
	netbsd-3-1-RC2:1.1.1.2
	netbsd-3-1-RC1:1.1.1.2
	netbsd-4:1.1.1.3.0.4
	netbsd-4-base:1.1.1.3
	netbsd-3-0-1-RELEASE:1.1.1.2
	netbsd-3-0:1.1.1.2.0.4
	netbsd-3-0-RELEASE:1.1.1.2
	netbsd-3-0-RC6:1.1.1.2
	netbsd-3-0-RC5:1.1.1.2
	netbsd-3-0-RC4:1.1.1.2
	netbsd-3-0-RC3:1.1.1.2
	netbsd-3-0-RC2:1.1.1.2
	netbsd-3-0-RC1:1.1.1.2
	netbsd-2-0-3-RELEASE:1.1.1.1
	netbsd-2-1:1.1.1.1.0.6
	netbsd-2-1-RELEASE:1.1.1.1
	FILE4_16:1.1.1.3
	netbsd-2-1-RC6:1.1.1.1
	netbsd-2-1-RC5:1.1.1.1
	netbsd-2-1-RC4:1.1.1.1
	netbsd-2-1-RC3:1.1.1.1
	netbsd-2-1-RC2:1.1.1.1
	netbsd-2-1-RC1:1.1.1.1
	netbsd-2-0-2-RELEASE:1.1.1.1
	netbsd-3:1.1.1.2.0.2
	netbsd-3-base:1.1.1.2
	FILE4_13:1.1.1.2
	FILE413-BEFOREIMPORT:1.1.1.2
	netbsd-2-0-1-RELEASE:1.1.1.1
	netbsd-2:1.1.1.1.0.4
	netbsd-2-base:1.1.1.1
	FILE4_12:1.1.1.2
	netbsd-2-0-RELEASE:1.1.1.1
	netbsd-2-0-RC5:1.1.1.1
	netbsd-2-0-RC4:1.1.1.1
	netbsd-2-0-RC3:1.1.1.1
	netbsd-2-0-RC2:1.1.1.1
	netbsd-2-0-RC1:1.1.1.1
	FILE4_10:1.1.1.2
	FILE4_09:1.1.1.1
	netbsd-2-0:1.1.1.1.0.2
	netbsd-2-0-base:1.1.1.1
	FILE4_08:1.1.1.1
	FILE4_06:1.1.1.1
	FILE4_04:1.1.1.1
	FILE4_03:1.1.1.1
	FILE4_00:1.1.1.1
	CHRISTOS:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2009.10.17.23.05.35;	author snj;	state dead;
branches;
next	1.1;

1.1
date	2003.03.25.22.30.26;	author pooka;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.03.25.22.30.26;	author pooka;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2004.09.16.13.43.51;	author pooka;	state Exp;
branches
	1.1.1.2.2.1
	1.1.1.2.4.1
	1.1.1.2.6.1;
next	1.1.1.3;

1.1.1.3
date	2005.10.17.17.48.36;	author pooka;	state Exp;
branches
	1.1.1.3.20.1;
next	1.1.1.4;

1.1.1.4
date	2008.08.30.11.21.01;	author christos;	state Exp;
branches;
next	;

1.1.1.2.2.1
date	2007.06.24.19.41.54;	author ghen;	state Exp;
branches;
next	;

1.1.1.2.4.1
date	2007.06.24.19.43.22;	author ghen;	state Exp;
branches;
next	;

1.1.1.2.6.1
date	2007.06.24.19.45.19;	author ghen;	state Exp;
branches;
next	;

1.1.1.3.20.1
date	2008.09.18.04.44.40;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.2
log
@This hasn't been used in a while.  Long live external/bsd/file!
@
text
@
#------------------------------------------------------------------------------
# diff:  file(1) magic for diff(1) output
#
0	string		diff\ 	'diff' output text
0	string		***\ 		'diff' output text
0	string		Only\ in\ 	'diff' output text
0	string		Common\ subdirectories:\ 	'diff' output text

# xdelta is like diff(1) for binary files (works for text, too).
# Available from: ftp://ftp.xcf.berkeley.edu/pub/xdelta/
0       string          %XDZ            xdelta diff file
>4      string          >%              version %.3s
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@file 4.00
@
text
@@


1.1.1.2
log
@file 4.10

minor fixes and improvements
@
text
@d9 5
@


1.1.1.2.6.1
log
@Pull up following revision(s) (requested by pooka in ticket #1804):
	dist/file/: synced with HEAD on 20070615
	distrib/sets/lists/base/shl.elf: revision 1.222
	distrib/sets/lists/base/shl.mi: revision 1.375 via patch
	lib/Makefile: revision 1.108 via patch
	lib/libmagic/Makefile: revision 1.5
	lib/libmagic/config.h: patch
	lib/libmagic/shlib_version: revision 1.3-1.4
	tools/file/Makefile: revision 1.4
	usr.bin/file/Makefile: revision 1.51-1.53
Update file(1) to version 4.21, including security fixes (CVE-2007-1536 and
CVE-2007-2799).
@
text
@a8 2

0	string		Index:		RCS/CVS diff output text
@


1.1.1.2.4.1
log
@Pull up following revision(s) (requested by pooka in ticket #1804):
	dist/file/: synced with HEAD on 20070615
	distrib/sets/lists/base/shl.elf: revision 1.222
	distrib/sets/lists/base/shl.mi: revision 1.375 via patch
	lib/Makefile: revision 1.108 via patch
	lib/libmagic/Makefile: revision 1.5
	lib/libmagic/config.h: patch
	lib/libmagic/shlib_version: revision 1.3-1.4
	tools/file/Makefile: revision 1.4
	usr.bin/file/Makefile: revision 1.51-1.53
Update file(1) to version 4.21, including security fixes (CVE-2007-1536 and
CVE-2007-2799).
@
text
@a8 2

0	string		Index:		RCS/CVS diff output text
@


1.1.1.2.2.1
log
@Pull up following revision(s) (requested by pooka in ticket #1804):
	dist/file/: synced with HEAD on 20070615
	distrib/sets/lists/base/shl.elf: revision 1.222
	distrib/sets/lists/base/shl.mi: revision 1.375 via patch
	lib/Makefile: revision 1.108 via patch
	lib/libmagic/Makefile: revision 1.5
	lib/libmagic/config.h: patch
	lib/libmagic/shlib_version: revision 1.3-1.4
	tools/file/Makefile: revision 1.4
	usr.bin/file/Makefile: revision 1.51-1.53
Update file(1) to version 4.21, including security fixes (CVE-2007-1536 and
CVE-2007-2799).
@
text
@a8 2

0	string		Index:		RCS/CVS diff output text
@


1.1.1.3
log
@file 4.16

Changes since 4.13:
* DragonFly ELF note support
* read buffer dynamically allocated
* Add -h flag and dereference symlinks if POSIXLY_CORRECT
* Avoid search and regex buffer overflows
* cross-compilation fixes
* don't close stdin in the library.
* search for elf notes in shared libraries too.

Now with more magic than ever before!
@
text
@a8 2

0	string		Index:		RCS/CVS diff output text
@


1.1.1.3.20.1
log
@Sync with wrstuden-revivesa-base-2.
@
text
@d1 1
d5 4
a8 8
0	search/1	diff\ 		diff output text
!:mime	text/x-diff
0	search/1	***\ 		diff output text
!:mime	text/x-diff
0	search/1	Only\ in\ 	diff output text
!:mime	text/x-diff
0	search/1	Common\ subdirectories:\ 	diff output text
!:mime	text/x-diff
d10 1
a10 2
0	search/1	Index:		RCS/CVS diff output text
!:mime	text/x-diff
@


1.1.1.4
log
@try-again for file-4.26
@
text
@d1 1
d5 4
a8 8
0	search/1	diff\ 		diff output text
!:mime	text/x-diff
0	search/1	***\ 		diff output text
!:mime	text/x-diff
0	search/1	Only\ in\ 	diff output text
!:mime	text/x-diff
0	search/1	Common\ subdirectories:\ 	diff output text
!:mime	text/x-diff
d10 1
a10 2
0	search/1	Index:		RCS/CVS diff output text
!:mime	text/x-diff
@
