[nss] - Update to NSS_3_13_RC0 - Adjust patches to new sources - Remove builtin patch which isn't needed d

[Elio Maldonado]

commit bc4ac545c9d254a177b7803e80fea4bac730d3a6
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Oct 8 12:04:26 2011 -0700

    - Update to NSS_3_13_RC0
    - Adjust patches to new sources
    - Remove builtin patch which isn't needed due to the update
    - update sources

 .gitignore                      |    2 +-
 builtins-nssckbi_1_87_rtm.patch | 3376 ---------------------------------------
 nss-539183.patch                |   23 +-
 nss.spec                        |   15 +-
 renegotiate-transitional.patch  |   10 +-
 sources                         |    2 +-
 6 files changed, 29 insertions(+), 3399 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 01ddb35..bae9afc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-nss-3.12.11-stripped.tar.bz2
+nss-3.13-stripped.tar.bz2
 nss-pem-20101125.tar.bz2
 blank-cert8.db
 blank-key3.db
diff --git a/nss-539183.patch b/nss-539183.patch
index bf82d96..4e04e0b 100644
--- a/nss-539183.patch
+++ b/nss-539183.patch
@@ -1,9 +1,11 @@
 diff -up ./mozilla/security/nss/cmd/selfserv/selfserv.c.539183 ./mozilla/security/nss/cmd/selfserv/selfserv.c
---- ./mozilla/security/nss/cmd/selfserv/selfserv.c.539183	2011-04-27 15:24:07.922128850 -0700
-+++ ./mozilla/security/nss/cmd/selfserv/selfserv.c	2011-04-27 15:27:11.053271675 -0700
-@@ -1493,14 +1493,14 @@ getBoundListenSocket(unsigned short port
+--- ./mozilla/security/nss/cmd/selfserv/selfserv.c.539183	2011-10-06 10:42:06.913919000 -0700
++++ ./mozilla/security/nss/cmd/selfserv/selfserv.c	2011-10-06 10:43:14.858987000 -0700
+@@ -1491,14 +1491,18 @@ getBoundListenSocket(unsigned short port
+     PRStatus	       prStatus;
+     PRNetAddr          addr;
      PRSocketOptionData opt;
-     PRUint16           socketDomain = PR_AF_INET;
++    PRUint16           socketDomain = PR_AF_INET;
  
 -    addr.inet.family = PR_AF_INET;
 -    addr.inet.ip     = PR_INADDR_ANY;
@@ -12,11 +14,14 @@ diff -up ./mozilla/security/nss/cmd/selfserv/selfserv.c.539183 ./mozilla/securit
 +	errExit("PR_SetNetAddr");
 +    }
  
-     if (PR_GetEnv("NSS_USE_SDP")) {
-         socketDomain = PR_AF_INET_SDP;
-     }
--    listen_sock = PR_OpenTCPSocket(socketDomain);
+-    listen_sock = PR_NewTCPSocket();
++    if (PR_GetEnv("NSS_USE_SDP")) {
++        socketDomain = PR_AF_INET_SDP;
++    }
 +    listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
      if (listen_sock == NULL) {
-         errExit("PR_OpenTCPSocket error");
+-	errExit("PR_NewTCPSocket");
++        errExit("PR_OpenTCPSocket error");
      }
+ 
+     opt.option = PR_SockOpt_Nonblocking;
diff --git a/nss.spec b/nss.spec
index 5fbb281..8b61368 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,12 +1,12 @@
-%global nspr_version 4.8.8
-%global nss_util_version 3.12.11
-%global nss_softokn_version 3.12.11
+%global nspr_version 4.9
+%global nss_util_version 3.13
+%global nss_softokn_version 3.13
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.11
-Release:          3%{?dist}
+Version:          3.13
+Release:          0.1%{?dist}.rc0.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -56,7 +56,6 @@ Patch7:           nsspem-642433.patch
 Patch8:           0001-Bug-695011-PEM-logging.patch
 Patch16:          nss-539183.patch
 Patch18:          nss-646045.patch
-Patch19:          builtins-nssckbi_1_87_rtm.patch
 Patch20:          nsspem-createobject-initialize-pointer.patch
 Patch21:          0001-libnsspem-rhbz-734760.patch
 Patch22:          nsspem-init-inform-not-thread-safe.patch
@@ -137,7 +136,6 @@ low level services.
 %patch8 -p1 -b .695011          
 %patch16 -p0 -b .539183
 %patch18 -p0 -b .646045
-%patch19 -p0 -b .ckbi187
 %patch20 -p1 -b .717338
 %patch21 -p1 -b .734760
 %patch22 -p0 -b .736410
@@ -551,6 +549,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Sat Oct 08 2011 Elio Maldonado <emaldona at redhat.com> - 3.13-0.1.rc0.1
+- Update to NSS_3_13_RC0
+
 * Wed Sep 14 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.11-3
 - Fix attempt to free initilized pointer (#717338)
 - Fix leak on pem_CreateObject when given non-existing file name (#734760)
diff --git a/renegotiate-transitional.patch b/renegotiate-transitional.patch
index 3dc6eec..989491d 100644
--- a/renegotiate-transitional.patch
+++ b/renegotiate-transitional.patch
@@ -1,7 +1,7 @@
-diff -up ./mozilla/security/nss/lib/ssl/sslsock.c.transitional ./mozilla/security/nss/lib/ssl/sslsock.c
---- ./mozilla/security/nss/lib/ssl/sslsock.c.transitional	2010-09-04 09:46:50.331327676 -0700
-+++ ./mozilla/security/nss/lib/ssl/sslsock.c	2010-09-04 09:50:02.814325605 -0700
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
+diff -up mozilla/security/nss/lib/ssl/sslsock.c.transitional mozilla/security/nss/lib/ssl/sslsock.c
+--- mozilla/security/nss/lib/ssl/sslsock.c.transitional	2011-10-06 10:37:47.156659000 -0700
++++ mozilla/security/nss/lib/ssl/sslsock.c	2011-10-06 10:38:32.276704000 -0700
+@@ -182,7 +182,7 @@ static sslOptions ssl_defaults = {
      PR_FALSE,   /* noLocks            */
      PR_FALSE,   /* enableSessionTickets */
      PR_FALSE,   /* enableDeflate      */
@@ -9,4 +9,4 @@ diff -up ./mozilla/security/nss/lib/ssl/sslsock.c.transitional ./mozilla/securit
 +    3,          /* enableRenegotiation (default: transitional) */
      PR_FALSE,   /* requireSafeNegotiation */
      PR_FALSE,   /* enableFalseStart   */
- };
+     PR_TRUE     /* cbcRandomIV        */
diff --git a/sources b/sources
index 8d16a43..57c5970 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-c9f781e984550985e4ae18d7bfafb7b4  nss-3.12.11-stripped.tar.bz2
+5b61645c2a353b3abdf981faeedffd3d  nss-3.13-stripped.tar.bz2
 e63cddf74c07f0d818d1052ecc6fbb1f  nss-pem-20101125.tar.bz2
 a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 9315689bbd9f28ceebd47894f99fccbd  blank-key3.db