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/b1e8f343908d
branches: trunk
changeset: 821603:b1e8f343908d
user: christos <christos%NetBSD.org@localhost>
date: Fri Feb 10 17:53:24 2017 +0000
description:
merge conflicts
diffstat:
external/bsd/file/dist/ChangeLog | 197 +++++
external/bsd/file/dist/Makefile.in | 46 +-
external/bsd/file/dist/aclocal.m4 | 67 +-
external/bsd/file/dist/compile | 2 +-
external/bsd/file/dist/config.guess | 32 +-
external/bsd/file/dist/config.h.in | 18 +
external/bsd/file/dist/config.sub | 20 +-
external/bsd/file/dist/configure | 140 ++-
external/bsd/file/dist/configure.ac | 32 +-
external/bsd/file/dist/depcomp | 2 +-
external/bsd/file/dist/doc/Makefile.in | 22 +-
external/bsd/file/dist/doc/file.1 | 61 +-
external/bsd/file/dist/doc/libmagic.3 | 18 +-
external/bsd/file/dist/doc/magic.5 | 41 +-
external/bsd/file/dist/magic/Makefile.am | 25 +-
external/bsd/file/dist/magic/Makefile.in | 47 +-
external/bsd/file/dist/magic/magdir/apple | 229 +++++-
external/bsd/file/dist/magic/magdir/archive | 343 ++++++++-
external/bsd/file/dist/magic/magdir/elf | 108 +-
external/bsd/file/dist/magic/magdir/filesystems | 98 +-
external/bsd/file/dist/magic/magdir/jpeg | 12 +-
external/bsd/file/dist/magic/magdir/netbsd | 19 +-
external/bsd/file/dist/magic/magdir/pgp | 65 +-
external/bsd/file/dist/missing | 6 +-
external/bsd/file/dist/python/Makefile.in | 22 +-
external/bsd/file/dist/src/Makefile.in | 64 +-
external/bsd/file/dist/src/apprentice.c | 242 ++++--
external/bsd/file/dist/src/cdf.c | 266 +++++--
external/bsd/file/dist/src/compress.c | 631 ++++++++++++-----
external/bsd/file/dist/src/encoding.c | 42 +-
external/bsd/file/dist/src/file.c | 117 ++-
external/bsd/file/dist/src/file.h | 59 +-
external/bsd/file/dist/src/fsmagic.c | 8 +-
external/bsd/file/dist/src/funcs.c | 120 ++-
external/bsd/file/dist/src/magic.c | 202 +++--
external/bsd/file/dist/src/print.c | 52 +-
external/bsd/file/dist/src/readcdf.c | 285 ++++++-
external/bsd/file/dist/src/readelf.c | 275 +++++++-
external/bsd/file/dist/src/softmagic.c | 819 ++++++++++-------------
external/bsd/file/dist/tests/Makefile.in | 25 +-
external/bsd/file/include/config.h | 26 +-
41 files changed, 3339 insertions(+), 1566 deletions(-)
diffs (truncated from 9276 to 300 lines):
diff -r 0ef47732cd40 -r b1e8f343908d external/bsd/file/dist/ChangeLog
--- a/external/bsd/file/dist/ChangeLog Fri Feb 10 17:42:56 2017 +0000
+++ b/external/bsd/file/dist/ChangeLog Fri Feb 10 17:53:24 2017 +0000
@@ -1,3 +1,200 @@
+2017-02-10 12:24 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * release 5.30
+
+2017-02-07 23:27 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * If we exceeded the offset in a search return no match
+ (Christoph Biedl)
+ * Be more lenient on corrupt CDF files (Christoph Biedl)
+
+2017-02-04 16:46 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * pacify ubsan sign extension (oss-fuzz/524)
+
+2017-02-01 12:42 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * off by one in cdf parsing (PR/593)
+ * report debugging sections in elf (PR/591)
+
+2016-11-06 10:52 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Allow @@@ in extensions
+ * 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>
+
+ * der getlength overflow (Jonas Wagner)
+ * multiple magic file load failure (Christoph Biedl)
+
+2016-10-17 11:26 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * CDF parsing improvements (Guy Helmer)
+
+2016-07-20 7:26 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Add support for signed indirect offsets
+
+2016-07-18 7:41 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * cat /dev/null | file - should print empty (Christoph Biedl)
+
+2016-07-05 15:20 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Bump string size from 64 to 96.
+
+2016-06-13 20:20 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/556: Fix separators on annotations.
+
+2016-06-13 19:40 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * release 5.28
+ * fix leak on allocation failure
+
+2016-06-01 1:20 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/555: Avoid overflow for offset > nbytes
+ * PR/550: Segv on DER parsing:
+ - use the correct variable for length
+ - 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.
+ * Offset comparison was off-by-one.
+ * Fix compression code (Werner Fink)
+ * 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>
+
+ * make the number of bytes read from files configurable.
+
+2016-03-21 13:40 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Add bounds checks for DER code (discovered by Thomas Jarosch)
+ * Change indirect recursion limit to indirect use count and
+ bump from 15 to 50 to prevent abuse.
+
+2016-03-13 20:39 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Add -00 which prints filename\0description\0
+
+2016-03-01 13:28 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Fix ID3 indirect parsing
+
+2016-01-19 10:18 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * add DER parsing capability
+
+2015-11-13 10:35 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * provide dprintf(3) for the OS's that don't have it.
+
+2015-11-11 16:25 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * redo the compression code report decompression errors
+
+2015-11-10 23:25 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * REG_STARTEND code is not working as expected, delete it.
+
+2015-11-09 16:05 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Add zlib support if we have it.
+
+2015-11-05 11:22 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * 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>
+
+ * add a limit to the length of regex searches
+
+2015-09-08 9:50 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * fix problems with --parameter (Christoph Biedl)
+
+2015-07-11 10:35 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Windows fixes PR/466 (Jason Hood)
+
+2015-07-09 10:35 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * release 5.24
+
+2015-06-11 8:52 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * redo long option encoding to fix off-by-one in 5.23
+
+2015-06-10 13:50 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * 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
+ * PR/459: Don't insert magic entries to the list if there are parsing
+ errors for them.
+
+2015-06-03 16:00 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/455: Add utf-7 encoding
+
+2015-06-03 14:30 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/455: Implement -Z, look inside, but don't report on compression
+ * PR/454: Fix allocation error on bad magic.
+
+2015-05-29 10:30 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * handle MAGIC_CONTINUE everywhere, not just in softmagic
+
+2015-05-21 14:30 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * don't print descriptions for NAME types when mime.
+
+2015-04-09 15:59 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Add --extension to list the known extensions for this file type
+ Idea by Andrew J Roazen
+
+2015-02-14 12:23 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Bump file search buffer size to 1M.
+
+2015-01-09 14:35 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Fix multiple issues with date formats reported by Christoph Biedl:
+ - T_LOCAL meaning was reversed
+ - Arithmetic did not work
+ Also stop adjusting daylight savings for gmt printing.
+
+2015-01-05 13:00 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * PR/411: Fix memory corruption from corrupt cdf file.
+
2015-01-02 15:15 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.22
diff -r 0ef47732cd40 -r b1e8f343908d external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in Fri Feb 10 17:42:56 2017 +0000
+++ b/external/bsd/file/dist/Makefile.in Fri Feb 10 17:53:24 2017 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 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,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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 \
?) ;; \
@@ -77,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 \
@@ -89,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
@@ -152,6 +159,9 @@
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)
@@ -317,7 +327,7 @@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = MAINT
-#SUBDIRS = src magic doc
+#SUBDIRS = src magic tests doc python
SUBDIRS = src
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -338,7 +348,6 @@
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*) \
@@ -569,15 +578,15 @@
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @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 distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
Home |
Main Index |
Thread Index |
Old Index