← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/file/intrepid-updates

« back to all changes in this revision

Viewing changes to debian/patches/103-magic-remove-bzip.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2007-05-08 03:10:15 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070508031015-zu86y0q1q6fesoex
Tags: 4.20-5ubuntu1
* Merge from debian unstable, remaining changes:
  - Build a python-magic-dbg package.
  - Set Ubuntu maintainer address.
* Add 500-adjust-rexx.dpatch: work around regex DoS (CVE-2007-2026)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/103-magic-remove-bzip.dpatch
 
1
#!/bin/sh /usr/share/dpatch/dpatch-run
 
2
## 103-magic-remove-bzip.dpatch by Michael Piefel <piefel@debian.org>
 
3
##
 
4
## DP: Disabled bzip detection (closes: #277648).
 
5
 
 
6
@DPATCH@
 
7
 
 
8
diff -Naur file-4.20.orig/magic/Magdir/compress file-4.20/magic/Magdir/compress
 
9
--- file-4.20.orig/magic/Magdir/compress        2006-03-02 22:10:26.000000000 +0000
 
10
+++ file-4.20/magic/Magdir/compress     2007-04-03 12:26:56.000000000 +0000
 
11
@@ -102,17 +102,17 @@
 
12
 # bzip a block-sorting file compressor
 
13
 #      by Julian Seward <sewardj@cs.man.ac.uk> and others
 
14
 #
 
15
-0      string          BZ              bzip compressed data
 
16
->2     byte            x               \b, version: %c
 
17
->3     string          =1              \b, compression block size 100k
 
18
->3     string          =2              \b, compression block size 200k
 
19
->3     string          =3              \b, compression block size 300k
 
20
->3     string          =4              \b, compression block size 400k
 
21
->3     string          =5              \b, compression block size 500k
 
22
->3     string          =6              \b, compression block size 600k
 
23
->3     string          =7              \b, compression block size 700k
 
24
->3     string          =8              \b, compression block size 800k
 
25
->3     string          =9              \b, compression block size 900k
 
26
+#0     string          BZ              bzip compressed data
 
27
+#>2    byte            x               \b, version: %c
 
28
+#>3    string          =1              \b, compression block size 100k
 
29
+#>3    string          =2              \b, compression block size 200k
 
30
+#>3    string          =3              \b, compression block size 300k
 
31
+#>3    string          =4              \b, compression block size 400k
 
32
+#>3    string          =5              \b, compression block size 500k
 
33
+#>3    string          =6              \b, compression block size 600k
 
34
+#>3    string          =7              \b, compression block size 700k
 
35
+#>3    string          =8              \b, compression block size 800k
 
36
+#>3    string          =9              \b, compression block size 900k
 
37
 
 
38
 # lzop from <markus.oberhumer@jk.uni-linz.ac.at>
 
39
 0      string          \x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a    lzop compressed data