- added msdos patch (disable too greedy DOS COM/BAT entries)

[packages/file.git] / file-debian.patch

diff --git a/file-debian.patch b/file-debian.patch
index 61f31e4ab2194da918f173d94daa9a0315187b45..860bd41dc12c06169a770418a9a62fc5087e08a7 100644 (file)
--- a/file-debian.patch
+++ b/file-debian.patch
@@ -1,8 +1,8 @@
---- file-4.13.orig/doc/file.man
-+++ file-4.13/doc/file.man
+--- 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
 @@ -1,4 +1,4 @@
 -.TH FILE __CSECTION__ "Copyright but distributable"
-+.TH FILE __CSECTION__ "January 2004" "Copyrighted but distributable"
++.TH FILE __CSECTION__ "August 2005" "Copyrighted but distributable"
  .\" $Id$
  .SH NAME
  file
@@ -31,7 +31,7 @@
  magic file
  .I __MAGIC__.mgc ,
  or 
-@@ -339,12 +340,6 @@
+@@ -368,12 +369,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}
-@@ -498,3 +493,7 @@
+@@ -527,3 +522,7 @@
  .B ftp.astron.com
  in the directory
  .I /pub/file/file-X.YZ.tar.gz
@@ -75,10 +75,10 @@
 +# Don't edit this file, edit /etc/magic or send your suggested inclusions to
 +# this file as a wishlist bug against file (using the reportbug utility).
 +
---- file-4.11/magic/magic.mime.orig    2004-11-21 06:20:30.000000000 +0100
-+++ file-4.11/magic/magic.mime 2004-11-22 23:30:02.976163088 +0100
-@@ -190,7 +190,7 @@
- 
+--- file-4.17/magic/magic.mime.orig    2006-03-02 22:50:32.000000000 +0100
++++ file-4.17/magic/magic.mime 2006-03-19 11:46:24.803922750 +0100
+@@ -195,7 +195,7 @@
+ 0       beshort         0x4De1          audio/MP4A-LATM
  
  # MPEG Layer 3 sound files
 -0       beshort               &0xffe0         audio/mpeg
@@ -86,7 +86,7 @@
  #MP3 with ID3 tag
  0     string          ID3             audio/mpeg
  # Ogg/Vorbis
-@@ -289,10 +289,10 @@
+@@ -295,10 +295,10 @@
  # because it tries to uncompress it to figure out what's inside.
  
  # standard unix compress
@@ -99,7 +99,7 @@
  
  0             string                  PK\003\004              application/x-zip
  
-@@ -393,19 +393,14 @@
+@@ -399,19 +399,14 @@
  #
  # from Daniel Quinlan <quinlan@yggdrasil.com>
  #
@@ -126,7 +126,7 @@
  
  #------------------------------------------------------------------------------
  # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
-@@ -468,7 +463,7 @@
+@@ -474,7 +469,7 @@
  0     beshort         0xffd8          image/jpeg
  
  # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
@@ -135,7 +135,7 @@
  #>14  byte            12              (OS/2 1.x format)
  #>14  byte            64              (OS/2 2.x format)
  #>14  byte            40              (Windows 3.x format)
-@@ -778,6 +773,7 @@
+@@ -789,6 +784,7 @@
  #
  0     string          FWS             
  >3    byte            x                       application/x-shockwave-flash
@@ -143,10 +143,11 @@
  
  # The following paramaters are created for Namazu.
  # <http://www.namazu.org/>
-@@ -906,3 +902,7 @@
- # (made the mimetype up) 
- 0     string  \0\0MMXPR3\0    application/x-quark-xpress-3
- 
+@@ -924,3 +920,8 @@
+ # From: Denis Knauf, via gentoo.
+ 0     string  fLaC            audio/x-flac
+ 0     string  CWS             application/x-shockwave-flash
++
 +# Gnumeric spreadsheet
 +# This entry is only semi-helpful, as Gnumeric compresses its files, so
 +# they will ordinarily reported as "compressed", but at least -z helps
@@ -157,3 +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 @@
+       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 */
+ 
+       /*
+@@ -227,7 +227,7 @@
+       if (file_reset(ms) == -1)
+               goto done;
+ 
+-      switch (file_fsmagic(ms, inname, &sb)) {
++      switch (file_fsmagic(ms, inname, st)) {
+       case -1:
+               goto done;
+       case 0: