Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by christos in t...
details: https://anonhg.NetBSD.org/src/rev/04252c9169a7
branches: netbsd-6
changeset: 773886:04252c9169a7
user: riz <riz%NetBSD.org@localhost>
date: Wed Mar 07 23:18:21 2012 +0000
description:
Pull up following revision(s) (requested by christos in ticket #30):
Update file to 5.11 (CDF security fixes)
diffstat:
doc/3RDPARTY | 6 +-
external/bsd/file/dist/ChangeLog | 52 ++++++
external/bsd/file/dist/configure | 30 +-
external/bsd/file/dist/configure.ac | 2 +-
external/bsd/file/dist/doc/file.1 | 23 ++-
external/bsd/file/dist/doc/libmagic.3 | 25 ++-
external/bsd/file/dist/doc/magic.5 | 16 +-
external/bsd/file/dist/install-sh | 2 +-
external/bsd/file/dist/magic/Makefile.am | 10 +-
external/bsd/file/dist/magic/Makefile.in | 10 +-
external/bsd/file/dist/magic/magdir/archive | 7 +-
external/bsd/file/dist/magic/magdir/assembler | 14 +
external/bsd/file/dist/magic/magdir/audio | 3 +-
external/bsd/file/dist/magic/magdir/c-lang | 54 +++++-
external/bsd/file/dist/magic/magdir/cad | 5 +-
external/bsd/file/dist/magic/magdir/commands | 8 +-
external/bsd/file/dist/magic/magdir/compress | 9 +-
external/bsd/file/dist/magic/magdir/cups | 82 ++++++++++
external/bsd/file/dist/magic/magdir/elf | 85 ++++++---
external/bsd/file/dist/magic/magdir/games | 10 +-
external/bsd/file/dist/magic/magdir/gnu | 29 ++-
external/bsd/file/dist/magic/magdir/guile | 13 +
external/bsd/file/dist/magic/magdir/images | 9 +-
external/bsd/file/dist/magic/magdir/java | 5 +-
external/bsd/file/dist/magic/magdir/linux | 7 +-
external/bsd/file/dist/magic/magdir/m4 | 6 +
external/bsd/file/dist/magic/magdir/mail.news | 8 +-
external/bsd/file/dist/magic/magdir/make | 15 +
external/bsd/file/dist/magic/magdir/msdos | 108 ++++++------
external/bsd/file/dist/magic/magdir/music | 17 ++
external/bsd/file/dist/magic/magdir/netbsd | 41 ++++-
external/bsd/file/dist/magic/magdir/palm | 111 +++++++------
external/bsd/file/dist/magic/magdir/pascal | 10 +
external/bsd/file/dist/magic/magdir/perl | 8 +-
external/bsd/file/dist/magic/magdir/python | 5 +-
external/bsd/file/dist/magic/magdir/sgml | 8 +-
external/bsd/file/dist/magic/magdir/varied.script | 15 +-
external/bsd/file/dist/magic/magdir/virtual | 12 +-
external/bsd/file/dist/magic/magdir/zfs | 96 +++++++++++
external/bsd/file/dist/python/magic.py | 22 +-
external/bsd/file/dist/src/Makefile.am | 2 +-
external/bsd/file/dist/src/Makefile.in | 2 +-
external/bsd/file/dist/src/apprentice.c | 16 +-
external/bsd/file/dist/src/ascmagic.c | 98 +----------
external/bsd/file/dist/src/cdf.c | 103 ++++++++---
external/bsd/file/dist/src/cdf.h | 176 +++++++++++----------
external/bsd/file/dist/src/cdf_time.c | 8 +-
external/bsd/file/dist/src/compress.c | 9 +-
external/bsd/file/dist/src/encoding.c | 11 +-
external/bsd/file/dist/src/file.c | 8 +-
external/bsd/file/dist/src/file.h | 15 +-
external/bsd/file/dist/src/funcs.c | 19 +-
external/bsd/file/dist/src/getline.c | 4 +-
external/bsd/file/dist/src/getopt_long.c | 6 +-
external/bsd/file/dist/src/magic.h | 14 +-
external/bsd/file/dist/src/mygetopt.h | 4 +-
external/bsd/file/dist/src/names.h | 178 ----------------------
external/bsd/file/dist/src/print.c | 28 ++-
external/bsd/file/dist/src/readcdf.c | 42 +++-
external/bsd/file/dist/src/softmagic.c | 31 ++-
external/bsd/file/dist/src/vasprintf.c | 9 +-
external/bsd/file/file2netbsd | 6 +-
62 files changed, 1075 insertions(+), 712 deletions(-)
diffs (truncated from 3652 to 300 lines):
diff -r 32c380434470 -r 04252c9169a7 doc/3RDPARTY
--- a/doc/3RDPARTY Wed Mar 07 22:50:40 2012 +0000
+++ b/doc/3RDPARTY Wed Mar 07 23:18:21 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.909.2.6 2012/03/02 17:39:47 riz Exp $
+# $NetBSD: 3RDPARTY,v 1.909.2.7 2012/03/07 23:18:21 riz Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -327,8 +327,8 @@
Only double-precision addressed at this time.
Package: file
-Version: 5.09
-Current Vers: 5.09
+Version: 5.11
+Current Vers: 5.11
Maintainer: Christos Zoulas <christos%zoulas.com@localhost>
Archive Site: ftp://ftp.astron.com/pub/file/
Home Page:
diff -r 32c380434470 -r 04252c9169a7 external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog Wed Mar 07 22:50:40 2012 +0000
+++ b/external/bsd/file/dist/ChangeLog Wed Mar 07 23:18:21 2012 +0000
@@ -1,3 +1,55 @@
+2012-02-20 17:33 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Fix CDF parsing issues found by CERT's fuzzing tool (Will Dormann)
+
+2011-12-15 12:17 Chris Metcalf <cmetcalf%tilera.com@localhost>
+
+ * Support Tilera architectures (tile64, tilepro, tilegx).
+
+2011-12-16 16:33 Reuben Thomas <rrt%sc3d.org@localhost>
+
+ * Add magic for /usr/bin/env Perl scripts
+ * Weaken generic script magic to avoid clashing with
+ language-specific magic.
+
+2011-12-08 13:37 Reuben Thomas <rrt%sc3d.org@localhost>
+
+ * Simplify if (p) free(p) to free(p).
+
+2011-12-08 13:07 Reuben Thomas <rrt%sc3d.org@localhost>
+
+ * Remove hardwired token finding (names.h), turning it into soft
+ magic. Patterns are either anchored regexs or search/8192. English
+ language detection and PL/1 detection have been removed as they
+ were too fragile. -e tokens is still accepted for backwards
+ compatibility.
+ * Move 3ds patterns (which are commented out anyway) into autodesk
+ (they were, oddly, in c-lang).
+
+2011-12-06 00:16 Reuben Thomas <rrt%sc3d.org@localhost>
+
+ * Tweak strength of generic hash-bang detectors to be less than
+ specific ones.
+ * Make an inconsistent description of Python scripts consistent.
+
+2011-12-05 23:58 Reuben Thomas <rrt%sc3d.org@localhost>
+
+ * Fix minor error in file(1).
+
+2011-11-05 00:00 Reuben Thomas <rrt%sc3d.org@localhost>
+
+ * Fix issue #150 (I hope).
+
+2011-09-22 12:57 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Python3 binding fixes from Kelly Anderson
+
+2011-09-20 11:32 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * If a string type magic entry is marked as text or binary
+ only match text files against text entries and binary
+ files against binary entries.
+
2011-09-01 12:12 Christos Zoulas <christos%zoulas.com@localhost>
* Don't wait for any subprocess, just the one we forked.
diff -r 32c380434470 -r 04252c9169a7 external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure Wed Mar 07 22:50:40 2012 +0000
+++ b/external/bsd/file/dist/configure Wed Mar 07 23:18:21 2012 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for file 5.09.
+# Generated by GNU Autoconf 2.68 for file 5.11.
#
# Report bugs to <christos%astron.com@localhost>.
#
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.09'
-PACKAGE_STRING='file 5.09'
+PACKAGE_VERSION='5.11'
+PACKAGE_STRING='file 5.11'
PACKAGE_BUGREPORT='christos%astron.com@localhost'
PACKAGE_URL=''
@@ -1431,7 +1431,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.09 to adapt to many kinds of systems.
+\`configure' configures file 5.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1501,7 +1501,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.09:";;
+ short | recursive ) echo "Configuration of file 5.11:";;
esac
cat <<\_ACEOF
@@ -1609,8 +1609,8 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.09
-generated by GNU Autoconf 2.64
+file configure 5.11
+generated by GNU Autoconf 2.68
Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -2308,8 +2308,8 @@
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.09, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+It was created by file $as_me 5.11, which was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3116,7 +3116,7 @@
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.09'
+ VERSION='5.11'
cat >>confdefs.h <<_ACEOF
@@ -13477,8 +13477,8 @@
# 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.09, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+This file was extended by file $as_me 5.11, which was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -13541,9 +13541,9 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-file config.status 5.09
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+file config.status 5.11
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
diff -r 32c380434470 -r 04252c9169a7 external/bsd/file/dist/configure.ac
--- a/external/bsd/file/dist/configure.ac Wed Mar 07 22:50:40 2012 +0000
+++ b/external/bsd/file/dist/configure.ac Wed Mar 07 23:18:21 2012 +0000
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(file, 5.09, christos%astron.com@localhost)
+AC_INIT(file, 5.11, christos%astron.com@localhost)
AM_INIT_AUTOMAKE()
AM_MAINTAINER_MODE(disable)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -r 32c380434470 -r 04252c9169a7 external/bsd/file/dist/doc/file.1
--- a/external/bsd/file/dist/doc/file.1 Wed Mar 07 22:50:40 2012 +0000
+++ b/external/bsd/file/dist/doc/file.1 Wed Mar 07 23:18:21 2012 +0000
@@ -1,7 +1,7 @@
-.\" $NetBSD: file.1,v 1.8 2011/09/16 21:06:25 christos Exp $
+.\" $NetBSD: file.1,v 1.8.4.1 2012/03/07 23:18:25 riz Exp $
.\"
-.\" $File: file.man,v 1.96 2011/07/12 11:23:38 rrt Exp $
-.Dd April 20, 2011
+.\" $File: file.man,v 1.98 2011/12/08 12:12:46 rrt Exp $
+.Dd October 17, 2011
.Dt FILE 1
.Os
.Sh NAME
@@ -26,7 +26,7 @@
.Nm
.Op Fl Fl help
.Sh DESCRIPTION
-This manual page documents version 5.09 of the
+This manual page documents version 5.11 of the
.Nm
command.
.Pp
@@ -194,7 +194,7 @@
.It encoding
Different text encodings for soft magic tests.
.It tokens
-Looks for known tokens inside text files.
+Ignored for backwards compatibility.
.It cdf
Prints details of Compound Document Files.
.It compress
@@ -222,6 +222,19 @@
to test the standard input, use
.Sq -
as a filename argument.
+Please note that
+.Ar namefile
+is unwrapped and the enclosed filenames are processed when this option is
+encountered and before any further options processing is done.
+This allows one to process multiple lists of files with different command line
+arguments on the same
+.Nm
+invocation.
+Thus if you want to set the delimiter, you need to do it before you specify
+the list of files, like:
+.Dq Fl F Ar @ Fl f Ar namefile ,
+instead of:
+.Dq Fl f Ar namefile Fl F Ar @ .
.It Fl h , Fl Fl no-dereference
option causes symlinks not to be followed
(on systems that support symbolic links).
diff -r 32c380434470 -r 04252c9169a7 external/bsd/file/dist/doc/libmagic.3
--- a/external/bsd/file/dist/doc/libmagic.3 Wed Mar 07 22:50:40 2012 +0000
+++ b/external/bsd/file/dist/doc/libmagic.3 Wed Mar 07 23:18:21 2012 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: libmagic.3,v 1.9 2011/11/10 13:41:00 christos Exp $
+.\" $NetBSD: libmagic.3,v 1.9.2.1 2012/03/07 23:18:25 riz Exp $
.\"
-.\" $File: libmagic.man,v 1.24 2011/05/13 22:11:44 christos Exp $
+.\" $File: libmagic.man,v 1.26 2011/12/19 17:49:31 christos Exp $
.\"
.\" Copyright (c) Christos Zoulas 2003.
.\" All Rights Reserved.
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 14, 2011
+.Dd December 19, 2011
.Dt LIBMAGIC 3
.Os
.Sh NAME
@@ -66,6 +66,8 @@
.Ft int
.Fn magic_compile "magic_t cookie" "const char *filename"
.Ft int
+.Fn magic_list "magic_t cookie" "const char *filename"
+.Ft int
.Fn magic_load "magic_t cookie" "const char *filename"
.Sh DESCRIPTION
These functions
@@ -221,6 +223,17 @@
appended to it.
.Pp
The
+.Fn magic_list
+function dumps all magic entries in a human readable format,
+dumping first the entries that are matched against binary files and then the
+ones that match text files.
+It takes and optional
+.Fa filename
+argument which is a colon separated list of database files, or
+.Dv NULL
+for the default database.
+.Pp
+The
.Fn magic_load
function must be used to load the the colon
separated list of database files passed in as
@@ -246,15 +259,17 @@
.Er EINVAL
if an unsupported value for flags was given.
The
+.Fn magic_list ,
.Fn magic_load ,
.Fn magic_compile ,
and
.Fn magic_check
functions return 0 on success and \-1 on failure.
The
-.Fn magic_file ,
+.Fn magic_buffer ,
+.Fn magic_getpath ,
and
-.Fn magic_buffer
Home |
Main Index |
Thread Index |
Old Index