diff options
| author | Eitan Adler <eadler@FreeBSD.org> | 2018-05-20 05:06:42 +0000 |
|---|---|---|
| committer | Eitan Adler <eadler@FreeBSD.org> | 2018-05-20 05:06:42 +0000 |
| commit | 58a0f0d00c0cc4a90ce584a61470290751bfcac7 (patch) | |
| tree | eef35fb3c88c840df414337ee218144dcbfc977c /contrib/file/magic/Magdir/elf | |
| parent | 2186ee6e721096cfe27650610518d84ee80dd410 (diff) | |
| parent | fd86496b2232c1f79946dc2d21515012a33b6274 (diff) | |
| download | src-58a0f0d00c0cc4a90ce584a61470290751bfcac7.tar.gz src-58a0f0d00c0cc4a90ce584a61470290751bfcac7.zip | |
MFV: file 5.33
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
Notes:
svn path=/head/; revision=333919
Diffstat (limited to 'contrib/file/magic/Magdir/elf')
| -rw-r--r-- | contrib/file/magic/Magdir/elf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/file/magic/Magdir/elf b/contrib/file/magic/Magdir/elf index 0e0e6dcb0f6a..7fd5de1c1fff 100644 --- a/contrib/file/magic/Magdir/elf +++ b/contrib/file/magic/Magdir/elf @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: elf,v 1.70 2016/06/02 12:36:30 christos Exp $ +# $File: elf,v 1.72 2018/02/24 19:50:04 christos Exp $ # elf: file(1) magic for ELF executables # # We have to check the byte order flag to see what byte order all the @@ -48,8 +48,9 @@ !:mime application/x-object >16 leshort 2 executable, !:mime application/x-executable ->16 leshort 3 shared object, -!:mime application/x-sharedlib +>16 leshort 3 ${x?pie executable:shared object} + +!:mime application/x-${x?pie-executable:sharedlib} >16 leshort 4 core file !:mime application/x-coredump # Core file detection is not reliable. |