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 new file
details: https://anonhg.NetBSD.org/src/rev/daf5bd16a61b
branches: trunk
changeset: 785620:daf5bd16a61b
user: christos <christos%NetBSD.org@localhost>
date: Sat Mar 23 16:15:57 2013 +0000
description:
merge new file
diffstat:
external/bsd/file/bin/Makefile | 5 +-
external/bsd/file/dist/Makefile.in | 3 +-
external/bsd/file/dist/aclocal.m4 | 76 +++-
external/bsd/file/dist/config.h.in | 3 +
external/bsd/file/dist/configure | 42 +-
external/bsd/file/dist/configure.ac | 4 +-
external/bsd/file/dist/doc/Makefile.in | 3 +-
external/bsd/file/dist/doc/file.1 | 17 +-
external/bsd/file/dist/doc/libmagic.3 | 25 +-
external/bsd/file/dist/doc/magic.5 | 115 +++++-
external/bsd/file/dist/install-sh | 2 +-
external/bsd/file/dist/m4/visibility.m4 | 77 ---
external/bsd/file/dist/magic/Makefile.am | 7 +-
external/bsd/file/dist/magic/Makefile.in | 10 +-
external/bsd/file/dist/magic/magdir/apple | 9 +-
external/bsd/file/dist/magic/magdir/archive | 160 ++++----
external/bsd/file/dist/magic/magdir/assembler | 2 +-
external/bsd/file/dist/magic/magdir/elf | 4 +-
external/bsd/file/dist/magic/magdir/filesystems | 254 ++++++++++--
external/bsd/file/dist/magic/magdir/geo | 2 +-
external/bsd/file/dist/magic/magdir/gnome-keyring | 26 -
external/bsd/file/dist/python/Makefile.in | 3 +-
external/bsd/file/dist/src/Makefile.in | 26 +-
external/bsd/file/dist/src/apprentice.c | 427 ++++++++++++++-------
external/bsd/file/dist/src/cdf.c | 11 +-
external/bsd/file/dist/src/file.h | 29 +-
external/bsd/file/dist/src/fsmagic.c | 84 ++-
external/bsd/file/dist/src/magic.c | 12 +-
external/bsd/file/dist/src/magic.h | 109 -----
external/bsd/file/dist/src/print.c | 26 +-
external/bsd/file/dist/src/readelf.c | 122 ++---
external/bsd/file/dist/src/softmagic.c | 106 +++--
external/bsd/file/dist/tests/Makefile.in | 3 +-
external/bsd/file/include/config.h | 9 +-
external/bsd/file/lib/Makefile | 8 +-
external/bsd/file/lib/shlib_version | 4 +-
36 files changed, 1088 insertions(+), 737 deletions(-)
diffs (truncated from 3543 to 300 lines):
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/bin/Makefile
--- a/external/bsd/file/bin/Makefile Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/bin/Makefile Sat Mar 23 16:15:57 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/05/08 17:28:01 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/03/23 16:15:57 christos Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk>
@@ -20,6 +20,9 @@
realall: file magic.mgc
.endif
+LIBMAGIC!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
+CPPFLAGS+=-I${LIBMAGIC}
+
.if ${MKSHARE} != "no"
magic.mgc: ${TOOL_MKMAGIC}
${_MKTARGET_CREATE}
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/dist/Makefile.in Sat Mar 23 16:15:57 2013 +0000
@@ -58,8 +58,7 @@
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)/m4/visibility.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/dist/aclocal.m4
--- a/external/bsd/file/dist/aclocal.m4 Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/dist/aclocal.m4 Sat Mar 23 16:15:57 2013 +0000
@@ -19,6 +19,81 @@
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 3 (gettext-0.18)
+dnl Copyright (C) 2005, 2008-2010 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 MacOS 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
+ dnl user has put into $CC $CFLAGS $CPPFLAGS.
+ AC_MSG_CHECKING([whether the -Werror option is usable])
+ AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror"
+ AC_TRY_COMPILE([], [],
+ [gl_cv_cc_vis_werror=yes],
+ [gl_cv_cc_vis_werror=no])
+ CFLAGS="$gl_save_CFLAGS"])
+ AC_MSG_RESULT([$gl_cv_cc_vis_werror])
+ dnl Now check whether visibility declarations are supported.
+ AC_MSG_CHECKING([for simple visibility declarations])
+ AC_CACHE_VAL([gl_cv_cc_visibility], [
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ dnl We use the option -Werror and a function dummyfunc, because on some
+ dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+ dnl "visibility attribute not supported in this configuration; ignored"
+ dnl at the first function definition in every compilation unit, and we
+ dnl don't want to use the option in this case.
+ if test $gl_cv_cc_vis_werror = yes; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
+ AC_TRY_COMPILE(
+ [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+ extern __attribute__((__visibility__("default"))) int exportedvar;
+ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+ extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+ void dummyfunc (void) {}],
+ [],
+ [gl_cv_cc_visibility=yes],
+ [gl_cv_cc_visibility=no])
+ CFLAGS="$gl_save_CFLAGS"])
+ AC_MSG_RESULT([$gl_cv_cc_visibility])
+ if test $gl_cv_cc_visibility = yes; then
+ CFLAG_VISIBILITY="-fvisibility=hidden"
+ HAVE_VISIBILITY=1
+ fi
+ fi
+ AC_SUBST([CFLAG_VISIBILITY])
+ AC_SUBST([HAVE_VISIBILITY])
+ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+ [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
+
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -1077,5 +1152,4 @@
m4_include([m4/ltsugar.m4])
m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
-m4_include([m4/visibility.m4])
m4_include([acinclude.m4])
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/dist/config.h.in
--- a/external/bsd/file/dist/config.h.in Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/dist/config.h.in Sat Mar 23 16:15:57 2013 +0000
@@ -89,6 +89,9 @@
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
+/* Define to 1 if you have the `pread' function. */
+#undef HAVE_PREAD
+
/* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/dist/configure Sat Mar 23 16:15:57 2013 +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.12.
+# Generated by GNU Autoconf 2.69 for file 5.14.
#
# Report bugs to <christos%astron.com@localhost>.
#
@@ -729,8 +729,8 @@
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.12'
-PACKAGE_STRING='file 5.12'
+PACKAGE_VERSION='5.14'
+PACKAGE_STRING='file 5.14'
PACKAGE_BUGREPORT='christos%astron.com@localhost'
PACKAGE_URL=''
@@ -1467,7 +1467,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.12 to adapt to many kinds of systems.
+\`configure' configures file 5.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1537,7 +1537,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.12:";;
+ short | recursive ) echo "Configuration of file 5.14:";;
esac
cat <<\_ACEOF
@@ -1648,7 +1648,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.12
+file configure 5.14
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2304,7 +2304,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by file $as_me 5.12, which was
+It was created by file $as_me 5.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3131,7 +3131,7 @@
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.12'
+ VERSION='5.14'
cat >>confdefs.h <<_ACEOF
@@ -11692,11 +11692,10 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
- extern __attribute__((__visibility__("default"))) int exportedvar;
- extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
- extern __attribute__((__visibility__("default"))) int exportedfunc (void);
- void dummyfunc (void) {}
-
+ extern __attribute__((__visibility__("default"))) int exportedvar;
+ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+ extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+ void dummyfunc (void) {}
int
main ()
{
@@ -13408,6 +13407,19 @@
fi
+ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
+if test "x$ac_cv_func_pread" = xyes; then :
+ $as_echo "#define HAVE_PREAD 1" >>confdefs.h
+
+else
+ case " $LIBOBJS " in
+ *" pread.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS pread.$ac_objext"
+ ;;
+esac
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
@@ -14063,7 +14075,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by file $as_me 5.12, which was
+This file was extended by file $as_me 5.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14129,7 +14141,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-file config.status 5.12
+file config.status 5.14
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/dist/configure.ac
--- a/external/bsd/file/dist/configure.ac Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/dist/configure.ac Sat Mar 23 16:15:57 2013 +0000
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.12],[christos%astron.com@localhost])
+AC_INIT([file],[5.14],[christos%astron.com@localhost])
AM_INIT_AUTOMAKE([subdir-objects foreign])
AM_MAINTAINER_MODE(disable)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -140,7 +140,7 @@
AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof)
dnl Provide implementation of some required functions if necessary
-AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r)
+AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r pread)
dnl Checks for libraries
AC_CHECK_LIB(z,gzopen)
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/dist/doc/Makefile.in
--- a/external/bsd/file/dist/doc/Makefile.in Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/dist/doc/Makefile.in Sat Mar 23 16:15:57 2013 +0000
@@ -54,8 +54,7 @@
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)/m4/visibility.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -r fe1ab90a6253 -r daf5bd16a61b external/bsd/file/dist/doc/file.1
--- a/external/bsd/file/dist/doc/file.1 Sat Mar 23 16:11:05 2013 +0000
+++ b/external/bsd/file/dist/doc/file.1 Sat Mar 23 16:15:57 2013 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: file.1,v 1.11 2013/01/04 15:37:53 christos Exp $
+.\" $NetBSD: file.1,v 1.12 2013/03/23 16:15:57 christos Exp $
.\"
-.\" $File: file.man,v 1.101 2012/11/01 04:31:53 christos Exp $
+.\" $File: file.man,v 1.102 2013/01/04 15:39:22 christos Exp $
.Dd October 25, 2012
.Dt FILE 1
Home |
Main Index |
Thread Index |
Old Index