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 for file-5.33



details:   https://anonhg.NetBSD.org/src/rev/0046002a0c76
branches:  trunk
changeset: 361162:0046002a0c76
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 15 19:45:31 2018 +0000

description:
merge conflicts for file-5.33

diffstat:

 external/bsd/file/dist/ChangeLog                |   25 +
 external/bsd/file/dist/Makefile.in              |  115 +--
 external/bsd/file/dist/aclocal.m4               |  445 ++++----------
 external/bsd/file/dist/compile                  |    2 +-
 external/bsd/file/dist/config.guess             |  469 +++++++++------
 external/bsd/file/dist/config.h.in              |   10 +-
 external/bsd/file/dist/config.sub               |  120 +--
 external/bsd/file/dist/configure                |  413 ++++++-------
 external/bsd/file/dist/configure.ac             |   10 +-
 external/bsd/file/dist/depcomp                  |    5 +-
 external/bsd/file/dist/doc/Makefile.in          |   78 +--
 external/bsd/file/dist/doc/file.1               |  155 +++-
 external/bsd/file/dist/doc/magic.5              |   22 +-
 external/bsd/file/dist/install-sh               |  708 +++++++++++++++--------
 external/bsd/file/dist/magic/Makefile.am        |    8 +-
 external/bsd/file/dist/magic/Makefile.in        |   86 +--
 external/bsd/file/dist/magic/magdir/apple       |   18 +-
 external/bsd/file/dist/magic/magdir/archive     |  306 +++++++++-
 external/bsd/file/dist/magic/magdir/elf         |    7 +-
 external/bsd/file/dist/magic/magdir/filesystems |   24 +-
 external/bsd/file/dist/magic/magdir/geo         |   15 +-
 external/bsd/file/dist/magic/magdir/netbsd      |    2 +-
 external/bsd/file/dist/magic/magdir/pgp         |   45 +-
 external/bsd/file/dist/missing                  |    6 +-
 external/bsd/file/dist/python/Makefile.in       |   78 +--
 external/bsd/file/dist/src/Makefile.in          |   96 +--
 external/bsd/file/dist/src/apprentice.c         |   36 +-
 external/bsd/file/dist/src/cdf.c                |   24 +-
 external/bsd/file/dist/src/compress.c           |   12 +-
 external/bsd/file/dist/src/encoding.c           |   20 +-
 external/bsd/file/dist/src/file.c               |  180 ++++-
 external/bsd/file/dist/src/file.h               |   68 +-
 external/bsd/file/dist/src/funcs.c              |   31 +-
 external/bsd/file/dist/src/readcdf.c            |   12 +-
 external/bsd/file/dist/src/readelf.c            |   43 +-
 external/bsd/file/dist/src/softmagic.c          |  279 ++++++--
 external/bsd/file/dist/tests/Makefile.in        |   80 +--
 external/bsd/file/include/config.h              |   16 +-
 external/bsd/file/lib/Makefile                  |    4 +-
 external/bsd/file/lib/shlib_version             |    6 +-
 40 files changed, 2303 insertions(+), 1776 deletions(-)

diffs (truncated from 7050 to 300 lines):

diff -r 0e4d45e7d4ff -r 0046002a0c76 external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog  Sun Apr 15 19:32:47 2018 +0000
+++ b/external/bsd/file/dist/ChangeLog  Sun Apr 15 19:45:31 2018 +0000
@@ -1,3 +1,28 @@
+2018-04-15  14:52  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * release 5.33
+
+2018-02-24  14:50  Christos Zoulas <christos%zoulas.com@localhost> 
+
+       * extend the support for ${x?:} expansions for magic descriptions
+
+2018-02-21  16:25  Christos Zoulas <christos%zoulas.com@localhost> 
+
+       * add support for ${x?:} in mime types to handle
+         pie binaries.
+
+2017-11-03   9:23  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * add support for negative offsets (offsets from the end of file)
+
+2017-09-26   8:22  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * close the file on error when writing magic (Steve Grubb)
+
+2017-09-24  12:02  Christos Zoulas <christos%zoulas.com@localhost>
+
+       * seccomp support (Paul Moore)
+
 2017-09-02  11:53  Christos Zoulas <christos%zoulas.com@localhost>
 
        * release 5.32
diff -r 0e4d45e7d4ff -r 0046002a0c76 external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in        Sun Apr 15 19:32:47 2018 +0000
+++ b/external/bsd/file/dist/Makefile.in        Sun Apr 15 19:45:31 2018 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,61 +14,23 @@
 
 @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 \
+am__make_dryrun = \
+  { \
+    am__dry=no; \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
     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))
+    test $$am__dry = yes; \
+  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -87,6 +49,11 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(top_srcdir)/configure $(am__configure_deps) \
+       $(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+       README TODO compile config.guess config.sub depcomp install-sh \
+       missing ltmain.sh
 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 \
@@ -94,8 +61,6 @@
        $(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
@@ -159,9 +124,6 @@
 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 depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -216,7 +178,6 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -232,7 +193,6 @@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -347,6 +307,7 @@
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
          *config.status*) \
@@ -367,8 +328,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-       @test -f $@ || rm -f stamp-h1
-       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+       @if test ! -f $@; then rm -f stamp-h1; else :; fi
+       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
        @rm -f stamp-h1
@@ -397,12 +358,13 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-       @fail=; \
-       if $(am__make_keepgoing); then \
-         failcom='fail=yes'; \
-       else \
-         failcom='exit 1'; \
-       fi; \
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
        case "$@" in \
@@ -577,16 +539,10 @@
        $(am__post_remove_distdir)
 
 dist-tarZ: distdir
-       @echo WARNING: "Support for distribution archives compressed with" \
-                      "legacy program 'compress' is deprecated." >&2
-       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__post_remove_distdir)
 
 dist-shar: distdir
-       @echo WARNING: "Support for shar distribution archives is" \
-                      "deprecated." >&2
-       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
        $(am__post_remove_distdir)
 
@@ -621,17 +577,16 @@
        esac
        chmod -R a-w $(distdir)
        chmod u+w $(distdir)
-       mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+       mkdir $(distdir)/_build $(distdir)/_inst
        chmod a-w $(distdir)
        test -d $(distdir)/_build || exit 0; \
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
          && am__cwd=`pwd` \
-         && $(am__cd) $(distdir)/_build/sub \
-         && ../../configure \
+         && $(am__cd) $(distdir)/_build \
+         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
-           --srcdir=../.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -808,8 +763,6 @@
        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
        uninstall-am
 
-.PRECIOUS: Makefile
-
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -r 0e4d45e7d4ff -r 0046002a0c76 external/bsd/file/dist/aclocal.m4
--- a/external/bsd/file/dist/aclocal.m4 Sun Apr 15 19:32:47 2018 +0000
+++ b/external/bsd/file/dist/aclocal.m4 Sun Apr 15 19:45:31 2018 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,85 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl Mac OS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([gl_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    dnl First, check whether -Werror can be added to the command line, or
-    dnl whether it leads to an error because of some other option that the



Home | Main Index | Thread Index | Old Index