aboutsummaryrefslogtreecommitdiff
path: root/contrib/file
Commit message (Collapse)AuthorAgeFilesLines
* MFV: file 5.46.Xin LI2024-12-08163-3840/+8877
|\ | | | | | | MFC after: 2 weeks
* | Remove residual blank line at start of MakefileWarner Losh2024-07-151-1/+0
| | | | | | | | | | | | | | This is a residual of the $FreeBSD$ removal. MFC After: 3 days (though I'll just run the command on the branches) Sponsored by: Netflix
* | (upstream) PR/386: Add newlines for consitency 2Jose Luis Duran2023-10-091-1/+1
| | | | | | | | Obtained from: https://github.com/file/file/pull/134/
* | file_test: Fix file testJose Luis Duran2023-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trimming of the line feed is no longer necessary after https://github.com/file/file/commit/d993c6b0db20711b2c4cb9d2bee8c7f2e59b0a43 Currently the tests: - bcachefs2 - gpkg-1-zst - multiple are failing, but a fix will be committed upstream. This also reverts c5e957ad4 "file: fix test case for gpkg by removing the extra \n." MFC after: 3 days
* | MFV: file 5.45.Xin LI2023-09-10233-1556/+6459
|\| | | | | | | MFC after: 3 days
* | MFV: Restore the ability to process files from stdin immediately.Xin LI2022-10-273-17/+25
|\| | | | | | | | | PR: bin/267221 MFC after: 3 days
* | file: fix test case for gpkg by removing the extra \n.Xin LI2022-10-011-1/+1
| | | | | | | | MFC after: 3 days
* | file: upgrade to 5.43.Xin LI2022-09-2589-4331/+7287
|\| | | | | | | MFC after: 3 days
* | MFV: cherry-pick "PR/358: Fix width for -f - (jpalus)"Xin LI2022-09-071-17/+29
|\| | | | | | | | | MFC after: 1 week PR: bin/266264
* | file: upgrade to 5.42.Xin LI2022-07-0488-1966/+5429
|\| | | | | | | MFC after: 2 weeks
* | file: upgrade to 5.41.Xin LI2022-01-04199-2710/+6710
|\| | | | | | | MFC after: 2 weeks
* | Revert r362261, "Re-apply r333944 to unbreak ports"Ed Maste2020-06-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file update in 2018 broke many ports as it misidentified shared libraries as PIE binaries. r333944 reverted part of the change, restoring ports builds but misidentifying objects in the opposite direction. Earlier this month file 5.39 was imported, and then the change originally from r333944 was recommitted as r362261. However, the issue was fixed upstream, so r362261 serves no purpose. PR: 246960, 247461 [exp-run] Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=362782
* | Revert r362466Baptiste Daroussin2020-06-221-4/+4
| | | | | | | | | | | | | | | | | | Such change should not have happen without prior discussion and review. With hat: transitioning core Notes: svn path=/head/; revision=362488
* | Improve wording to be more precise and clear.Hans Petter Selasky2020-06-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | No functional change intended. s/Master Boot/Main Boot/ (also called MBR) MFC after: 1 week Sponsored by: Mellanox Technologies Notes: svn path=/head/; revision=362466
* | Re-apply r333944 to unbreak portsAntoine Brodin2020-06-171-3/+2
| | | | | | | | Notes: svn path=/head/; revision=362261
* | MFV r362254: file 5.39.Xin LI2020-06-1767-889/+3102
|\| | | | | | | | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=362258
* | MFV r357712: file 5.38.Xin LI2020-02-1197-6574/+11276
|\| | | | | | | | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=357757
* | MFV r354798:Xin LI2019-11-182-7/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Apply vendor fixes: 06de62c Detect multiplication overflow when computing sector position 46a8443 Limit the number of elements in a vector (found by oss-fuzz) Requested by: wen MFC after: 3 days Security: CVE-2019-18218 Notes: svn path=/head/; revision=354802
* | MFV r354582: file 5.37.Xin LI2019-11-10233-1987/+5340
|\| | | | | | | | | | | | | MFC after: 3 days Notes: svn path=/head/; revision=354595
* | [PowerPC64] Add ABI flags to 'file' magicLeandro Lupori2019-06-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The distinction between ELF header version and OpenPOWER ELF ABI version is confusing for most of people, so this adds text to "file" output to make it clear about which OpenPOWER ELF ABI version binary was built for. The strings used in this change are based on "64-Bit ELF V2 ABI Specification/3.1. ELF Header" document available at http://openpowerfoundation.org/wp-content/uploads/resources/leabi/content/dbdoclet.50655241_97607.html Example: $ file t1-Flag2 -m -m contrib/file/magic/Magdir/elf t1-Flag2: ELF 64-bit MSB executable, 64-bit PowerPC or cisco 7500, OpenPOWER ELF V2 ABI, version 1 (FreeBSD), dynamically linked, interpreter /libexec/ld-elf.so.1, for FreeBSD 13.0 (1300033), FreeBSD-style, not stripped Submitted by: alfredo.junior_eldorado.org.br Reviewed by: luporl Differential Revision: https://reviews.freebsd.org/D20771 Notes: svn path=/head/; revision=349509
* | file: update to 5.34Eitan Adler2018-08-0862-1664/+3059
|\| | | | | | | | | | | | | | | PR: 230141 exp-run by: antoine Notes: svn path=/head/; revision=337442
* | Fix file(1) dumpdate reporting for dump(8) filesOleksandr Tymoshenko2018-06-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Magic file for dump(8) had this dump and previous dump dates reversed. Fix order for all three flavours of the dump(8) format. This fix was committed to upstream repo as magic/Magdir/dump,v 1.17 and will be merged during next vendor import. PR: 223155 MFC after: 2 weeks Notes: svn path=/head/; revision=335675
* | Revert last change to file/magic/Magdir/elf, it misidentifies most sharedAntoine Brodin2018-05-201-3/+2
| | | | | | | | | | | | | | | | libraries installed from ports as pie executables instead of shared libraries, and consequently breaks ports. Notes: svn path=/head/; revision=333944
* | MFV: file 5.33Eitan Adler2018-05-2076-2214/+3948
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the latest file(1) in. Relevent Changelog: - extend the support for ${x?:} expansions for magic descriptions - add support for ${x?:} in mime types to handle pie binaries. - add support for negative offsets (offsets from the end of file) - close the file on error when writing magic Relnotes: yes Notes: svn path=/head/; revision=333919
* | MFV r323678: file 5.32Gordon Tetlow2017-09-17145-1845/+3228
|\| | | | | | | | | | | | | | | | | Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D12400 Notes: svn path=/head/; revision=323683
* | Fix an incorrectly used conditional causing a stack buffer overflow.Gordon Tetlow2017-09-071-1/+1
| | | | | | | | | | | | | | | | | | Reported by: Thomas Jarosch of Intra2net AG Reviewed by: emaste, jhb Security: CVE-2017-1000249 Notes: svn path=/head/; revision=323278
* | MFV r308392: file 5.29.Xin LI2016-11-0750-882/+1377
|\| | | | | | | | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=308420
* | MFV r302218: file 5.28.Xin LI2016-06-2728-322/+750
|\| | | | | | | | | | | | | | | | | Relnotes: yes MFC after: 2 weeks Approved by: re (gjb) Notes: svn path=/head/; revision=302221
* | MFV r299716: file 5.27Xin LI2016-05-1420-104/+188
|\| | | | | | | | | | | | | | | MFC after: 2 weeks Relnotes: yes Notes: svn path=/head/; revision=299736
* | MFV r299237: apply two upstream revisions to address upstream bug PR/540.Xin LI2016-05-081-22/+42
|\| | | | | | | | | | | | | | | | | PR: 209211 MFC after: 2 weeks X-MFC: if there is no new file release Notes: svn path=/head/; revision=299238
* | MFV r299233: Apply upstream fix 11edb37a71851b5bcbd4e51ca6ad3dcbf57e9761:Xin LI2016-05-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | Revert: Don't close stdin... This have been observed by portupgrade in its interaction with file(1), as reported as a regression in bin/209211. PR: 209211 MFC after: 3 days Notes: svn path=/head/; revision=299234
* | MFV r298178:Xin LI2016-04-1876-950/+4421
|\| | | | | | | | | | | | | | | | | | | Update file to 5.26. MFC after: 2 weeks Relnotes: yes Notes: svn path=/head/; revision=298192
* | MFV r288140: update file to 5.25.Xin LI2015-09-2341-213/+364
|\| | | | | | | | | | | | | MFC after: 1 month Notes: svn path=/head/; revision=288143
* | Fix build.Xin LI2015-09-041-1/+1
| | | | | | | | Notes: svn path=/head/; revision=287454
* | MFV r287451 + 287452: file 5.24 + fix for bin/181436.Xin LI2015-09-0412-61/+87
|\| | | | | | | | | | | | | | | PR: 181436 MFC after: 2 weeks Notes: svn path=/head/; revision=287453
* | MFV r284276: Fix long options.Xin LI2015-06-113-26/+30
|\| | | | | | | | | | | | | | | Reported by: jkim MFC after: 13 days Notes: svn path=/head/; revision=284277
* | MFV r284234:Xin LI2015-06-1069-529/+1279
|\| | | | | | | | | | | | | | | | | Update file to 5.23. MFC after: 2 weeks Notes: svn path=/head/; revision=284237
* | MFV r276568:Xin LI2015-01-0235-553/+788
|\| | | | | | | | | | | | | | | | | Update file to 5.22. MFC after: 2 weeks Notes: svn path=/head/; revision=276577
* | MFV r275696: file 5.21.Xin LI2014-12-1165-551/+2110
|\| | | | | | | | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=275698
* | Add fstyp(8). This utility, named after its SVR4 counterpart, detectsEdward Tomasz Napierala2014-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=275680
* | Fix multiple vulnerabilities in file(1) and libmagic(3).Xin LI2014-12-105-26/+114
| | | | | | | | | | | | | | | | Security: FreeBSD-SA-14:28.file Security: CVE-2014-3710, CVE-2014-8116, CVE-2014-8117 Notes: svn path=/head/; revision=275666
* | MFV r273688:Xin LI2014-10-261-43/+101
|\| | | | | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=273689
* | MFV r267843: update file/libmagic to 5.19.Xin LI2014-06-26359-7511/+40339
|\| | | | | | | | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=267897
* | Fix multiple vulnerabilities in file(1) and libmagic(3).Xin LI2014-06-245-26/+37
| | | | | | | | | | | | | | | | Security: FreeBSD-SA-14:16.file Approved by: so Notes: svn path=/head/; revision=267827
* | Update NetBSD Foundation copyrights to 2-clause BSDEd Maste2014-03-181-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=263289
* | Apply upstream commit 33312fd828e59c78ae4ee30fd70d0ca109748cf0 (byDimitry Andric2013-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | zoulasc) to contrib/file: don't write a char to a pointer. MFC after: 3 days Notes: svn path=/head/; revision=259724
* | Add support for Lua 5.2.David E. O'Brien2013-01-111-0/+1
| | | | | | | | | | | | | | Submitted by: skreuzer Notes: svn path=/head/; revision=245307
* | Correct a regression introduced during the import of file(1) 5.11.Stephen McKay2012-08-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=239348
* | Update file(1) to version 5.11.David E. O'Brien2012-04-19287-27933/+14896
|\| | | | | | | Notes: svn path=/head/; revision=234449
* | In contrib/file/softmagic.c, fix a potential format string securityDimitry Andric2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=228553