[seamonkey/el6] Update to 2.22
Dmitry Butskoy
buc at fedoraproject.org
Sat Nov 2 19:08:50 UTC 2013
commit 0afdae2e228e4057d4790025fe49dafd020f165e
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Sat Nov 2 23:08:48 2013 +0400
Update to 2.22
.gitignore | 2 +
seamonkey-2.19-elfhack.patch | 12 ---
seamonkey-2.21-nss_3_14_3.patch | 28 -------
seamonkey-2.22-elfhack.patch | 12 +++
..._4_9_5.patch => seamonkey-2.22-nspr_4_9_5.patch | 16 ++--
seamonkey-2.22-nss_3_14_3.patch | 82 ++++++++++++++++++++
seamonkey.sh.in | 4 +
seamonkey.spec | 19 ++++-
sources | 4 +-
9 files changed, 124 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a0458bc..0f5c5ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-langpacks-2.20-20130808.tar.xz
/seamonkey-2.21.source.tar.bz2
/seamonkey-langpacks-2.21-20130918.tar.xz
+/seamonkey-2.22.source.tar.bz2
+/seamonkey-langpacks-2.22-20131101.tar.xz
diff --git a/seamonkey-2.22-elfhack.patch b/seamonkey-2.22-elfhack.patch
new file mode 100644
index 0000000..ac22924
--- /dev/null
+++ b/seamonkey-2.22-elfhack.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.22/comm-release/mozilla/build/unix/elfhack/Makefile.in seamonkey-2.22-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in
+--- seamonkey-2.22/comm-release/mozilla/build/unix/elfhack/Makefile.in 2013-10-29 05:20:42.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in 2013-11-01 18:54:56.575000337 +0400
+@@ -22,7 +22,7 @@
+ elfhack.cpp \
+ $(NULL)
+
+-OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
++HOST_CXXFLAGS := $(filter-out -fno-exceptions,$(HOST_CXXFLAGS)) -fexceptions
+
+ CSRCS := \
+ test-ctors.c \
diff --git a/seamonkey-2.21-nspr_4_9_5.patch b/seamonkey-2.22-nspr_4_9_5.patch
similarity index 70%
rename from seamonkey-2.21-nspr_4_9_5.patch
rename to seamonkey-2.22-nspr_4_9_5.patch
index e6ffbd3..45061ac 100644
--- a/seamonkey-2.21-nspr_4_9_5.patch
+++ b/seamonkey-2.22-nspr_4_9_5.patch
@@ -1,14 +1,14 @@
-diff -Nrbu seamonkey-2.19/comm-release/mozilla/configure seamonkey-2.19-OK/comm-release/mozilla/configure
---- seamonkey-2.19/comm-release/mozilla/configure 2013-06-29 09:01:16.000000000 +0400
-+++ seamonkey-2.19-OK/comm-release/mozilla/configure 2013-07-05 20:55:48.600947214 +0400
-@@ -14846,13 +14846,13 @@
+diff -Nrbu seamonkey-2.22/comm-release/mozilla/configure seamonkey-2.22-OK/comm-release/mozilla/configure
+--- seamonkey-2.22/comm-release/mozilla/configure 2013-10-29 05:21:35.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/configure 2013-11-01 19:03:05.713807663 +0400
+@@ -14880,13 +14880,13 @@
echo "$ac_t""no" 1>&6
fi
- min_nspr_version=4.9.6
+ min_nspr_version=4.9.5
echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
- echo "configure:14788: checking for NSPR - version >= $min_nspr_version" >&5
+ echo "configure:14886: checking for NSPR - version >= $min_nspr_version" >&5
no_nspr=""
if test "$NSPR_CONFIG" != "no"; then
@@ -17,9 +17,9 @@ diff -Nrbu seamonkey-2.19/comm-release/mozilla/configure seamonkey-2.19-OK/comm-
NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`
elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
-diff -Nrbu seamonkey-2.19/comm-release/nspr495/plarena.h seamonkey-2.19-OK/comm-release/nspr495/plarena.h
---- seamonkey-2.19/comm-release/nspr495/plarena.h 1970-01-01 03:00:00.000000000 +0300
-+++ seamonkey-2.19-OK/comm-release/nspr495/plarena.h 2013-07-05 20:52:45.000000000 +0400
+diff -Nrbu seamonkey-2.22/comm-release/nspr495/plarena.h seamonkey-2.22-OK/comm-release/nspr495/plarena.h
+--- seamonkey-2.22/comm-release/nspr495/plarena.h 1970-01-01 03:00:00.000000000 +0300
++++ seamonkey-2.22-OK/comm-release/nspr495/plarena.h 2013-11-01 19:00:50.794237343 +0400
@@ -0,0 +1,41 @@
+#ifndef nspr495_plarena_h___
+#define nspr495_plarena_h___
diff --git a/seamonkey-2.22-nss_3_14_3.patch b/seamonkey-2.22-nss_3_14_3.patch
new file mode 100644
index 0000000..c72f0f0
--- /dev/null
+++ b/seamonkey-2.22-nss_3_14_3.patch
@@ -0,0 +1,82 @@
+diff -rbu seamonkey-2.22/comm-release/mozilla/configure seamonkey-2.22-OK/comm-release/mozilla/configure
+--- seamonkey-2.22/comm-release/mozilla/configure 2013-11-02 03:14:34.476653888 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/configure 2013-11-02 02:03:56.954962814 +0400
+@@ -15315,7 +15315,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nss_version=3.15
++ min_nss_version=3.14.3
+ echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:15321: checking for NSS - version >= $min_nss_version" >&5
+
+diff -rbu seamonkey-2.22/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp
+--- seamonkey-2.22/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-10-29 05:21:09.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-11-02 02:03:56.954962814 +0400
+@@ -596,9 +596,9 @@
+ }
+
+ // Verify that the signature file is a valid signature of the SF file
+- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner,
+- &sfCalculatedDigest.get(),
+- HASH_AlgSHA1, false, PR_Now())) {
++ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner,
++ (SECItem *) &sfCalculatedDigest.get(),
++ HASH_AlgSHA1, false)) {
+ PRErrorCode error = PR_GetError();
+ const char * errorName = PR_ErrorToName(error);
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s",
+diff -rbu seamonkey-2.22/comm-release/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp
+--- seamonkey-2.22/comm-release/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp 2013-10-29 05:21:09.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp 2013-11-02 02:53:12.601339727 +0400
+@@ -1197,16 +1197,7 @@
+ return SECFailure;
+ }
+
+- // SSL_PeerStapledOCSPResponses will never return a non-empty response if
+- // OCSP stapling wasn't enabled because libssl wouldn't have let the server
+- // return a stapled OCSP response.
+- // We don't own these pointers.
+- const SECItemArray *csa = SSL_PeerStapledOCSPResponses(fd);
+ SECItem *stapledOCSPResponse = nullptr;
+- // we currently only support single stapled responses
+- if (csa && csa->len == 1) {
+- stapledOCSPResponse = &csa->items[0];
+- }
+
+ uint32_t providerFlags = 0;
+ socketInfo->GetProviderFlags(&providerFlags);
+diff -rbu seamonkey-2.22/comm-release/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
+--- seamonkey-2.22/comm-release/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 2013-10-29 05:21:09.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 2013-11-02 02:47:37.548929054 +0400
+@@ -2639,11 +2639,6 @@
+ }
+ infoObject->SetTLSEnabled(enabled);
+
+- enabled = infoObject->SharedState().IsOCSPStaplingEnabled();
+- if (SECSuccess != SSL_OptionSet(fd, SSL_ENABLE_OCSP_STAPLING, enabled)) {
+- return NS_ERROR_FAILURE;
+- }
+-
+ if (SECSuccess != SSL_OptionSet(fd, SSL_HANDSHAKE_AS_CLIENT, true)) {
+ return NS_ERROR_FAILURE;
+ }
+diff -rbu seamonkey-2.22/comm-release/mozilla/security/manager/ssl/tests/unit/moz.build seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/tests/unit/moz.build
+--- seamonkey-2.22/comm-release/mozilla/security/manager/ssl/tests/unit/moz.build 2013-10-29 05:21:09.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/tests/unit/moz.build 2013-11-02 03:05:16.590600504 +0400
+@@ -4,7 +4,5 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-DIRS += ['test_ocsp_stapling']
+-
+ MODULE = 'pipnss'
+
+diff -rbu seamonkey-2.22/comm-release/mozilla/security/manager/ssl/tests/unit/xpcshell.ini seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/tests/unit/xpcshell.ini
+--- seamonkey-2.22/comm-release/mozilla/security/manager/ssl/tests/unit/xpcshell.ini 2013-10-29 05:21:09.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/security/manager/ssl/tests/unit/xpcshell.ini 2013-11-02 03:00:58.676354949 +0400
+@@ -17,4 +17,3 @@
+ [test_sts_preloadlist_perwindowpb.js]
+ [test_sts_preloadlist_selfdestruct.js]
+ [test_sts_ipv4_ipv6.js]
+-[test_ocsp_stapling.js]
diff --git a/seamonkey.sh.in b/seamonkey.sh.in
index ca382d9..b1d26ef 100755
--- a/seamonkey.sh.in
+++ b/seamonkey.sh.in
@@ -103,6 +103,10 @@ export MOZ_APP_LAUNCHER="/usr/bin/seamonkey"
GNOME_DISABLE_CRASH_DIALOG=1
export GNOME_DISABLE_CRASH_DIALOG
+# BEAST fix (rhbz#838879)
+NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
+export NSS_SSL_CBC_RANDOM_IV
+
function check_running() {
$MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
RETURN_VAL=$?
diff --git a/seamonkey.spec b/seamonkey.spec
index 141d3d6..a066faa 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -24,7 +24,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.21
+Version: 2.22
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
@@ -38,7 +38,7 @@ Source0: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
#
# Run script as ./moz-grab-langpacks --app seamonkey %{version}
#
-Source1: seamonkey-langpacks-%{version}-20130918.tar.xz
+Source1: seamonkey-langpacks-%{version}-20131101.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -58,9 +58,9 @@ Patch5: seamonkey-8.0-enable-addons.patch
Patch10: seamonkey-idl-parser-cachepath.patch
Patch20: seamonkey-2.21-c++0x.patch
Patch22: seamonkey-2.14-installdir.patch
-Patch23: seamonkey-2.19-elfhack.patch
-Patch24: seamonkey-2.21-nspr_4_9_5.patch
-Patch26: seamonkey-2.21-nss_3_14_3.patch
+Patch23: seamonkey-2.22-elfhack.patch
+Patch24: seamonkey-2.22-nspr_4_9_5.patch
+Patch26: seamonkey-2.22-nss_3_14_3.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{with system_nspr}
@@ -181,6 +181,9 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
# enabled by default since 2.21
echo "ac_add_options --disable-gstreamer" >> .mozconfig
+# needed to compile with the current gcc-4.4
+echo "ac_add_options --enable-cpp-rtti" >>.mozconfig
+
%build
%if %{?bundled_python}
@@ -499,6 +502,12 @@ fi
%changelog
+* Fri Nov 1 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.22-1
+- update to 2.22
+- fix for BEAST iissue in startup script (as in #1005611 for Firefox)
+- now need to enable rtti for C++ compiling by gcc-4.4
+ (ie. drop -fno-rtti flag)
+
* Wed Sep 18 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-1
- update to 2.21
- add patch to avoid c++0x code (not supported with gcc-4.4)
diff --git a/sources b/sources
index e7da37f..22f60f6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f2ddfea12f80aab48cc3cfca9f15f2a2 seamonkey-2.21.source.tar.bz2
-2add02f1213d2bfba25e8264aa74690f seamonkey-langpacks-2.21-20130918.tar.xz
+49b92ed98c23efdbdafa39b9dee920a7 seamonkey-2.22.source.tar.bz2
+3cd57ff116eb24d951690b270b303787 seamonkey-langpacks-2.22-20131101.tar.xz
5eea8462f69ab1369d32f9c4cd6272ab Python-2.7.5.tar.xz
More information about the scm-commits
mailing list