[nss/f19] Update to nss-3.17.0

[Elio Maldonado]

commit 6267a036341b43b9ff2bdb275c2407493bd400cc
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Aug 22 08:28:07 2014 -0700

    Update to nss-3.17.0
    
    - selective merge from f21

 .gitignore   |    2 +-
 iquote.patch |   26 ++++++++++++++++++++++++++
 nss.spec     |   15 ++++++++++-----
 sources      |    2 +-
 4 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d357569..601f0f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
 /nss-pem-20140125.tar.bz2
-/nss-3.16.2.tar.gz
+/nss-3.17.0.tar.gz
diff --git a/iquote.patch b/iquote.patch
index 2d853c7..becdd7e 100644
--- a/iquote.patch
+++ b/iquote.patch
@@ -9,6 +9,32 @@ diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile
  
  
  #######################################################################
+diff -up nss/cmd/certcgi/Makefile.iquote nss/cmd/certcgi/Makefile
+--- nss/cmd/certcgi/Makefile.iquote	2014-08-19 10:18:35.713017904 -0700
++++ nss/cmd/certcgi/Makefile	2014-08-19 10:19:36.106528087 -0700
+@@ -36,7 +36,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL)                           #
+ #######################################################################
+ 
+-
++INCLUDES += -iquote $(DIST)/../public/nss
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ #######################################################################
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+diff -up nss/cmd/certutil/Makefile.iquote nss/cmd/certutil/Makefile
+--- nss/cmd/certutil/Makefile.iquote	2014-08-19 10:23:39.697585905 -0700
++++ nss/cmd/certutil/Makefile	2014-08-19 10:24:31.060019803 -0700
+@@ -37,7 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL)                           #
+ #######################################################################
+ 
+-
++INCLUDES += -iquote $(DIST)/../public/nss
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ #######################################################################
+ # (7) Execute "local" rules. (OPTIONAL).                              #
 diff -up nss/cmd/lib/Makefile.iquote nss/cmd/lib/Makefile
 --- nss/cmd/lib/Makefile.iquote	2014-05-01 20:27:18.000000000 -0700
 +++ nss/cmd/lib/Makefile	2014-05-06 07:15:41.174387806 -0700
diff --git a/nss.spec b/nss.spec
index 0c97613..2028791 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.10.6
-%global nss_util_version 3.16.2
-%global nss_softokn_version 3.16.2
+%global nspr_version 4.10.7
+%global nss_util_version 3.17.0
+%global nss_softokn_version 3.17.0
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
 
@@ -18,8 +18,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.16.2
-Release:          2%{?dist}
+Version:          3.17.0
+Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -611,6 +611,8 @@ fi
 
 %files
 %defattr(-,root,root)
+%{!?_licensedir:%global license %%doc}
+%license nss/COPYING
 %{_libdir}/libnss3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
@@ -751,6 +753,9 @@ fi
 
 
 %changelog
+* Fri Aug 22 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.0-1
+- Update to nss-3.17.0
+
 * Wed Jul 30 2014 Elio Maldonado <emaldona at redhat.com> - 3.16.2-2
 - Replace expired PayPal test cert with current one to prevent build failure
 
diff --git a/sources b/sources
index c23aece..e9fdea2 100644
--- a/sources
+++ b/sources
@@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
 b8a94e863c852e1f8b75e930e76f8640  nss-pem-20140125.tar.bz2
-afc6789c9d805db5be1e5f3c533394f1  nss-3.16.2.tar.gz
+7e5e411e757949b699c0a5aa9417592b  nss-3.17.0.tar.gz