From 8f343923c11ae72451ce89b9524fb3bbc4f6463c Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Thu, 6 Sep 2007 16:06:32 +0000 Subject: [PATCH] - fix a C++ mode compilation error --- nss-create-obj.patch | 6 +++--- nss.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nss-create-obj.patch b/nss-create-obj.patch index 37cdb73..abac4fc 100644 --- a/nss-create-obj.patch +++ b/nss-create-obj.patch @@ -49,7 +49,7 @@ diff -u -r1.11.2.3 pk11obj.c + * Hand Create a new object and return the Generic object for our new object. + */ +PK11GenericObject * -+PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template, ++PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template_, + int count, PRBool token) +{ + CK_OBJECT_HANDLE objectID; @@ -57,7 +57,7 @@ diff -u -r1.11.2.3 pk11obj.c + CK_RV crv; + + PK11_EnterSlotMonitor(slot); -+ crv = PK11_CreateNewObject(slot, slot->session, template, count, ++ crv = PK11_CreateNewObject(slot, slot->session, template_, count, + token, &objectID); + PK11_ExitSlotMonitor(slot); + if (crv != CKR_OK) { @@ -150,7 +150,7 @@ diff -u -r1.14.2.1 pk11pub.h SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object); SECStatus PK11_DestroyGenericObject(PK11GenericObject *object); +PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot, -+ const CK_ATTRIBUTE *template, ++ const CK_ATTRIBUTE *template_, + int count, PRBool token); SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object, CK_ATTRIBUTE_TYPE attr, SECItem *item); diff --git a/nss.spec b/nss.spec index d4ed701..02667a1 100644 --- a/nss.spec +++ b/nss.spec @@ -7,7 +7,7 @@ Summary: Network Security Services Name: nss Version: 3.11.7 -Release: 7%{?dist} +Release: 8%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -453,6 +453,9 @@ done %changelog +* Thu Sep 06 2007 Kai Engert - 3.11.7-8 +- fix a C++ mode compilation error + * Wed Sep 05 2007 Bob Relyea - 3.11.7-7 - Add 3.12 ckfw and libnsspem