[seamonkey/el6] Update non-ESR stuff to 2.24 (2.24 is still not working on some sites (with bad javascript?), and be
Dmitry Butskoy
buc at fedoraproject.org
Mon Feb 10 01:30:29 UTC 2014
commit 74e5f3847234794377dd5c5144f8b86926fce907
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Mon Feb 10 01:01:50 2014 +0400
Update non-ESR stuff to 2.24
(2.24 is still not working on some sites (with bad javascript?),
and behaves even worse than 2.22-2.23 ...)
seamonkey-2.23-elfhack.patch | 12 -------
seamonkey-2.24-elfhack.patch | 12 +++++++
seamonkey-2.24-nss_3_15_3.patch | 46 ++++++++++++++++++++++++++++
seamonkey.spec-2.23 => seamonkey.spec-2.24 | 18 ++++++++---
xulrunner-26.0-build-arm.patch | 35 ---------------------
xulrunner-27.0-build-arm.patch | 12 +++++++
6 files changed, 83 insertions(+), 52 deletions(-)
---
diff --git a/seamonkey-2.24-elfhack.patch b/seamonkey-2.24-elfhack.patch
new file mode 100644
index 0000000..e790693
--- /dev/null
+++ b/seamonkey-2.24-elfhack.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.24/comm-release/mozilla/build/unix/elfhack/Makefile.in seamonkey-2.24-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in
+--- seamonkey-2.24/comm-release/mozilla/build/unix/elfhack/Makefile.in 2014-02-04 11:09:42.000000000 +0400
++++ seamonkey-2.24-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in 2014-02-09 05:52:50.049013546 +0400
+@@ -16,6 +16,8 @@
+
+ include $(topsrcdir)/config/rules.mk
+
++HOST_CXXFLAGS := $(filter-out -fno-exceptions,$(HOST_CXXFLAGS)) -fexceptions
++
+ DEFINES += -DELFHACK_BUILD
+
+ test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX): %$(DLL_SUFFIX): %.$(OBJ_SUFFIX) elfhack $(filter inject/%,$(CSRCS:.c=.$(OBJ_SUFFIX)))
diff --git a/seamonkey-2.24-nss_3_15_3.patch b/seamonkey-2.24-nss_3_15_3.patch
new file mode 100644
index 0000000..f9745ed
--- /dev/null
+++ b/seamonkey-2.24-nss_3_15_3.patch
@@ -0,0 +1,46 @@
+diff -rbu seamonkey-2.24/comm-release/mozilla/configure seamonkey-2.24-OK/comm-release/mozilla/configure
+--- seamonkey-2.24/comm-release/mozilla/configure 2014-02-04 11:10:34.000000000 +0400
++++ seamonkey-2.24-OK/comm-release/mozilla/configure 2014-02-09 05:54:39.637262447 +0400
+@@ -15166,7 +15166,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nss_version=3.15.4
++ min_nss_version=3.15.3
+ echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:15172: checking for NSS - version >= $min_nss_version" >&5
+
+diff -rbu seamonkey-2.24/comm-release/mozilla/security/manager/ssl/src/CertVerifier.cpp seamonkey-2.24-OK/comm-release/mozilla/security/manager/ssl/src/CertVerifier.cpp
+--- seamonkey-2.24/comm-release/mozilla/security/manager/ssl/src/CertVerifier.cpp 2014-02-04 11:10:10.000000000 +0400
++++ seamonkey-2.24-OK/comm-release/mozilla/security/manager/ssl/src/CertVerifier.cpp 2014-02-09 06:51:01.145162627 +0400
+@@ -240,9 +240,7 @@
+ rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_crl] = revMethodFlags;
+
+ rev.leafTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+- rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_ocsp]
+- = revMethodFlags
+- | (mOCSPGETEnabled ? 0 : CERT_REV_M_FORCE_POST_METHOD_FOR_OCSP);
++ rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] = revMethodFlags;
+
+ rev.leafTests.cert_rev_method_independent_flags =
+ rev.chainTests.cert_rev_method_independent_flags =
+@@ -353,8 +351,6 @@
+ // ocsp enabled controls network fetching, too
+ | ((mOCSPDownloadEnabled && !localOnly) ?
+ CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+-
+- | (mOCSPGETEnabled ? 0 : CERT_REV_M_FORCE_POST_METHOD_FOR_OCSP);
+ ;
+
+ rev.leafTests.preferred_methods[0] =
+diff -rbu seamonkey-2.24/comm-release/mozilla/security/manager/ssl/src/nsNSSComponent.cpp seamonkey-2.24-OK/comm-release/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
+--- seamonkey-2.24/comm-release/mozilla/security/manager/ssl/src/nsNSSComponent.cpp 2014-02-04 11:10:10.000000000 +0400
++++ seamonkey-2.24-OK/comm-release/mozilla/security/manager/ssl/src/nsNSSComponent.cpp 2014-02-09 06:52:23.573421642 +0400
+@@ -1061,7 +1061,6 @@
+
+ // XXX: Always use POST for OCSP; see bug 871954 for undoing this.
+ bool ocspGetEnabled = Preferences::GetBool("security.OCSP.GET.enabled", false);
+- CERT_ForcePostMethodForOCSP(!ocspGetEnabled);
+
+ mDefaultCertVerifier = new CertVerifier(
+ aiaDownloadEnabled ?
diff --git a/seamonkey.spec-2.23 b/seamonkey.spec-2.24
similarity index 98%
rename from seamonkey.spec-2.23
rename to seamonkey.spec-2.24
index 3e36b52..ba3bf6a 100644
--- a/seamonkey.spec-2.23
+++ b/seamonkey.spec-2.24
@@ -9,7 +9,7 @@
%define cairo_version 0.5
%global minimum_build_nspr_version 4.10.2
-%global minimum_build_nss_version 3.15.0
+%global minimum_build_nss_version 3.15.3
%global minimum_build_vpx_version 1.0.0
%define build_langpacks 1
@@ -24,7 +24,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.23
+Version: 2.24
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
@@ -38,7 +38,7 @@ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{versi
#
# Run script as ./moz-grab-langpacks --app seamonkey %{version}
#
-Source1: seamonkey-langpacks-%{version}-20131218.tar.xz
+Source1: seamonkey-langpacks-%{version}-20140209.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -54,11 +54,12 @@ Source100: find-external-requires
Patch1: xulrunner-26.0-gcc47.patch
Patch2: xulrunner-24.0-jemalloc-ppc.patch
-Patch3: xulrunner-26.0-build-arm.patch
+Patch3: xulrunner-27.0-build-arm.patch
Patch5: seamonkey-8.0-enable-addons.patch
Patch20: seamonkey-2.21-c++0x.patch
Patch22: seamonkey-2.23-installdir.patch
-Patch23: seamonkey-2.23-elfhack.patch
+Patch23: seamonkey-2.24-elfhack.patch
+Patch24: seamonkey-2.24-nss_3_15_3.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{with system_nspr}
@@ -151,6 +152,10 @@ popd
%patch22 -p2 -b .installdir
%patch23 -p2 -b .elfhack
+%if %{with system_nss}
+%patch24 -p2 -b .nss3153
+%endif
+
# fix obsoleted modifier in inspector
sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn
@@ -494,6 +499,9 @@ fi
%changelog
+* Mon Feb 10 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.24-1
+- update to 2.24
+
* Wed Dec 18 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.23-1
- update to 2.23
- drop no more needed patches
diff --git a/xulrunner-27.0-build-arm.patch b/xulrunner-27.0-build-arm.patch
new file mode 100644
index 0000000..f82dc4f
--- /dev/null
+++ b/xulrunner-27.0-build-arm.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-27.0/mozilla-release/gfx/ycbcr/moz.build.arm xulrunner-27.0/mozilla-release/gfx/ycbcr/moz.build
+--- firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm 2014-01-28 05:03:42.000000000 +0100
++++ firefox-27.0/mozilla-release/gfx/ycbcr/moz.build 2014-02-03 11:14:34.062219509 +0100
+@@ -61,7 +61,7 @@ else:
+ 'yuv_row_other.cpp',
+ ]
+
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+ SOURCES += [
+ 'yuv_row_arm.s',
+ ]
More information about the scm-commits
mailing list