From db7fe531237dd8f9ad78f718862eaacca6f340b2 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Sat, 23 Nov 2013 20:47:19 -0800
Subject: [PATCH] Update to NSS_3_15_3_RTM

- Resolves: Bug 1031897 - CVE-2013-5605 CVE-2013-5606 CVE-2013-1741 nss: various flaws
- Fix option descriptions for setup-nsssysinit manpage
---
 .gitignore           |  2 +-
 nss.spec             | 13 ++++++++-----
 setup-nsssysinit.xml | 22 +++++++++-------------
 sources              |  2 +-
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25fde7a..4cb9016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
 /nss-pem-20130828.tar.bz2
-/nss-3.15.2.tar.gz
+/nss-3.15.3.tar.gz
diff --git a/nss.spec b/nss.spec
index c164779..9f88823 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,4 +1,4 @@
-%global nspr_version 4.10.1
+%global nspr_version 4.10.2
 %global nss_util_version 3.15.2
 %global nss_softokn_fips_version 3.12.9
 %global nss_softokn_version 3.15.2
@@ -19,8 +19,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.15.2
-Release:          3%{?dist}
+Version:          3.15.3
+Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -79,8 +79,6 @@ Patch18:          nss-646045.patch
 # must statically link pem against the freebl in the buildroot
 # Needed only when freebl on tree has new APIS
 Patch25:          nsspem-use-system-freebl.patch
-# This patch is currently meant for stable branches
-# Patch29:          nss-ssl-cbc-random-iv-off-by-default.patch
 # Prevent users from trying to enable ssl pkcs11 bypass
 # Patch39:          nss-ssl-enforce-no-pkcs11-bypass.path
 # TODO: Remove this patch when the ocsp test are fixed
@@ -742,6 +740,11 @@ fi
 
 
 %changelog
+* Sun Nov 24 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.3-1
+- Update to NSS_3_15_3_RTM
+- Resolves: Bug 1031897 - CVE-2013-5605 CVE-2013-5606 CVE-2013-1741 nss: various flaws
+- Fix option descriptions for setup-nsssysinit manpage
+
 * Sun Oct 27 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.2-3
 - Revert one change from last commit to preserve full nss pluggable ecc supprt [1019245]
 
diff --git a/setup-nsssysinit.xml b/setup-nsssysinit.xml
index 0560cc1..5b9827f 100644
--- a/setup-nsssysinit.xml
+++ b/setup-nsssysinit.xml
@@ -27,13 +27,9 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>setup-nsssysinit</command>
-      <arg><option>--prefix</option></arg>
-      <arg><option>--exec-prefix</option></arg>
-      <arg><option>--includedir</option></arg>
-      <arg><option>--libs</option></arg>
-      <arg><option>--cflags</option></arg>
-      <arg><option>--libdir</option></arg>
-      <arg><option>--version</option></arg>
+      <arg><option>on</option></arg>
+      <arg><option>off</option></arg>
+      <arg><option>status</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -49,17 +45,17 @@
     
     <variablelist>
       <varlistentry>
-        <term><option>--on</option></term>
+        <term><option>on</option></term>
         <listitem><simpara>Turn on nss-sysinit.</simpara></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>--off</option></term>
+        <term><option>off</option></term>
         <listitem><simpara>Turn on nss-sysinit.</simpara></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>--status</option> <replaceable>count</replaceable></term>
+        <term><option>status</option></term>
         <listitem><simpara>returns whether nss-syinit is enabled or not.</simpara></listitem>
       </varlistentry>
 
@@ -71,13 +67,13 @@
 
     <para>The following example will query for the status of nss-sysinit:
       <programlisting>
-        /usr/bin/setup-nsssysinit --status
+        /usr/bin/setup-nsssysinit status
       </programlisting>
     </para>
 
     <para>The following example, when run as superuser, will turn on nss-sysinit:
       <programlisting>
-        /usr/bin/setup-nsssysinit --on
+        /usr/bin/setup-nsssysinit on
       </programlisting>
     </para>
 
@@ -85,7 +81,7 @@
 
   <refsection>
     <title>Files</title>
-    <para><filename>/usr/sbin/setup-nsssysinit</filename></para>
+    <para><filename>/usr/bin/setup-nsssysinit</filename></para>
   </refsection>
 
   <refsection>
diff --git a/sources b/sources
index 2a414c9..f7b6e77 100644
--- a/sources
+++ b/sources
@@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
 e82dd2b9520f9d0f5d101e7710d59656  nss-pem-20130828.tar.bz2
-154223568f9734c76c164b46c774450c  nss-3.15.2.tar.gz
+1bb267452359bd37e34d072a215873d5  nss-3.15.3.tar.gz