[Pkg-chromium-commit] [pkg-chromium] 02/02: release 35.0.1916.153-2

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit 46eadea3a9c7df56ad1d7caeedd82fc03e3b6d6e
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Fri Jun 13 00:04:56 2014 -0400

    release 35.0.1916.153-2
---
 debian/changelog             | 19 +++++++++++++++++++
 debian/control               |  4 ++--
 debian/patches/no-sse2.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 debian/rules                 |  4 ++++
 5 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 284c826..4fdc5c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+chromium-browser (35.0.1916.153-2) unstable; urgency=medium
+
+  * Avoid gcc 4.9 (closes: #751294)
+
+ -- Michael Gilbert <mgilbert at debian.org>  Thu, 12 Jun 2014 01:11:09 +0000
+
+chromium-browser (35.0.1916.153-1) unstable; urgency=high
+
+  * New upstream stable release:
+    - CVE-2014-3154: Use-after-free in filesystem api. Credit to Collin Payne.
+    - CVE-2014-3155: Out-of-bounds read in SPDY. Credit to James March, Daniel
+      Sommermann and Alan Frindell of Facebook.
+    - CVE-2014-3156: Buffer overflow in clipboard. Credit to Atte Kettunen.
+    - CVE-2014-3157: Heap overflow in media.
+  * Don't set sse2 compiler flags on i386 (closes: #750361).
+  * Prefer libgcrypt11 (closes: #750304).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Wed, 11 Jun 2014 02:31:22 +0000
+
 chromium-browser (35.0.1916.114-2) unstable; urgency=medium
 
   * Add flags to avoid memory exhaustion while linking on i386
diff --git a/debian/control b/debian/control
index 4399b31..ae57078 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Homepage: http://www.chromium.org/Home
 Build-Depends:
  cdbs,
  debhelper (>= 7),
+ g++-4.8,
  pkg-config,
  lsb-release,
  gyp (>= 0.1~svn1119),
@@ -19,7 +20,6 @@ Build-Depends:
  bison,
  flex,
  gperf,
- gdb,
  wdiff,
  coreutils (>= 7.5) | timeout,
  xvfb,
@@ -80,7 +80,7 @@ Build-Depends:
  libjs-jquery,
  libjs-excanvas,
  libjs-jquery-flot | libjs-flot,
- libgcrypt20-dev | libgcrypt11-dev,
+ libgcrypt11-dev | libgcrypt20-dev,
 Standards-Version: 3.9.5
 
 Package: chromium
diff --git a/debian/patches/no-sse2.patch b/debian/patches/no-sse2.patch
new file mode 100644
index 0000000..45d831e
--- /dev/null
+++ b/debian/patches/no-sse2.patch
@@ -0,0 +1,26 @@
+description: don't set sse2 compiler flags on i386
+author: Michael Gilbert <mgilbert at debian.org>
+debian-bug: http://bugs.debian.org/750361
+
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -3391,7 +3391,7 @@
+                 # http://crbug.com/313032 for an example where this has "bit"
+                 # us in the past.
+                 'cflags': [
+-                  '-msse2',
++                  '-msse',
+                   '-mfpmath=sse',
+                   '-mmmx',  # Allows mmintrin.h for MMX intrinsics.
+                   '-m32',
+--- a/src/third_party/qcms/qcms.gyp
++++ b/src/third_party/qcms/qcms.gyp
+@@ -31,7 +31,7 @@
+       'msvs_disabled_warnings': [ 4018 ],
+ 
+       'conditions': [
+-        ['target_arch=="ia32" or target_arch=="x64"', {
++        ['target_arch=="x64"', {
+           'defines': [
+             'SSE2_ENABLE',
+           ],
diff --git a/debian/patches/series b/debian/patches/series
index 6bf40e4..7229eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,6 +21,7 @@ no-promo.patch
 chromedriver-revision.patch
 
 linker-flags.patch
+no-sse2.patch
 
 make-support/gyp.patch
 make-support/mojo.patch
diff --git a/debian/rules b/debian/rules
index fc21c02..a6fd2ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,10 @@ ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 WANT_TESTS := 0
 endif
 
+# Hardcode gcc 4.8 to avoid issues caused by >= 4.9
+export CC=gcc-4.8
+export CXX=g++-4.8
+
 # Disable SSE2
 GYP_DEFINES = disable_sse2=1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git