summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2014-02-13 04:41:32 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2014-02-13 04:41:32 +0000
commit67df71f464069ac47859752a1063e1c503889ac1 (patch)
treefd7173f37b984e8091cb6343097797a998498d6c /www-client
parentfix for CVE-2014-1948 (diff)
downloadgentoo-2-67df71f464069ac47859752a1063e1c503889ac1.tar.gz
gentoo-2-67df71f464069ac47859752a1063e1c503889ac1.tar.bz2
gentoo-2-67df71f464069ac47859752a1063e1c503889ac1.zip
Dev channel bump. Fix bug #500306 by Murph. Remove old.
(Portage version: 2.2.7/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog9
-rw-r--r--www-client/chromium/chromium-34.0.1833.5.ebuild (renamed from www-client/chromium/chromium-34.0.1809.0.ebuild)9
-rw-r--r--www-client/chromium/files/chromium-d8-r0.patch10
3 files changed, 25 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d6858cd2f0e1..e6f77b66e9d3 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1022 2014/02/08 04:15:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1023 2014/02/13 04:41:32 phajdan.jr Exp $
+
+*chromium-34.0.1833.5 (12 Feb 2014)
+
+ 12 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ +chromium-34.0.1833.5.ebuild, +files/chromium-d8-r0.patch,
+ -chromium-34.0.1809.0.ebuild:
+ Dev channel bump. Fix bug #500306 by Murph. Remove old.
*chromium-34.0.1825.4 (08 Feb 2014)
diff --git a/www-client/chromium/chromium-34.0.1809.0.ebuild b/www-client/chromium/chromium-34.0.1833.5.ebuild
index a37395c77599..c595b0b00ba2 100644
--- a/www-client/chromium/chromium-34.0.1809.0.ebuild
+++ b/www-client/chromium/chromium-34.0.1833.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-34.0.1809.0.ebuild,v 1.1 2014/01/29 05:16:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-34.0.1833.5.ebuild,v 1.1 2014/02/13 04:41:32 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
+IUSE="aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -167,6 +167,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-system-jinja-r3.patch"
epatch "${FILESDIR}/${PN}-gn-r1.patch"
epatch "${FILESDIR}/${PN}-depot-tools-r0.patch"
+ epatch "${FILESDIR}/${PN}-d8-r0.patch"
epatch_user
@@ -204,6 +205,7 @@ src_prepare() {
'third_party/libphonenumber' \
'third_party/libsrtp' \
'third_party/libusb' \
+ 'third_party/libwebm' \
'third_party/libxml/chromium' \
'third_party/libXNVCtrl' \
'third_party/libyuv' \
@@ -213,6 +215,7 @@ src_prepare() {
'third_party/modp_b64' \
'third_party/mt19937ar' \
'third_party/npapi' \
+ 'third_party/nss.isolate' \
'third_party/ots' \
'third_party/polymer' \
'third_party/pywebsocket' \
@@ -582,6 +585,8 @@ src_install() {
# keep the old symlink around for consistency
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+ dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
# Allow users to override command-line options, bug #357629.
dodir /etc/chromium || die
insinto /etc/chromium
diff --git a/www-client/chromium/files/chromium-d8-r0.patch b/www-client/chromium/files/chromium-d8-r0.patch
new file mode 100644
index 000000000000..590e531a18dc
--- /dev/null
+++ b/www-client/chromium/files/chromium-d8-r0.patch
@@ -0,0 +1,10 @@
+--- build/all.gyp.orig 2014-02-12 19:11:50.200718819 +0000
++++ build/all.gyp 2014-02-12 19:12:11.160850317 +0000
+@@ -676,7 +676,6 @@
+ }],
+ ['chromeos==0', {
+ 'dependencies': [
+- '../v8/src/d8.gyp:d8',
+ ],
+ }],
+ ['internal_filter_fuzzer==1', {