diff options
5 files changed, 52 insertions, 3 deletions
diff --git a/media-video/handbrake/handbrake-0.10.5-r2.ebuild b/media-video/handbrake/handbrake-0.10.5-r2.ebuild index 93a0cb9cecb7..4eb9205a3ac2 100644 --- a/media-video/handbrake/handbrake-0.10.5-r2.ebuild +++ b/media-video/handbrake/handbrake-0.10.5-r2.ebuild @@ -31,7 +31,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )" RDEPEND=" dev-libs/jansson media-libs/a52dec - media-libs/libass + media-libs/libass:= media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index ec778ddedec2..8481f7acf1bd 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -31,7 +31,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )" RDEPEND=" dev-libs/jansson media-libs/a52dec - media-libs/libass + media-libs/libass:= media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread diff --git a/www-client/seamonkey/files/firefox-52-curve.patch b/www-client/seamonkey/files/firefox-52-curve.patch new file mode 100644 index 000000000000..508d580524d7 --- /dev/null +++ b/www-client/seamonkey/files/firefox-52-curve.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User Franziskus Kiefer <franziskuskiefer@gmail.com> +# Date 1469717280 -7200 +# Thu Jul 28 16:48:00 2016 +0200 +# Node ID 95aa61f1e3562e526bf88179d9d078fd90ad1bda +# Parent d42aacfe34af25e2f5110e2ca3d24a210eabeb33 +Update keybits in H2, r=mt + +MozReview-Commit-ID: 35oWoDMqe1Y + +diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp +--- a/netwerk/protocol/http/Http2Session.cpp ++++ b/netwerk/protocol/http/Http2Session.cpp +@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile() + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + uint32_t keybits = ssl->GetKEAKeyBits(); + if (kea == ssl_kea_dh && keybits < 2048) { + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + int16_t macAlgorithm = ssl->GetMACAlgorithmUsed(); + LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n", + this, macAlgorithm)); + if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) { diff --git a/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch b/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch new file mode 100644 index 000000000000..6928f84d6f5b --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/604696 +https://bugzilla.mozilla.org/show_bug.cgi?id=1329252 + +--- seamonkey-2.46/mozilla/build/autoconf/icu.m4 ++++ seamonkey-2.46/mozilla/build/autoconf/icu.m4 +@@ -70,7 +70,7 @@ + fi + fi + +- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` + if test x"$version" = x; then + AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) + fi diff --git a/www-client/seamonkey/seamonkey-2.46.ebuild b/www-client/seamonkey/seamonkey-2.46.ebuild index 63d968e69b8a..e7c68b2631d4 100644 --- a/www-client/seamonkey/seamonkey-2.46.ebuild +++ b/www-client/seamonkey/seamonkey-2.46.ebuild @@ -135,12 +135,13 @@ src_unpack() { src_prepare() { # Apply our patches eapply "${WORKDIR}"/seamonkey + eapply "${FILESDIR}"/${PN}-2.46-configure_regexp.patch # browser patches go here pushd "${S}"/mozilla &>/dev/null || die rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch eapply "${WORKDIR}"/firefox - #eapply "${FILESDIR}"/mozilla-svg-crashfix.patch + eapply "${FILESDIR}"/firefox-52-curve.patch popd &>/dev/null || die # Shell scripts sometimes contain DOS line endings; bug 391889 |