Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/file merge 5.31
details: https://anonhg.NetBSD.org/src/rev/6348aa499322
branches: trunk
changeset: 824125:6348aa499322
user: christos <christos%NetBSD.org@localhost>
date: Thu May 25 00:11:26 2017 +0000
description:
merge 5.31
diffstat:
external/bsd/file/dist/ChangeLog | 6 +
external/bsd/file/dist/Makefile.in | 2 +-
external/bsd/file/dist/aclocal.m4 | 2 +-
external/bsd/file/dist/configure | 20 +-
external/bsd/file/dist/configure.ac | 2 +-
external/bsd/file/dist/doc/file.1 | 4 +-
external/bsd/file/dist/doc/magic.5 | 16 +-
external/bsd/file/dist/magic/Makefile.am | 4 +-
external/bsd/file/dist/magic/Makefile.in | 4 +-
external/bsd/file/dist/magic/magdir/apple | 56 +-
external/bsd/file/dist/magic/magdir/archive | 115 +-
external/bsd/file/dist/magic/magdir/diff | 14 +-
external/bsd/file/dist/magic/magdir/filesystems | 833 ++++++++++++-----------
external/bsd/file/dist/magic/magdir/geo | 4 +-
external/bsd/file/dist/magic/magdir/jpeg | 10 +-
external/bsd/file/dist/magic/magdir/netbsd | 22 +-
external/bsd/file/dist/magic/magdir/os9 | 4 +-
external/bsd/file/dist/magic/magdir/pgp | 20 +-
external/bsd/file/dist/src/apprentice.c | 8 +-
external/bsd/file/dist/src/cdf.c | 337 +++++---
external/bsd/file/dist/src/cdf_time.c | 8 +-
external/bsd/file/dist/src/compress.c | 12 +-
external/bsd/file/dist/src/der.c | 6 +-
external/bsd/file/dist/src/file.h | 16 +-
external/bsd/file/dist/src/funcs.c | 8 +-
external/bsd/file/dist/src/print.c | 5 +-
external/bsd/file/dist/src/readcdf.c | 14 +-
external/bsd/file/dist/src/readelf.c | 108 +-
external/bsd/file/dist/src/softmagic.c | 21 +-
external/bsd/file/dist/tests/Makefile.in | 2 +-
external/bsd/file/include/config.h | 6 +-
31 files changed, 914 insertions(+), 775 deletions(-)
diffs (truncated from 3834 to 300 lines):
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/ChangeLog Thu May 25 00:11:26 2017 +0000
@@ -1,3 +1,9 @@
+2017-03-17 20:32 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * remove trailing spaces from magic files
+ * refactor is_tar
+ * better bounds checks for cdf
+
2017-02-10 12:24 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.30
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/Makefile.in Thu May 25 00:11:26 2017 +0000
@@ -327,8 +327,8 @@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = MAINT
+SUBDIRS = src
#SUBDIRS = src magic tests doc python
-SUBDIRS = src
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/aclocal.m4
--- a/external/bsd/file/dist/aclocal.m4 Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/aclocal.m4 Thu May 25 00:11:26 2017 +0000
@@ -21,7 +21,7 @@
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/configure Thu May 25 00:11:26 2017 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.30.
+# Generated by GNU Autoconf 2.69 for file 5.31.
#
# Report bugs to <christos%astron.com@localhost>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.30'
-PACKAGE_STRING='file 5.30'
+PACKAGE_VERSION='5.31'
+PACKAGE_STRING='file 5.31'
PACKAGE_BUGREPORT='christos%astron.com@localhost'
PACKAGE_URL=''
@@ -1332,7 +1332,7 @@
# 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.30 to adapt to many kinds of systems.
+\`configure' configures file 5.31 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1402,7 +1402,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.30:";;
+ short | recursive ) echo "Configuration of file 5.31:";;
esac
cat <<\_ACEOF
@@ -1516,7 +1516,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.30
+file configure 5.31
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2172,7 +2172,7 @@
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.30, which was
+It was created by file $as_me 5.31, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3060,7 +3060,7 @@
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.30'
+ VERSION='5.31'
cat >>confdefs.h <<_ACEOF
@@ -15108,7 +15108,7 @@
# 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.30, which was
+This file was extended by file $as_me 5.31, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15174,7 +15174,7 @@
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.30
+file config.status 5.31
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/configure.ac
--- a/external/bsd/file/dist/configure.ac Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/configure.ac Thu May 25 00:11:26 2017 +0000
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.30],[christos%astron.com@localhost])
+AC_INIT([file],[5.31],[christos%astron.com@localhost])
AM_INIT_AUTOMAKE([subdir-objects foreign])
AM_MAINTAINER_MODE(disable)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/doc/file.1
--- a/external/bsd/file/dist/doc/file.1 Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/doc/file.1 Thu May 25 00:11:26 2017 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: file.1,v 1.18 2017/02/10 17:53:24 christos Exp $
+.\" $NetBSD: file.1,v 1.19 2017/05/25 00:11:26 christos Exp $
.\"
.\" $File: file.man,v 1.125 2017/01/03 11:24:46 christos Exp $
.Dd October 19, 2016
@@ -28,7 +28,7 @@
.Nm
.Op Fl Fl help
.Sh DESCRIPTION
-This manual page documents version 5.30 of the
+This manual page documents version 5.31 of the
.Nm
command.
.Pp
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/doc/magic.5
--- a/external/bsd/file/dist/doc/magic.5 Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/doc/magic.5 Thu May 25 00:11:26 2017 +0000
@@ -1,7 +1,7 @@
-.\" $NetBSD: magic.5,v 1.15 2017/02/10 17:53:24 christos Exp $
+.\" $NetBSD: magic.5,v 1.16 2017/05/25 00:11:26 christos Exp $
.\"
-.\" $File: magic.man,v 1.90 2017/02/08 21:52:03 christos Exp $
-.Dd February 8, 2017
+.\" $File: magic.man,v 1.91 2017/02/12 15:30:08 christos Exp $
+.Dd February 12, 2017
.Dt MAGIC 5
.Os
.\" install as magic.4 on USG, magic.5 on V7, Berkeley and Linux systems.
@@ -12,7 +12,7 @@
This manual page documents the format of magic files as
used by the
.Xr file 1
-command, version 5.30.
+command, version 5.31.
The
.Xr file 1
command identifies the type of a file using,
@@ -106,13 +106,13 @@
.It B
A byte length (default).
.It H
-A 2 byte big endian length.
+A 4 byte big endian length.
.It h
-A 2 byte big little length.
+A 2 byte big endian length.
.It L
-A 4 byte big endian length.
+A 4 byte little endian length.
.It l
-A 4 byte big little length.
+A 2 byte little endian length.
.It J
The length includes itself in its count.
.El
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/magic/Makefile.am
--- a/external/bsd/file/dist/magic/Makefile.am Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/magic/Makefile.am Thu May 25 00:11:26 2017 +0000
@@ -1,5 +1,5 @@
#
-# $File: Makefile.am,v 1.122 2016/11/09 18:20:53 christos Exp $
+# $File: Makefile.am,v 1.124 2017/04/11 14:52:15 christos Exp $
#
MAGIC_FRAGMENT_BASE = magdir
MAGIC_DIR = $(top_srcdir)/magic
@@ -21,6 +21,7 @@
$(MAGIC_FRAGMENT_DIR)/android \
$(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/aout \
+$(MAGIC_FRAGMENT_DIR)/apache \
$(MAGIC_FRAGMENT_DIR)/apl \
$(MAGIC_FRAGMENT_DIR)/apple \
$(MAGIC_FRAGMENT_DIR)/application \
@@ -276,6 +277,7 @@
$(MAGIC_FRAGMENT_DIR)/vxl \
$(MAGIC_FRAGMENT_DIR)/warc \
$(MAGIC_FRAGMENT_DIR)/weak \
+$(MAGIC_FRAGMENT_DIR)/webassembly \
$(MAGIC_FRAGMENT_DIR)/windows \
$(MAGIC_FRAGMENT_DIR)/wireless \
$(MAGIC_FRAGMENT_DIR)/wordprocessors \
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/magic/Makefile.in
--- a/external/bsd/file/dist/magic/Makefile.in Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/magic/Makefile.in Thu May 25 00:11:26 2017 +0000
@@ -274,7 +274,7 @@
top_srcdir = @top_srcdir@
#
-# $File: Makefile.am,v 1.122 2016/11/09 18:20:53 christos Exp $
+# $File: Makefile.am,v 1.124 2017/04/11 14:52:15 christos Exp $
#
MAGIC_FRAGMENT_BASE = magdir
MAGIC_DIR = $(top_srcdir)/magic
@@ -294,6 +294,7 @@
$(MAGIC_FRAGMENT_DIR)/android \
$(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/aout \
+$(MAGIC_FRAGMENT_DIR)/apache \
$(MAGIC_FRAGMENT_DIR)/apl \
$(MAGIC_FRAGMENT_DIR)/apple \
$(MAGIC_FRAGMENT_DIR)/application \
@@ -549,6 +550,7 @@
$(MAGIC_FRAGMENT_DIR)/vxl \
$(MAGIC_FRAGMENT_DIR)/warc \
$(MAGIC_FRAGMENT_DIR)/weak \
+$(MAGIC_FRAGMENT_DIR)/webassembly \
$(MAGIC_FRAGMENT_DIR)/windows \
$(MAGIC_FRAGMENT_DIR)/wireless \
$(MAGIC_FRAGMENT_DIR)/wordprocessors \
diff -r 93eb8f10ace8 -r 6348aa499322 external/bsd/file/dist/magic/magdir/apple
--- a/external/bsd/file/dist/magic/magdir/apple Wed May 24 23:59:56 2017 +0000
+++ b/external/bsd/file/dist/magic/magdir/apple Thu May 25 00:11:26 2017 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: apple,v 1.35 2016/08/17 09:45:13 christos Exp $
+# $File: apple,v 1.36 2017/03/17 21:35:28 christos Exp $
# apple: file(1) magic for Apple file formats
#
0 search/1/t FiLeStArTfIlEsTaRt binscii (apple ][) text
@@ -67,15 +67,15 @@
# AppleWorks word processor:
# URL: https://en.wikipedia.org/wiki/AppleWorks
# Reference: http://www.gno.org/pub/apple2/doc/apple/filetypes/ftn.1a.xxxx
-# Update: Joerg Jenderek
+# Update: Joerg Jenderek
# NOTE:
# The "O" is really the magic number, but that's so common that it's
# necessary to check the tab stops that follow it to avoid false positives.
# and/or look for unused bits of booleans bytes like zoom, paginated, mail merge
# the newer AppleWorks is from claris with extension CWK
-4 string O
+4 string O
# test for unused bits of zoom- , paginated-boolean bytes
->84 ubequad ^0x00Fe00000000Fe00
+>84 ubequad ^0x00Fe00000000Fe00
# look for tabstop definitions "=" no tab, "|" no tab
# "<" left tab,"^" center tab,">" right tab, "." decimal tab,
# unofficial "!" other , "\x8a" other
@@ -92,9 +92,9 @@
!:ext awp
# minimum version needed to read this files. SFMinVers (0 , 30~3.0 )
>>>183 ubyte 30 3.0
->>>183 ubyte !30
+>>>183 ubyte !30
>>>>183 ubyte !0 0x%x
-# usual tabstop start sequence "=====<"
+# usual tabstop start sequence "=====<"
>>>5 string x \b, tabstop ruler "%6.6s"
# tabstop ruler
#>>>5 string >\0 \b, tabstops "%-79s"
@@ -105,7 +105,7 @@
# contains any mail-merge commands
>>>92 byte&0x01 >0 \b, with mail merge
# left margin in 1/10 inches ( normally 0 or 10 )
->>>91 ubyte >0
+>>>91 ubyte >0
>>>>91 ubyte x \b, %d/10 inch left margin
# AppleWorks database:
@@ -140,13 +140,13 @@
# GRR: this test is still too general as it catches also Gujin BOOT144.SYS (0xfa080000)
Home |
Main Index |
Thread Index |
Old Index