rpms/nss/devel nss-create-obj.patch,1.1,1.2 nss.spec,1.27,1.28

[Kai Engert (kengert)]

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9015

Modified Files:
	nss-create-obj.patch nss.spec 
Log Message:
* Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
- fix a C++ mode compilation error


nss-create-obj.patch:

Index: nss-create-obj.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-create-obj.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss-create-obj.patch	5 Sep 2007 20:00:42 -0000	1.1
+++ nss-create-obj.patch	6 Sep 2007 16:06:32 -0000	1.2
@@ -49,7 +49,7 @@
 + * 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 @@
 +    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 @@
  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);


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nss.spec	5 Sep 2007 20:00:42 -0000	1.27
+++ nss.spec	6 Sep 2007 16:06:32 -0000	1.28
@@ -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 @@
 
 
 %changelog
+* Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
+- fix a C++ mode compilation error
+
 * Wed Sep 05 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.7-7
 - Add 3.12 ckfw and libnsspem