diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2017-01-07 02:16:04 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-01-07 02:16:04 +0100 |
| commit | 2a5741dae751f123ee59351567be2c6fbd75903d (patch) | |
| tree | 50f187c7b8259af1d4644232222fca931595ffff /www-client/seamonkey | |
| parent | www-client/seamonkey: Added a fix for an configure issue with sed-4.3 (diff) | |
| download | gentoo-2a5741dae751f123ee59351567be2c6fbd75903d.tar.gz gentoo-2a5741dae751f123ee59351567be2c6fbd75903d.tar.bz2 gentoo-2a5741dae751f123ee59351567be2c6fbd75903d.zip | |
Revert "www-client/seamonkey: Added a fix for an configure issue with sed-4.3"
This reverts commit ace7925507486ba6c86397c82f8bd9184599d81d.
Which also changes some other package that had independent changes.
Diffstat (limited to 'www-client/seamonkey')
| -rw-r--r-- | www-client/seamonkey/files/firefox-52-curve.patch | 34 | ||||
| -rw-r--r-- | www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch | 14 | ||||
| -rw-r--r-- | www-client/seamonkey/seamonkey-2.46.ebuild | 3 |
3 files changed, 1 insertions, 50 deletions
diff --git a/www-client/seamonkey/files/firefox-52-curve.patch b/www-client/seamonkey/files/firefox-52-curve.patch deleted file mode 100644 index 508d580524d7..000000000000 --- a/www-client/seamonkey/files/firefox-52-curve.patch +++ /dev/null @@ -1,34 +0,0 @@ -# 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 deleted file mode 100644 index 6928f84d6f5b..000000000000 --- a/www-client/seamonkey/files/seamonkey-2.46-configure_regexp.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 e7c68b2631d4..63d968e69b8a 100644 --- a/www-client/seamonkey/seamonkey-2.46.ebuild +++ b/www-client/seamonkey/seamonkey-2.46.ebuild @@ -135,13 +135,12 @@ 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}"/firefox-52-curve.patch + #eapply "${FILESDIR}"/mozilla-svg-crashfix.patch popd &>/dev/null || die # Shell scripts sometimes contain DOS line endings; bug 391889 |