- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Update file(1) to version 5.11.

Merge vendor/file/dist@191739, bringing FILE 5.00 to 8-CURRENT.

Add strndup(3) prototype to string.h.

This change was erronously ommitted from the r185690, and attempt
to simply add the prototype to string.h has revealed that several
contributed programs defined local prototypes for strndup(), controlled
by autoconfed config.h. So, manually change #undef HAVE_STRNDUP to
#define HAVE_STRNDUP 1. Next import of the corresponding program would
regenerate config.h, overriding the changes in this commit.

No objections from: kan

Christos decided to keep the manpages in mdoc(7) format,
so stop using our own versions of these.

Update for the 'file' 4.23 import.

Update for the 4.21 import (manuals didn't change).

FreeBSD has <limits.h>.

Update for the 'file' 4.21 import.

Update for the 'file' 4.19 import.

Markup fixes.

Update manpages for FILE 4.17.

Update for the 'file' 4.17 import.

remove comment about systems, I got confused which arch one of my systems
was...

Pointed out by: ru

document that even if magic is newer than magic.mgc, it isn't used

compiling mgc on a big endian system (specificly tested sparc64) breaks,
using one from a little endian system works

Expand contractions.

Expand *n't contractions.

Update for FILE v4.12.

Update for FILE v4.12.

Catch up with file 4.12 import.

Install the header for libmagic.

PR: 73647
Submitted by: Uranus <uranus@it.muds.net>

Don't try to programatically support running file(1) w/in /usr/obj or other
non-standard install path.

Agreed with: ru

Uncomment the real paths and remove the local debugging paths.

Noticed by: ru (who's faster than 'make world' on my stock src test machine)

The file consumer binary, which depends on the libmagic.

Mechanically kill hard sentence breaks.

Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

mdoc(7): Use the new feature of the .In macro.

Update for FILE v3.41.

Update for version 3.41.

Update for version 3.40.
* We have inttypes.h (yes, even in RELENG_4).
* We now have GNU getopt, so lets be the first thing in the tree to
acutally use it...

Uniformly refer to a file system as "file system".

Approved by: re

Update for FILE v3.39.

Bootstrapping aid for systems without <stdint.h>.
(Needed to build mkmagic in build-tools.)

Update for version 3.39.

Update for 3.39.

Use `The .Nm utility'

Install files via FILES.

Fold example text into 80 column width display.

PR: docs/32676
Submitted by: Rich Morin <rdm@cfcl.com>

Update for FILE v3.37.

Update for FILE v3.37.
FreeBSD no longer needs the daylight hack.
(we really should sync our timezone code up ...)

Use a build-tool to create the .mgc files.

Submitted by: ru (partial)
Obtained from: NetBSD (basic idea)
Reviewed by: bde, ru

mdoc(7) police: protect trailing full stops of abbreviations
with a trailing zero-width space: `e.g.\&'.

Update for 3.36.

Update for 3.36.
Reduce diffs to distributed, man(7) format, version.
Markup nits.

Clean up this thing a little.

Support the new "-i" (output MIME type strings) option by installing
the MIME files (both regular and precompiled).

Build and use the precompiled magic file. Precompiled magic files have
been supported since version 3.35, however it is just with version 3.36
that file has become verbose about it.

Update to version 3.36.

Update to version 3.36.
I had to hack print.c due to some new bits that only compile on NetBSD.
I could not figure what the analogous FreeBSD bits are.

Remove whitespace at EOL.

MAN[1-9] -> MAN.

mdoc(7) police: split punctuation characters + misc fixes.

Remove hard-sentence breaks, canonify .Dd (no leading zero).

Re-add home born file(1) and magic(5) manual pages. Update them to
current file(1) version (3.33)

Approved by: obrien

Use the vendor's manpages (which are in old -man format) rather than
our modified one based on a much older version of the vendor's manpage.

mdoc(7) police: do not split author names in the AUTHORS section.

mdoc(7) police: use the new features of the Nm macro.

Avoid use of direct troff requests in mdoc(7) manual pages.

Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.

Include sys/types.h

Add the RealMedia file format. Also, add the $FreeBSD$.

Identify timezone data files by their ``TZif'' magic number.
Add $FreeBSD$ tag.

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Fxi various man pages to stop abusing the .Bx macro to generate
the string "FreeBSD". Use the .Fx macro instead. Also did some
minor re-wording/formatting to work around a deficiency with
the .Fx macro when it comes to puncuation characters other than
periods and commas.

Correct spelling : ascii -> ASCII

PR: docs/13702
Submitted by: Stephen J. Roznowski <sjr@home.com>
Reviewed by: mpp

$Id$ -> $FreeBSD$

Vastly improve the speed of the file command by making
the expected size of the magic(5) database agree with the
real world. Also, improve the behavior of the realloc
mechanism when the magic database does exceed expectations.

Reviewed by: Peter Jeremy, Matt Dillon
Obtained from: Peter Edwards <peter.edwards@isocor.ie>

Don't go looking for weird #includes if major isn't a macro.

Add Hitachi SH-3, SH-4, ARM, PPC, 68k PA-ARCH and a few others to PE
file types. Also add bit interpretation from NetBSD to give more
details about the file.

New file formats.

Obtained from: NetBSD-current/src/usr.bin/file/magdir

Additional file formats.
Obtained from: NetBSD-current/src/usr.bin/file/magdir/msdos

Added Microsoft's PE formatted executables for mips, i386 and Alpha.
Also added entry for the debugger files as well. The PE format is
used for all Win32 platforms (Win95, Win98, WinNT and WinCE), so it is
nice to be able to tell what kind of thing the foo.dll.... Don't have
any data for powerpc formats, however...

Don't try to print out the signal number that caused core to be
dumped. It is not in a fixed location in the file, so at best,
garbage comes out. I don't think this code was ever valid.

Fix "file" so that it prints the program names from core files
correctly.

Remove useless `BINOWN=root' now that it is the default.

Correct zsh shell script entry.
PR: bin/7657
Submitted by: Dom Mitchell dom@phmit.demon.co.uk

This PR contains additional magic for file(1) describing
various adventure game data files.

from Allen Garvin <earendil@faeryland.tamu-commerce.edu>
Edited by Dave Chapeskie <dchapes@ddm.on.ca> Jun 28, 1998

PR: 7466
Reviewed by: phk
Submitted by: The Frobozz Magic Homing Pigeon Company

.Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq.

Can't use ~0L to compare against a uint32. Use ~((uint32) 0) instead.

Add #include <string.h> to get prototypes.

Convert to mdoc. Move Id to the top.

Add rcsid. RU#. Use err(3) instead of local redefinition. Convert man page to
mdoc format. Add usage(). Remove rcs $ Log $ -> use cvs log instead.

/etc/magic -> /usr/share/misc/magic

PR: docs/4872

Check for invalid lower controls to not claim binary data with chars < 128 as
ASCII _text_
Cleanup names detection code

Add magic for FIGlet fonts and controlfiles

Obtained from: Figlet v2.2 release.

Remove the etc-magic target since we no longer install the
/etc/magic symlink.

The magic file now lives in /usr/share/misc.
Closes PR# 3187.

Submitted by: Ollivier Robert <roberto@keltia.freenix.fr>

Fix broken built-in ELF file handling, caused by missing prototypes
and use of off_t. Correct the types of Elf64_Addr and Elf64_Off.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

I had to rename one additional file in the last file import, so
update this script to reflect that.

The author picked up this file from FreeBSD, but gave it a different name
in file v3.22, so this one is going away.

Merge to resolve conflicts with file 3.22 merge.

This commit was generated by cvs2svn to compensate for changes in r23988,
which included commits to RCS files with non-trunk default branches.

Revert $FreeBSD$ to $Id$

Revert $FreeBSD$ to $Id$

Add framemaker 5.0.
This file could be rationalized I belive.

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Move the check for ASCIIness earlier. This avoids the following
misdetection:

j@uriah 307% file X.hga
X.hga: 80386 COFF executable not stripped
j@uriah 308% strings X.hga | head -3
~f&`i
.text
.data
j@uriah 309% strings X.hga | file -
standard input: assembler program text

New version:

j@uriah 310% strings X.hga | ./file -
standard input: International language text

Reviewed by: christos@deshaw.com (Christos Zoulas)

Restored installation of /etc/magic. It's now a symlink instead of a
file (like /etc/termcap). /usr/src/etc/Makefile depends on there
being an etc-magic install rule here, and who-knows-what depends on
`magic' being in /etc.

Fixed some style bugs - don't use -c for installing files in the obj
directory...

Add another matching algorithhm to do heuristics for international
language text files.

Should finally close PR # bin/1925: file does not consider cyrillic
text..., though i've never got any response from the originator about
my suggestion.

While i was at it, also move out the `magic' file to /usr/share/misc,
there's nothing that magic with this file to justify its life under
/etc.

Detect GUS patches now

Teach file about:
1) our branded elf's
2) mpeg audio/video/system streams
3) compiled java classes

