Commit Graph

48 Commits

Author SHA1 Message Date
delphij
34650d7da6 MFV r288140: update file to 5.25.
MFC after:	1 month
2015-09-23 05:39:20 +00:00
delphij
142041f917 Fix build. 2015-09-04 08:04:12 +00:00
delphij
b4f95287e7 MFV r287451 + 287452: file 5.24 + fix for bin/181436.
PR:		181436
MFC after:	2 weeks
2015-09-04 05:56:14 +00:00
delphij
8b34434f8e MFV r284276: Fix long options.
Reported by:	jkim
MFC after:	13 days
2015-06-11 17:32:36 +00:00
delphij
7d7b7b5da3 MFV r284234:
Update file to 5.23.

MFC after:	2 weeks
2015-06-10 19:22:41 +00:00
delphij
1bda30591a MFV r276568:
Update file to 5.22.

MFC after:	2 weeks
2015-01-02 21:20:02 +00:00
delphij
504cc95e05 MFV r275696: file 5.21.
MFC after:	 2 weeks
2014-12-11 06:52:10 +00:00
trasz
3e3c248f83 Add fstyp(8). This utility, named after its SVR4 counterpart, detects
filesystems.  It differs from file(1) in that it gives machine-parseable
output, it outputs filesystem labels, doesn't get confused by other
formats metadata, and runs in Capsicum sandbox.

Differential Revision:	https://reviews.freebsd.org/D1255
Relnotes:	yes
Sponsored by:	The FreeBSD Foundation
2014-12-10 14:14:16 +00:00
delphij
ae66b4b7f2 Fix multiple vulnerabilities in file(1) and libmagic(3).
Security:	FreeBSD-SA-14:28.file
Security:	CVE-2014-3710, CVE-2014-8116, CVE-2014-8117
2014-12-10 08:19:55 +00:00
delphij
ed6a185709 MFV r273688:
Update filesystems magic.  This fixes a regression introduced by
libmagic 5.19 which prevents file(1) to show more verbose information
about a MBR.

Submitted by:	madpilot
MFC after:	2 weeks
2014-10-26 09:29:12 +00:00
delphij
cd5514ba3b MFV r267843: update file/libmagic to 5.19.
MFC after:	2 weeks
2014-06-26 06:03:39 +00:00
delphij
b76205207d Fix multiple vulnerabilities in file(1) and libmagic(3).
Security:	FreeBSD-SA-14:16.file
Approved by:	so
2014-06-24 19:04:32 +00:00
emaste
dfd2dcdc01 Update NetBSD Foundation copyrights to 2-clause BSD
The NetBSD Foundation states "Third parties are encouraged to change the
license on any files which have a 4-clause license contributed to the
NetBSD Foundation to a 2-clause license."

This change removes clauses 3 and 4 from copyright / license blocks that
list The NetBSD Foundation as the only copyright holder.

Sponsored by:	The FreeBSD Foundation
2014-03-18 01:40:25 +00:00
dim
a73ec90252 Apply upstream commit 33312fd828e59c78ae4ee30fd70d0ca109748cf0 (by
zoulasc) to contrib/file:

  don't write a char to a pointer.

MFC after:	3 days
2013-12-22 14:14:53 +00:00
obrien
24403111aa Add support for Lua 5.2.
Submitted by:	skreuzer
2013-01-11 17:34:30 +00:00
mckay
3671fbcc9a 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
2012-08-17 02:27:17 +00:00
obrien
248502d7f0 Update file(1) to version 5.11. 2012-04-19 03:20:13 +00:00
dim
1b62ee21f0 In contrib/file/softmagic.c, fix a potential format string security
problem.  (This fix has already been applied upstream, but we do not
have the latest version of file in the tree at the moment.)

MFC after:	1 week
2011-12-15 23:28:17 +00:00
attilio
7718cbcbf4 Add the ability for GDB to printout the thread name along with other
thread specific informations.

In order to do that, and in order to avoid KBI breakage with existing
infrastructure the following semantic is implemented:
- For live programs, a new member to the PT_LWPINFO is added (pl_tdname)
- For cores, a new ELF note is added (NT_THRMISC) that can be used for
  storing thread specific, miscellaneous, informations. Right now it is
  just popluated with a thread name.

GDB, then, retrieves the correct informations from the corefile via the
BFD interface, as it groks the ELF notes and create appropriate
pseudo-sections.

