1 This removes support for DCM, DIB, XBM, XCF and XWD file formats. It saves us |
|
2 from CVE-2007-4985, CVE-2007-4986 and CVE-2007-4988. |
|
3 |
|
4 diff -urN ImageMagick-6.3.4.orig/Makefile.am ImageMagick-6.3.4/Makefile.am |
|
5 --- ImageMagick-6.3.4.orig/Makefile.am 2007-04-02 18:59:34.000000000 -0700 |
|
6 +++ ImageMagick-6.3.4/Makefile.am 2011-08-24 09:07:57.831550701 -0700 |
|
7 @@ -21,7 +21,7 @@ |
|
8 |
|
9 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) |
|
10 |
|
11 -ACLOCAL_AMFLAGS = -Iltdl/m4 -I m4 |
|
12 +ACLOCAL_AMFLAGS = -I m4 |
|
13 |
|
14 MODULECOMMONFLAGS = -no-undefined -module -avoid-version |
|
15 |
|
16 diff -urN ImageMagick-6.3.4.orig/coders/Makefile.am ImageMagick-6.3.4/coders/Makefile.am |
|
17 --- ImageMagick-6.3.4.orig/coders/Makefile.am 2007-04-27 17:41:46.000000000 -0700 |
|
18 +++ ImageMagick-6.3.4/coders/Makefile.am 2011-08-24 09:11:10.957499184 -0700 |
|
19 @@ -58,8 +58,8 @@ |
|
20 endif |
|
21 |
|
22 if HasX11 |
|
23 -MAGICK_X11_MODULES = coders/x.la coders/xwd.la |
|
24 -MAGICK_X11_SRCS = coders/x.c coders/xwd.c |
|
25 +MAGICK_X11_MODULES = coders/x.la |
|
26 +MAGICK_X11_SRCS = coders/x.c |
|
27 endif |
|
28 |
|
29 MAGICK_CODER_SRCS = \ |
|
30 @@ -73,8 +73,6 @@ |
|
31 coders/clip.c \ |
|
32 coders/cmyk.c \ |
|
33 coders/cut.c \ |
|
34 - coders/dcm.c \ |
|
35 - coders/dib.c \ |
|
36 coders/dot.c \ |
|
37 coders/dps.c \ |
|
38 coders/dpx.c \ |
|
39 @@ -147,9 +145,7 @@ |
|
40 coders/wbmp.c \ |
|
41 coders/wmf.c \ |
|
42 coders/wpg.c \ |
|
43 - coders/xbm.c \ |
|
44 coders/xc.c \ |
|
45 - coders/xcf.c \ |
|
46 coders/xpm.c \ |
|
47 coders/ycbcr.c \ |
|
48 coders/yuv.c \ |
|
49 @@ -175,8 +171,6 @@ |
|
50 coders/clip.la \ |
|
51 coders/cmyk.la \ |
|
52 coders/cut.la \ |
|
53 - coders/dcm.la \ |
|
54 - coders/dib.la \ |
|
55 coders/dot.la \ |
|
56 coders/dps.la \ |
|
57 coders/dpx.la \ |
|
58 @@ -249,9 +243,7 @@ |
|
59 coders/wbmp.la \ |
|
60 coders/wmf.la \ |
|
61 coders/wpg.la \ |
|
62 - coders/xbm.la \ |
|
63 coders/xc.la \ |
|
64 - coders/xcf.la \ |
|
65 coders/xpm.la \ |
|
66 coders/ycbcr.la \ |
|
67 coders/yuv.la \ |
|
68 @@ -334,18 +326,6 @@ |
|
69 coders_cut_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
70 coders_cut_la_LIBADD = $(LIBMAGICK) |
|
71 |
|
72 -# DCM coder module |
|
73 -coders_dcm_la_SOURCES = coders/dcm.c |
|
74 -coders_dcm_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
75 -coders_dcm_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
76 -coders_dcm_la_LIBADD = $(LIBMAGICK) |
|
77 - |
|
78 -# DIB coder module |
|
79 -coders_dib_la_SOURCES = coders/dib.c |
|
80 -coders_dib_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
81 -coders_dib_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
82 -coders_dib_la_LIBADD = $(LIBMAGICK) |
|
83 - |
|
84 # DJVU coder module |
|
85 coders_djvu_la_SOURCES = coders/djvu.c |
|
86 coders_djvu_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
87 @@ -839,36 +819,18 @@ |
|
88 coders_x_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
89 coders_x_la_LIBADD = $(LIBMAGICK) $(X11_LIBS) |
|
90 |
|
91 -# XBM coder module |
|
92 -coders_xbm_la_SOURCES = coders/xbm.c |
|
93 -coders_xbm_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
94 -coders_xbm_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
95 -coders_xbm_la_LIBADD = $(LIBMAGICK) |
|
96 - |
|
97 # XC coder module |
|
98 coders_xc_la_SOURCES = coders/xc.c |
|
99 coders_xc_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
100 coders_xc_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
101 coders_xc_la_LIBADD = $(LIBMAGICK) |
|
102 |
|
103 -# XCF coder module |
|
104 -coders_xcf_la_SOURCES = coders/xcf.c |
|
105 -coders_xcf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
106 -coders_xcf_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
107 -coders_xcf_la_LIBADD = $(LIBMAGICK) |
|
108 - |
|
109 # XPM coder module |
|
110 coders_xpm_la_SOURCES = coders/xpm.c |
|
111 coders_xpm_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
112 coders_xpm_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
113 coders_xpm_la_LIBADD = $(LIBMAGICK) |
|
114 |
|
115 -# XWD coder module |
|
116 -coders_xwd_la_SOURCES = coders/xwd.c |
|
117 -coders_xwd_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|
118 -coders_xwd_la_LDFLAGS = $(MODULECOMMONFLAGS) |
|
119 -coders_xwd_la_LIBADD = $(LIBMAGICK) $(X11_LIBS) |
|
120 - |
|
121 # YCBCR coder module |
|
122 coders_ycbcr_la_SOURCES = coders/ycbcr.c |
|
123 coders_ycbcr_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) |
|