Added magic file for bzip in ./Magdir
Obtained from: bzip sources ;)

Make "file foo.core" print the program name properly again.

make install should not install any file in /etc.

New magic file with more politically correct identification of objects
and execs.
Submitted-By: Brent Nordquist <nordquis@winternet.com>

Update an offset field for i386 a.out core files, so that the program
name comes out right again.

Note: Don't bring this change directly into the -stable branch. The
appropriate offset for -stable is different.

Fix a typo in the syntax for indirect offsets.

Fixed some minor formatting problems to silence manck some more.
Corrected some bogus cross references to man pages that we don't/won't
have and either deleted them, or found a more appropriate man page
that we do have. Various other minor changes to silence manck.

Manck is currently down to about 200 lines of errors, down from
the 500 - 600+ when I started all this.

Recognize ld.so.hints file. Don't ask.

Correct some manual page cross reference errors. E.g. su is a section
one man page, not section eight. This is the first round of such changes
and only fixes man pages in manual section one.

Fix a bunch of spelling errors in a bunch of man pages.

Merged changes to resolve conflicts with file 3.19 import.

This commit was generated by cvs2svn to compensate for changes in r13584,
which included commits to RCS files with non-trunk default branches.

Recognize Acrobat files too.

Implement a rather gross hack to identify i386 a.out core files.
Takes advantage of some bytes in our current tss structure that
reliably have particular values (due to our current architecture or
CPU requirements).

Add X11 XPM and BDF description strings. Alas, bitmaps do not have
anything usable as "magic string".

Sanitize the PGP strings a bit.

Change `install' to `${INSTALL}' so that default install flags can be
specified in the top level Makefiles.

Add magic cookie for Zyxel modems ADPCM4 encoding.
Submitted by: Henrik Vestergaard Draboel <hvd@terry.ping.dk>

Remove trailing whitespace.

Fix %d and others printing
Reviewed by: davidg
Submitted by: Bill Fenner <fenner@parc.xerox.com>

Add recognition of HP Printer Job Language (PJL) commands.

Shell script containing the steps followed in importing file(1).
Reviewed by: Geoff.
Submitted by: Rod Grimes.

Changes to file(1) for FreeBSD:
- Makefile: bmake the sucker
- file.1, magic.5: replace __MAGIC__ and __SECTION__
- add Magdir/freebsd
- add file to usr.bin/Makefile

A note on the FreeBSD magic entry:
The magic number "000000407" is reported as "impure format". This
stops file(1) telling us that our object files are "PDP-11 executables".
(Saying anything more than "impure format" would probably be bogus.
Submitted by: Geoff.

This commit was generated by cvs2svn to compensate for changes in r2479,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.