jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-02 19:22:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
196,671 Commits 78 Branches 140 Tags 3.5 GiB
ffb22e4bfe
Commit Graph

50 Commits

Author SHA1 Message Date
Eitan Adler
e6546abc96 MFC r323683: 
MFV r323678: file 5.32
 2018-02-05 08:50:34 +00:00
Gordon Tetlow
0412f7e9a2 MFC r323278: Fix an incorrectly used conditional causing buffer overflow. 
Reported by:	Thomas Jarosch of Intra2net AG
Reviewed by:	emaste, jhb
Approved by:	re (marius)
Security:	CVE-2017-1000249
 2017-09-07 19:23:08 +00:00
Xin LI
0ac9fb6229 MFC r308420: MFV r308392: file 5.29. 2016-12-11 07:37:20 +00:00
Xin LI
f45d22e528 MFC r302221,302222: 
MFV r302218: file 5.28.

Relnotes:	yes
 2016-07-11 07:35:58 +00:00
Xin LI
42b6c492fd MFC r298192,299234,299238,299736: 
file 5.27.
 2016-05-28 06:17:35 +00:00
Xin LI
de958d2631 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
 2016-05-08 18:09:30 +00:00
Xin LI
4bf10ebebb MFC r298192: MFV r298178: 
Update file to 5.26.

Relnotes:	yes
 2016-05-02 05:46:47 +00:00
Xin LI
76804c5f99 MFC r287453,287454,288143: 
file 5.25.

Relnotes:	yes
 2015-10-29 17:51:48 +00:00
Xin LI
0c24b26c2b MFC r284237,284277: 
file 5.23.

Relnotes:	yes
 2015-06-24 19:58:14 +00:00
Xin LI
c590b07003 MFC r276577: MFV r276568: 
Update file to 5.22.
 2015-01-23 18:48:59 +00:00
Edward Tomasz Napierala
178109a716 MFC r275680: 
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
 2015-01-20 20:39:29 +00:00
Xin LI
f734e7aa47 MFC r275698: MFV r275696: file 5.21. 2014-12-30 19:39:31 +00:00
Xin LI
9fe25876b6 MFC r275666: 
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:26:53 +00:00
Xin LI
8defb9997c MFC r267897: MFV r267843: 
Update file/libmagic to 5.19.
 2014-07-11 00:00:00 +00:00
Xin LI
e74e520ac5 Fix multiple vulnerabilities in file(1) and libmagic(3). 
Security:	FreeBSD-SA-14:16.file
Approved by:	so
 2014-06-24 19:04:55 +00:00
Ed Maste
f5ed9f801d MFC r263289: 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-24 13:48:04 +00:00
Dimitry Andric
5aef0fd068 MFC r259724: 
Apply upstream commit 33312fd828e59c78ae4ee30fd70d0ca109748cf0 (by
zoulasc) to contrib/file:

  don't write a char to a pointer.
 2013-12-25 00:48:08 +00:00
David E. O'Brien
4ebb86b33b Add support for Lua 5.2. 
Submitted by:	skreuzer
 2013-01-11 17:34:30 +00:00
Stephen McKay
a0ebde2020 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
David E. O'Brien
80c86c3659 Update file(1) to version 5.11. 2012-04-19 03:20:13 +00:00
Dimitry Andric
0adb64b5d9 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 Rao
7f08176ee8 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
Rui Paulo
91e3f06a9e Properly warp around more code under COMPILE_ONLY to recover from build 
errors.
 2010-08-02 13:05:12 +00:00
Xin LI
70b95ceeab Merge vendor/file/dist@192348, bringing FILE 5.03 to 8-CURRENT. 
Security:	CVE-2009-1515
 2009-05-18 22:34:33 +00:00
David E. O'Brien
befabca97a This belongs in //svn.freebsd.org/base/vendor/file/dist now. 2009-05-04 00:42:15 +00:00
David E. O'Brien
7dbb948b5f Merge vendor/file/dist@191739, bringing FILE 5.00 to 8-CURRENT. 2009-05-04 00:37:44 +00:00
David E. O'Brien
4f99d1ea86 Add an additional COMPILE_ONLY check. 2009-01-02 03:31:45 +00:00
David E. O'Brien
28a8b56297 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
David E. O'Brien
e78ce05075 Flatten the file vendor area. 
Remove the svn:keywords property from the vendor files.
 2009-01-01 05:39:43 +00:00
David E. O'Brien
eca0ab3fbd Remove files no longer part of the vendor's file(1). 2008-02-02 18:26:53 +00:00
David E. O'Brien
129099554f 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
David E. O'Brien
c331df4f23 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
David E. O'Brien
bbb6d1d6bc 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
David E. O'Brien
da4c6b80d9 Update for the 4.23 import. 2008-01-30 02:48:24 +00:00
David E. O'Brien
974b70c47d Import file version 4.23 onto the vendor branch 2008-01-13 20:35:16 +00:00
David E. O'Brien
17c6260f4c Virgin import of Christos Zoulas's FILE 4.21. 2007-05-24 21:59:38 +00:00
David E. O'Brien
d1d50c78ab Virgin import of Christos Zoulas's FILE 4.19. 2007-05-24 16:12:23 +00:00
David E. O'Brien
dbca37326f 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
David E. O'Brien
88a5e5ac7b Virgin import of Christos Zoulas's FILE 4.17. 2006-06-19 07:52:15 +00:00
David E. O'Brien
a2e8fb4c99 Virgin import of Christos Zoulas's FILE 4.12. 2004-12-28 04:31:47 +00:00
David E. O'Brien
ea8dc7e0f2 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
David E. O'Brien
490143648c 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
David E. O'Brien
3459dd3784 Virgin import of Christos Zoulas's FILE 3.40. 2003-02-15 18:53:17 +00:00
David E. O'Brien
8ed12636aa Virgin import of Christos Zoulas's FILE 3.39. 2002-09-16 05:54:26 +00:00
David E. O'Brien
649d615c25 Virgin import of Christos Zoulas's FILE 3.37. 2001-10-08 22:50:54 +00:00
David E. O'Brien
2e67ec0205 Virgin import of Christos Zoulas's FILE 3.36. 2001-07-30 03:09:46 +00:00
David E. O'Brien
61295bbb39 Virgin import of Christos Zoulas's FILE 3.35. 2001-04-25 07:41:21 +00:00
David E. O'Brien
adef7cde57 Virgin import of Christos Zoulas's FILE 3.34. 2001-03-25 18:37:04 +00:00
David E. O'Brien
ebb4cbb2d0 Virgin import of Christos Zoulas FILE 3.33. 2000-11-26 21:26:20 +00:00
David E. O'Brien
75a6cdb3a2 Virgin import of FILE 3.32 2000-11-05 08:33:55 +00:00