summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-03-03 09:28:16 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-03-03 09:28:16 +0000
commit4c2424cde611ee00ed399c8ad5121d2a8e593228 (patch)
tree2eddd1258f835f6215e63f8ba62c7b3e83e43533 /www-client
parentStable for AMD64, wrt security bug #355739 (diff)
downloadgentoo-2-4c2424cde611ee00ed399c8ad5121d2a8e593228.tar.gz
gentoo-2-4c2424cde611ee00ed399c8ad5121d2a8e593228.tar.bz2
gentoo-2-4c2424cde611ee00ed399c8ad5121d2a8e593228.zip
Use system tlslite instead of the bundled one.
(Portage version: 2.1.10.44/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/chromium-19.0.1055.1.ebuild8
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild8
3 files changed, 15 insertions, 7 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c2626f9f32eb..21f4731b0bb4 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.570 2012/03/03 06:47:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.571 2012/03/03 09:28:16 phajdan.jr Exp $
+
+ 03 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ chromium-19.0.1055.1.ebuild, chromium-9999-r1.ebuild:
+ Use system tlslite instead of the bundled one.
03 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+files/chromium-glib-r0.patch:
diff --git a/www-client/chromium/chromium-19.0.1055.1.ebuild b/www-client/chromium/chromium-19.0.1055.1.ebuild
index ac4e33dcfc76..12fd2a4de7df 100644
--- a/www-client/chromium/chromium-19.0.1055.1.ebuild
+++ b/www-client/chromium/chromium-19.0.1055.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1055.1.ebuild,v 1.1 2012/02/29 11:06:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1055.1.ebuild,v 1.2 2012/03/03 09:28:16 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -64,7 +64,10 @@ DEPEND="${RDEPEND}
>=sys-devel/bison-2.4.3
sys-devel/flex
>=sys-devel/make-3.81-r2
- test? ( dev-python/pyftpdlib )"
+ test? (
+ dev-python/pyftpdlib
+ >=dev-python/tlslite-0.4.0
+ )"
RDEPEND+="
!=www-client/chromium-9999
x11-misc/xdg-utils
@@ -227,7 +230,6 @@ src_prepare() {
\! -path 'third_party/speex/speex.h' \
\! -path 'third_party/sqlite/*' \
\! -path 'third_party/tcmalloc/*' \
- \! -path 'third_party/tlslite/*' \
\! -path 'third_party/undoview/*' \
\! -path 'third_party/v8-i18n/*' \
\! -path 'third_party/webdriver/*' \
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 4cc53544ce8f..029cfb951be9 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.95 2012/02/24 17:30:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.96 2012/03/03 09:28:16 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -64,7 +64,10 @@ DEPEND="${RDEPEND}
>=sys-devel/bison-2.4.3
sys-devel/flex
>=sys-devel/make-3.81-r2
- test? ( dev-python/pyftpdlib )"
+ test? (
+ dev-python/pyftpdlib
+ >=dev-python/tlslite-0.4.0
+ )"
RDEPEND+="
!=www-client/chromium-9999
x11-misc/xdg-utils
@@ -283,7 +286,6 @@ src_prepare() {
\! -path 'third_party/speex/speex.h' \
\! -path 'third_party/sqlite/*' \
\! -path 'third_party/tcmalloc/*' \
- \! -path 'third_party/tlslite/*' \
\! -path 'third_party/undoview/*' \
\! -path 'third_party/v8-i18n/*' \
\! -path 'third_party/webdriver/*' \