commit: 422df34e40a8ed9f0a17d509a12baa69f3fa7fe5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 01:22:27 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 01:22:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422df34e
www-client/seamonkey: Added a fix for an configure issue with sed-4.3
This fixes Gentoo bug #604696
Furthermore added a patch so the package works reliably with nss-3.28
This fixes Gentoo bug #603622
Both fixes don't affect stable so no revbump necessary.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-client/seamonkey/files/firefox-52-curve.patch | 34 ++++++++++++++++++++++
.../files/seamonkey-2.46-configure_regexp.patch | 14 +++++++++
www-client/seamonkey/seamonkey-2.46.ebuild | 3 +-
3 files changed, 50 insertions(+), 1 deletion(-)
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 00000000..508d580
--- /dev/null
+++ b/www-client/seamonkey/files/firefox-52-curve.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Franziskus Kiefer <franziskuskie...@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 00000000..6928f84
--- /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 63d968e..e7c68b2 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
