MFC r323683:

MFV r323678: file 5.32

MFC r312497:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output

MFC r308420: MFV r308392: file 5.29.

MFC r302221,302222:

MFV r302218: file 5.28.

Relnotes: yes

MFC r298192,299234,299238,299736:

file 5.27.

Revert r298920 until we have addressed all known regressions on head/ after
settle. file is now downgraded to 5.25.

PR: bin/209211
Requested by: Tomoaki AOKI
Relnotes: yes

MFC r298192: MFV r298178:

Update file to 5.26.

Relnotes: yes

MFC r287453,287454,288143:

file 5.25.

Relnotes: yes

MFC r284237,284277:

file 5.23.

Relnotes: yes

MFC r276577: MFV r276568:

Update file to 5.22.

MFC r277147:

Since the merge of file 5.21 in r276415 and r276416, stable/9 and
stable/10 cannot be built from FreeBSD 8.x. This is because the
build-tools stage requires libmagic, but lib/libmagic/config.h was
generated on head, and it now enables using the xlocale.h APIs, which
are not supported on 8.x (and on 9.x before __FreeBSD_version 900506).

See also the start of this thread on -stable:
https://lists.freebsd.org/pipermail/freebsd-stable/2015-January/081521.html

To fix this, conditionalize the use of xlocale.h APIs to make
bootstrapping from older FreeBSD versions work correctly.

Reviewed by: delphij
Differential Revision: https://reviews.freebsd.org/D1518

MFC r275698: MFV r275696: file 5.21.

MFC r267897: MFV r267843:

Update file/libmagic to 5.19.

MFC r265464:

Sort .ALLSRC before concatenating files together. This makes sure that the
file are always built the same.

(Note that Header and Localstuff must appear first and in that order, the
sorting does not affect as a coincident effect).

Submitted by: sjg

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

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

r235638 is not the clean way to add support for building on ancient FreeBSD
versions. Instead use Imp's good work on "legacy" and follow the outcome
of the previous TRB discussions on this topic.

Now use the libc getline() if it exists, and only where it doesn't
create a bootstraping version.

Correct a regression introduced during the import of file(1) 5.11.

Magic tests containing "search" or "regex" directives were incorrectly
compiled by "mkmagic" and were effectively ignored. This caused troff
files (for example) to be detected as simply "ASCII text" instead of
as "troff or preprocessor input, ASCII text".

PR: bin/170415
Approved by: consensus on developers@
MFC after: 3 days

Don't depend on getline being on the build machine. That's
not the case for FreeBSD 7.x machines.

Update file(1) to version 5.11.

Use CFLAGS and LDFLAGS when compiling mkmagic. This ensures that all the
correct flags are being used (esp. NO_WERROR wrt clang).

Submitted by: Dimitry Andric <dimitry at andric.com>
Reviewed by: ru

With r208341 in place WARNS can be increased.

Update to a config.h created by a file 5.03 configure script. This causes
file.1 to contain the correct version number and SIZEOF_LONG_LONG to be
defined as appropriate, which is crucial for 64-bit big-endian ELF files
to be handled correctly on big-endian systems.

PR: 146387
Reviewed by: delphij
MFC after: 3 days

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE. Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by: kib
Approved by: re (rwatson)

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

Don't make the MIME magic any longer.

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

Update for the 'file' 4.23 import.

FreeBSD has <limits.h>.

Update for the 'file' 4.21 import.

Update for the 'file' 4.19 import.

Bump library versions in preparation for 7.0.

Ok'd by: kan

Update for the 'file' 4.17 import.

Add missing shared library interdependencies.

Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by: ru
Approved by: re (not needed for commit check but in principle...)

Clean up makefile.

- Remove all:. It's redundant, and ${LIB} in it is just a bug.
- Remove .ORDER:. *.mgc files can safely be built in parallel.
- Remove PITA. The mkmagic tool is smart to put the binary file
into the current directory (${.OBJDIR}) even if the source file
lives somewhere else, which is just what we need.

Catch up with file 4.12 import.

Install the header for libmagic.

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

uniq(1) is not an install tool, and using it was causing
"uniq: not found" during the installworld.

Spotted by: Roman Neuhauser

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)

Bmake the library containing and processing the magic.