From 1ba94a0e249bab68380f8509a7046b30a0b9c8ec Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Mon, 28 May 2007 18:42:39 +0000
Subject: [PATCH] Update to file 4.21 which is a bugfix release including an
 integer overflow.  See Changelog for more changes.

---
 lib/libmagic/Makefile            |  9 ++++-----
 lib/libmagic/config.h            |  7 +++++--
 lib/libmagic/file.h.no_obj.patch | 13 -------------
 lib/libmagic/libmagic.man.patch  | 17 -----------------
 4 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 lib/libmagic/file.h.no_obj.patch
 delete mode 100644 lib/libmagic/libmagic.man.patch

diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 98c54968a2..78f790a452 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/lib/libmagic/Makefile,v 1.18 2007/03/25 07:50:50 sephe Exp $
+# $DragonFly: src/lib/libmagic/Makefile,v 1.19 2007/05/28 18:42:39 pavalos Exp $
 
 CONTRIBDIR=	${.CURDIR}/../../contrib/file-4/src
 MAGICDIR= ${CONTRIBDIR}/../magic
@@ -10,7 +10,7 @@ LIB=	magic
 SHLIB_MAJOR=	2
 
 SRCS=	apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c\
-	is_tar.c magic.c print.c readelf.c softmagic.c file.h.no_obj.patch
+	is_tar.c magic.c print.c readelf.c softmagic.c
 INCS=	magic.h
 
 LIBMAGIC_CDEFS = -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
@@ -38,11 +38,10 @@ FILESDIR=	/usr/share/misc
 MAGFILES=	${MAGICDIR}/Header ${MAGICDIR}/Localstuff\
 		${MAGICDIR}/Magdir/[a-z]*
 
-libmagic.3: ${CONTRIBDIR}/../doc/libmagic.man libmagic.man.patch
-	  patch -o - ${.ALLSRC} | \
+libmagic.3: ${CONTRIBDIR}/../doc/libmagic.man
 	    sed	-e s@__CSECTION__@1@g \
 		-e s@__FSECTION__@5@g \
-		-e s@__MAGIC__@${MAGIC}@g > ${.TARGET}
+		-e s@__MAGIC__@${MAGIC}@g ${.ALLSRC} > ${.TARGET}
 
 all: ${LIB} magic.mgc magic.mime.mgc
 
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index 72e5673054..aafa026217 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -1,4 +1,4 @@
-/* $DragonFly: src/lib/libmagic/config.h,v 1.10 2007/03/25 03:33:59 pavalos Exp $ */
+/* $DragonFly: src/lib/libmagic/config.h,v 1.11 2007/05/28 18:42:39 pavalos Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
@@ -29,6 +29,9 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #define HAVE_LIBZ 1
 
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
@@ -179,7 +182,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "4.20"
+#define VERSION "4.21"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
diff --git a/lib/libmagic/file.h.no_obj.patch b/lib/libmagic/file.h.no_obj.patch
deleted file mode 100644
index 0c2b202249..0000000000
--- a/lib/libmagic/file.h.no_obj.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$DragonFly: src/lib/libmagic/Attic/file.h.no_obj.patch,v 1.1 2007/03/25 03:33:59 pavalos Exp $
---- file.h.orig	2007-03-24 22:33:12.000000000 -0400
-+++ file.h	2007-03-24 22:33:35.000000000 -0400
-@@ -51,7 +51,9 @@
- /* Do this here and now, because struct stat gets re-defined on solaris */
- #include <sys/stat.h>
- 
-+#ifndef COMPILE_ONLY
- #define ENABLE_CONDITIONALS
-+#endif
- 
- #ifndef MAGIC
- #define MAGIC "/etc/magic"
diff --git a/lib/libmagic/libmagic.man.patch b/lib/libmagic/libmagic.man.patch
deleted file mode 100644
index d438ebd8f2..0000000000
--- a/lib/libmagic/libmagic.man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-$DragonFly: src/lib/libmagic/Attic/libmagic.man.patch,v 1.2 2006/12/12 18:44:17 pavalos Exp $
-Index: libmagic.man
-===================================================================
-RCS file: /cvs/src/contrib/file-4/doc/libmagic.man,v
-retrieving revision 1.1
-diff -u -r1.1 libmagic.man
---- libmagic.man	12 Nov 2006 04:51:56 -0000	1.1
-+++ libmagic.man	12 Nov 2006 23:35:03 -0000
-@@ -120,7 +120,7 @@
- The
- .Fn magic_errno
- function returns the last operating system error number
--.Pq .Xr errno 2
-+.Pq Xr errno 2
- that was encountered by a system call.
- .Pp
- The
-- 
2.11.4.GIT