[seamonkey] Update to 2.0.14

Jan Horak xhorak at fedoraproject.org
Fri Apr 29 13:33:50 UTC 2011


commit 65c58b4787823e22f75fc3b97efa9f95c87467d8
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Apr 29 15:33:32 2011 +0200

    Update to 2.0.14

 .gitignore                  |    2 ++
 mozilla-comodo-646460.patch |   24 ++++++++++++++++++++++++
 seamonkey.spec              |    9 +++++++--
 sources                     |    4 ++--
 4 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e947ab7..dbae4ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ seamonkey-2.0.6.source.tar.bz2
 /seamonkey-langpacks-2.0.12-20110307.tar.bz2
 /seamonkey-2.0.13.source.tar.bz2
 /seamonkey-langpacks-2.0.13-20110409.tar.xz
+/seamonkey-2.0.14.source.tar.bz2
+/seamonkey-langpacks-2.0.14-20110429.tar.xz
diff --git a/mozilla-comodo-646460.patch b/mozilla-comodo-646460.patch
new file mode 100644
index 0000000..93367eb
--- /dev/null
+++ b/mozilla-comodo-646460.patch
@@ -0,0 +1,24 @@
+diff --git a/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp b/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
+--- a/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
++++ b/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
+@@ -3339,16 +3339,20 @@ cancel_and_failure(nsNSSSocketInfo* info
+ {
+   infoObject->SetCanceled(PR_TRUE);
+   return SECFailure;
+ }
+ 
+ static SECStatus
+ nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
+ {
++  // cert was revoked, don't do anything else
++  if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE)
++    return SECFailure;
++
+   nsNSSShutDownPreventionLock locker;
+   nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg;
+   if (!infoObject)
+     return SECFailure;
+ 
+   if (nsSSLThread::exitRequested())
+     return cancel_and_failure(infoObject);
+ 
diff --git a/seamonkey.spec b/seamonkey.spec
index 2148460..c3a48a8 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -15,14 +15,14 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.0.13
+Version:        2.0.14
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
 
 Source0:        seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1:        seamonkey-langpacks-%{version}-20110409.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20110429.tar.xz
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -38,6 +38,7 @@ Source100:      find-external-requires
 Patch0:         mozilla-jemalloc.patch
 Patch1:         mozilla-191-path.patch
 Patch2:         cstddef.patch
+Patch3:         mozilla-comodo-646460.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -98,6 +99,7 @@ cd %{sources_subdir}
 %patch0 -p0 -b .jemalloc
 %patch1 -p0 -b .path
 %patch2 -p1 -b .cstddef
+%patch3 -p1 -b .646460
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -348,6 +350,9 @@ update-desktop-database %{_datadir}/applications
 
 
 %changelog
+* Fri Apr 29 2011 Jan Horak <jhorak at redhat.com> - 2.0.14-1
+- Update to 2.0.14
+
 * Sat Apr  9 2011 Christopher Aillon <caillon at redhat.com> 2.0.13-1
 - Update to 2.0.13
 
diff --git a/sources b/sources
index 4895315..4976c48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8915dbdd48aa26b791b622a7e8778b64  seamonkey-2.0.13.source.tar.bz2
-511b3b7fea867581b6010dcce2f8c47e  seamonkey-langpacks-2.0.13-20110409.tar.xz
+2099ec0b71f950faad297a140b2702bc  seamonkey-2.0.14.source.tar.bz2
+9e98b4c90e8bf705d80f4a99aee44e84  seamonkey-langpacks-2.0.14-20110429.tar.xz


More information about the scm-commits mailing list