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 file-5.32



details:   https://anonhg.NetBSD.org/src/rev/e899674f4a79
branches:  trunk
changeset: 356192:e899674f4a79
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 08 13:40:24 2017 +0000

description:
merge file-5.32

diffstat:

 external/bsd/file/dist/ChangeLog                |   26 ++-
 external/bsd/file/dist/Makefile.in              |    3 +-
 external/bsd/file/dist/config.guess             |   32 ++-
 external/bsd/file/dist/config.sub               |   20 +-
 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/libmagic.3           |   15 +-
 external/bsd/file/dist/doc/magic.5              |    4 +-
 external/bsd/file/dist/magic/Makefile.am        |    4 +-
 external/bsd/file/dist/magic/Makefile.in        |    4 +-
 external/bsd/file/dist/magic/magdir/archive     |   12 +-
 external/bsd/file/dist/magic/magdir/filesystems |   19 +-
 external/bsd/file/dist/src/apprentice.c         |  221 ++++++++++++++++-------
 external/bsd/file/dist/src/cdf.c                |    7 +-
 external/bsd/file/dist/src/compress.c           |    6 +-
 external/bsd/file/dist/src/file.h               |    6 +-
 external/bsd/file/dist/src/fsmagic.c            |   23 +-
 external/bsd/file/dist/src/funcs.c              |   10 +-
 external/bsd/file/dist/src/magic.c              |   21 +-
 external/bsd/file/dist/src/readelf.c            |   17 +-
 external/bsd/file/dist/src/softmagic.c          |   10 +-
 external/bsd/file/dist/tests/Makefile.in        |    2 +
 external/bsd/file/include/config.h              |    6 +-
 24 files changed, 329 insertions(+), 165 deletions(-)

diffs (truncated from 1349 to 300 lines):

diff -r e397a58c327f -r e899674f4a79 external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog  Fri Sep 08 13:22:41 2017 +0000
+++ b/external/bsd/file/dist/ChangeLog  Fri Sep 08 13:40:24 2017 +0000
@@ -1,3 +1,27 @@
+2017-09-02  11:53  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.32
+
+2017-08-28  16:37  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Always reset state in {file,buffer}_apprentice (Krzysztof Wilczynski)
+
+2017-08-27  03:55  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix always true condition (Thomas Jarosch)
+
+2017-05-24  17:30  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * pickier parsing of numeric values in magic files.
+
+2017-05-23  17:55  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/615 add magic_getflags()
+
+2017-05-23  13:55  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.31
+
 2017-03-17  20:32  Christos Zoulas <christos%zoulas.com@localhost>
 
        * remove trailing spaces from magic files
@@ -417,7 +441,7 @@
                `
 2013-11-06  14:40  Christos Zoulas <christos%zoulas.com@localhost>
 
-       * fix erroneous non-zero exit code from non-existant file and message
+       * fix erroneous non-zero exit code from non-existent file and message
 
 2013-10-29  14:25  Christos Zoulas <christos%zoulas.com@localhost>
 
diff -r e397a58c327f -r e899674f4a79 external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in        Fri Sep 08 13:22:41 2017 +0000
+++ b/external/bsd/file/dist/Makefile.in        Fri Sep 08 13:40:24 2017 +0000
@@ -327,8 +327,7 @@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = MAINT
-SUBDIRS = src
-#SUBDIRS = src magic tests doc python
+SUBDIRS = src magic tests doc python
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff -r e397a58c327f -r e899674f4a79 external/bsd/file/dist/config.guess
--- a/external/bsd/file/dist/config.guess       Fri Sep 08 13:22:41 2017 +0000
+++ b/external/bsd/file/dist/config.guess       Fri Sep 08 13:40:24 2017 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-03-04'
+timestamp='2017-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches%gnu.org@localhost>.
 
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -188,7 +188,10 @@
        # The Operating System including object format, if it has switched
        # to ELF recently (or will in the future) and ABI.
        case "${UNAME_MACHINE_ARCH}" in
-           arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+           earm*)
+               os=netbsdelf
+               ;;
+           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                        | grep -q __ELF__
@@ -900,7 +903,7 @@
        exit ;;
     *:GNU/*:*:*)
        # other systems with GNU libc and userland
-       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
        exit ;;
     i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
@@ -923,7 +926,7 @@
          EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
        objdump --private-headers /bin/sh | grep -q ld.so.1
-       if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+       if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -969,6 +972,9 @@
     ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
+    k1om:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+       exit ;;
     m32r*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
@@ -994,6 +1000,9 @@
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
        ;;
+    mips64el:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+       exit ;;
     openrisc*:Linux:*:*)
        echo or1k-unknown-linux-${LIBC}
        exit ;;
@@ -1026,6 +1035,9 @@
     ppcle:Linux:*:*)
        echo powerpcle-unknown-linux-${LIBC}
        exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+       exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
        exit ;;
@@ -1045,7 +1057,7 @@
        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
        exit ;;
     x86_64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+       echo ${UNAME_MACHINE}-pc-linux-${LIBC}
        exit ;;
     xtensa*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1289,9 +1301,9 @@
            UNAME_PROCESSOR=powerpc
        fi
        if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-           if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+           if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
                if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                   (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
                    grep IS_64BIT_ARCH >/dev/null
                then
                    case $UNAME_PROCESSOR in
diff -r e397a58c327f -r e899674f4a79 external/bsd/file/dist/config.sub
--- a/external/bsd/file/dist/config.sub Fri Sep 08 13:22:41 2017 +0000
+++ b/external/bsd/file/dist/config.sub Fri Sep 08 13:40:24 2017 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-03-08'
+timestamp='2017-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -254,6 +254,7 @@
        | arc | arceb \
        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
        | avr | avr32 \
+       | ba \
        | be32 | be64 \
        | bfin \
        | c4x | c8051 | clipper \
@@ -521,7 +522,7 @@
                basic_machine=i386-pc
                os=-aros
                ;;
-        asmjs)
+       asmjs)
                basic_machine=asmjs-unknown
                ;;
        aux)
@@ -1387,18 +1388,18 @@
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
              | -sym* | -kopensolaris* | -plan9* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-             | -aos* | -aros* | -cloudabi* \
+             | -aos* | -aros* | -cloudabi* | -sortix* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-             | -bitrig* | -openbsd* | -solidbsd* \
+             | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+             | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
              | -linux-newlib* | -linux-musl* | -linux-uclibc* \
              | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1407,7 +1408,8 @@
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+             | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
diff -r e397a58c327f -r e899674f4a79 external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure  Fri Sep 08 13:22:41 2017 +0000
+++ b/external/bsd/file/dist/configure  Fri Sep 08 13:40:24 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.31.
+# Generated by GNU Autoconf 2.69 for file 5.32.
 #
 # Report bugs to <christos%astron.com@localhost>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.31'
-PACKAGE_STRING='file 5.31'
+PACKAGE_VERSION='5.32'
+PACKAGE_STRING='file 5.32'
 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.31 to adapt to many kinds of systems.
+\`configure' configures file 5.32 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.31:";;
+     short | recursive ) echo "Configuration of file 5.32:";;
    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.31
+file configure 5.32
 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.
 



Home | Main Index | Thread Index | Old Index