etc/gimprc | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

plug-ins/print/print-draw-page.c | 2 2 + 0 - 0 !
plug-ins/print/print-preview.c | 2 2 + 0 - 0 !
2 files changed, 4 insertions(+)

 bug 631199 - printing and print preview broken with cairo 1.10

Add missing calls to cairo_surface_mark_dirty().

plug-ins/common/sphere-designer.c | 5 4 + 1 - 0 !
plug-ins/gfig/gfig-style.c | 8 7 + 1 - 0 !
plug-ins/lighting/lighting-ui.c | 27 23 + 4 - 0 !
3 files changed, 34 insertions(+), 6 deletions(-)

 fix denial of service and possible code execution via
 malformed plugin configuration files

plug-ins/common/file-psp.c | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 fix denial of service and possible code execution via
 malformed PSP image file

plug-ins/common/file-psp.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix denial of service and possible code execution via
 malformed PSP image file

app/actions/image-commands.c | 2 1 + 1 - 0 !
app/actions/layers-commands.c | 4 2 + 2 - 0 !
app/actions/select-commands.c | 2 1 + 1 - 0 !
app/actions/vectors-commands.c | 4 2 + 2 - 0 !
app/config/gimprc.c | 6 3 + 3 - 0 !
app/core/gimpcontainer-filter.c | 2 1 + 1 - 0 !
app/dialogs/convert-dialog.c | 2 1 + 1 - 0 !
app/dialogs/preferences-dialog.c | 2 1 + 1 - 0 !
app/dialogs/quit-dialog.c | 2 1 + 1 - 0 !
app/dialogs/stroke-dialog.c | 1 1 + 0 - 0 !
app/errors.c | 2 1 + 1 - 0 !
app/file/file-open.c | 8 5 + 3 - 0 !
app/gui/gui-message.c | 2 1 + 1 - 0 !
app/gui/gui.c | 2 1 + 1 - 0 !
app/main.c | 4 2 + 2 - 0 !
app/plug-in/gimppluginprocedure.c | 2 1 + 1 - 0 !
app/tools/gimpaligntool.c | 2 1 + 1 - 0 !
app/tools/gimpbucketfilltool.c | 2 1 + 1 - 0 !
app/tools/gimpcolorpickertool.c | 2 1 + 1 - 0 !
app/tools/gimpcurvestool.c | 2 1 + 1 - 0 !
app/tools/gimpforegroundselecttool.c | 2 1 + 1 - 0 !
app/tools/gimpfreeselecttool.c | 2 1 + 1 - 0 !
app/tools/gimpimagemaptool-settings.c | 4 2 + 2 - 0 !
app/tools/gimpiscissorstool.c | 4 2 + 2 - 0 !
app/tools/gimpmeasuretool.c | 6 3 + 3 - 0 !
app/tools/gimppainttool.c | 4 2 + 2 - 0 !
app/tools/gimpselectiontool.c | 2 1 + 1 - 0 !
app/tools/gimpsourcetool.c | 4 2 + 2 - 0 !
app/tools/gimptool.c | 2 1 + 1 - 0 !
app/tools/gimptransformtool.c | 2 1 + 1 - 0 !
app/tools/gimpvectortool.c | 2 1 + 1 - 0 !
app/widgets/gimpcontrollerlist.c | 4 2 + 2 - 0 !
app/widgets/gimperrordialog.c | 2 1 + 1 - 0 !
app/widgets/gimphelp.c | 5 3 + 2 - 0 !
app/widgets/gimpwidgets-utils.c | 6 3 + 3 - 0 !
configure.in | 3 3 + 0 - 0 !
libgimpconfig/gimpconfigwriter.c | 1 1 + 0 - 0 !
libgimpthumb/gimpthumbnail.c | 2 1 + 1 - 0 !
plug-ins/common/lcms.c | 4 2 + 2 - 0 !
plug-ins/common/mail.c | 2 1 + 1 - 0 !
plug-ins/file-bmp/bmp-write.c | 4 2 + 2 - 0 !
plug-ins/file-fits/fits.c | 2 1 + 1 - 0 !
plug-ins/file-jpeg/jpeg.c | 2 1 + 1 - 0 !
plug-ins/file-uri/uri.c | 2 1 + 1 - 0 !
plug-ins/help/gimphelpdomain.c | 2 1 + 1 - 0 !
plug-ins/ifs-compose/ifs-compose.c | 3 2 + 1 - 0 !
plug-ins/print/print.c | 2 1 + 1 - 0 !
47 files changed, 72 insertions(+), 63 deletions(-)

 [patch] bug 660305 - fails to build with -werror=format-security

According to the bug, Debian enforces
-Wformat-security and -Werror=format-security, which is a good thing.
Most of these patches are already in master, but I'll check master
anyway.

plug-ins/common/file-gif-load.c | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

 [patch 1/2] file-gif-load: ensure return value of lzwreadbyte() is
 <= 255 (cherry picked from commit
 b1a3de761362db982c0ddfaff60ab4a3c4267f32)

plug-ins/common/file-gif-load.c | 15 9 + 6 - 0 !
1 file changed, 9 insertions(+), 6 deletions(-)

 [patch 2/2] file-gif-load: fix heap corruption and buffer overflow
 (CVE-2011-2896) (cherry picked from commit
 376ad788c1a1c31d40f18494889c383f6909ebfc)

plug-ins/common/file-cel.c | 283 234 + 49 - 0 !
1 file changed, 234 insertions(+), 49 deletions(-)

---

gimp-2.6.10.orig | only
plug-ins/common/file-gif-load.c | 11 9 + 2 - 0 !
2 files changed, 9 insertions(+), 2 deletions(-)

---

plug-ins/common/file-xwd.c | 78 52 + 26 - 0 !
plug-ins/common/file-xwd.c~ | only
2 files changed, 52 insertions(+), 26 deletions(-)

---

plug-ins/common/file-xwd.c | 11 11 + 0 - 0 !
1 file changed, 11 insertions(+)

---

plug-ins/common/file-xwd.c | 51 28 + 23 - 0 !
1 file changed, 28 insertions(+), 23 deletions(-)

---