Sponsored by:	Sandvine Incorporated
Tested by:	gianni
Discussed with:	dim, kan, kib
MFC after:	2 weeks
2010-11-22 14:42:13 +00:00
rpaulo
e4ed2cb10c Properly warp around more code under COMPILE_ONLY to recover from build
errors.
2010-08-02 13:05:12 +00:00
delphij
94241912dc Merge vendor/file/dist@192348, bringing FILE 5.03 to 8-CURRENT.
Security:	CVE-2009-1515
2009-05-18 22:34:33 +00:00
obrien
7fea4c3732 This belongs in //svn.freebsd.org/base/vendor/file/dist now. 2009-05-04 00:42:15 +00:00
obrien
a8abfd3eba Merge vendor/file/dist@191739, bringing FILE 5.00 to 8-CURRENT. 2009-05-04 00:37:44 +00:00
obrien
69f0422a25 Add an additional COMPILE_ONLY check. 2009-01-02 03:31:45 +00:00
obrien
729acffa05 Record that base/vendor/file/dist@186675 was merged.
Merge base/vendor/file/dist@186675@186690, bringing FILE 4.26 to 8-CURRENT.
2009-01-02 03:10:55 +00:00
obrien
87d6fde760 Flatten the file vendor area.
Remove the svn:keywords property from the vendor files.
2009-01-01 05:39:43 +00:00
obrien
99e8b7f6d1 Remove files no longer part of the vendor's file(1). 2008-02-02 18:26:53 +00:00
obrien
3a8bdecd70 This commit was generated by cvs2svn to compensate for changes in r175898,
which included commits to RCS files with non-trunk default branches.
2008-02-02 18:26:53 +00:00
obrien
b8fb0b4b01 Fix nit in version 4.23 in which -p does not work (thus updating access
times when it shouldn't).  The PR's patch has been incorporated upstream
as magic.c rev 1.46.

PR:		107676
Submitted by:	Dr. Markus Waldeck <waldeck@gmx.de>
2008-02-02 07:19:01 +00:00
obrien
ffe35eb26b This commit was generated by cvs2svn to compensate for changes in r175882,
which included commits to RCS files with non-trunk default branches.
2008-02-02 07:19:01 +00:00
obrien
7b230e75d8 Update for the 4.23 import. 2008-01-30 02:48:24 +00:00
obrien
6678cf7c2a Import file version 4.23 onto the vendor branch 2008-01-13 20:35:16 +00:00
obrien
240c77918b Virgin import of Christos Zoulas's FILE 4.21. 2007-05-24 21:59:38 +00:00
obrien
09615277da Virgin import of Christos Zoulas's FILE 4.19. 2007-05-24 16:12:23 +00:00
obrien
0af3611cb6 Fix segfault when '/etc/malloc.conf@ -> AJ' due to differnce between
calloc & malloc as agreed by vendor.  Also remove an unused variable.
2006-06-21 09:28:00 +00:00
obrien
5c5b299c7d Virgin import of Christos Zoulas's FILE 4.17. 2006-06-19 07:52:15 +00:00
obrien
df11c7b63d Virgin import of Christos Zoulas's FILE 4.12. 2004-12-28 04:31:47 +00:00
obrien
bda6cdf589 Virgin import of Christos Zoulas's FILE 4.10.
*- file is now broken into a library containing and processing the magic
   and a consumer binary.
2004-08-09 08:45:41 +00:00
obrien
f35360c372 Virgin import of Christos Zoulas's FILE 3.41.
* - fix memory allocation problem (Jeff Johnson)
	* - fix stack overflow corruption (David Endler)
2003-02-28 05:19:36 +00:00
obrien
822cce384d Virgin import of Christos Zoulas's FILE 3.40. 2003-02-15 18:53:17 +00:00
obrien
2ef757c3c6 Virgin import of Christos Zoulas's FILE 3.39. 2002-09-16 05:54:26 +00:00
obrien
7860fd7670 Virgin import of Christos Zoulas's FILE 3.37. 2001-10-08 22:50:54 +00:00
obrien
0bc19fe086 Virgin import of Christos Zoulas's FILE 3.36. 2001-07-30 03:09:46 +00:00
obrien
30980cd72d Virgin import of Christos Zoulas's FILE 3.35. 2001-04-25 07:41:21 +00:00
obrien
fd87285c4e Virgin import of Christos Zoulas's FILE 3.34. 2001-03-25 18:37:04 +00:00
cvs2svn
07b03dc31d This commit was manufactured by cvs2svn to create branch 'VENDOR-file'. 2000-11-26 21:29:27 +00:00
obrien
150ca1a161 Virgin import of Christos Zoulas FILE 3.33. 2000-11-26 21:26:20 +00:00
obrien
73a570e26c Virgin import of FILE 3.32 2000-11-05 08:33:55 +00:00