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 conflicts



details:   https://anonhg.NetBSD.org/src/rev/054fa4fbd03f
branches:  trunk
changeset: 972985:054fa4fbd03f
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 15 00:37:24 2020 +0000

description:
merge conflicts

diffstat:

 external/bsd/file/dist/ChangeLog                |   80 +++++++++++
 external/bsd/file/dist/Makefile.am              |    7 +-
 external/bsd/file/dist/Makefile.in              |   89 +++++++++++-
 external/bsd/file/dist/configure                |   23 +-
 external/bsd/file/dist/configure.ac             |    4 +-
 external/bsd/file/dist/doc/file.1               |   25 ++-
 external/bsd/file/dist/doc/magic.5              |   64 ++++++++-
 external/bsd/file/dist/magic/Makefile.am        |    8 +-
 external/bsd/file/dist/magic/Makefile.in        |    8 +-
 external/bsd/file/dist/magic/magdir/archive     |  117 ++++++++++++++--
 external/bsd/file/dist/magic/magdir/elf         |    7 +-
 external/bsd/file/dist/magic/magdir/filesystems |    6 +-
 external/bsd/file/dist/magic/magdir/parix       |    2 +-
 external/bsd/file/dist/magic/magdir/pgp         |   97 ++++++++++++--
 external/bsd/file/dist/src/apprentice.c         |  156 ++++++++++++++++------
 external/bsd/file/dist/src/compress.c           |   60 ++++----
 external/bsd/file/dist/src/der.c                |   81 ++++++++---
 external/bsd/file/dist/src/file.c               |   92 +++++++++----
 external/bsd/file/dist/src/file.h               |   96 +++++++++-----
 external/bsd/file/dist/src/funcs.c              |  143 +++++++++++++++++++-
 external/bsd/file/dist/src/is_csv.c             |    7 +-
 external/bsd/file/dist/src/is_json.c            |   21 ++-
 external/bsd/file/dist/src/magic.c              |    9 +-
 external/bsd/file/dist/src/print.c              |   33 +++-
 external/bsd/file/dist/src/readelf.c            |   45 +++++-
 external/bsd/file/dist/src/softmagic.c          |  162 +++++++++++++++++------
 external/bsd/file/include/config.h              |    6 +-
 external/bsd/file/lib/shlib_version             |    4 +-
 28 files changed, 1109 insertions(+), 343 deletions(-)

diffs (truncated from 3361 to 300 lines):

diff -r 8a1bf59fd4f0 -r 054fa4fbd03f external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog  Mon Jun 15 00:31:21 2020 +0000
+++ b/external/bsd/file/dist/ChangeLog  Mon Jun 15 00:37:24 2020 +0000
@@ -1,3 +1,83 @@
+2020-06-14  20:02  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.39
+
+2020-06-07  20:00  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Remove unused subtype_mime (Steve Grubb)
+       * Remove unused check in okstat (Steve Grubb)
+       * Fix mime-type in elf binaries by making sure $x is set
+       * Fix indirect negative offsets broken by OFFNEGATIVE
+       * Fix GUID equality check
+       * PR/165: Handle empty array and strings in JSON
+       * PR/162: Add --exclude-quiet
+
+2020-06-06  15:33  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix memory leak in ascmagic (Steve Grubb)
+
+2020-06-04  00:21  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix string comparison length with ignore whitespace
+
+2020-05-31  00:11  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Fix mingwin 64 compilation
+
+2020-05-30  23:56  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/159: whitelist getpid needed for file_pipe2file()
+
+2020-05-09  18:57  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Indicate negative offsets with a flag OFFNEGATIVE
+         so that -0 works.
+       * Introduce "offset" magic type that can be used to
+         detect the file size, and bail on short files.
+       * document DER better in the magic man page.
+
+2020-03-11  21:53  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * fix memory leaks (SonarQube)
+
+2020-03-08  21:33  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * fix memory leaks (SonarQube)
+       * rewrite confusing loops (SonarQube)
+       * fix bogus test (SonarQube)
+       * pass a sized buffer to file_fmttime() (SonarQube)
+
+       * fix memory leaks (SonarQube)
+
+2020-02-20  15:50  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Don't allow * in printf formats, or the code itself (Christoph Biedl)
+       * Introduce a printf output size checker to avoid DoS attacks
+
+2020-02-17  17:22  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Avoid memory leak on error (oss-fuzz)
+       * Check length of string on DER before derefercing and add new types
+       * Add missing DER string (oss-fuzz)
+
+2020-02-16  20:45  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * Add missing DER types, and debugging
+
+2020-02-13  13:10  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/140: Avoid abort with hand-crafted magic file (gockelhahn)
+       * PR/139  Avoid DoS in printf with hand-crafted magic file (gockelhahn)
+       * PR/138: Avoid crash with hand-crafted magic file (gockelhahn)
+
+2020-02-12  17:30  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * PR/136: Fix static build by adding a libmagic.pc (Fabrice Fontaine)
+
+2019-12-24  14:16  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * add guid support
+
 2019-12-16  21:11  Christos Zoulas <christos%zoulas.com@localhost>
 
        * release 5.38
