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

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/bsd/file merge conflicts
From: christos <christos%NetBSD.org@localhost>
Date: Wed, 22 May 2019 19:57:04 +0000
details:   https://anonhg.NetBSD.org/src/rev/90acc68eaa91
branches:  trunk
changeset: 451432:90acc68eaa91
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 22 17:26:05 2019 +0000

description:
merge conflicts

diffstat:

 external/bsd/file/dist/ChangeLog                |   50 +++
 external/bsd/file/dist/config.h.in              |   21 +-
 external/bsd/file/dist/configure                |   34 +-
 external/bsd/file/dist/configure.ac             |   19 +-
 external/bsd/file/dist/doc/file.1               |   10 +-
 external/bsd/file/dist/doc/magic.5              |   12 +-
 external/bsd/file/dist/magic/Makefile.am        |   17 +-
 external/bsd/file/dist/magic/Makefile.in        |   17 +-
 external/bsd/file/dist/magic/magdir/apple       |  113 ++++++-
 external/bsd/file/dist/magic/magdir/archive     |  223 ++++++++++++-
 external/bsd/file/dist/magic/magdir/elf         |    6 +-
 external/bsd/file/dist/magic/magdir/filesystems |  140 +++++---
 external/bsd/file/dist/magic/magdir/geo         |   12 +-
 external/bsd/file/dist/magic/magdir/kml         |    6 +-
 external/bsd/file/dist/magic/magdir/netbsd      |    2 +-
 external/bsd/file/dist/magic/magdir/pgp         |   10 +-
 external/bsd/file/dist/src/apprentice.c         |  166 +++++-----
 external/bsd/file/dist/src/cdf.c                |  143 ++++----
 external/bsd/file/dist/src/cdf_time.c           |   28 +-
 external/bsd/file/dist/src/compress.c           |  215 ++++++++-----
 external/bsd/file/dist/src/der.c                |   14 +-
 external/bsd/file/dist/src/encoding.c           |   81 ++++-
 external/bsd/file/dist/src/file.c               |   28 +-
 external/bsd/file/dist/src/file.h               |   25 +-
 external/bsd/file/dist/src/fsmagic.c            |   13 +-
 external/bsd/file/dist/src/funcs.c              |   45 +-
 external/bsd/file/dist/src/is_json.c            |   23 +-
 external/bsd/file/dist/src/magic.c              |   74 ++--
 external/bsd/file/dist/src/print.c              |   28 +-
 external/bsd/file/dist/src/readcdf.c            |   20 +-
 external/bsd/file/dist/src/readelf.c            |  204 +++++++-----
 external/bsd/file/dist/src/softmagic.c          |  372 +++++++++++++++--------
 external/bsd/file/include/config.h              |   27 +-
 33 files changed, 1378 insertions(+), 820 deletions(-)

diffs (truncated from 5839 to 300 lines):

diff -r 443e219dfa3a -r 90acc68eaa91 external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog  Wed May 22 17:19:56 2019 +0000
+++ b/external/bsd/file/dist/ChangeLog  Wed May 22 17:26:05 2019 +0000
@@ -1,3 +1,53 @@
+2019-05-14  22:26  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.37
+
+2019-05-09  22:27  Christos Zoulas <christos%zoulas.com@localhost>
+       
+       * Make sure that continuation separators are printed
+         with -k within softmagic
+
+2019-05-06  22:27  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Change SIGPIPE saving and restoring during compression to use
+         sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko)
+       * Cache stat(2) calls more to reduce number of calls (Denys Vlasenko)
+
+2019-05-06  17:25  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/77: Handle --mime-type and -k correctly.
+
+2019-05-03  15:26  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Switch decompression code to use vfork() because
+         tools like rpmdiff and rpmbuild call libmagic
+         with large process footprints (Denys Vlasenko)
+
+2019-04-07  14:05  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/75: --enable-zlib, did not work.
+
+2019-02-27  11:54  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Improve regex efficiency (Michael Schroeder) by:
+               1. Prefixing regex searches with regular search
+                  for keywords where possible
+               2. Using memmem(3) where available
+
+2019-02-20  10:16  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.36
+
+2019-02-19  15:30  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix cast to use cast macros
+       * Add UCS-32 builtin detection (PR/61) reported by tmc
+
+2019-02-18  18:24  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix stack read (PR/62) and write (PR/64) stack overflows
+         reported by spinpx 
+
 2018-10-18  19:32  Christos Zoulas <christos%zoulas.com@localhost>
 
        * release 5.35
diff -r 443e219dfa3a -r 90acc68eaa91 external/bsd/file/dist/config.h.in
--- a/external/bsd/file/dist/config.h.in        Wed May 22 17:19:56 2019 +0000
+++ b/external/bsd/file/dist/config.h.in        Wed May 22 17:26:05 2019 +0000
@@ -83,9 +83,6 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
@@ -95,6 +92,9 @@
 /* Define to 1 if <wchar.h> declares mbstate_t. */
 #undef HAVE_MBSTATE_T
 
