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/10fdea853383
branches: trunk
changeset: 445231:10fdea853383
user: christos <christos%NetBSD.org@localhost>
date: Fri Oct 19 00:11:48 2018 +0000
description:
Merge conflicts
diffstat:
external/bsd/file/dist/ChangeLog | 70 ++-
external/bsd/file/dist/Makefile.in | 115 +++-
external/bsd/file/dist/aclocal.m4 | 443 ++++++++++++----
external/bsd/file/dist/compile | 2 +-
external/bsd/file/dist/config.guess | 469 +++++++----------
external/bsd/file/dist/config.h.in | 13 +-
external/bsd/file/dist/config.sub | 120 +++-
external/bsd/file/dist/configure | 363 ++++++++-----
external/bsd/file/dist/configure.ac | 11 +-
external/bsd/file/dist/depcomp | 5 +-
external/bsd/file/dist/doc/Makefile.in | 78 ++-
external/bsd/file/dist/doc/file.1 | 20 +-
external/bsd/file/dist/doc/libmagic.3 | 23 +-
external/bsd/file/dist/doc/magic.5 | 30 +-
external/bsd/file/dist/install-sh | 712 +++++++++------------------
external/bsd/file/dist/magic/Makefile.am | 9 +-
external/bsd/file/dist/magic/Makefile.in | 87 ++-
external/bsd/file/dist/magic/magdir/archive | 5 +-
external/bsd/file/dist/magic/magdir/elf | 11 +-
external/bsd/file/dist/magic/magdir/jpeg | 8 +-
external/bsd/file/dist/missing | 6 +-
external/bsd/file/dist/python/Makefile.in | 82 ++-
external/bsd/file/dist/src/Makefile.in | 95 ++-
external/bsd/file/dist/src/apprentice.c | 158 +++--
external/bsd/file/dist/src/cdf.c | 38 +-
external/bsd/file/dist/src/cdf_time.c | 10 +-
external/bsd/file/dist/src/compress.c | 116 ++-
external/bsd/file/dist/src/der.c | 35 +-
external/bsd/file/dist/src/encoding.c | 8 +-
external/bsd/file/dist/src/file.c | 29 +-
external/bsd/file/dist/src/file.h | 21 +-
external/bsd/file/dist/src/fsmagic.c | 34 +-
external/bsd/file/dist/src/funcs.c | 129 +++-
external/bsd/file/dist/src/magic.c | 47 +-
external/bsd/file/dist/src/print.c | 23 +-
external/bsd/file/dist/src/readcdf.c | 399 +++++++-------
external/bsd/file/dist/src/readelf.c | 406 ++++++++++-----
external/bsd/file/dist/src/softmagic.c | 159 +++--
external/bsd/file/dist/tests/Makefile.in | 160 +++++-
external/bsd/file/include/config.h | 19 +-
external/bsd/file/lib/Makefile | 6 +-
41 files changed, 2615 insertions(+), 1959 deletions(-)
diffs (truncated from 8728 to 300 lines):
diff -r f026ce4ebfdd -r 10fdea853383 external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog Thu Oct 18 23:54:09 2018 +0000
+++ b/external/bsd/file/dist/ChangeLog Fri Oct 19 00:11:48 2018 +0000
@@ -1,12 +1,46 @@
+2018-10-18 19:32 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * release 5.35
+
+2018-09-10 20:38 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Add FreeBSD ELF core file support (John Baldwin)
+
+2018-08-20 18:40 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/30: Allow all parameter values to be set (don't treat 0 specially)
+ * handle default annotations on the softmagic match instead at the
+ end.
+
+2018-07-25 10:17 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/23: Recognize JSON files
+
+2018-07-25 10:17 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/18: file --mime-encoding should not print mime-type
+
+2018-07-25 8:50 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * release 5.34
+
+2018-06-22 16:38 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Add Quad indirect offsets
+
+2018-05-24 14:10 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Enable parsing of ELF dynamic sections to handle PIE better
+
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>
+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>
+2018-02-21 16:25 Christos Zoulas <christos%zoulas.com@localhost>
* add support for ${x?:} in mime types to handle
pie binaries.
@@ -78,7 +112,7 @@
* Add missing overflow check in der magic (Jonas Wagner)
2016-10-25 10:40 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* release 5.29
2016-10-24 11:20 Christos Zoulas <christos%zoulas.com@localhost>
@@ -119,11 +153,11 @@
- set offset to 0 on failure.
2016-05-13 12:00 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* release 5.27
2016-04-18 9:35 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* Errors comparing DER entries or computing offsets
are just indications of malformed non-DER files.
Don't print them.
@@ -132,7 +166,7 @@
* Put new bytes constant in the right file (not the generated one)
2016-04-16 18:34 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* release 5.26
2016-03-31 13:50 Christos Zoulas <christos%zoulas.com@localhost>
@@ -178,7 +212,7 @@
* PR/492: compression forking was broken with magic_buffer.
2015-09-16 9:50 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* release 5.25
2015-09-11 13:25 Christos Zoulas <christos%zoulas.com@localhost>
@@ -206,7 +240,7 @@
* release 5.23
2015-06-09 16:10 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* Fix issue with regex range for magic with offset
* Always return true from mget with USE (success to mget not match
indication). Fixes mime evaluation after USE magic
@@ -259,12 +293,12 @@
* add indirect relative for TIFF/Exif
2014-12-16 18:10 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* restructure elf note printing to avoid repeated messages
* add note limit, suggested by Alexander Cherepanov
2014-12-16 16:53 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* Bail out on partial pread()'s (Alexander Cherepanov)
* Fix incorrect bounds check in file_printable (Alexander Cherepanov)
@@ -275,7 +309,7 @@
more places for safety
* in ELF, instead of "(uses dynamic libraries)" when PT_INTERP
is present print the interpreter name.
-
+
2014-12-10 20:01 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.21
@@ -318,7 +352,7 @@
on a byte by byte basis, so that we don't get issues with
locale's trying to interpret random byte streams as UTF-8 and
having printf error out with EILSEQ.
-
+
2014-10-17 11:48 Christos Zoulas <christos%zoulas.com@localhost>
* fix bounds in note reading (Francisco Alonso / Red Hat)
@@ -349,7 +383,7 @@
* release 5.19
2014-06-09 9:04 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* Misc buffer overruns and missing buffer size tests in cdf parsing
(Francisco Alonso, Jan Kaluza)
@@ -379,7 +413,7 @@
2014-05-04 14:55 Christos Zoulas <christos%zoulas.com@localhost>
- * PR/351: Fix compilation of empty files
+ * PR/351: Fix compilation of empty files
2014-04-30 17:39 Christos Zoulas <christos%zoulas.com@localhost>
@@ -483,7 +517,7 @@
* Don't treat magic as an error if offset was past EOF (Christoph Biedl)
2013-05-28 17:25 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* Fix spacing issues in softmagic and elf (Jan Kaluza)
2013-05-02 18:00 Christos Zoulas <christos%zoulas.com@localhost>
@@ -539,7 +573,7 @@
* Make getline public so that file can link against it.
Perhaps it is better to rename it, or hide it differently.
Fixes builds on platforms that do not provide it.
-
+
2013-01-07 16:30 Christos Zoulas <christos%zoulas.com@localhost>
* Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
@@ -889,7 +923,7 @@
(Cheng Renquan)
2009-05-08 13:40 Christos Zoulas <christos%zoulas.com@localhost>
-
+
* lint fixes and more from NetBSD
2009-05-06 10:25 Christos Zoulas <christos%zoulas.com@localhost>
@@ -909,7 +943,7 @@
2009-03-27 18:43 Christos Zoulas <christos%zoulas.com@localhost>
- * don't print \012- separators in the same magic entry
+ * don't print \012- separators in the same magic entry
if it consists of multiple magic printing lines.
2009-03-23 10:20 Christos Zoulas <christos%zoulas.com@localhost>
diff -r f026ce4ebfdd -r 10fdea853383 external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in Thu Oct 18 23:54:09 2018 +0000
+++ b/external/bsd/file/dist/Makefile.in Fri Oct 19 00:11:48 2018 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,61 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- 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;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
@@ -49,11 +87,6 @@
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 \
@@ -61,6 +94,8 @@
$(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
@@ -124,6 +159,9 @@
Home |
Main Index |
Thread Index |
Old Index