- updated for 4.18

Changed files:
    file-debian.patch -> 1.15
    file-sparc.patch -> 1.4

diff --git a/file-debian.patch b/file-debian.patch
index 860bd41dc12c06169a770418a9a62fc5087e08a7..8657a6016db3ce928dfbb31dd477030c8aff1535 100644 (file)
--- a/file-debian.patch
+++ b/file-debian.patch
@@ -1,8 +1,8 @@
---- file-4.15/doc/file.man.orig        2005-08-18 17:18:22.000000000 +0200
-+++ file-4.15/doc/file.man     2005-08-28 22:16:00.615271312 +0200
+--- file-4.18/doc/file.man.orig        2006-05-03 21:20:25.000000000 +0200
++++ file-4.18/doc/file.man     2006-11-13 16:15:03.159505000 +0100
 @@ -1,4 +1,4 @@
 -.TH FILE __CSECTION__ "Copyright but distributable"
-+.TH FILE __CSECTION__ "August 2005" "Copyrighted but distributable"
++.TH FILE __CSECTION__ "May 2006" "Copyright but distributable"
  .\" $Id$
  .SH NAME
  file
@@ -31,7 +31,7 @@
  magic file
  .I __MAGIC__.mgc ,
  or 
-@@ -368,12 +369,6 @@
+@@ -369,12 +370,6 @@
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.
@@ -44,7 +44,7 @@
  .SH EXAMPLES
  .nf
  $ file file.c file /dev/{wd0a,hda}
-@@ -527,3 +522,7 @@
+@@ -528,3 +523,7 @@
  .B ftp.astron.com
  in the directory
  .I /pub/file/file-X.YZ.tar.gz
@@ -158,23 +158,23 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
---- file-4.14/src/magic.c.debian       2005-06-25 17:52:14.000000000 +0200
-+++ file-4.14/src/magic.c      2005-07-14 09:43:18.000000000 +0200
-@@ -213,7 +213,7 @@
+--- file-4.18/src/magic.c.orig 2006-10-31 20:37:17.000000000 +0100
++++ file-4.18/src/magic.c      2006-11-13 16:15:31.219505000 +0100
+@@ -238,7 +238,7 @@
        int     fd = 0;
        int     rv = -1;
        unsigned char *buf;
 -      struct stat     sb;
 +      struct stat     sb, *st = &sb;
        ssize_t nbytes = 0;     /* number of bytes read from a datafile */
+       int     ispipe = 0;
  
-       /*
-@@ -227,7 +227,7 @@
+@@ -253,7 +253,7 @@
        if (file_reset(ms) == -1)
                goto done;
  
 -      switch (file_fsmagic(ms, inname, &sb)) {
 +      switch (file_fsmagic(ms, inname, st)) {
-       case -1:
+       case -1:                /* error */
                goto done;
-       case 0:
+       case 0:                 /* nothing found */

diff --git a/file-sparc.patch b/file-sparc.patch
index c3bb33eff170f665127ac65b5f1d305ad5ebb19e..38fb6e190879b30e08da53d127003abac7c41ee7 100644 (file)
--- a/file-sparc.patch
+++ b/file-sparc.patch
@@ -71,10 +71,9 @@ diff -Nru file-4.02.bak/magic/Magdir/netbsd file-4.02/magic/Magdir/netbsd
  >12   string                  >\0             from '%s'
  >32   belong                  !0              (signal %d)
  
-diff -Nru file-4.02.bak/magic/Magdir/sun file-4.02/magic/Magdir/sun
---- file-4.02.bak/magic/Magdir/sun     Fri Feb  7 17:26:01 1997
-+++ file-4.02/magic/Magdir/sun Thu Apr  3 09:14:25 2003
-@@ -5,18 +5,18 @@
+--- file-4.18/magic/Magdir/sun.orig    2006-06-14 00:17:00.000000000 +0200
++++ file-4.18/magic/Magdir/sun 2006-11-13 16:16:59.029505000 +0100
+@@ -5,7 +5,7 @@
  # Values for big-endian Sun (MC680x0, SPARC) binaries on pre-5.x
  # releases.  (5.x uses ELF.)
  #
@@ -83,14 +82,16 @@ diff -Nru file-4.02.bak/magic/Magdir/sun file-4.02/magic/Magdir/sun
  >0    byte            &0x80
  >>20  belong          <4096           shared library
  >>20  belong          =4096           dynamically linked executable
- >>20  belong          >4096           dynamically linked executable
+@@ -13,12 +13,12 @@
  >0    byte            ^0x80           executable
  >16   belong          >0              not stripped
+ 
 -0     belong&077777777        0600410         sparc pure
 +0     belong&077777777        0600410         SPARC pure
  >0    byte            &0x80           dynamically linked executable
  >0    byte            ^0x80           executable
  >16   belong          >0              not stripped
+ 
 -0     belong&077777777        0600407         sparc
 +0     belong&077777777        0600407         SPARC
  >0    byte            &0x80           dynamically linked executable