git Service of IN-Ulm e.V. Explore Help
Sign In
cbiedl
/
file
1
0
Fork 0
Files Pull Requests 0 Wiki
Tree: c59687a149
Branches Tags
file
/
debian
/
patches
/
999-conglomeration.dpatch

999-conglomeration.dpatch 6.2 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161 
  1. #!/bin/sh /usr/share/dpatch/dpatch-run
    2. 

  2. ## 999-conglomeration.dpatch by Michael Piefel <piefel@debian.org>
    3. 

  3. ##
    4. 

  4. ## DP: Needs to be broken out (FIXME).
    5. 

  5. 

  6. @DPATCH@
    7. 

  7. 

  8. diff -Naurp file-4.23.orig/magic/magic.mime file-4.23/magic/magic.mime
    9. 

  9. --- file-4.23.orig/magic/magic.mime	2008-01-12 18:23:14.000000000 +0000
    10. 

  10. +++ file-4.23/magic/magic.mime	2008-01-12 18:25:28.000000000 +0000
    11. 

  11. @@ -184,6 +184,7 @@
    12. 

  12.  0	string	MThd			audio/x-midi
    13. 

  13.  #>9 	byte	>0			(format %d)
    14. 

  14.  #>11	byte	>1			using %d channels
    15. 

  15. +0	string	MThd			audio/midi
    16. 

  16.  #					Creative Music (CMF) data
    17. 

  17.  0	string	CTMF			audio/x-unknown
    18. 

  18.  #					SoundBlaster instrument data
    19. 

  19. @@ -332,7 +333,7 @@
    20. 

  20.  # because it tries to uncompress it to figure out what's inside.
    21. 

  21.  
    22. 

  22.  # standard unix compress
    23. 

  23. -0	string		\037\235	application/x-compress
    24. 

  24. +#0	string		\037\235	application/x-compress
    25. 

  25.  
    26. 

  26.  # gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
    27. 

  27.  0       string          \037\213        application/x-gzip
    28. 

  28. @@ -437,18 +438,14 @@
    29. 

  29.  #------------------------------------------------------------------------------
    30. 

  30.  # html:  file(1) magic for HTML (HyperText Markup Language) docs
    31. 

  31.  #
    32. 

  32. -# from Daniel Quinlan <quinlan@yggdrasil.com>
    33. 

  33. +# from Michael Piefel <piefel@debian.org>
    34. 

  34.  #
    35. 

  35. -0	string		\<HEAD	text/html
    36. 

  36. -0	string		\<head	text/html
    37. 

  37. -0	string		\<TITLE	text/html
    38. 

  38. -0	string		\<title	text/html
    39. 

  39. -0       string          \<html	text/html
    40. 

  40. -0       string          \<HTML	text/html
    41. 

  41. -0	string		\<!--	text/html
    42. 

  42. -0	string		\<h1	text/html
    43. 

  43. -0	string		\<H1	text/html
    44. 

  44. -0	string/c	\<!doctype\ html	text/html
    45. 

  45. +0	string/cB	\<!DOCTYPE\ html	text/html
    46. 

  46. +0	string/cb	\<head			text/html
    47. 

  47. +0	string/cb	\<title			text/html
    48. 

  48. +0	string/bc	\<html			text/html
    49. 

  49. +0	string		\<!--			text/html
    50. 

  50. +0	string/c	\<h1			text/html
    51. 

  51.  
    52. 

  52.  #------------------------------------------------------------------------------
    53. 

  53.  # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
    54. 

  54. @@ -511,7 +508,7 @@
    55. 

  55.  0	beshort		0xffd8		image/jpeg
    56. 

  56.  
    57. 

  57.  # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
    58. 

  58. -0	string		BM		image/bmp
    59. 

  59. +0	string		BM		image/x-ms-bmp
    60. 

  60.  #>14	byte		12		(OS/2 1.x format)
    61. 

  61.  #>14	byte		64		(OS/2 2.x format)
    62. 

  62.  #>14	byte		40		(Windows 3.x format)
    63. 

  63. @@ -749,8 +746,10 @@
    64. 

  64.  #------------------------------------------------------------------------------
    65. 

  65.  # Hierarchical Data Format, used to facilitate scientific data exchange
    66. 

  66.  # specifications at http://hdf.ncsa.uiuc.edu/
    67. 

  67. -0	belong		0x0e031301	Hierarchical Data Format (version 4) data
    68. 

  68. -0	string		\211HDF\r\n\032	Hierarchical Data Format (version 5) data
    69. 

  69. +#Hierarchical Data Format (version 4) data
    70. 

  70. +0	belong		0x0e031301		application/x-hdf
    71. 

  71. +#Hierarchical Data Format (version 5) data
    72. 

  72. +0	string		\211HDF\r\n\032		application/x-hdf
    73. 

  73.  
    74. 

  74.  # Adobe Photoshop
    75. 

  75.  0	string		8BPS			image/vnd.adobe.photoshop
    76. 

  76. @@ -820,21 +819,39 @@
    77. 

  77.  # Debian has entries for the old PGP formats:
    78. 

  78.  # pgp:  file(1) magic for Pretty Good Privacy
    79. 

  79.  # see http://lists.gnupg.org/pipermail/gnupg-devel/1999-September/016052.html
    80. 

  80. -0       beshort         0x9900                  application/x-pgp-keyring
    81. 

  81. -0       beshort         0x9501                  application/x-pgp-keyring
    82. 

  82. -0       beshort         0x9500                  application/x-pgp-keyring
    83. 

  83. -0       beshort         0xa600                  application/pgp-encrypted
    84. 

  84. -0       string          -----BEGIN\040PGP       text/PGP armored data
    85. 

  85. ->15     string          PUBLIC\040KEY\040BLOCK- public key block
    86. 

  86. ->15     string          MESSAGE-                message
    87. 

  87. ->15     string          SIGNED\040MESSAGE-      signed message
    88. 

  88. ->15     string          PGP\040SIGNATURE-       signature
    89. 

  89. -0       beshort         0x8501                  data
    90. 

  90. +#0       beshort         0x9900                  application/x-pgp-keyring
    91. 

  91. +#0       beshort         0x9501                  application/x-pgp-keyring
    92. 

  92. +#0       beshort         0x9500                  application/x-pgp-keyring
    93. 

  93. +#0       beshort         0xa600                  application/pgp-encrypted
    94. 

  94. +#0       string          -----BEGIN\040PGP       text/PGP armored data
    95. 

  95. +#>15     string          PUBLIC\040KEY\040BLOCK- public key block
    96. 

  96. +#>15     string          MESSAGE-                message
    97. 

  97. +#>15     string          SIGNED\040MESSAGE-      signed message
    98. 

  98. +#>15     string          PGP\040SIGNATURE-       signature
    99. 

  99. +#0       beshort         0x8501                  data
    100. 

  100. +#text/PGP key public ring
    101. 

  101. +0	beshort		0x9900		application/pgp
    102. 

  102. +#text/PGP key security ring
    103. 

  103. +0	beshort		0x9501		application/pgp
    104. 

  104. +#text/PGP key security ring
    105. 

  105. +0	beshort		0x9500		application/pgp
    106. 

  106. +#text/PGP encrypted data
    107. 

  107. +0	beshort		0xa600		application/pgp-encrypted
    108. 

  108. +#text/PGP armored data
    109. 

  109. +##public key block
    110. 

  110. +2	string	---BEGIN\ PGP\ PUBLIC\ KEY\ BLOCK-	application/pgp-keys
    111. 

  111. +0	string	-----BEGIN\040PGP\40MESSAGE-		application/pgp
    112. 

  112. +0	string	-----BEGIN\040PGP\40SIGNATURE-		application/pgp-signature
    113. 

  113. +
    114. 

  114.  #
    115. 

  115.  # GnuPG Magic:
    116. 

  116.  #
    117. 

  117. -0       beshort         0x9901                  application/x-gnupg-keyring
    118. 

  118. -0       beshort         0x8501                  text/OpenPGP data
    119. 

  119. +#0       beshort         0x9901                  application/x-gnupg-keyring
    120. 

  120. +#0       beshort         0x8501                  text/OpenPGP data
    121. 

  121. +#text/GnuPG key public ring
    122. 

  122. +0	beshort		0x9901		application/pgp
    123. 

  123. +#text/OpenPGP data
    124. 

  124. +0	beshort		0x8501		application/pgp-encrypted
    125. 

  125.  
    126. 

  126.  # flash:        file(1) magic for Macromedia Flash file format
    127. 

  127.  #
    128. 

  128. @@ -1003,3 +1020,8 @@
    129. 

  129.  0	lelong	0x10201A7A	x-epoc/x-sisx-app
    130. 

  130.  # FORTRAN source
    131. 

  131.  0	string/c	c\ 		text/x-fortran
    132. 

  132. +
    133. 

  133. +# Gnumeric spreadsheet
    134. 

  134. +# This entry is only semi-helpful, as Gnumeric compresses its files, so
    135. 

  135. +# they will ordinarily reported as "compressed", but at least -z helps
    136. 

  136. +39	string	=<gmr:Workbook	application/x-gnumeric
    137. 

  137. diff -Naurp file-4.23.orig/src/file.c file-4.23/src/file.c
    138. 

  138. --- file-4.23.orig/src/file.c	2007-12-27 16:35:58.000000000 +0000
    139. 

  139. +++ file-4.23/src/file.c	2008-01-12 18:25:28.000000000 +0000
    140. 

  140. @@ -350,7 +350,7 @@ main(int argc, char *argv[])
    141. 

  141.  	}
    142. 

  142.  
    143. 

  143.  	magic_close(magic);
    144. 

  144. -	return 0;
    145. 

  145. +	return magic->haderr ? -1 : 0;
    146. 

  146.  }
    147. 

  147.  
    148. 

  148.  
    149. 

  149. diff -Naurp file-4.23.orig/src/fsmagic.c file-4.23/src/fsmagic.c
    150. 

  150. --- file-4.23.orig/src/fsmagic.c	2007-11-07 21:33:23.000000000 +0000
    151. 

  151. +++ file-4.23/src/fsmagic.c	2008-01-12 18:25:28.000000000 +0000
    152. 

  152. @@ -93,7 +93,8 @@ file_fsmagic(struct magic_set *ms, const
    153. 

  153.  		if (file_printf(ms, "cannot open `%s' (%s)",
    154. 

  154.  		    fn, strerror(errno)) == -1)
    155. 

  155.  			return -1;
    156. 

  156. -		return 1;
    157. 

  157. +		ms->haderr++;
    158. 

  158. +		return -1;
    159. 

  159.  	}
    160. 

  160.  
    161. 

  161.  	if (mime) {
    162.