[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, wheezy, updated. debian/25.0.1364.152-1-12-g87d1d1c

Michael Gilbert mgilbert at debian.org
Thu Jul 18 00:08:27 UTC 2013 

The following commit has been merged in the wheezy branch:
commit 87d1d1c3473536230344a6cf7eb08b708be5521a
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Wed Jul 17 20:12:49 2013 -0400

    Release 28.0.1500.71-1~deb7u1

diff --git a/debian/changelog b/debian/changelog
index e4bbf95..bb2357f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+chromium-browser (28.0.1500.71-1~deb7u1) stable-security; urgency=high
+
+  * New upstream stable release:
+    - Low CVE-2013-2867: Block pop-unders in various scenarios.
+    - High CVE-2013-2879: Confusion setting up sign-in and sync. Credit to
+      Andrey Labunets.
+    - Medium CVE-2013-2868: Incorrect sync of NPAPI extension component. Credit
+      to Andrey Labunets.
+    - Medium CVE-2013-2869: Out-of-bounds read in JPEG2000 handling. Credit to
+      Felix Groebert of Google Security Team.
+    - Critical CVE-2013-2870: Use-after-free with network sockets. Credit to
+      Collin Payne.
+    - Medium CVE-2013-2853: Man-in-the-middle attack against HTTP in SSL.
+      Credit to Antoine Delignat-Lavaud and Karthikeyan Bhargavan from Prosecco
+      at INRIA Paris.
+    - High CVE-2013-2871: Use-after-free in input handling. Credit to miaubiz.
+    - High CVE-2013-2873: Use-after-free in resource loading. Credit to
+      miaubiz.
+    - Medium CVE-2013-2875: Out-of-bounds-read in SVG. Credit to miaubiz.
+    - Medium CVE-2013-2876: Extensions permissions confusion with
+      interstitials.  Credit to Dev Akhawe.
+    - Low CVE-2013-2877: Out-of-bounds read in XML parsing. Credit to Aki Helin
+      of OUSPG.
+    - None: Remove the “viewsource” attribute on iframes. Credit to Collin
+      Jackson.
+    - Medium CVE-2013-2878: Out-of-bounds read in text handling. Credit to Atte
+      Kettunen of OUSPG.
+    - High CVE-2013-2880: Various fixes from internal audits, fuzzing and other
+      initiatives. Credit to Chrome 28 team.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Mon, 15 Jul 2013 00:17:54 +0000
+
 chromium-browser (27.0.1453.110-1~deb7u1) stable-security; urgency=high
 
   * New stable release:
diff --git a/debian/chromium.install b/debian/chromium.install
index 6466c8d..729ea1a 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -11,6 +11,7 @@ debian/tmp/usr/lib/chromium/remoting_locales
 debian/tmp/usr/lib/chromium/lib*
 #debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
 #debian/tmp/usr/lib/chromium/nacl_irt_*
+debian/tmp/usr/lib/chromium/mksnapshot.*
 debian/tmp/usr/lib/chromium/pseudo_locales/fake-bidi.pak
 debian/tmp/usr/lib/chromium/remoting_locales/en-US.pak
 debian/chromium.desktop usr/share/applications
diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
index 1d5fbf2..617b9f3 100644
--- a/debian/patches/arm-neon.patch
+++ b/debian/patches/arm-neon.patch
@@ -6,8 +6,8 @@ Bug-Ubuntu: 1084852
 
 Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
 ===================================================================
---- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-03-16 09:38:40.000000000 +0100
-+++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-03-30 17:42:05.571734731 +0100
+--- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-06-24 11:51:46.204041318 +0200
++++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-06-24 11:51:46.196041318 +0200
 @@ -72,7 +72,7 @@
              'WEBRTC_LINUX',
            ],
@@ -19,8 +19,8 @@ Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/is
              'lattice_armv7.S',
 Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
 ===================================================================
---- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-03-16 09:38:39.000000000 +0100
-+++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-03-30 17:42:05.575734731 +0100
+--- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-06-24 11:51:46.204041318 +0200
++++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-06-24 11:51:46.196041318 +0200
 @@ -18,6 +18,47 @@
  
  #include "typedefs.h"
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
deleted file mode 100644
index 53df892..0000000
--- a/debian/patches/arm-no-float-abi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: chromium/src/build/common.gypi
-===================================================================
---- chromium.orig/src/build/common.gypi	2013-05-22 03:15:43.553475451 +0000
-+++ chromium/src/build/common.gypi	2013-05-22 03:15:43.549475453 +0000
-@@ -919,7 +919,7 @@
-     'arm_fpu%': 'vfpv3',
- 
-     # Set ARM float abi compilation flag.
--    'arm_float_abi%': 'softfp',
-+    #'arm_float_abi%': 'softfp',
- 
-     # Enable use of OpenMAX DL FFT routines.
-     'use_openmax_dl_fft%': '<(use_openmax_dl_fft)',
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index 5c6889c..f2aca1b 100644
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
@@ -1,7 +1,7 @@
-Index: chromium/src/ui/base/resource/data_pack.cc
+Index: sid/src/ui/base/resource/data_pack.cc
 ===================================================================
---- chromium.orig/src/ui/base/resource/data_pack.cc	2013-05-22 03:15:53.209475098 +0000
-+++ chromium/src/ui/base/resource/data_pack.cc	2013-05-22 03:15:53.185475099 +0000
+--- sid.orig/src/ui/base/resource/data_pack.cc	2013-06-24 11:51:04.360040869 +0200
++++ sid/src/ui/base/resource/data_pack.cc	2013-06-24 11:51:04.352040869 +0200
 @@ -147,9 +147,11 @@
    // 2) Verify the entries are within the appropriate bounds. There's an extra
    // entry after the last item which gives us the length of the last item.
@@ -15,20 +15,3 @@ Index: chromium/src/ui/base/resource/data_pack.cc
        LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
                   << "Was the file corrupted?";
        UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
-Index: chromium/src/v8/src/arm/macro-assembler-arm.cc
-===================================================================
---- chromium.orig/src/v8/src/arm/macro-assembler-arm.cc	2013-05-22 03:15:53.209475098 +0000
-+++ chromium/src/v8/src/arm/macro-assembler-arm.cc	2013-05-22 03:15:53.205475100 +0000
-@@ -61,9 +61,9 @@
- // We do not support thumb inter-working with an arm architecture not supporting
- // the blx instruction (below v5t).  If you know what CPU you are compiling for
- // you can use -march=armv7 or similar.
--#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
--# error "For thumb inter-working we require an architecture which supports blx"
--#endif
-+//#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
-+//# error "For thumb inter-working we require an architecture which supports blx"
-+//#endif
- 
- 
- // Using bx does not yield better code, so use it only when required
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index 21578fb..3714f12 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,13 +1,13 @@
 Do not use armv4 incopatible code
-Index: chromium/src/build/common.gypi
+Index: sid/src/build/common.gypi
 ===================================================================
