~ubuntu-branches/ubuntu/quantal/chromium-browser/quantal

« back to all changes in this revision

Viewing changes to debian/patches/cups_1.5_build_fix.patch

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin
  • Date: 2011-08-23 07:22:44 UTC
  • mfrom: (1.5.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20110823072244-1fad1bln8d3lacxr
Tags: 13.0.782.215~r97094-0ubuntu1
* New upstream release from the Stable Channel
  This release fixes the following security issues:
  + Chromium issues:
   - [91517] High, CVE-2011-2828: Out-of-bounds write in v8. Credit to Google
     Chrome Security Team (SkyLined).
  + Webkit issues:
   - [82552] High, CVE-2011-2823: Use-after-free in line box handling. Credit
     to Google Chrome Security Team (SkyLined) and independent later
     discovery by miaubiz.
   - [88216] High, CVE-2011-2824: Use-after-free with counter nodes. Credit
     to miaubiz.
   - [88670] High, CVE-2011-2825: Use-after-free with custom fonts. Credit to
     wushi of team509 reported through ZDI (ZDI-CAN-1283), plus indepdendent
     later discovery by miaubiz.
   - [87453] High, CVE-2011-2826: Cross-origin violation with empty origins.
     Credit to Sergey Glazunov.
   - [90668] High, CVE-2011-2827: Use-after-free in text searching. Credit to
     miaubiz.
   - [32-bit only] [91598] High, CVE-2011-2829: Integer overflow in uniform
     arrays. Credit to Sergey Glazunov.
  + libxml2 issue:
   - [89402] High, CVE-2011-2821: Double free in libxml XPath handling.
     Credit to Yang Dingning from NCNIPC, Graduate University of Chinese
     Academy of Sciences.
Packaging changes:
* Fix a FTBFS with cups 1.5.0 by including individual cups headers
  - add debian/patches/cups_1.5_build_fix.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# cups 1.5.0 now needs individual headers
 
2
---
 
3
 chrome/browser/ui/webui/print_preview_handler.cc |    1 +
 
4
 1 file changed, 1 insertion(+)
 
5
 
 
6
Index: src/chrome/browser/ui/webui/print_preview_handler.cc
 
7
===================================================================
 
8
--- src.orig/chrome/browser/ui/webui/print_preview_handler.cc
 
9
+++ src/chrome/browser/ui/webui/print_preview_handler.cc
 
10
@@ -41,16 +41,17 @@
 
11
 #include "printing/backend/print_backend.h"
 
12
 #include "printing/metafile.h"
 
13
 #include "printing/metafile_impl.h"
 
14
 #include "printing/page_range.h"
 
15
 #include "printing/print_job_constants.h"
 
16
 
 
17
 #if defined(USE_CUPS)
 
18
 #include <cups/cups.h>
 
19
+#include <cups/ppd.h>
 
20
 
 
21
 #include "base/file_util.h"
 
22
 #endif
 
23
 
 
24
 namespace {
 
25
 
 
26
 const char kDisableColorOption[] = "disableColorOption";
 
27
 const char kSetColorAsDefault[] = "setColorAsDefault";