diff -r 8a1bf59fd4f0 -r 054fa4fbd03f external/bsd/file/dist/Makefile.am
--- a/external/bsd/file/dist/Makefile.am        Mon Jun 15 00:31:21 2020 +0000
+++ b/external/bsd/file/dist/Makefile.am        Mon Jun 15 00:37:24 2020 +0000
@@ -2,4 +2,9 @@
 
 EXTRA_DIST = MAINT
 
-SUBDIRS = src magic doc
+SUBDIRS = src magic tests doc python
+
+# This variable must have 'exec' in its name, in order to be installed
+# by 'install-exec' target (instead of default 'install-data')
+pkgconfigexecdir = $(libdir)/pkgconfig
+pkgconfigexec_DATA = libmagic.pc
diff -r 8a1bf59fd4f0 -r 054fa4fbd03f external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in        Mon Jun 15 00:31:21 2020 +0000
+++ b/external/bsd/file/dist/Makefile.in        Mon Jun 15 00:37:24 2020 +0000
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -100,7 +101,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+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@)
@@ -129,6 +130,35 @@
     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 = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkgconfigexecdir)"
+DATA = $(pkgconfigexec_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -159,9 +189,10 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-       COPYING ChangeLog INSTALL NEWS README TODO compile \
-       config.guess config.sub install-sh ltmain.sh missing
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+       $(srcdir)/libmagic.pc.in AUTHORS COPYING ChangeLog INSTALL \
+       NEWS README TODO compile config.guess config.sub install-sh \
+       ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -328,6 +359,11 @@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = MAINT
 SUBDIRS = src magic tests doc python
+
+# This variable must have 'exec' in its name, in order to be installed
+# by 'install-exec' target (instead of default 'install-data')
+pkgconfigexecdir = $(libdir)/pkgconfig
+pkgconfigexec_DATA = libmagic.pc
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -380,6 +416,8 @@
 
 distclean-hdr:
        -rm -f config.h stamp-h1
+libmagic.pc: $(top_builddir)/config.status $(srcdir)/libmagic.pc.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -389,6 +427,27 @@
 
 distclean-libtool:
        -rm -f libtool config.lt
+install-pkgconfigexecDATA: $(pkgconfigexec_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(pkgconfigexec_DATA)'; test -n "$(pkgconfigexecdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigexecdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(pkgconfigexecdir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigexecdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigexecdir)" || exit $$?; \
+       done
+
+uninstall-pkgconfigexecDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(pkgconfigexec_DATA)'; test -n "$(pkgconfigexecdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(pkgconfigexecdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -689,9 +748,12 @@
               exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
+       for dir in "$(DESTDIR)$(pkgconfigexecdir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -750,7 +812,7 @@
 
 install-dvi-am:
 
-install-exec-am:
+install-exec-am: install-pkgconfigexecDATA
 
 install-html: install-html-recursive
 
@@ -790,7 +852,7 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-pkgconfigexecDATA
 
 .MAKE: $(am__recursive_targets) all install-am install-strip
 
@@ -804,12 +866,13 @@
        info-am install install-am install-data install-data-am \
        install-dvi install-dvi-am install-exec install-exec-am \
        install-html install-html-am install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-       uninstall-am
+       install-man install-pdf install-pdf-am \
+       install-pkgconfigexecDATA install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-am uninstall uninstall-am \
+       uninstall-pkgconfigexecDATA
 
 .PRECIOUS: Makefile
 
diff -r 8a1bf59fd4f0 -r 054fa4fbd03f external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure  Mon Jun 15 00:31:21 2020 +0000
+++ b/external/bsd/file/dist/configure  Mon Jun 15 00:37:24 2020 +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.38.
+# Generated by GNU Autoconf 2.69 for file 5.39.
 #
 # Report bugs to <christos%astron.com@localhost>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.38'
-PACKAGE_STRING='file 5.38'
+PACKAGE_VERSION='5.39'
+PACKAGE_STRING='file 5.39'
 PACKAGE_BUGREPORT='christos%astron.com@localhost'
 PACKAGE_URL=''
 
@@ -1338,7 +1338,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.38 to adapt to many kinds of systems.
+\`configure' configures file 5.39 to adapt to many kinds of systems.



Home | Main Index | Thread Index | Old Index