From 976de5ebbea07f14bbad403b577dc92596566d1e Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Wed, 27 Apr 2011 18:05:46 -0700
Subject: [PATCH] - Update to NSS_3_12_10_BETA1 - Update nss-539183.patch for
 new 3.12.10 sources

---
 .gitignore       |  2 +-
 nss-539183.patch | 31 ++++++++++---------------------
 nss.spec         | 23 ++++++++---------------
 sources          |  2 +-
 4 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index f006423..c4a4ab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-nss-3.12.9-stripped.tar.bz2
+nss-3.12.10-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 d86a705..bf82d96 100644
--- a/nss-539183.patch
+++ b/nss-539183.patch
@@ -1,18 +1,9 @@
-Index: mozilla/security/nss/cmd/selfserv/selfserv.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/cmd/selfserv/selfserv.c,v
-retrieving revision 1.94
-diff -p -u -8 -r1.94 selfserv.c
---- mozilla/security/nss/cmd/selfserv/selfserv.c	3 Apr 2010 18:27:27 -0000	1.94
-+++ mozilla/security/nss/cmd/selfserv/selfserv.c	24 Feb 2011 02:28:02 -0000
-@@ -1487,21 +1487,21 @@ PRFileDesc *
- getBoundListenSocket(unsigned short port)
- {
-     PRFileDesc *       listen_sock;
-     int                listenQueueDepth = 5 + (2 * maxThreads);
-     PRStatus	       prStatus;
-     PRNetAddr          addr;
+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
      PRSocketOptionData opt;
+     PRUint16           socketDomain = PR_AF_INET;
  
 -    addr.inet.family = PR_AF_INET;
 -    addr.inet.ip     = PR_INADDR_ANY;
@@ -21,13 +12,11 @@ diff -p -u -8 -r1.94 selfserv.c
 +	errExit("PR_SetNetAddr");
 +    }
  
--    listen_sock = PR_NewTCPSocket();
+     if (PR_GetEnv("NSS_USE_SDP")) {
+         socketDomain = PR_AF_INET_SDP;
+     }
+-    listen_sock = PR_OpenTCPSocket(socketDomain);
 +    listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
      if (listen_sock == NULL) {
- 	errExit("PR_NewTCPSocket");
+         errExit("PR_OpenTCPSocket error");
      }
- 
-     opt.option = PR_SockOpt_Nonblocking;
-     opt.value.non_blocking = PR_FALSE;
-     prStatus = PR_SetSocketOption(listen_sock, &opt);
-     if (prStatus < 0) {
diff --git a/nss.spec b/nss.spec
index 1f077bf..a45f98e 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,12 +1,12 @@
-%global nspr_version 4.8.7
-%global nss_util_version 3.12.9
-%global nss_softokn_version 3.12.9
+%global nspr_version 4.8.8
+%global nss_util_version 3.12.10
+%global nss_softokn_version 3.12.10
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.9
-Release:          15%{?dist}
+Version:          3.12.10
+Release:          0.1%{?dist}.beta1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -43,11 +43,6 @@ Patch3:           renegotiate-transitional.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           nsspem-642433.patch
 Patch8:           0001-Bug-695011-PEM-logging.patch
-Patch11:          honor-user-trust-preferences.patch
-Patch12:          allow-content-types-beyond-smime.patch
-Patch13:          nss-recurse.patch
-Patch14:          dont-use-cpp-reserved-words.patch
-Patch15:          swap-internal-key-slot.patch
 Patch16:          nss-539183.patch
 
 %description
@@ -122,11 +117,6 @@ low level services.
 %patch6 -p0 -b .libpem
 %patch7 -p0 -b .642433
 %patch8 -p1 -b .695011          
-%patch11 -p1 -b .643134
-%patch12 -p1 -b .contenttypes
-%patch13 -p1 -b .recurse
-%patch14 -p1 -b .676036
-%patch15 -p1 -b .jss
 %patch16 -p0 -b .539183
 
 
@@ -521,6 +511,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Wed Apr 27 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.10-0.1.beta1
+- Update to NSS_3_12_10_BETA1
+
 * Mon Apr 11 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-15
 - Implement PEM logging using NSPR's own (#695011)
 
diff --git a/sources b/sources
index d5ce83d..3213841 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-240c8d61d9c9091e486318e889bc1f2f  nss-3.12.9-stripped.tar.bz2
+c656c06f0defb42e36f46048a71122a1  nss-3.12.10-stripped.tar.bz2
 e63cddf74c07f0d818d1052ecc6fbb1f  nss-pem-20101125.tar.bz2
 a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 9315689bbd9f28ceebd47894f99fccbd  blank-key3.db