---- chromium.orig/src/build/common.gypi	2013-05-22 03:14:34.821477965 +0000
-+++ chromium/src/build/common.gypi	2013-05-22 03:14:34.817477965 +0000
-@@ -2745,6 +2745,7 @@
+--- sid.orig/src/build/common.gypi	2013-06-24 11:48:31.368039228 +0200
++++ sid/src/build/common.gypi	2013-06-24 11:48:31.364039228 +0200
+@@ -2924,6 +2924,7 @@
                    # silences those warnings, as they are not helpful and
                    # clutter legitimate warnings.
                    '-Wno-abi',
 +                  '-fno-tree-sink',
                  ],
                  'conditions': [
-                   ['arm_thumb==1 and android_webview_build==0', {
+                   ['arm_arch!=""', {
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
index dd71946..64e7745 100644
--- a/debian/patches/cups1.5.patch
+++ b/debian/patches/cups1.5.patch
@@ -2,8 +2,8 @@ Description: Fix build failure due to cups 1.5 header changes
 Author: Michael Gilbert <michael.s.gilbert at gmail.com>
 Index: sid/src/printing/backend/cups_helper.h
 ===================================================================
---- sid.orig/src/printing/backend/cups_helper.h	2013-03-16 09:35:30.000000000 +0100
-+++ sid/src/printing/backend/cups_helper.h	2013-03-30 17:41:53.611735017 +0100
+--- sid.orig/src/printing/backend/cups_helper.h	2013-06-24 11:48:42.972039352 +0200
++++ sid/src/printing/backend/cups_helper.h	2013-06-24 11:48:42.964039352 +0200
 @@ -6,6 +6,7 @@
  #define PRINTING_BACKEND_CUPS_HELPER_H_
  
@@ -14,8 +14,8 @@ Index: sid/src/printing/backend/cups_helper.h
  
 Index: sid/src/chrome/service/cloud_print/print_system_cups.cc
 ===================================================================
---- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc	2013-03-16 09:37:20.000000000 +0100
-+++ sid/src/chrome/service/cloud_print/print_system_cups.cc	2013-03-30 17:41:53.615735017 +0100
+--- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc	2013-06-24 11:48:42.972039352 +0200
++++ sid/src/chrome/service/cloud_print/print_system_cups.cc	2013-06-24 11:48:42.968039352 +0200
 @@ -5,6 +5,7 @@
  #include "chrome/service/cloud_print/print_system.h"
  
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 6037c1b..3c3c7a7 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -1,8 +1,8 @@
 Include system copy of expat.h
 Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
 ===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h	2013-03-16 09:38:14.000000000 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h	2013-03-30 17:34:46.651745229 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h	2013-06-24 11:48:25.644039166 +0200
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h	2013-06-24 11:48:25.636039166 +0200
 @@ -32,9 +32,9 @@
  
  #include "talk/xmllite/xmlnsstack.h"
@@ -17,8 +17,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
  struct XML_ParserStruct;
 Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
 ===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc	2013-03-16 09:38:11.000000000 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc	2013-03-30 17:34:46.655745229 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc	2013-06-24 11:48:25.644039166 +0200
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc	2013-06-24 11:48:25.640039166 +0200
 @@ -31,9 +31,9 @@
  #include "talk/base/common.h"
  #include "talk/xmpp/constants.h"
@@ -33,8 +33,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
  namespace buzz {
 Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
 ===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp	2013-03-16 09:38:30.000000000 +0100
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp	2013-03-30 17:34:46.655745229 +0100
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp	2013-06-24 11:48:25.644039166 +0200
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp	2013-06-24 11:48:25.640039166 +0200
 @@ -11,7 +11,7 @@
  #include "SkString.h"
  #include "SkStream.h"
@@ -46,8 +46,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
  #define CHAR_16_TO_9
 Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
 ===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp	2013-03-16 09:38:30.000000000 +0100
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp	2013-03-30 17:34:46.655745229 +0100
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp	2013-06-24 11:48:25.644039166 +0200
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp	2013-06-24 11:48:25.640039166 +0200
 @@ -12,7 +12,7 @@
  #include "SkString.h"
  #include "SkStream.h"
@@ -59,8 +59,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
  {
 Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
 ===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h	2013-03-16 09:38:14.000000000 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h	2013-03-30 17:34:46.655745229 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h	2013-06-24 11:48:25.644039166 +0200
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h	2013-06-24 11:48:25.640039166 +0200
 @@ -33,11 +33,7 @@
  #include "talk/base/scoped_ptr.h"
  #include "talk/xmllite/xmlparser.h"
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 60c3dec..2444679 100644
--- a/debian/patches/fix-manpage.patch
+++ b/debian/patches/fix-manpage.patch
@@ -6,8 +6,8 @@ Last-Update: 2011-02-20
 
 Index: sid/src/chrome/app/resources/manpage.1.in
 ===================================================================
---- sid.orig/src/chrome/app/resources/manpage.1.in	2013-03-16 09:36:16.000000000 +0100
-+++ sid/src/chrome/app/resources/manpage.1.in	2013-03-30 17:41:44.635735232 +0100
+--- sid.orig/src/chrome/app/resources/manpage.1.in	2013-06-24 11:48:37.340039292 +0200
++++ sid/src/chrome/app/resources/manpage.1.in	2013-06-24 11:48:37.336039292 +0200
 @@ -1,5 +1,5 @@
 -." This file is processed by chrome.gyp to generate manpages in the
 -." build diretory.
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
index 6e144a8..518ae26 100644
--- a/debian/patches/gcc4.7.patch
+++ b/debian/patches/gcc4.7.patch
@@ -1,7 +1,7 @@
 Index: sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h
 ===================================================================
---- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h	2013-03-16 09:36:26.000000000 +0100
-+++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h	2013-03-30 17:41:58.651734896 +0100
+--- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h	2013-06-24 11:50:52.936040746 +0200
 @@ -8,6 +8,7 @@
  #include <stddef.h>
  #include <string>
@@ -12,8 +12,8 @@ Index: sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h
  #include "chrome/browser/search_engines/search_engine_type.h"
 Index: sid/src/gpu/command_buffer/common/types.h
 ===================================================================
---- sid.orig/src/gpu/command_buffer/common/types.h	2013-03-16 09:35:31.000000000 +0100
-+++ sid/src/gpu/command_buffer/common/types.h	2013-03-30 17:41:58.651734896 +0100
+--- sid.orig/src/gpu/command_buffer/common/types.h	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/gpu/command_buffer/common/types.h	2013-06-24 11:50:52.940040746 +0200
 @@ -12,6 +12,7 @@
  #endif
  #include <cstddef>
@@ -24,8 +24,8 @@ Index: sid/src/gpu/command_buffer/common/types.h
  typedef signed char         int8;
 Index: sid/src/ipc/ipc_channel.h
 ===================================================================
---- sid.orig/src/ipc/ipc_channel.h	2013-03-16 09:36:05.000000000 +0100
-+++ sid/src/ipc/ipc_channel.h	2013-03-30 17:41:58.655734896 +0100
+--- sid.orig/src/ipc/ipc_channel.h	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/ipc/ipc_channel.h	2013-06-24 11:50:52.940040746 +0200
 @@ -1,3 +1,4 @@
 +#include <sys/types.h>
  // Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -33,8 +33,8 @@ Index: sid/src/ipc/ipc_channel.h
  // found in the LICENSE file.
 Index: sid/src/third_party/ots/src/os2.cc
 ===================================================================
---- sid.orig/src/third_party/ots/src/os2.cc	2013-03-16 09:38:20.000000000 +0100
-+++ sid/src/third_party/ots/src/os2.cc	2013-03-30 17:41:58.655734896 +0100
+--- sid.orig/src/third_party/ots/src/os2.cc	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/third_party/ots/src/os2.cc	2013-06-24 11:50:52.940040746 +0200
 @@ -5,6 +5,7 @@
  #include "os2.h"
  
@@ -45,8 +45,8 @@ Index: sid/src/third_party/ots/src/os2.cc
  // http://www.microsoft.com/opentype/otspec/os2.htm
 Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
 ===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2013-03-16 09:35:52.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2013-03-30 17:41:58.655734896 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2013-06-24 11:50:52.940040746 +0200
 @@ -39,6 +39,7 @@
  
  #include <stddef.h>   // for ptrdiff_t
@@ -57,8 +57,8 @@ Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
  
 Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
 ===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2013-03-16 09:35:52.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2013-03-30 17:41:58.655734896 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2013-06-24 11:50:52.940040746 +0200
 @@ -63,6 +63,7 @@
  
  #define HAVE_VDSO_SUPPORT 1
@@ -69,8 +69,8 @@ Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
  namespace base {
 Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
 ===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc	2013-03-16 09:35:52.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/common.cc	2013-03-30 17:41:58.655734896 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/common.cc	2013-06-24 11:50:52.940040746 +0200
 @@ -33,6 +33,7 @@
  #include "config.h"
  #include "common.h"
@@ -81,8 +81,8 @@ Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
  #include <unistd.h>                     // for getpagesize
 Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
 ===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h	2013-03-16 09:35:52.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h	2013-03-30 17:41:58.655734896 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h	2013-06-24 11:50:52.944040747 +0200
 @@ -39,6 +39,7 @@
  #endif
  #include <stddef.h>  // for NULL
@@ -93,8 +93,8 @@ Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
  
 Index: sid/src/ui/gfx/codec/jpeg_codec.h
 ===================================================================
---- sid.orig/src/ui/gfx/codec/jpeg_codec.h	2013-03-16 09:37:21.000000000 +0100
-+++ sid/src/ui/gfx/codec/jpeg_codec.h	2013-03-30 17:41:58.655734896 +0100
+--- sid.orig/src/ui/gfx/codec/jpeg_codec.h	2013-06-24 11:50:52.948040747 +0200
++++ sid/src/ui/gfx/codec/jpeg_codec.h	2013-06-24 11:50:52.944040747 +0200
 @@ -7,6 +7,7 @@
  
  #include <stddef.h>
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 4631698..9868967 100644
--- a/debian/patches/icon.patch
+++ b/debian/patches/icon.patch
@@ -1,7 +1,7 @@
-Index: chromium/src/chrome/browser/ui/gtk/gtk_util.cc
+Index: sid/src/chrome/browser/ui/gtk/gtk_util.cc
 ===================================================================
---- chromium.orig/src/chrome/browser/ui/gtk/gtk_util.cc	2013-05-22 03:15:59.425474873 +0000
-+++ chromium/src/chrome/browser/ui/gtk/gtk_util.cc	2013-05-22 03:15:59.421474874 +0000
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc	2013-06-24 11:51:43.528041289 +0200
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc	2013-06-24 11:51:43.520041289 +0200
 @@ -54,7 +54,7 @@
  #if defined(GOOGLE_CHROME_BUILD)
  static const char* kIconName = "google-chrome";
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 4e83014..93e8d0e 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,8 +1,8 @@
 Include system copy of prtime.h
-Index: chromium-browser/src/base/pr_time_unittest.cc
+Index: sid/src/base/pr_time_unittest.cc
 ===================================================================
---- chromium-browser.orig/src/base/pr_time_unittest.cc	2013-03-30 14:55:16.652387438 +0000
-+++ chromium-browser/src/base/pr_time_unittest.cc	2013-03-30 14:55:16.640387437 +0000
+--- sid.orig/src/base/pr_time_unittest.cc	2013-06-24 11:46:01.748037623 +0200
++++ sid/src/base/pr_time_unittest.cc	2013-06-24 11:46:01.740037623 +0200
 @@ -5,7 +5,7 @@
  #include <time.h>
  
@@ -12,10 +12,10 @@ Index: chromium-browser/src/base/pr_time_unittest.cc
  #include "base/time.h"
  #include "testing/gtest/include/gtest/gtest.h"
  
-Index: chromium-browser/src/base/time.cc
+Index: sid/src/base/time.cc
 ===================================================================
---- chromium-browser.orig/src/base/time.cc	2013-03-30 14:55:16.652387438 +0000
-+++ chromium-browser/src/base/time.cc	2013-03-30 14:55:44.116387204 +0000
+--- sid.orig/src/base/time.cc	2013-06-24 11:46:01.748037623 +0200
++++ sid/src/base/time.cc	2013-06-24 11:46:01.740037623 +0200
 @@ -12,7 +12,7 @@
  #include <limits>
  
@@ -25,11 +25,11 @@ Index: chromium-browser/src/base/time.cc
  
  #include "base/logging.h"
  
-Index: chromium-browser/src/chrome/browser/metrics/metrics_log.cc
+Index: sid/src/chrome/browser/metrics/metrics_log.cc
 ===================================================================
---- chromium-browser.orig/src/chrome/browser/metrics/metrics_log.cc	2013-03-30 14:55:16.652387438 +0000
-+++ chromium-browser/src/chrome/browser/metrics/metrics_log.cc	2013-03-30 14:55:16.644387438 +0000
-@@ -19,7 +19,7 @@
+--- sid.orig/src/chrome/browser/metrics/metrics_log.cc	2013-06-24 11:46:01.748037623 +0200
++++ sid/src/chrome/browser/metrics/metrics_log.cc	2013-06-24 11:46:01.744037623 +0200
+@@ -20,7 +20,7 @@
  #include "base/string_util.h"
  #include "base/strings/string_number_conversions.h"
  #include "base/sys_info.h"
@@ -38,10 +38,10 @@ Index: chromium-browser/src/chrome/browser/metrics/metrics_log.cc
  #include "base/time.h"
  #include "base/tracked_objects.h"
  #include "base/utf_string_conversions.h"
-Index: chromium-browser/src/base/base.gypi
+Index: sid/src/base/base.gypi
 ===================================================================
---- chromium-browser.orig/src/base/base.gypi	2013-03-30 14:55:16.652387438 +0000
-+++ chromium-browser/src/base/base.gypi	2013-03-30 14:56:24.860387023 +0000
+--- sid.orig/src/base/base.gypi	2013-06-24 11:46:01.748037623 +0200
++++ sid/src/base/base.gypi	2013-06-24 11:46:01.744037623 +0200
 @@ -25,7 +25,6 @@
            'third_party/nspr/prcpucfg_openbsd.h',
            'third_party/nspr/prcpucfg_solaris.h',
@@ -50,16 +50,16 @@ Index: chromium-browser/src/base/base.gypi
            'third_party/nspr/prtime.h',
            'third_party/nspr/prtypes.h',
            'third_party/xdg_mime/xdgmime.h',
-Index: chromium-browser/src/net/base/x509_certificate_nss.cc
+Index: sid/src/chrome/common/metrics/metrics_log_base.cc
 ===================================================================
---- chromium-browser.orig/src/net/base/x509_certificate_nss.cc	2013-03-30 14:55:16.652387438 +0000
-+++ chromium-browser/src/net/base/x509_certificate_nss.cc	2013-03-30 14:56:54.568387012 +0000
-@@ -9,7 +9,7 @@
- #include <keyhi.h>
- #include <nss.h>
- #include <pk11pub.h>
--#include <prtime.h>
+--- sid.orig/src/chrome/common/metrics/metrics_log_base.cc	2013-06-18 09:53:32.000000000 +0200
++++ sid/src/chrome/common/metrics/metrics_log_base.cc	2013-06-24 11:47:51.052038795 +0200
+@@ -13,7 +13,7 @@
+ #include "base/strings/string_number_conversions.h"
+ #include "base/sys_byteorder.h"
+ #include "base/sys_info.h"
+-#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
- #include <seccomon.h>
- #include <secder.h>
- #include <sechash.h>
+ #include "base/utf_string_conversions.h"
+ #include "chrome/common/chrome_version_info.h"
+ #include "chrome/common/logging_chrome.h"
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index d2b3d27..7d8e387 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,9 +1,9 @@
 webkit needs to call nss to pull in nspr headers
-Index: chromium/src/chrome/chrome_common.gypi
+Index: sid/src/chrome/chrome_common.gypi
 ===================================================================
---- chromium.orig/src/chrome/chrome_common.gypi	2013-05-22 03:08:57.793490276 +0000
-+++ chromium/src/chrome/chrome_common.gypi	2013-05-22 03:08:57.793490276 +0000
-@@ -490,6 +490,11 @@
+--- sid.orig/src/chrome/chrome_common.gypi	2013-06-29 17:15:15.753983583 +0200
++++ sid/src/chrome/chrome_common.gypi	2013-06-29 17:15:15.745983583 +0200
+@@ -514,6 +514,11 @@
              'common/crash_keys.h',
            ],
          }],
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index b8da675..21a6fb8 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,10 +1,10 @@
 Author:  Raymond Wooninck (tittiatcoke)
 Source: OpenSUSE (chromium-master-prefs-path.patch)
-Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
+Index: sid/src/chrome/browser/first_run/first_run_linux.cc
 ===================================================================
---- chromium.orig/src/chrome/browser/first_run/first_run_linux.cc	2013-05-22 05:50:57.197135151 +0000
-+++ chromium/src/chrome/browser/first_run/first_run_linux.cc	2013-05-22 05:51:58.833132898 +0000
-@@ -70,9 +70,7 @@
+--- sid.orig/src/chrome/browser/first_run/first_run_linux.cc	2013-06-24 11:48:28.200039194 +0200
++++ sid/src/chrome/browser/first_run/first_run_linux.cc	2013-06-24 11:48:28.196039194 +0200
+@@ -65,9 +65,7 @@
  
  base::FilePath MasterPrefsPath() {
    // The standard location of the master prefs is next to the chrome binary.
diff --git a/debian/patches/series b/debian/patches/series
index cc24fc3..17ceb15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,6 @@ webkit-version.patch
 cups1.5.patch
 #system_v8.patch
 #protobuf.patch
-arm-no-float-abi.patch
 gcc4.7.patch
 arm.patch
 icon.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 00022b7..53cb7b8 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
 Use system speex
-Index: chromium/src/build/linux/system.gyp
+Index: sid/src/build/linux/system.gyp
 ===================================================================
---- chromium.orig/src/build/linux/system.gyp	2013-05-22 03:14:40.493477755 +0000
-+++ chromium/src/build/linux/system.gyp	2013-05-22 03:14:40.473477755 +0000
-@@ -619,6 +619,26 @@
+--- sid.orig/src/build/linux/system.gyp	2013-06-24 11:48:34.768039264 +0200
++++ sid/src/build/linux/system.gyp	2013-06-24 11:48:34.760039264 +0200
+@@ -636,6 +636,26 @@
        ],
      },
      {
@@ -30,10 +30,10 @@ Index: chromium/src/build/linux/system.gyp
        'target_name': 'gnome_keyring',
        'type': 'none',
        'conditions': [
-Index: chromium/src/content/browser/speech/audio_encoder.cc
+Index: sid/src/content/browser/speech/audio_encoder.cc
 ===================================================================
---- chromium.orig/src/content/browser/speech/audio_encoder.cc	2013-05-22 03:14:40.493477755 +0000
-+++ chromium/src/content/browser/speech/audio_encoder.cc	2013-05-22 03:15:28.897475986 +0000
+--- sid.orig/src/content/browser/speech/audio_encoder.cc	2013-06-24 11:48:34.768039264 +0200
++++ sid/src/content/browser/speech/audio_encoder.cc	2013-06-24 11:48:34.764039264 +0200
 @@ -11,7 +11,7 @@
  #include "base/string_number_conversions.h"
  #include "content/browser/speech/audio_buffer.h"
@@ -43,16 +43,16 @@ Index: chromium/src/content/browser/speech/audio_encoder.cc
  
  namespace content {
  namespace {
-Index: chromium/src/content/content_browser.gypi
+Index: sid/src/content/content_browser.gypi
 ===================================================================
---- chromium.orig/src/content/content_browser.gypi	2013-05-22 03:14:40.493477755 +0000
-+++ chromium/src/content/content_browser.gypi	2013-05-22 03:14:40.493477755 +0000
-@@ -1172,7 +1172,7 @@
-     }, { # OS!="android"
+--- sid.orig/src/content/content_browser.gypi	2013-06-24 11:48:34.768039264 +0200
++++ sid/src/content/content_browser.gypi	2013-06-24 11:48:34.764039264 +0200
+@@ -1342,7 +1342,7 @@
+     }, {  # input_speech==1
        'dependencies': [
          '../third_party/flac/flac.gyp:libflac',
 -        '../third_party/speex/speex.gyp:libspeex',
 +        '../build/linux/system.gyp:speex',
        ],
      }],
-     ['OS=="mac"', {
+     ['linux_use_libgps==1', {
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index 454d81a..3bc345b 100644
--- a/debian/patches/webkit-version.patch
+++ b/debian/patches/webkit-version.patch
@@ -1,11 +1,11 @@
 description: debian-specific version parsing (for about dialog)
 Index: sid/src/webkit/build/webkit_version.py
 ===================================================================
---- sid.orig/src/webkit/build/webkit_version.py	2013-03-16 09:35:29.000000000 +0100
-+++ sid/src/webkit/build/webkit_version.py	2013-03-30 17:41:51.355735071 +0100
-@@ -61,6 +61,15 @@
+--- sid.orig/src/webkit/build/webkit_version.py	2013-06-24 11:48:39.708039317 +0200
++++ sid/src/webkit/build/webkit_version.py	2013-06-24 11:48:39.700039317 +0200
+@@ -31,6 +31,15 @@
        default_lastchange=None,
-       directory=os.path.join(webkit_dir, version_file_dir),
+       directory=webkit_src_dir,
        directory_regex_prior_to_src_url='webkit')
 +  if version_info.url is None or version_info.url == 'unknown':
 +    # parse the DEPS file
diff --git a/debian/rules b/debian/rules
index 4f4f1f8..8cd0af7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export DH_VERBOSE = 1
 
 DEBIAN_NAME		:= chromium
 DEBIAN_VERSION		:= $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
@@ -30,7 +31,6 @@ WANT_SHARED_LIBS ?= 0
 WANT_TESTS       ?= 0
 WANT_SANDBOXING  ?= 1
 USE_SYSTEM_V8    ?= 0
-VERBOSE          ?= 0
 
 export DEB_BUILD_HARDENING=1
 #use DEB_BUILD_OPTIONS's parallel=n option (see Policy 4.9.1)
@@ -162,7 +162,7 @@ endif
 BUILD_ARGS += BUILDTYPE=$(BUILD_TYPE)
 
 # Verbose?
-ifeq (1,$(VERBOSE))
+ifeq (1,$(DH_VERBOSE))
 BUILD_ARGS += V=1
 endif
 

-- 
Git repository for pkg-chromium

More information about the Pkg-chromium-commit mailing list