+/* Define to 1 if you have the `memmem' function. */
+#undef HAVE_MEMMEM
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -113,15 +113,9 @@
 /* Define to 1 if you have the `pread' function. */
 #undef HAVE_PREAD
 
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
 /* Have sig_t type */
 #undef HAVE_SIG_T
 
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -131,9 +125,6 @@
 /* Define to 1 if you have the `strcasestr' function. */
 #undef HAVE_STRCASESTR
 
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
@@ -152,9 +143,6 @@
 /* Define to 1 if you have the `strtof' function. */
 #undef HAVE_STRTOF
 
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
 /* HAVE_STRUCT_OPTION */
 #undef HAVE_STRUCT_OPTION
 
@@ -176,6 +164,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+#undef HAVE_SYS_SYSMACROS_H
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
diff -r 443e219dfa3a -r 90acc68eaa91 external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure  Wed May 22 17:19:56 2019 +0000
+++ b/external/bsd/file/dist/configure  Wed May 22 17:26:05 2019 +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.35.
+# Generated by GNU Autoconf 2.69 for file 5.37.
 #
 # Report bugs to <christos%astron.com@localhost>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.35'
-PACKAGE_STRING='file 5.35'
+PACKAGE_VERSION='5.37'
+PACKAGE_STRING='file 5.37'
 PACKAGE_BUGREPORT='christos%astron.com@localhost'
 PACKAGE_URL=''
 
@@ -1333,7 +1333,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.35 to adapt to many kinds of systems.
+\`configure' configures file 5.37 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1403,7 +1403,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of file 5.35:";;
+     short | recursive ) echo "Configuration of file 5.37:";;
    esac
   cat <<\_ACEOF
 
@@ -1518,7 +1518,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-file configure 5.35
+file configure 5.37
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2174,7 +2174,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.35, which was
+It was created by file $as_me 5.37, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3062,7 +3062,7 @@
 
 # Define the identity of the package.
  PACKAGE='file'
- VERSION='5.35'
+ VERSION='5.37'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12813,7 +12813,7 @@
 
 fi
 
-for ac_header in stdint.h fcntl.h stdint.h inttypes.h unistd.h
+for ac_header in stdint.h fcntl.h inttypes.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -12826,7 +12826,7 @@
 
 done
 
-for ac_header in stddef.h utime.h wchar.h wctype.h limits.h
+for ac_header in utime.h wchar.h wctype.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -12852,7 +12852,7 @@
 
 done
 
-for ac_header in sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h
+for ac_header in sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h sys/sysmacros.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -13002,7 +13002,8 @@
 fi
 
 
-ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "$ac_includes_default"
+ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
+"
 if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
@@ -14255,7 +14256,7 @@
 fi
 
 
-for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale setlocale
+for ac_func in strndup mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale memmem
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -14609,7 +14610,8 @@
   if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" != "yesyes"; then
     as_fn_error $? "zlib support requested but not found" "$LINENO" 5
   fi
-elif  test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" = "yesyes"; then
+fi
+if  test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" = "yesyes"; then
 
 $as_echo "#define ZLIBSUPPORT 1" >>confdefs.h
 
@@ -15164,7 +15166,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.35, which was
+This file was extended by file $as_me 5.37, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15230,7 +15232,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.35
+file config.status 5.37
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -r 443e219dfa3a -r 90acc68eaa91 external/bsd/file/dist/configure.ac
--- a/external/bsd/file/dist/configure.ac       Wed May 22 17:19:56 2019 +0000
+++ b/external/bsd/file/dist/configure.ac       Wed May 22 17:26:05 2019 +0000
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.35],[christos%astron.com@localhost])
+AC_INIT([file],[5.37],[christos%astron.com@localhost])
 AM_INIT_AUTOMAKE([subdir-objects foreign])
 AM_MAINTAINER_MODE(disable)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -36,12 +36,12 @@
 ])
 
 AC_MSG_CHECKING(for zlib support)
-AC_ARG_ENABLE(zlib,
+AC_ARG_ENABLE([zlib],
 [AS_HELP_STRING([--disable-zlib], [disable zlib compression support @<:@default=auto@:>@])])
 AC_MSG_RESULT($enable_zlib)
 
 AC_MSG_CHECKING(for libseccomp support)
-AC_ARG_ENABLE(libseccomp,
+AC_ARG_ENABLE([libseccomp],
 [AS_HELP_STRING([--disable-libseccomp], [disable libseccomp sandboxing @<:@default=auto@:>@])])
 AC_MSG_RESULT($enable_libseccomp)
 
@@ -91,10 +91,10 @@
 AC_HEADER_STDC
 AC_HEADER_MAJOR
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdint.h fcntl.h stdint.h inttypes.h unistd.h)
-AC_CHECK_HEADERS(stddef.h utime.h wchar.h wctype.h limits.h)
+AC_CHECK_HEADERS(stdint.h fcntl.h inttypes.h unistd.h)
+AC_CHECK_HEADERS(utime.h wchar.h wctype.h)
Prev by Date: [src/trunk]: src/external/bsd/file/dist 2019-05-14 22:26 Christos Zoulas <c...
Next by Date: [src/trunk]: src/doc new file(1)
Previous by Thread: [src/trunk]: src/external/bsd/file/dist 2019-05-14 22:26 Christos Zoulas <c...
Next by Thread: [src/trunk]: src/doc new file(1)
Indexes:
Home | Main Index | Thread Index | Old Index