[seamonkey/el6] build with new system's nspr-4.9.5 and nss-3.14.3

Dmitry Butskoy buc at fedoraproject.org
Wed Aug 14 14:59:38 UTC 2013 

commit 6a040e4a8042fa51a36329a043320b3ac2a2cff6
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Wed Aug 14 18:58:57 2013 +0400

    build with new system's nspr-4.9.5 and nss-3.14.3

 seamonkey-2.17-nss_hasht_h.patch |   17 ------
 seamonkey-2.19-nspr_4_9_2.patch  |  113 --------------------------------------
 seamonkey-2.20-nspr_4_9_5.patch  |   64 +++++++++++++++++++++
 seamonkey-2.20-nss_3_14_0.patch  |   58 -------------------
 seamonkey-2.20-nss_3_14_3.patch  |   28 +++++++++
 seamonkey.spec                   |   21 ++++---
 6 files changed, 103 insertions(+), 198 deletions(-)
---
diff --git a/seamonkey-2.20-nspr_4_9_5.patch b/seamonkey-2.20-nspr_4_9_5.patch
new file mode 100644
index 0000000..09f0223
--- /dev/null
+++ b/seamonkey-2.20-nspr_4_9_5.patch
@@ -0,0 +1,64 @@
+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 @@
+   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:14827: checking for NSPR - version >= $min_nspr_version" >&5
+ 
+ 	no_nspr=""
+ 	if test "$NSPR_CONFIG" != "no"; then
+-		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
++		NSPR_CFLAGS="-I$topsrcdir/../nspr495 `$NSPR_CONFIG $nspr_config_args --cflags`"
+ 		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
+@@ -0,0 +1,41 @@
++#ifndef nspr495_plarena_h___
++#define nspr495_plarena_h___
++
++#include_next "plarena.h"
++
++
++PR_BEGIN_EXTERN_C
++
++/*  Backport from nspr-4.9.6   */
++
++/*
++** A function like malloc_size() or malloc_usable_size() that measures the
++** size of a heap block.
++*/
++typedef size_t (*PLMallocSizeFn)(const void *ptr);
++
++/*
++** Measure all memory used by a PLArenaPool, excluding the PLArenaPool
++** structure.
++*/
++
++static size_t PL_SizeOfArenaPoolExcludingPool(
++    const PLArenaPool *pool, PLMallocSizeFn mallocSizeOf)
++{
++    /*
++     * The first PLArena is within |pool|, so don't measure it.  Subsequent
++     * PLArenas are separate and must be measured.
++     */
++    size_t size = 0;
++    const PLArena *arena = pool->first.next;
++    while (arena) {
++        size += mallocSizeOf(arena);
++        arena = arena->next;
++    }
++    return size;
++}
++
++PR_END_EXTERN_C
++
++
++#endif /* nspr495_plarena_h___ */
diff --git a/seamonkey-2.20-nss_3_14_3.patch b/seamonkey-2.20-nss_3_14_3.patch
new file mode 100644
index 0000000..cf32535
--- /dev/null
+++ b/seamonkey-2.20-nss_3_14_3.patch
@@ -0,0 +1,28 @@
+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.3
+ 	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
+@@ -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 --git a/seamonkey.spec b/seamonkey.spec
index e6fc758..1cc03ec 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -1,6 +1,6 @@
 %define bundled_python 1
 
-%bcond_with	system_nspr
+%bcond_without	system_nspr
 %bcond_without	system_nss
 %bcond_with	system_libvpx
 
@@ -8,8 +8,8 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define cairo_version 0.5
 
-%global minimum_build_nspr_version 4.9.2
-%global minimum_build_nss_version 3.14.0
+%global minimum_build_nspr_version 4.9.5
+%global minimum_build_nss_version 3.14.3
 %global minimum_build_vpx_version 1.0.0
 
 %define build_langpacks 1
@@ -25,7 +25,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv2.0
 Group:          Applications/Internet
@@ -58,9 +58,8 @@ Patch10:        seamonkey-idl-parser-cachepath.patch
 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.20-nss_3_14_0.patch
-Patch27:	seamonkey-2.17-nss_hasht_h.patch
+Patch24:	seamonkey-2.20-nspr_4_9_5.patch
+Patch26:	seamonkey-2.20-nss_3_14_3.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with system_nspr}
@@ -152,11 +151,10 @@ popd
 %patch23 -p2 -b .elfhack
 
 %if %{with system_nspr}
-%patch24 -p2 -b .nspr492
+%patch24 -p2 -b .nspr495
 %endif
 %if %{with system_nss}
-%patch26 -p2 -b .nss3140
-%patch27 -p2 -b .hashth
+%patch26 -p2 -b .nss3143
 %endif
 
 
@@ -496,6 +494,9 @@ fi
 
 
 %changelog
+* Wed Aug 14 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.20-2
+- rebuild with new system's nspr-4.9.5 and nss-3.14.3
+
 * 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

More information about the scm-commits mailing list