Update to file-4.14. Remove merged patches.
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Wed, 6 Jul 2005 14:01:57 +0000 (14:01 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Wed, 6 Jul 2005 14:01:57 +0000 (14:01 +0000)
contrib/file-4/README.DRAGONFLY
lib/libmagic/Makefile
lib/libmagic/patches/readelf.c.patch [deleted file]
lib/libmagic/patches/readelf.h.patch [deleted file]

index 3c13553..be0da2f 100644 (file)
@@ -1,6 +1,7 @@
-This directory contains most of the file 4.13 distribution. The original
+This directory contains most of the file 4.14 distribution. The original
 source can be obtained from
-       ftp://ftp.astron.com/pub/file/file-4.13.tar.gz
-       (MD5 (file-4.13.tar.gz) = 2bfc0f878ee22e50441b68df2ccbb984)
+       ftp://ftp.astron.com/pub/file/file-4.14.tar.gz
+       (MD5 (file-4.14.tar.gz) = 66983e60087e8bcd588c8ab38a861af0)
+
 A list of the omitted files and directories can be found in
 README.DELETED.
index 57ea1c9..a38cc6c 100644 (file)
@@ -1,7 +1,6 @@
-# $DragonFly: src/lib/libmagic/Makefile,v 1.9 2005/06/01 15:09:11 joerg Exp $
+# $DragonFly: src/lib/libmagic/Makefile,v 1.10 2005/07/06 14:01:57 joerg Exp $
 
 MAGICDIR= ${.CURDIR}/../../contrib/file-4/magic
-PATCHES!=      echo ${.CURDIR}/patches/*.patch
 CONTRIBDIR=    ${.CURDIR}/../../contrib/file-4/src
 .PATH: ${CONTRIBDIR}
 
@@ -13,7 +12,6 @@ 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
-SRCS+= ${PATCHES}
 INCS=  magic.h
 
 CFLAGS+= -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
diff --git a/lib/libmagic/patches/readelf.c.patch b/lib/libmagic/patches/readelf.c.patch
deleted file mode 100644 (file)
index 2e87cd5..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-$DragonFly: src/lib/libmagic/patches/Attic/readelf.c.patch,v 1.1 2005/06/01 15:09:11 joerg Exp $
-
---- readelf.c  18 Dec 2004 17:18:06 -0000      1.1
-+++ readelf.c  1 Jun 2005 13:53:21 -0000
-@@ -487,6 +487,19 @@
-               return size;
-       }
-+      if (namesz == 10 && strcmp((char *)&nbuf[noff], "DragonFly") == 0 &&
-+          nh_type == NT_DRAGONFLY_VERSION && descsz == 4) {
-+              if (file_printf(ms, ", for DragonFly") == -1)
-+                      return size;
-+              uint32_t desc;
-+              (void)memcpy(&desc, &nbuf[doff], sizeof(desc));
-+              desc = getu32(swap, desc);
-+              if (file_printf(ms, " %d.%d.%d", desc / 100000,
-+                  desc / 10000 % 10, desc % 10000) == -1)
-+                      return size;
-+              return size;
-+      }
-+
-       /*
-        * Sigh.  The 2.0.36 kernel in Debian 2.1, at
-        * least, doesn't correctly implement name
diff --git a/lib/libmagic/patches/readelf.h.patch b/lib/libmagic/patches/readelf.h.patch
deleted file mode 100644 (file)
index dedf95f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$DragonFly: src/lib/libmagic/patches/Attic/readelf.h.patch,v 1.1 2005/06/01 15:09:11 joerg Exp $
-
---- readelf.h  18 Dec 2004 17:18:06 -0000      1.1
-+++ readelf.h  31 May 2005 23:00:18 -0000
-@@ -223,6 +223,7 @@
- #define NT_NETBSD_EMULATION   2
- #define NT_FREEBSD_VERSION    1
- #define NT_OPENBSD_VERSION    1
-+#define NT_DRAGONFLY_VERSION  1
- /* GNU executables (name = "GNU") */
- #define NT_GNU_VERSION                1