From 9c646875f073c2685a7405bb4beae57e38fb537c Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sat, 19 Jan 2008 23:44:59 +0000
Subject: [PATCH] Update for file-4.23 import:

This release generally fixes bugs. A list of changes can be found in the
ChangeLog.
---
 contrib/file-4/README.DRAGONFLY | 10 ++++++----
 lib/libmagic/config.h           | 27 ++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/contrib/file-4/README.DRAGONFLY b/contrib/file-4/README.DRAGONFLY
index a0c9632d78..eeea363011 100644
--- a/contrib/file-4/README.DRAGONFLY
+++ b/contrib/file-4/README.DRAGONFLY
@@ -1,10 +1,12 @@
-This directory contains most of the file 4.20 distribution. The original
-source can be obtained from
-	ftp://ftp.astron.com/pub/file/file-4.20.tar.gz
-	MD5 (file-4.20.tar.gz) = 402bdb26356791bd5d277099adacc006
+This directory contains most of the file distribution. The original
+source can be obtained from:
+	ftp://ftp.astron.com/pub/file/
 
 A list of the omitted files and directories can be found in
 README.DELETED.
 
 This is used in lib/libmagic and usr.bin/file.  When upgrading, remember
 to update config.h in lib/libmagic.
+
+cvs import hint:
+cvs import src/contrib/file-4 FILE v4_??
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index aafa026217..51f9c3ac71 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -1,5 +1,5 @@
-/* $DragonFly: src/lib/libmagic/config.h,v 1.11 2007/05/28 18:42:39 pavalos Exp $ */
-/* config.h.  Generated by configure.  */
+/* $DragonFly: src/lib/libmagic/config.h,v 1.12 2008/01/19 23:44:59 pavalos Exp $ */
+/* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
 /* Use the builtin ELF recognition code */
@@ -74,6 +74,9 @@
 /* Define to 1 if you have the `strndup' function. */
 /* #undef HAVE_STRNDUP */
 
+/* Define to 1 if you have the `strtof' function. */
+/* #undef HAVE_STRTOF */
+
 /* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
@@ -137,6 +140,9 @@
 #define HAVE_WCWIDTH 1
 #endif	/* BOOTSTRAPPING */
 
+/* Define to 1 if you have the <zlib.h> header file. */
+#define HAVE_ZLIB_H 1
+
 /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
    */
 /* #undef MAJOR_IN_MKDEV */
@@ -164,6 +170,9 @@
 #define PACKAGE_VERSION ""
 
 /* */
+#define SIZEOF_INT64_T 8
+
+/* */
 #define SIZEOF_UINT16_T 2
 
 /* */
@@ -182,11 +191,16 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "4.21"
+#define VERSION "4.23"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
@@ -196,13 +210,16 @@
 /* */
 /* #undef int32_t */
 
+/* */
+/* #undef int64_t */
+
 /* Define to a type if <wchar.h> does not define. */
 /* #undef mbstate_t */
 
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
 /* #undef off_t */
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
 /* */
-- 
2.11.4.GIT