Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/file/dist merge changes between 5.40 and 5.43



details:   https://anonhg.NetBSD.org/src/rev/5bef206f828a
branches:  trunk
changeset: 370699:5bef206f828a
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Sep 24 20:21:45 2022 +0000

description:
merge changes between 5.40 and 5.43

diffstat:

 external/bsd/file/dist/ChangeLog                |    135 +
 external/bsd/file/dist/Makefile.am              |      3 +-
 external/bsd/file/dist/Makefile.in              |    882 -
 external/bsd/file/dist/README                   |    157 -
 external/bsd/file/dist/aclocal.m4               |   1255 -
 external/bsd/file/dist/compile                  |    348 -
 external/bsd/file/dist/config.guess             |   1507 -
 external/bsd/file/dist/config.h.in              |    426 -
 external/bsd/file/dist/config.sub               |   1795 --
 external/bsd/file/dist/configure                |  17505 ----------------------
 external/bsd/file/dist/configure.ac             |     51 +-
 external/bsd/file/dist/depcomp                  |    791 -
 external/bsd/file/dist/doc/Makefile.in          |    472 -
 external/bsd/file/dist/doc/file.1               |      4 +-
 external/bsd/file/dist/doc/libmagic.3           |     10 +-
 external/bsd/file/dist/doc/magic.5              |     17 +-
 external/bsd/file/dist/install-sh               |    301 -
 external/bsd/file/dist/ltmain.sh                |  11162 --------------
 external/bsd/file/dist/m4/libtool.m4            |   8369 ----------
 external/bsd/file/dist/m4/ltoptions.m4          |    437 -
 external/bsd/file/dist/m4/ltsugar.m4            |    124 -
 external/bsd/file/dist/m4/ltversion.m4          |     23 -
 external/bsd/file/dist/m4/lt~obsolete.m4        |     99 -
 external/bsd/file/dist/magic/Makefile.am        |     30 +-
 external/bsd/file/dist/magic/Makefile.in        |    858 -
 external/bsd/file/dist/magic/magdir/apple       |     10 +-
 external/bsd/file/dist/magic/magdir/archive     |    467 +-
 external/bsd/file/dist/magic/magdir/cad         |    104 +-
 external/bsd/file/dist/magic/magdir/coff        |      6 +-
 external/bsd/file/dist/magic/magdir/commands    |    130 +-
 external/bsd/file/dist/magic/magdir/elf         |      6 +-
 external/bsd/file/dist/magic/magdir/filesystems |    382 +-
 external/bsd/file/dist/magic/magdir/games       |     40 +-
 external/bsd/file/dist/magic/magdir/geo         |     48 +-
 external/bsd/file/dist/magic/magdir/guile       |     13 -
 external/bsd/file/dist/magic/magdir/jpeg        |    131 +-
 external/bsd/file/dist/magic/magdir/linux       |     47 +-
 external/bsd/file/dist/magic/magdir/mail.news   |     52 +-
 external/bsd/file/dist/magic/magdir/msdos       |    355 +-
 external/bsd/file/dist/magic/magdir/neko        |     12 -
 external/bsd/file/dist/magic/magdir/pgp         |      8 +-
 external/bsd/file/dist/magic/magdir/xenix       |      6 +-
 external/bsd/file/dist/missing                  |    215 -
 external/bsd/file/dist/python/Makefile.in       |    445 -
 external/bsd/file/dist/src/Makefile.in          |    899 -
 external/bsd/file/dist/src/apprentice.c         |    570 +-
 external/bsd/file/dist/src/cdf.c                |     49 +-
 external/bsd/file/dist/src/cdf_time.c           |     13 +-
 external/bsd/file/dist/src/compress.c           |    447 +-
 external/bsd/file/dist/src/der.c                |     40 +-
 external/bsd/file/dist/src/encoding.c           |     77 +-
 external/bsd/file/dist/src/file.c               |    249 +-
 external/bsd/file/dist/src/file.h               |    178 +-
 external/bsd/file/dist/src/fsmagic.c            |      8 +-
 external/bsd/file/dist/src/funcs.c              |    183 +-
 external/bsd/file/dist/src/is_csv.c             |     10 +-
 external/bsd/file/dist/src/is_json.c            |    105 +-
 external/bsd/file/dist/src/magic.c              |     31 +-
 external/bsd/file/dist/src/print.c              |    114 +-
 external/bsd/file/dist/src/readcdf.c            |     13 +-
 external/bsd/file/dist/src/readelf.c            |     64 +-
 external/bsd/file/dist/src/softmagic.c          |    397 +-
 external/bsd/file/dist/tests/Makefile.in        |    714 -
 63 files changed, 3360 insertions(+), 50039 deletions(-)

diffs (truncated from 57547 to 300 lines):

diff -r 9c2c24727f53 -r 5bef206f828a external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog  Sat Sep 24 20:07:53 2022 +0000
+++ b/external/bsd/file/dist/ChangeLog  Sat Sep 24 20:21:45 2022 +0000
@@ -1,3 +1,138 @@
+2022-09-20  17:12  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * fixed various clustefuzz issues
+
+2022-09-19  15:54  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix error detection for decompression code (Vincent Mihalkovic)
+
+2022-09-15  13:50  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add MAGIC_NO_COMPRESS_FORK and use it to produce a more
+         meaningful error message if we are sandboxing.
+
+2022-09-15  10:45  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add built-in lzip decompression support (Michal Gorny)
+
+2022-09-14  10:35  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add built-in zstd decompression support (Martin Rodriguez Reboredo)
+
+2022-09-13  14:55  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.43
+
+2022-09-10   9:17  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add octal indirect magic (Michal Gorny)
+
+2022-08-17  11:43  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/374: avoid infinite loop in non-wide code (piru)
+       * PR/373: Obey MAGIC_CONTINUE with multiple magic files (vismarli)
+
+2022-07-26  11:10  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix bug with large flist (Florian Weimer)
+
+2022-07-07  13:21  Christos Zoulas <christos%zoulas.com@localhost>
+
+        * PR/364: Detect non-nul-terminated core filenames from QEMU
+         (mam-ableton)
+
+2022-07-04  15:45  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/359: Add support for http://ndjson.org/ (darose)
+       * PR/362: Fix wide printing (ro-ee)
+       * PR/358: Fix width for -f - (jpalus)
+       * PR/356: Fix JSON constant parsing (davewhite)
+
+2022-06-10   9:40  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.42
+
+2022-05-31  14:50   Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/348: add missing cases to prevent file from aborting on
+         random magic files.
+
+2022-05-27  21:05   Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/351: octalify filenames when not raw before printing.
+
+2022-04-18  17:51   Christos Zoulas <christos%zoulas.com@localhost>
+
+       * fix regex cacheing bug (Dirk Mueller)
+       * merge file_regcomp and file_regerror() to simplify the code
+         and reduce memory requirements for storing regexes (Dirk Mueller)
+
+2022-03-19  12:56   Christos Zoulas <christos%zoulas.com@localhost>
+
+       * cache regex (Dirk Mueller)
+       * detect filesystem full by flushing output (Dirk Mueller)
+
+2021-11-19  12:36   Christos Zoulas <christos%zoulas.com@localhost>
+
+       * implement running decompressor programs using
+         posix_spawnp(2) instead of vfork(2)
+
+2021-10-24  11:51   Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add support for msdos dates and times
+
+2021-10-20   9:55   Christos Zoulas <christos%zoulas.com@localhost>
+
+       * use the system byte swapping functions if available (Werner Fink)
+
+2021-10-18  11:57  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.41
+
+2021-09-23  03:51  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Avinash Sonawane: Fix tzname detection
+
+2021-09-03  09:17  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix relationship tests with "search" magic, don't short circuit
+         logic
+
+2021-07-13  01:06  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix memory leak in compile mode
+
+2021-07-01  03:51  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/272: kiefermat: Only set returnval = 1 when we printed something
+         (in all cases print or !print). This simplifies the logic and fixes
+         the issue in the PR with -k and --mime-type there was no continuation
+         printed before the default case.
+
+2021-06-30  13:07  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/270: Don't translate unprintable characters in %s magic formats
+         when -r
+       * PR/269: Avoid undefined behavior with clang (adding offset to NULL)
+
+2021-05-09  18:38  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add a new flag (f) that requires that the match is a full word,
+          not a partial word match.
+       * Add varint types (unused)
+
+2021-04-19  17:17  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/256: mutableVoid: If the file is less than 3 bytes, use the file
+         length to determine type
+       * PR/259: aleksandr.v.novichkov: mime printing through indirect magic
+         is not taken into account, use match directly so that it does.
+
+2021-04-04  17:02  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * count the total bytes found not the total byte positions
+         in order to determine encoding (Anatol Belski)
+
 2021-03-30  20:21  Christos Zoulas <christos%zoulas.com@localhost>
 
        * release 5.40
diff -r 9c2c24727f53 -r 5bef206f828a external/bsd/file/dist/Makefile.am
--- a/external/bsd/file/dist/Makefile.am        Sat Sep 24 20:07:53 2022 +0000
+++ b/external/bsd/file/dist/Makefile.am        Sat Sep 24 20:21:45 2022 +0000
@@ -1,6 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = MAINT
+EXTRA_DIST = MAINT RELEASE-PROCEDURE README.DEVELOPER README.md \
+       m4/visibility.m4
 
 SUBDIRS = src magic tests doc python
 
diff -r 9c2c24727f53 -r 5bef206f828a external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in        Sat Sep 24 20:07:53 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,882 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \  ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-       $(am__configure_deps) $(am__DIST_COMMON)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libmagic.pc
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-       ctags-recursive dvi-recursive html-recursive info-recursive \
-       install-data-recursive install-dvi-recursive \
-       install-exec-recursive install-html-recursive \
-       install-info-recursive install-pdf-recursive \
-       install-ps-recursive install-recursive installcheck-recursive \
-       installdirs-recursive pdf-recursive ps-recursive \
-       tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \



Home | Main Index | Thread Index | Old Index