Update to NSS_3_15_1_RTM

- Enable the iquote.patch to access newly introduced types
- New types and constants added to sslprot.h, sslerr.h, and sslt.h require thhe in-tree headers to be picked up first

iquote.patch

@@ -0,0 +1,38 @@
+diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile
+--- nss/cmd/bltest/Makefile.iquote	2013-06-27 10:58:08.000000000 -0700
++++ nss/cmd/bltest/Makefile	2013-07-02 15:02:26.656643246 -0700
+@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL)                           #
+ #######################################################################
+ 
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ 
+ #######################################################################
+diff -up nss/cmd/lib/Makefile.iquote nss/cmd/lib/Makefile
+--- nss/cmd/lib/Makefile.iquote	2013-07-02 15:07:47.260622471 -0700
++++ nss/cmd/lib/Makefile	2013-07-02 15:08:47.219179157 -0700
+@@ -38,7 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL)                           #
+ #######################################################################
+ 
+-
++INCLUDES += -iquote $(DIST)/../private/nss
++INCLUDES += -iquote $(DIST)/../public/nss
+ 
+ #######################################################################
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
+--- nss/coreconf/location.mk.iquote	2013-06-27 10:58:08.000000000 -0700
++++ nss/coreconf/location.mk	2013-07-02 15:02:26.656643246 -0700
+@@ -45,6 +45,10 @@ endif
+ 
+ ifdef NSS_INCLUDE_DIR
+     INCLUDES += -I$(NSS_INCLUDE_DIR)
++    ifdef IN_TREE_FREEBL_HEADERS_FIRST
++        INCLUDES += -iquote $(DIST)/../public/nss
++        INCLUDES += -iquote $(DIST)/../private/nss
++    endif
+ endif
+ 
+ ifndef NSS_LIB_DIR

nss.spec

@@ -103,6 +103,7 @@ Patch47:          utilwrap-include-templates.patch
 Patch48:          nss-versus-softoken-tests.patch
 # TODO remove when we switch to building nss without softoken
 Patch49:  nss-skip-bltest-and-fipstest.patch
+Patch50:  iquote.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -196,6 +197,7 @@ low level services.
 %patch47 -p0 -b .templates
 %patch48 -p0 -b .crypto
 %patch49 -p0 -b .skipthem
+%patch50 -p0 -b .iquote
 
 #########################################################
 # Higher-level libraries and test tools need access to
@@ -274,6 +276,9 @@ USE_64=1
 export USE_64
 %endif
 
+# uncomment if the iquote patch is activated
+export IN_TREE_FREEBL_HEADERS_FIRST=1
+
 ##### phase 1: remove util/freebl/softoken and low level tools
 #
 ######## Remove freebl, softoken and util
@@ -720,6 +725,7 @@ fi
 %changelog
 * Tue Jul 02 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-1
 - Update to NSS_3_15_1_RTM
+- Enable the iquote.patch to access newly introduced types
 
 * Wed Jun 19 2013 Elio Maldonado <emaldona@redhat.com> - 3.15-5
 - Install man pages for nss-tools and the nss-config and setup-nsssysinit scripts