Author: delphij
Date: Fri Sep 4 05:56:14 2015
New Revision: 287453
URL: https://svnweb.freebsd.org/changeset/base/287453
Log:
MFV r287451 + 287452: file 5.24 + fix for bin/181436.
PR: 181436
MFC after: 2 weeks
Modified:
head/contrib/file/ChangeLog
head/contrib/file/configure
head/contrib/file/configure.ac
head/contrib/file/magic/Magdir/database
head/contrib/file/magic/Magdir/elf
head/contrib/file/magic/Magdir/fortran
head/contrib/file/magic/Magdir/mail.news
head/contrib/file/magic/Magdir/make
head/contrib/file/magic/Magdir/map
head/contrib/file/src/file.c
head/contrib/file/src/funcs.c
head/contrib/file/src/readelf.c
head/lib/libmagic/config.h
Directory Properties:
head/contrib/file/ (props changed)
Modified: head/contrib/file/ChangeLog
==============================================================================
--- head/contrib/file/ChangeLog Fri Sep 4 05:42:08 2015 (r287452)
+++ head/contrib/file/ChangeLog Fri Sep 4 05:56:14 2015 (r287453)
@@ -1,3 +1,7 @@
+2015-07-09 10:35 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.24
+
2015-06-11 8:52 Christos Zoulas <chris...@zoulas.com>
* redo long option encoding to fix off-by-one in 5.23
Modified: head/contrib/file/configure
==============================================================================
--- head/contrib/file/configure Fri Sep 4 05:42:08 2015 (r287452)
+++ head/contrib/file/configure Fri Sep 4 05:56:14 2015 (r287453)
@@ -1,6 +1,6 @@
#! /bin/sh
# 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 <chris...@astron.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.23'
-PACKAGE_STRING='file 5.23'
+PACKAGE_VERSION='5.24'
+PACKAGE_STRING='file 5.24'
PACKAGE_BUGREPORT='chris...@astron.com'
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.
# This message is too long to be a string in the A/UX 3.1 sh.
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]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.23:";;
+ short | recursive ) echo "Configuration of file 5.24:";;
esac
cat <<\_ACEOF
@@ -1507,7 +1507,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.23
+file configure 5.24
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2163,7 +2163,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
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
$ $0 $@
@@ -3029,7 +3029,7 @@ fi
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.23'
+ VERSION='5.24'
cat >>confdefs.h <<_ACEOF
@@ -15036,7 +15036,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
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
CONFIG_FILES = $CONFIG_FILES
@@ -15102,7 +15102,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-file config.status 5.23
+file config.status 5.24
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: head/contrib/file/configure.ac
==============================================================================
--- head/contrib/file/configure.ac Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/configure.ac Fri Sep 4 05:56:14 2015
(r287453)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.23],[chris...@astron.com])
+AC_INIT([file],[5.24],[chris...@astron.com])
AM_INIT_AUTOMAKE([subdir-objects foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
Modified: head/contrib/file/magic/Magdir/database
==============================================================================
--- head/contrib/file/magic/Magdir/database Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/magic/Magdir/database Fri Sep 4 05:56:14 2015
(r287453)
@@ -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
#
# extracted from header/code files by Graeme Wilford (eep...@ee.surrey.ac.uk)
@@ -533,7 +533,9 @@
# From: Stephane Blondon http://www.yaal.fr
# 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)
0 string ZEC3 Zope Object Database Client Cache File (data)
Modified: head/contrib/file/magic/Magdir/elf
==============================================================================
--- head/contrib/file/magic/Magdir/elf Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/magic/Magdir/elf Fri Sep 4 05:56:14 2015
(r287453)
@@ -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
#
# We have to check the byte order flag to see what byte order all the
@@ -15,6 +15,32 @@
# Modified by (4): <gerardo.cacci...@gmail.com> (VMS Itanium)
# Modified by (5): Matthias Urlichs <sm...@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
>16 leshort 0 no file type,
!:mime application/octet-stream
@@ -55,47 +81,26 @@
>18 leshort 8
# only for 32-bit
>>4 byte 1
->>>36 lelong&0xf0000000 0x00000000 MIPS-I
->>>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
+>>>36 use elf-mips
# only for 64-bit
>>4 byte 2
->>>48 lelong&0xf0000000 0x00000000 MIPS-I
->>>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
+>>>48 use elf-mips
>18 leshort 9 Amdahl,
>18 leshort 10 MIPS (deprecated),
>18 leshort 11 RS6000,
>18 leshort 15 PA-RISC,
# only for 32-bit
>>4 byte 1
->>>38 leshort 0x0214 2.0
->>>36 leshort &0x0008 (LP64)
+>>>36 use elf-pa-risc
# only for 64-bit
>>4 byte 2
->>>50 leshort 0x0214 2.0
->>>48 leshort &0x0008 (LP64)
+>>>48 use elf-pa-risc
>18 leshort 16 nCUBE,
>18 leshort 17 Fujitsu VPP500,
>18 leshort 18 SPARC32PLUS,
# only for 32-bit
>>4 byte 1
->>>36 lelong&0xffff00 0x000100 V8+ Required,
->>>36 lelong&0xffff00 0x000200 Sun UltraSPARC1 Extensions Required,
->>>36 lelong&0xffff00 0x000400 HaL R1 Extensions Required,
->>>36 lelong&0xffff00 0x000800 Sun UltraSPARC3 Extensions Required,
+>>>36 use elf-sparc
>18 leshort 19 Intel 80960,
>18 leshort 20 PowerPC or cisco 4500,
>18 leshort 21 64-bit PowerPC or cisco 7500,
@@ -117,12 +122,7 @@
>18 leshort 42 Renesas SH,
>18 leshort 43 SPARC V9,
>>4 byte 2
->>>48 lelong&0xffff00 0x000200 Sun UltraSPARC1 Extensions Required,
->>>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,
+>>>48 use elf-sparc
>18 leshort 44 Siemens Tricore Embedded Processor,
>18 leshort 45 Argonaut RISC Core, Argonaut
>Technologies Inc.,
>18 leshort 46 Renesas H8/300,
Modified: head/contrib/file/magic/Magdir/fortran
==============================================================================
--- head/contrib/file/magic/Magdir/fortran Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/magic/Magdir/fortran Fri Sep 4 05:56:14 2015
(r287453)
@@ -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
-0 regex/100l \^[Cc][\ \t] FORTRAN program
+0 regex/100l \^[Cc][\ \t] FORTRAN program text
!:mime text/x-fortran
!:strength - 5
Modified: head/contrib/file/magic/Magdir/mail.news
==============================================================================
--- head/contrib/file/magic/Magdir/mail.news Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/magic/Magdir/mail.news Fri Sep 4 05:56:14 2015
(r287453)
@@ -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
#
# Unfortunately, saved netnews also has From line added in some news software.
@@ -41,6 +41,7 @@
# From: Simon Matter <simon.mat...@invoca.ch>
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
# JHR file
Modified: head/contrib/file/magic/Magdir/make
==============================================================================
--- head/contrib/file/magic/Magdir/make Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/magic/Magdir/make Fri Sep 4 05:56:14 2015
(r287453)
@@ -2,14 +2,20 @@
# $File: make,v 1.1 2011/12/08 12:12:46 rrt Exp $
# make: file(1) magic for makefiles
#
-0 regex \^CFLAGS makefile script text
+0 regex/100l \^CFLAGS makefile script text
!:mime text/x-makefile
-0 regex \^LDFLAGS makefile script text
+0 regex/100l \^VPATH makefile script text
!:mime text/x-makefile
-0 regex \^all: makefile script text
+0 regex/100l \^LDFLAGS makefile script text
!: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
-0 regex \^SUBDIRS automake makefile script text
+0 regex/100l \^SUBDIRS automake makefile script text
!:mime text/x-makefile
Modified: head/contrib/file/magic/Magdir/map
==============================================================================
--- head/contrib/file/magic/Magdir/map Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/magic/Magdir/map Fri Sep 4 05:56:14 2015
(r287453)
@@ -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
#
@@ -9,9 +9,11 @@
8 string .FIT FIT Map data
>15 byte 0
>>35 belong x \b, unit id %d
-# 20 years after unix epoch
>>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 1 \b (garmin)
Modified: head/contrib/file/src/file.c
==============================================================================
--- head/contrib/file/src/file.c Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/src/file.c Fri Sep 4 05:56:14 2015
(r287453)
@@ -32,7 +32,7 @@
#include "file.h"
#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 */
#include "magic.h"
Modified: head/contrib/file/src/funcs.c
==============================================================================
--- head/contrib/file/src/funcs.c Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/src/funcs.c Fri Sep 4 05:56:14 2015
(r287453)
@@ -27,7 +27,7 @@
#include "file.h"
#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 */
#include "magic.h"
@@ -107,8 +107,10 @@ file_error_core(struct magic_set *ms, in
if (lineno != 0) {
free(ms->o.buf);
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);
if (error > 0)
file_printf(ms, " (%s)", strerror(error));
Modified: head/contrib/file/src/readelf.c
==============================================================================
--- head/contrib/file/src/readelf.c Fri Sep 4 05:42:08 2015
(r287452)
+++ head/contrib/file/src/readelf.c Fri Sep 4 05:56:14 2015
(r287453)
@@ -27,7 +27,7 @@
#include "file.h"
#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
#ifdef BUILTIN_ELF
@@ -1048,9 +1048,18 @@ doshn(struct magic_set *ms, int clazz, i
break;
}
+
/* Things we can determine when we seek */
switch (xsh_type) {
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) {
file_error(ms, errno, "Cannot allocate memory"
" for note");
Modified: head/lib/libmagic/config.h
==============================================================================
--- head/lib/libmagic/config.h Fri Sep 4 05:42:08 2015 (r287452)
+++ head/lib/libmagic/config.h Fri Sep 4 05:56:14 2015 (r287453)
@@ -290,7 +290,7 @@
#define PACKAGE_NAME "file"
/* 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 PACKAGE_TARNAME "file"
@@ -299,7 +299,7 @@
#define PACKAGE_URL ""
/* 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 STDC_HEADERS 1
@@ -330,7 +330,7 @@
/* 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
significant byte first (like Motorola and SPARC, unlike Intel). */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
