MFC r298192,299234,299238,299736:

file 5.27.

2 files changed, 7 insertions, 4 deletions

diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 14f1702..0ddecc8 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -12,7 +12,7 @@ LDADD=	-lz
 MAN=	libmagic.3 magic.5
 
 SRCS=	apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \
-	encoding.c fsmagic.c funcs.c \
+	der.c encoding.c fsmagic.c funcs.c \
 	is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c
 INCS=	magic.h
 
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index 752b82b..6fd2942 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -43,6 +43,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
+/* Define to 1 if you have the `dprintf' function. */
+#define HAVE_DPRINTF 1
+
 /* Define to 1 if you have the <err.h> header file. */
 #define HAVE_ERR_H 1
 
@@ -290,7 +293,7 @@
 #define PACKAGE_NAME "file"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "file 5.25"
+#define PACKAGE_STRING "file 5.27"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "file"
@@ -299,7 +302,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "5.25"
+#define PACKAGE_VERSION "5.27"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -330,7 +333,7 @@
 
 
 /* Version number of package */
-#define VERSION "5.25"
+#define VERSION "5.27"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */