diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2015-11-04 21:22:45 -0500 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2015-11-04 21:22:45 -0500 |
| commit | cfdf79384bbc9e7164a75eea6110642c5cb66a0a (patch) | |
| tree | a39c8078152fb2870179117a5024ed29d0cf5198 /www-client/firefox | |
| parent | net-analyzer/icinga: actually fixing bug 564242 CVE-2015-8010 (diff) | |
| download | gentoo-cfdf79384bbc9e7164a75eea6110642c5cb66a0a.tar.gz gentoo-cfdf79384bbc9e7164a75eea6110642c5cb66a0a.tar.bz2 gentoo-cfdf79384bbc9e7164a75eea6110642c5cb66a0a.zip | |
www-client/firefox: remove conflicting patch, force nss/nspr for security bug 564834
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'www-client/firefox')
| -rw-r--r-- | www-client/firefox/firefox-38.4.0.ebuild | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/www-client/firefox/firefox-38.4.0.ebuild b/www-client/firefox/firefox-38.4.0.ebuild index a4db9de21cfd..9c008b59c85f 100644 --- a/www-client/firefox/firefox-38.4.0.ebuild +++ b/www-client/firefox/firefox-38.4.0.ebuild @@ -55,8 +55,8 @@ ASM_DEPEND=">=dev-lang/yasm-1.1" # Mesa 7.10 needed for WebGL + bugfixes RDEPEND=" - >=dev-libs/nss-3.19.2 - >=dev-libs/nspr-4.10.8 + >=dev-libs/nss-3.20.1 + >=dev-libs/nspr-4.10.10 selinux? ( sec-policy/selinux-mozilla )" DEPEND="${RDEPEND} @@ -139,6 +139,7 @@ src_prepare() { # Apply our patches EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ + EPATCH_EXCLUDE="8011_bug1194520-freetype261_until_moz43.patch" \ epatch "${WORKDIR}/firefox" # Allow user to apply any additional patches without modifing ebuild |