d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r287451 + 287452: file 5.24 + fix for bin/181436.

Browse Source 
PR:		181436
MFC after:	2 weeks
This commit is contained in:
Xin LI 2015-09-04 05:56:14 +00:00
commit 9fc5c47fa5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=287453
13 changed files with 90 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/file/ChangeLog
View File

@ -1,3 +1,7 @@
2015-07-09 10:35 Christos Zoulas <christos@zoulas.com>
* release 5.24
2015-06-11 8:52 Christos Zoulas <christos@zoulas.com> 2015-06-11 8:52 Christos Zoulas <christos@zoulas.com>
* redo long option encoding to fix off-by-one in 5.23 * redo long option encoding to fix off-by-one in 5.23

20
contrib/file/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for file 5.23. # Generated by GNU Autoconf 2.69 for file 5.24.
# #
# Report bugs to <christos@astron.com>. # Report bugs to <christos@astron.com>.
# #
@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='file' PACKAGE_NAME='file'
PACKAGE_TARNAME='file' PACKAGE_TARNAME='file'
PACKAGE_VERSION='5.23' PACKAGE_VERSION='5.24'
PACKAGE_STRING='file 5.23' PACKAGE_STRING='file 5.24'
PACKAGE_BUGREPORT='christos@astron.com' PACKAGE_BUGREPORT='christos@astron.com'
PACKAGE_URL='' PACKAGE_URL=''
@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures file 5.23 to adapt to many kinds of systems. \`configure' configures file 5.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of file 5.23:";; short | recursive ) echo "Configuration of file 5.24:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1507,7 +1507,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
file configure 5.23 file configure 5.24
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2163,7 +2163,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by file $as_me 5.23, which was It was created by file $as_me 5.24, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -3029,7 +3029,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='file' PACKAGE='file'
VERSION='5.23' VERSION='5.24'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -15036,7 +15036,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by file $as_me 5.23, which was This file was extended by file $as_me 5.24, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -15102,7 +15102,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
file config.status 5.23 file config.status 5.24
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
contrib/file/configure.ac
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT([file],[5.23],[christos@astron.com]) AC_INIT([file],[5.24],[christos@astron.com])
AM_INIT_AUTOMAKE([subdir-objects foreign]) AM_INIT_AUTOMAKE([subdir-objects foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

6
contrib/file/magic/Magdir/database
View File

@ -1,6 +1,6 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# $File: database,v 1.43 2014/10/28 15:47:39 christos Exp $ # $File: database,v 1.44 2015/07/02 18:25:57 christos Exp $
# database: file(1) magic for various databases # database: file(1) magic for various databases
# #
# extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk) # extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk)
@ -533,7 +533,9 @@
# From: Stephane Blondon http://www.yaal.fr # From: Stephane Blondon http://www.yaal.fr
# Database file for Zope (done by FileStorage) # Database file for Zope (done by FileStorage)
0 string FS21 Zope Object Database File Storage (data) 0 string FS21 Zope Object Database File Storage v3 (data)
0 string FS30 Zope Object Database File Storage v4 (data)
# Cache file for the database of Zope (done by ClientStorage) # Cache file for the database of Zope (done by ClientStorage)
0 string ZEC3 Zope Object Database Client Cache File (data) 0 string ZEC3 Zope Object Database Client Cache File (data)

66
contrib/file/magic/Magdir/elf
View File

@ -1,6 +1,6 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# $File: elf,v 1.68 2014/09/19 19:05:57 christos Exp $ # $File: elf,v 1.69 2015/06/16 17:23:08 christos Exp $
# elf: file(1) magic for ELF executables # elf: file(1) magic for ELF executables
# #
# We have to check the byte order flag to see what byte order all the # We have to check the byte order flag to see what byte order all the
@ -15,6 +15,32 @@
# Modified by (4): <gerardo.cacciari@gmail.com> (VMS Itanium) # Modified by (4): <gerardo.cacciari@gmail.com> (VMS Itanium)
# Modified by (5): Matthias Urlichs <smurf@debian.org> (Listing of many architectures) # Modified by (5): Matthias Urlichs <smurf@debian.org> (Listing of many architectures)
0 name elf-mips
>0 lelong&0xf0000000 0x00000000 MIPS-I
>0 lelong&0xf0000000 0x10000000 MIPS-II
>0 lelong&0xf0000000 0x20000000 MIPS-III
>0 lelong&0xf0000000 0x30000000 MIPS-IV
>0 lelong&0xf0000000 0x40000000 MIPS-V
>0 lelong&0xf0000000 0x50000000 MIPS32
>0 lelong&0xf0000000 0x60000000 MIPS64
>0 lelong&0xf0000000 0x70000000 MIPS32 rel2
>0 lelong&0xf0000000 0x80000000 MIPS64 rel2
>0 lelong&0xf0000000 0x90000000 MIPS32 rel6
>0 lelong&0xf0000000 0xa0000000 MIPS64 rel6
0 name elf-sparc
>0 lelong&0x00ffff00 0x00000100 V8+ Required,
>0 lelong&0x00ffff00 0x00000200 Sun UltraSPARC1 Extensions Required,
>0 lelong&0x00ffff00 0x00000400 HaL R1 Extensions Required,
>0 lelong&0x00ffff00 0x00000800 Sun UltraSPARC3 Extensions Required,
>0 lelong&0x3 0 total store ordering,
>0 lelong&0x3 1 partial store ordering,
>0 lelong&0x3 2 relaxed memory ordering,
0 name elf-pa-risc
>2 leshort 0x0214 2.0
>0 leshort &0x0008 (LP64)
0 name elf-le 0 name elf-le
>16 leshort 0 no file type, >16 leshort 0 no file type,
!:mime application/octet-stream !:mime application/octet-stream
@ -55,47 +81,26 @@
>18 leshort 8 >18 leshort 8
# only for 32-bit # only for 32-bit
>>4 byte 1 >>4 byte 1
>>>36 lelong&0xf0000000 0x00000000 MIPS-I >>>36 use elf-mips
>>>36 lelong&0xf0000000 0x10000000 MIPS-II
>>>36 lelong&0xf0000000 0x20000000 MIPS-III
>>>36 lelong&0xf0000000 0x30000000 MIPS-IV
>>>36 lelong&0xf0000000 0x40000000 MIPS-V
>>>36 lelong&0xf0000000 0x50000000 MIPS32
>>>36 lelong&0xf0000000 0x60000000 MIPS64
>>>36 lelong&0xf0000000 0x70000000 MIPS32 rel2
>>>36 lelong&0xf0000000 0x80000000 MIPS64 rel2
# only for 64-bit # only for 64-bit
>>4 byte 2 >>4 byte 2
>>>48 lelong&0xf0000000 0x00000000 MIPS-I >>>48 use elf-mips
>>>48 lelong&0xf0000000 0x10000000 MIPS-II
>>>48 lelong&0xf0000000 0x20000000 MIPS-III
>>>48 lelong&0xf0000000 0x30000000 MIPS-IV
>>>48 lelong&0xf0000000 0x40000000 MIPS-V
>>>48 lelong&0xf0000000 0x50000000 MIPS32
>>>48 lelong&0xf0000000 0x60000000 MIPS64
>>>48 lelong&0xf0000000 0x70000000 MIPS32 rel2
>>>48 lelong&0xf0000000 0x80000000 MIPS64 rel2
>18 leshort 9 Amdahl, >18 leshort 9 Amdahl,
>18 leshort 10 MIPS (deprecated), >18 leshort 10 MIPS (deprecated),
>18 leshort 11 RS6000, >18 leshort 11 RS6000,
>18 leshort 15 PA-RISC, >18 leshort 15 PA-RISC,
# only for 32-bit # only for 32-bit
>>4 byte 1 >>4 byte 1
>>>38 leshort 0x0214 2.0 >>>36 use elf-pa-risc
>>>36 leshort &0x0008 (LP64)
# only for 64-bit # only for 64-bit
>>4 byte 2 >>4 byte 2
>>>50 leshort 0x0214 2.0 >>>48 use elf-pa-risc
>>>48 leshort &0x0008 (LP64)
>18 leshort 16 nCUBE, >18 leshort 16 nCUBE,
>18 leshort 17 Fujitsu VPP500, >18 leshort 17 Fujitsu VPP500,
>18 leshort 18 SPARC32PLUS, >18 leshort 18 SPARC32PLUS,
# only for 32-bit # only for 32-bit
>>4 byte 1 >>4 byte 1
>>>36 lelong&0xffff00 0x000100 V8+ Required, >>>36 use elf-sparc
>>>36 lelong&0xffff00 0x000200 Sun UltraSPARC1 Extensions Required,
>>>36 lelong&0xffff00 0x000400 HaL R1 Extensions Required,
>>>36 lelong&0xffff00 0x000800 Sun UltraSPARC3 Extensions Required,
>18 leshort 19 Intel 80960, >18 leshort 19 Intel 80960,
>18 leshort 20 PowerPC or cisco 4500, >18 leshort 20 PowerPC or cisco 4500,
>18 leshort 21 64-bit PowerPC or cisco 7500, >18 leshort 21 64-bit PowerPC or cisco 7500,
@ -117,12 +122,7 @@
>18 leshort 42 Renesas SH, >18 leshort 42 Renesas SH,
>18 leshort 43 SPARC V9, >18 leshort 43 SPARC V9,
>>4 byte 2 >>4 byte 2
>>>48 lelong&0xffff00 0x000200 Sun UltraSPARC1 Extensions Required, >>>48 use elf-sparc
>>>48 lelong&0xffff00 0x000400 HaL R1 Extensions Required,
>>>48 lelong&0xffff00 0x000800 Sun UltraSPARC3 Extensions Required,
>>>48 lelong&0x3 0 total store ordering,
>>>48 lelong&0x3 1 partial store ordering,
>>>48 lelong&0x3 2 relaxed memory ordering,
>18 leshort 44 Siemens Tricore Embedded Processor, >18 leshort 44 Siemens Tricore Embedded Processor,
>18 leshort 45 Argonaut RISC Core, Argonaut Technologies Inc., >18 leshort 45 Argonaut RISC Core, Argonaut Technologies Inc.,
>18 leshort 46 Renesas H8/300, >18 leshort 46 Renesas H8/300,

4
contrib/file/magic/Magdir/fortran
View File

@ -1,7 +1,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# $File: fortran,v 1.8 2014/06/03 19:01:34 christos Exp $ # $File: fortran,v 1.9 2015/06/17 19:55:27 christos Exp $
# FORTRAN source # FORTRAN source
0 regex/100l \^[Cc][\ \t] FORTRAN program 0 regex/100l \^[Cc][\ \t] FORTRAN program text
!:mime text/x-fortran !:mime text/x-fortran
!:strength - 5 !:strength - 5

3
contrib/file/magic/Magdir/mail.news
View File

@ -1,5 +1,5 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# $File: mail.news,v 1.22 2013/01/04 14:22:07 christos Exp $ # $File: mail.news,v 1.23 2015/06/29 14:44:26 christos Exp $
# mail.news: file(1) magic for mail and news # mail.news: file(1) magic for mail and news
# #
# Unfortunately, saved netnews also has From line added in some news software. # Unfortunately, saved netnews also has From line added in some news software.
@ -41,6 +41,7 @@
# From: Simon Matter <simon.matter@invoca.ch> # From: Simon Matter <simon.matter@invoca.ch>
0 string \241\002\213\015skiplist\ file\0\0\0 Cyrus skiplist DB 0 string \241\002\213\015skiplist\ file\0\0\0 Cyrus skiplist DB
0 string \241\002\213\015twoskip\ file\0\0\0\0 Cyrus twoskip DB
# JAM(mbp) Fidonet message area databases # JAM(mbp) Fidonet message area databases
# JHR file # JHR file

16
contrib/file/magic/Magdir/make
View File

@ -2,14 +2,20 @@
# $File: make,v 1.1 2011/12/08 12:12:46 rrt Exp $ # $File: make,v 1.1 2011/12/08 12:12:46 rrt Exp $
# make: file(1) magic for makefiles # make: file(1) magic for makefiles
# #
0 regex \^CFLAGS makefile script text 0 regex/100l \^CFLAGS makefile script text
!:mime text/x-makefile !:mime text/x-makefile
0 regex \^LDFLAGS makefile script text 0 regex/100l \^VPATH makefile script text
!:mime text/x-makefile !:mime text/x-makefile
0 regex \^all: makefile script text 0 regex/100l \^LDFLAGS makefile script text
!:mime text/x-makefile !:mime text/x-makefile
0 regex \^.PRECIOUS makefile script text 0 regex/100l \^all: makefile script text
!:mime text/x-makefile
0 regex/100l \^\.PRECIOUS makefile script text
!:mime text/x-makefile
0 regex/100l \^\.BEGIN BSD makefile script text
!:mime text/x-makefile
0 regex/100l \^\.include BSD makefile script text
!:mime text/x-makefile !:mime text/x-makefile
0 regex \^SUBDIRS automake makefile script text 0 regex/100l \^SUBDIRS automake makefile script text
!:mime text/x-makefile !:mime text/x-makefile

8
contrib/file/magic/Magdir/map
View File

@ -1,7 +1,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# $File: map,v 1.1 2014/06/03 18:22:25 christos Exp $ # $File: map,v 1.3 2015/07/09 15:16:41 christos Exp $
# map: file(1) magic for Map data # map: file(1) magic for Map data
# #
@ -9,9 +9,11 @@
8 string .FIT FIT Map data 8 string .FIT FIT Map data
>15 byte 0 >15 byte 0
>>35 belong x \b, unit id %d >>35 belong x \b, unit id %d
# 20 years after unix epoch
>>39 lelong x \b, serial %u >>39 lelong x \b, serial %u
>>43 ledate/631152000 x \b, %s # http://pub.ks-and-ks.ne.jp/cycling/edge500_fit.shtml
# 20 years after unix epoch
# TZ=GMT date -d '1989-12-31 0:00' +%s
>>43 leldate+631065600 x \b, %s
>>47 leshort x \b, manufacturer %d >>47 leshort x \b, manufacturer %d
>>47 leshort 1 \b (garmin) >>47 leshort 1 \b (garmin)

2
contrib/file/src/file.c
View File

@ -32,7 +32,7 @@
#include "file.h" #include "file.h"
#ifndef lint #ifndef lint
FILE_RCSID("@(#)$File: file.c,v 1.164 2015/06/03 18:21:24 christos Exp $") FILE_RCSID("@(#)$File: file.c,v 1.165 2015/06/11 12:52:32 christos Exp $")
#endif /* lint */ #endif /* lint */
#include "magic.h" #include "magic.h"

6
contrib/file/src/funcs.c
View File

@ -27,7 +27,7 @@
#include "file.h" #include "file.h"
#ifndef lint #ifndef lint
FILE_RCSID("@(#)$File: funcs.c,v 1.82 2015/06/03 18:01:20 christos Exp $") FILE_RCSID("@(#)$File: funcs.c,v 1.83 2015/06/16 14:17:37 christos Exp $")
#endif /* lint */ #endif /* lint */
#include "magic.h" #include "magic.h"
@ -107,8 +107,10 @@ file_error_core(struct magic_set *ms, int error, const char *f, va_list va,
if (lineno != 0) { if (lineno != 0) {
free(ms->o.buf); free(ms->o.buf);
ms->o.buf = NULL; ms->o.buf = NULL;
file_printf(ms, "line %" SIZE_T_FORMAT "u: ", lineno); file_printf(ms, "line %" SIZE_T_FORMAT "u:", lineno);
} }
if (ms->o.buf && *ms->o.buf)
file_printf(ms, " ");
file_vprintf(ms, f, va); file_vprintf(ms, f, va);
if (error > 0) if (error > 0)
file_printf(ms, " (%s)", strerror(error)); file_printf(ms, " (%s)", strerror(error));

11
contrib/file/src/readelf.c
View File

@ -27,7 +27,7 @@
#include "file.h" #include "file.h"
#ifndef lint #ifndef lint
FILE_RCSID("@(#)$File: readelf.c,v 1.119 2015/04/09 20:01:41 christos Exp $") FILE_RCSID("@(#)$File: readelf.c,v 1.120 2015/06/16 14:18:07 christos Exp $")
#endif #endif
#ifdef BUILTIN_ELF #ifdef BUILTIN_ELF
@ -1048,9 +1048,18 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
break; break;
} }
/* Things we can determine when we seek */ /* Things we can determine when we seek */
switch (xsh_type) { switch (xsh_type) {
case SHT_NOTE: case SHT_NOTE:
if (xsh_size + xsh_offset > (uintmax_t)fsize) {
if (file_printf(ms,
", note offset/size 0x%jx+0x%jx exceeds"
" file size 0x%jx", (uintmax_t)xsh_offset,
(uintmax_t)xsh_size, (uintmax_t)fsize) == -1)
return -1;
return 0;
}
if ((nbuf = malloc(xsh_size)) == NULL) { if ((nbuf = malloc(xsh_size)) == NULL) {
file_error(ms, errno, "Cannot allocate memory" file_error(ms, errno, "Cannot allocate memory"
" for note"); " for note");

6
lib/libmagic/config.h
View File

@ -290,7 +290,7 @@
#define PACKAGE_NAME "file" #define PACKAGE_NAME "file"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "file 5.23" #define PACKAGE_STRING "file 5.24"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "file" #define PACKAGE_TARNAME "file"
@ -299,7 +299,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "5.23" #define PACKAGE_VERSION "5.24"
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
@ -330,7 +330,7 @@
/* Version number of package */ /* Version number of package */
#define VERSION "5.23" #define VERSION "5.24"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */ significant byte first (like Motorola and SPARC, unlike Intel). */