From 9b70717281f8fae0705a62d5c8fc60e4b668c906 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Fri, 27 Sep 2013 11:32:01 -0700 Subject: [PATCH] - Update to NSS_3_15_2_RTM - Update iquote.patch on account of modified prototype on cert.h installed by nss-devel - On CERT_GetKeyType a const qualifier was added to the input parameter and this we must include - the cert.h from the build tree intead of the one in system/buildroot which is not up to date yet --- iquote.patch | 24 ++++++++++++++++++++++++ nss.spec | 1 + 2 files changed, 25 insertions(+) diff --git a/iquote.patch b/iquote.patch index 78fa6d4..3df4927 100644 --- a/iquote.patch +++ b/iquote.patch @@ -36,3 +36,27 @@ diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk endif ifndef NSS_LIB_DIR +diff -up nss/lib/certhigh/Makefile.iquote nss/lib/certhigh/Makefile +--- nss/lib/certhigh/Makefile.iquote 2013-09-27 11:13:55.158689314 -0700 ++++ nss/lib/certhigh/Makefile 2013-09-27 11:14:38.181042336 -0700 +@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk + # (6) Execute "component" rules. (OPTIONAL) # + ####################################################################### + +- ++INCLUDES += -iquote $(DIST)/../public/nss + + ####################################################################### + # (7) Execute "local" rules. (OPTIONAL). # +diff -up nss/lib/cryptohi/Makefile.iquote nss/lib/cryptohi/Makefile +--- nss/lib/cryptohi/Makefile.iquote 2013-09-27 11:11:30.117494489 -0700 ++++ nss/lib/cryptohi/Makefile 2013-09-27 11:12:54.704194915 -0700 +@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk + # (6) Execute "component" rules. (OPTIONAL) # + ####################################################################### + +- ++INCLUDES += -iquote $(DIST)/../public/nss + + ####################################################################### + # (7) Execute "local" rules. (OPTIONAL). # diff --git a/nss.spec b/nss.spec index ec5140f..819cc68 100644 --- a/nss.spec +++ b/nss.spec @@ -757,6 +757,7 @@ fi %changelog * Thu Sep 26 2013 Elio Maldonado - 3.15.2-1 - Update to NSS_3_15_2_RTM +- Update iquote.patch on account of modified prototype on cert.h installed by nss-devel * Wed Aug 28 2013 Elio Maldonado - 3.15.1-7 - Update pem sources to pick up a patch applied upstream which a faulty merge had missed