[src/trunk]: src/external/bsd/file/dist merge conflicts

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/bsd/file/dist merge conflicts
From: christos <christos%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 22:53:44 +0000
details:   https://anonhg.NetBSD.org/src/rev/978eb55dcd8c
branches:  trunk
changeset: 777546:978eb55dcd8c
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Feb 22 17:53:48 2012 +0000

description:
merge conflicts

diffstat:

 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/src/Makefile.in      |    2 +-
 external/bsd/file/dist/src/apprentice.c     |   16 +-
 external/bsd/file/dist/src/cdf.c            |  103 +++++++++++-----
 external/bsd/file/dist/src/cdf_time.c       |    8 +-
 external/bsd/file/dist/src/compress.c       |    9 +-
 external/bsd/file/dist/src/file.h           |   15 +-
 external/bsd/file/dist/src/funcs.c          |   19 +-
 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 ++--
 20 files changed, 264 insertions(+), 312 deletions(-)

diffs (truncated from 1420 to 300 lines):

diff -r 954f6bb71478 -r 978eb55dcd8c external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure  Wed Feb 22 17:52:58 2012 +0000
+++ b/external/bsd/file/dist/configure  Wed Feb 22 17:53:48 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 954f6bb71478 -r 978eb55dcd8c external/bsd/file/dist/configure.ac
--- a/external/bsd/file/dist/configure.ac       Wed Feb 22 17:52:58 2012 +0000
+++ b/external/bsd/file/dist/configure.ac       Wed Feb 22 17:53:48 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 954f6bb71478 -r 978eb55dcd8c external/bsd/file/dist/doc/file.1
--- a/external/bsd/file/dist/doc/file.1 Wed Feb 22 17:52:58 2012 +0000
+++ b/external/bsd/file/dist/doc/file.1 Wed Feb 22 17:53:48 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.9 2012/02/22 17:53:50 christos 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 954f6bb71478 -r 978eb55dcd8c external/bsd/file/dist/doc/libmagic.3
--- a/external/bsd/file/dist/doc/libmagic.3     Wed Feb 22 17:52:58 2012 +0000
+++ b/external/bsd/file/dist/doc/libmagic.3     Wed Feb 22 17:53:48 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.10 2012/02/22 17:53:50 christos 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
+.Fn magic_file ,
 functions return a string on success and
 .Dv NULL
 on failure.
diff -r 954f6bb71478 -r 978eb55dcd8c external/bsd/file/dist/doc/magic.5
--- a/external/bsd/file/dist/doc/magic.5        Wed Feb 22 17:52:58 2012 +0000
+++ b/external/bsd/file/dist/doc/magic.5        Wed Feb 22 17:53:48 2012 +0000
@@ -1,6 +1,6 @@
-.\"    $NetBSD: magic.5,v 1.6 2011/09/16 21:06:25 christos Exp $
+.\"    $NetBSD: magic.5,v 1.7 2012/02/22 17:53:50 christos Exp $
 .\"
-.\" $File: magic.man,v 1.69 2011/05/13 22:11:44 christos Exp $
+.\" $File: magic.man,v 1.71 2011/12/07 11:58:24 rrt Exp $
 .Dd April 20, 2011
 .Dt MAGIC 5
 .Os
@@ -12,7 +12,7 @@
 This manual page documents the format of the magic file as
 used by the
 .Xr file 1
-command, version 5.09.
+command, version 5.11.
 The
 .Xr file 1
 command identifies the type of a file using,
@@ -65,16 +65,16 @@
 consecutive blanks to match.
 The
 .Dq w
-flag treats every blank in the target as an optional blank.
+flag treats every blank in the magic as an optional blank.
 The
 .Dq c
-flag, specifies case insensitive matching: lower case
+flag specifies case insensitive matching: lower case
 characters in the magic match both lower and upper case characters in the
 target, whereas upper case characters in the magic only match upper case
 characters in the target.
 The
 .Dq C
-flag, specifies case insensitive matching: upper case
+flag specifies case insensitive matching: upper case
 characters in the magic match both lower and upper case characters in the
 target, whereas lower case characters in the magic only match upper case
 characters in the target.
@@ -84,9 +84,9 @@
 .Dq C .
 The
 .Dq t
-flag, forces the test to be done for text files, while the
+flag forces the test to be done for text files, while the
 .Dq b
-flag, forces the test to be done for binary files.
+flag forces the test to be done for binary files.
 .It Dv pstring
 A Pascal-style string where the first byte/short/int is interpreted as the an
 unsigned length.
diff -r 954f6bb71478 -r 978eb55dcd8c external/bsd/file/dist/install-sh
--- a/external/bsd/file/dist/install-sh Wed Feb 22 17:52:58 2012 +0000
+++ b/external/bsd/file/dist/install-sh Wed Feb 22 17:53:48 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: install-sh,v 1.4 2011/09/25 18:18:44 christos Exp $
+# NetBSD: install-sh.in,v 1.5 2010/10/08 19:57:05 tez Exp 
 # This script now also installs multiple files, but might choke on installing
 # multiple files with spaces in the file names.
 #
diff -r 954f6bb71478 -r 978eb55dcd8c external/bsd/file/dist/magic/Makefile.am
--- a/external/bsd/file/dist/magic/Makefile.am  Wed Feb 22 17:52:58 2012 +0000
+++ b/external/bsd/file/dist/magic/Makefile.am  Wed Feb 22 17:53:48 2012 +0000
@@ -1,5 +1,5 @@
 #
-# $File: Makefile.am,v 1.73 2011/09/08 21:58:42 christos Exp $
+# $File: Makefile.am,v 1.78 2012/01/27 01:41:26 christos Exp $
 #
 MAGIC_FRAGMENT_BASE = magdir
 MAGIC_DIR = $(top_srcdir)/magic
@@ -22,6 +22,7 @@
Prev by Date: [src/trunk]: src/external/bsd/file/dist from ftp.astron.com, CDF security fixes
Next by Date: [src/trunk]: src/doc new file(1)
Previous by Thread: [src/trunk]: src/external/bsd/file/dist from ftp.astron.com, CDF security fixes
Next by Thread: [src/trunk]: src/doc new file(1)
Indexes:
Home | Main Index | Thread Index | Old Index