[seamonkey/el6] update to 2.20
Dmitry Butskoy
buc at fedoraproject.org
Thu Aug 8 15:26:19 UTC 2013
commit f0623527a7e57363ff881fc9e53071b205e7d333
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Thu Aug 8 19:25:55 2013 +0400
update to 2.20
.gitignore | 2 +
seamonkey-2.19-nss_3_14_0.patch | 24 ----------------
seamonkey-2.20-nss_3_14_0.patch | 58 +++++++++++++++++++++++++++++++++++++++
seamonkey.spec | 12 +++++---
sources | 5 +--
5 files changed, 70 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa27fef..6ffea94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-2.19.source.tar.bz2
/seamonkey-langpacks-2.19-20130705.tar.xz
/Python-2.7.5.tar.xz
+/seamonkey-2.20.source.tar.bz2
+/seamonkey-langpacks-2.20-20130808.tar.xz
diff --git a/seamonkey-2.20-nss_3_14_0.patch b/seamonkey-2.20-nss_3_14_0.patch
new file mode 100644
index 0000000..cb90f52
--- /dev/null
+++ b/seamonkey-2.20-nss_3_14_0.patch
@@ -0,0 +1,58 @@
+diff -Nrbu seamonkey-2.20/comm-release/mozilla/configure seamonkey-2.20-OK/comm-release/mozilla/configure
+--- seamonkey-2.20/comm-release/mozilla/configure 2013-08-04 07:06:08.000000000 +0400
++++ seamonkey-2.20-OK/comm-release/mozilla/configure 2013-08-08 17:36:48.083511798 +0400
+@@ -15256,7 +15256,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nss_version=3.15
++ min_nss_version=3.14.0
+ echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:15262: checking for NSS - version >= $min_nss_version" >&5
+
+diff -Nrbu seamonkey-2.20/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp seamonkey-2.20-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp
+--- seamonkey-2.20/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-08-04 07:05:47.000000000 +0400
++++ seamonkey-2.20-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-08-08 18:24:55.382891240 +0400
+@@ -356,7 +356,7 @@
+ }
+
+ if (attrName.LowerCaseEqualsLiteral("sha1-digest-manifest")) {
+- rv = MapSECStatus(ATOB_ConvertAsciiToItem(&mfDigest, attrValue.get()));
++ rv = MapSECStatus(ATOB_ConvertAsciiToItem(&mfDigest, (char *) attrValue.get()));
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
+@@ -473,7 +473,7 @@
+ if (digest.len > 0) // multiple SHA1 digests in section
+ return NS_ERROR_SIGNED_JAR_MANIFEST_INVALID;
+
+- rv = MapSECStatus(ATOB_ConvertAsciiToItem(&digest, attrValue.get()));
++ rv = MapSECStatus(ATOB_ConvertAsciiToItem(&digest, (char *) attrValue.get()));
+ if (NS_FAILED(rv))
+ return NS_ERROR_SIGNED_JAR_MANIFEST_INVALID;
+
+@@ -587,9 +587,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 -Nrbu seamonkey-2.20/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h seamonkey-2.20-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h
+--- seamonkey-2.20/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-08-04 07:05:47.000000000 +0400
++++ seamonkey-2.20-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-08-08 17:36:48.083511798 +0400
+@@ -164,7 +164,7 @@
+ {
+ nsresult rv = SetLength(hashAlg);
+ NS_ENSURE_SUCCESS(rv, rv);
+- return MapSECStatus(PK11_HashBuf(hashAlg, item.data, buf, len));
++ return MapSECStatus(PK11_HashBuf(hashAlg, item.data, (unsigned char *) buf, len));
+ }
+
+ nsresult End(SECOidTag hashAlg, ScopedPK11Context & context)
diff --git a/seamonkey.spec b/seamonkey.spec
index e564542..e6fc758 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -24,8 +24,8 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.19
-Release: 2%{?dist}
+Version: 2.20
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
Group: Applications/Internet
@@ -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}-20130705.tar.xz
+Source1: seamonkey-langpacks-%{version}-20130808.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -59,7 +59,7 @@ Patch20: seamonkey-2.13-jemalloc.patch
Patch22: seamonkey-2.14-installdir.patch
Patch23: seamonkey-2.19-elfhack.patch
Patch24: seamonkey-2.19-nspr_4_9_2.patch
-Patch26: seamonkey-2.19-nss_3_14_0.patch
+Patch26: seamonkey-2.20-nss_3_14_0.patch
Patch27: seamonkey-2.17-nss_hasht_h.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -496,6 +496,10 @@ fi
%changelog
+* Thu Aug 8 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.20-1
+- update to 2.20
+- fix build with system nss-3.14.0
+
* Mon Jul 15 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.19-2
- use native nspr (version of 4.9.6) instead of the system one (4.9.2).
Seamonkey-2.19 with nspr patches seems to require at least nspr >= 4.9.3
diff --git a/sources b/sources
index ad5fe2b..00369d3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-233587b605261349405330005c91b2fe seamonkey-2.19.source.tar.bz2
-2afc3e509604a49d3ef9dbf597f30cf2 seamonkey-langpacks-2.19-20130705.tar.xz
-5eea8462f69ab1369d32f9c4cd6272ab Python-2.7.5.tar.xz
+04b961790658233b7dafb5222b251bf5 seamonkey-2.20.source.tar.bz2
+583e661bca7620430f9b425035d02cf7 seamonkey-langpacks-2.20-20130808.tar.xz
More information about the scm-commits
mailing list