Merge lp:~ken-vandine/chromium-browser/chromium-browser.quantal into lp:~chromium-team/chromium-browser/chromium-browser.quantal

[Ken VanDine]

[Micah Gersten (micahg)]

Meh, this is wrong for quantal as armel isn't armv7. Also, there are other related things in debian/rules that should probably be fixed. But merging since this was uploaded, please make a merge proposal next time unless it's critical (and this didn't even build on any arch anyways)

[lp:~ken-vandine/chromium-browser/chromium-browser.quantal]

736. By Micah Gersten on 2012-06-18

(merge in ken vandine's 18.0.1025.168~r134367-0ubuntu1)
we're forced to merge this broken branch since it's been uploaded already

* debian/rules
  - include armv7 in GYP_DEFINES for 11.10, 12.04 and 12.10. Fixes
    FTBFS on arm (LP: #993080)

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-09 21:22:02 +0000
+++ debian/changelog	2012-06-18 14:23:29 +0000
@@ -1,3 +1,28 @@
+chromium-browser (18.0.1025.168~r134367-0ubuntu1) quantal; urgency=low
+
+  * debian/rules
+    - include armv7 in GYP_DEFINES for 11.10, 12.04 and 12.10.  Fixes 
+      FTBFS on arm (LP: #993080)
+
+ -- Ken VanDine <[e-mail]>  Mon, 18 Jun 2012 10:04:59 -0400
+
+chromium-browser (18.0.1025.168~r134367-0ubuntu0.12.04.1) precise-security; urgency=low
+
+  * New upstream release from the Stable Channel (LP: #992352)
+    - [106413] High CVE-2011-3078: Use after free in floats handling. Credit to
+      Google Chrome Security Team (Marty Barbella) and independent later
+      discovery by miaubiz.
+    - [117110] High CVE-2012-1521: Use after free in xml parser. Credit to
+      Google Chrome Security Team (SkyLined) and independent later discovery by
+      wushi of team509 reported through iDefense VCP (V-874rcfpq7z).
+    - [117627] Medium CVE-2011-3079: IPC validation failure. Credit to PinkiePie
+    - [121726] Medium CVE-2011-3080: Race condition in sandbox IPC. Credit to
+      Willem Pinckaers of Matasano.
+    - [121899] High CVE-2011-3081: Use after free in floats handling.
+      Credit to miaubiz.
+
+ -- Micah Gersten <[e-mail]>  Tue, 01 May 2012 00:02:53 -0500
+
 chromium-browser (18.0.1025.151~r130497-0ubuntu1) precise; urgency=low
 
   * New upstream release from the Stable Channel (LP: #977502)

=== modified file 'debian/rules'
--- debian/rules	2012-04-01 19:50:28 +0000
+++ debian/rules	2012-06-18 14:23:29 +0000
@@ -90,7 +90,7 @@
 	use_cups=0 \
 	$(NULL)
 WANT_XZ_DEBS := 0
-ifneq (,$(filter 10.10 11.04 unstable development,$(DEBIAN_DIST)))
+ifneq (,$(filter 10.10 11.04 11.10 12.04 12.10 unstable development,$(DEBIAN_DIST)))
 # on $(DEB_BUILD_ARCH) and $(DEBIAN_DIST), enforce an armv7 with thumb build (or not)
 GYP_DEFINES += \
 	armv7=1 \