Browse Source

Refresh patch queue

Christoph Biedl 7 years ago
parent
commit
78a3c22485

File diff suppressed because it is too large
+ 0 - 1066
debian/patches/cherry-pick.FILE5_29-38-gafec4e7c.combined.patch


+ 0 - 65
debian/patches/local.improve-flash.patch

@@ -1,65 +0,0 @@
-Subject: Improve detection of Flash data
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Bug-Debian: https://bugs.debian.org/838860
-
---- a/magic/Magdir/flash
-+++ b/magic/Magdir/flash
-@@ -11,22 +11,44 @@
- #
- 
- 0   name        swf-details
-->0	string		F		Macromedia Flash data
--!:mime	application/x-shockwave-flash
-->0	string		C		Macromedia Flash data (compressed)
--!:mime	application/x-shockwave-flash
-->0	string		Z		Macromedia Flash data (lzma compressed)
--!:mime	application/x-shockwave-flash
-->3   byte        x      \b, version %d
-+
-+>0      string      F
-+>>8     byte&0xfd   0x08    Macromedia Flash data
-+!:mime  application/x-shockwave-flash
-+>>>3    byte        x       \b, version %d
-+>>8     byte&0xfe   0x10    Macromedia Flash data
-+!:mime  application/x-shockwave-flash
-+>>>3    byte        x       \b, version %d
-+>>8     byte        0x18    Macromedia Flash data
-+!:mime  application/x-shockwave-flash
-+>>>3    byte        x       \b, version %d
-+>>8     beshort&ff87 0x2000 Macromedia Flash data
-+!:mime  application/x-shockwave-flash
-+>>>3    byte        x       \b, version %d
-+>>8     beshort&ffe0 0x3000 Macromedia Flash data
-+!:mime  application/x-shockwave-flash
-+>>>3    byte        x       \b, version %d
-+>>8     byte&0x7    0
-+>>>8    ubyte       >0x2f
-+>>>>9   ubyte       <0x20   Macromedia Flash data
-+!:mime  application/x-shockwave-flash
-+>>>>>3  byte        x       \b, version %d
-+
-+>0      string      C
-+>>8     byte        0x78    Macromedia Flash data (compressed)
-+!:mime  application/x-shockwave-flash
-+>>>3    byte        x       \b, version %d
-+
-+>0      string      Z
-+>>8     byte        0x5d    Macromedia Flash data (lzma compressed)
-+!:mime  application/x-shockwave-flash
-+>>>3    byte        x      \b, version %d
-+
- 
- 1   string      WS
-->4  lelong      !0
-->>3 byte        255 Suspicious
-->>>0    use     swf-details
--
-->>3 ubyte       <32
-->>>3 ubyte      !0
-->>>>0   use     swf-details
-+>4  ulelong     >14
-+>>3 ubyte       !0
-+>>>0   use      swf-details
- 
- # From: Cal Peake <cp@absolutedigital.net>
- 0	string		FLV\x01		Macromedia Flash Video

+ 0 - 2
debian/patches/series

@@ -1,5 +1,4 @@
 # cherry-picked commits. Keep in upstream's chronological order
-cherry-pick.FILE5_29-38-gafec4e7c.combined.patch
 
 # local modifications
 local.support-local-definitions-in-etc-magic.patch
@@ -8,4 +7,3 @@ local.mention-posixly-correct-dependent-behaviour-in-usage-message.patch
 local.report-gz-as-application-gzip.patch
 local.disable-detection-of-vax-coff-executables.patch
 local.disable-algol68-detection.patch
-local.improve-flash.patch