Update for the 'file' 4.17 import.

2 files changed, 49 insertions, 55 deletions

diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index c04c811..83df646 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -16,7 +16,7 @@ INCS=	magic.h
 
 MAGICPATH?=	/usr/share/misc
 
-CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
+CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR} -I${CONTRDIR}
 
 CLEANFILES+=	magic magic.mgc magic.mime.mgc
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index 1863903..e9e4200 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -4,66 +4,18 @@
 
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
-/* Autoheader needs me */
-#define PACKAGE "file"
-
-/* Autoheader needs me */
-#define VERSION "4.12"
 
-/* Define if builtin ELF support is enabled.  */
+/* Use the builtin ELF recognition code */
 #define BUILTIN_ELF 1
 
-/* Define if ELF core file support is enabled.  */
+/* Recognize ELF core files */
 #define ELFCORE 1
 
-/* Define if the `long long' type works.  */
-#define HAVE_LONG_LONG 1
-
-/* Define if we have "tm_zone" in "struct tm".  */
-#define HAVE_TM_ZONE 1
-
-/* Define if we have a global "char * []" "tzname" variable.  */
-#define HAVE_TZNAME 1
-
-/* Define if we have "tm_isdst" in "struct tm".  */
-#define HAVE_TM_ISDST 1
-
-/* Define if we have a global "int" variable "daylight".  */
+/* */
 /* #undef HAVE_DAYLIGHT */
 
-/* Define if we have a mkstemp */
-#define HAVE_MKSTEMP 1
-
-/* Define to `unsigned char' if standard headers don't define.  */
-/* #undef uint8_t */
-
-/* Define to `unsigned short' if standard headers don't define.  */
-/* #undef uint16_t */
-
-/* Define to `unsigned int' if standard headers don't define.  */
-/* #undef uint32_t */
-
-/* Define to `unsigned long long', if available, or `unsigned long', if
-   standard headers don't define.  */
-/* #undef uint64_t */
-
-/* Define to `int' if standard headers don't define.  */
-/* #undef int32_t */
-
-/* FIXME: These have to be added manually because autoheader doesn't know
-   about AC_CHECK_SIZEOF_INCLUDES.  */
-
-/* The number of bytes in a uint8_t.  */
-#define SIZEOF_UINT8_T 1
-
-/* The number of bytes in a uint16_t.  */
-#define SIZEOF_UINT16_T 2
-
-/* The number of bytes in a uint32_t.  */
-#define SIZEOF_UINT32_T 4
-
-/* The number of bytes in a uint64_t.  */
-#define SIZEOF_UINT64_T 8
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
@@ -83,9 +35,15 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
+/* */
+#define HAVE_LONG_LONG 1
+
 /* Define to 1 if you have the `mbrtowc' function. */
 #define HAVE_MBRTOWC 1
 
+/* Define to 1 if <wchar.h> declares mbstate_t. */
+#define HAVE_MBSTATE_T 1
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
@@ -95,6 +53,9 @@
 /* Define to 1 if you have the `mmap' function. */
 #define HAVE_MMAP 1
 
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #if __FreeBSD_version >= 500019
 #define HAVE_STDINT_H 1
@@ -137,6 +98,9 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #define HAVE_SYS_WAIT_H 1
 
+/* */
+#define HAVE_TM_ISDST 1
+
 /* HAVE_TM_ZONE */
 #define HAVE_TM_ZONE 1
 
@@ -155,6 +119,9 @@
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
 /* Define to 1 if you have the <wchar.h> header file. */
 #define HAVE_WCHAR_H 1
 
@@ -187,6 +154,18 @@
 /* Define to the version of this package. */
 #define PACKAGE_VERSION ""
 
+/* */
+#define SIZEOF_UINT16_T 2
+
+/* */
+#define SIZEOF_UINT32_T 4
+
+/* */
+#define SIZEOF_UINT64_T 8
+
+/* */
+#define SIZEOF_UINT8_T 1
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
@@ -194,7 +173,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "4.12"
+#define VERSION "4.17"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
@@ -205,6 +184,9 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
+/* */
+/* #undef int32_t */
+
 /* Define to a type if <wchar.h> does not define. */
 /* #undef mbstate_t */
 
@@ -213,3 +195,15 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
+
+/* */
+/* #undef uint16_t */
+
+/* */
+/* #undef uint32_t */
+
+/* */
+/* #undef uint64_t */
+
+/* */
+/* #undef uint8_t */