Bug 676036

Summary: NSS CMS headers cmst.h and cms.h use C++ reserved identifiers 'private' and 'template'
Product: [Fedora] Fedora Reporter: Christopher Aillon <caillon>
Component: nssAssignee: Elio Maldonado Batiz <emaldona>
Status: CLOSED ERRATA QA Contact: Fedora Extras Quality Assurance <extras-qa>
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: rawhideCC: emaldona, kdudka, kengert, nalin
Target Milestone: ---   
Target Release: ---   
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: nss-softokn-3.12.9-7.fc15 Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2011-03-03 03:23:28 UTC Type: ---
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Attachments:
Description Flags
Rename the offending field from private to privateInfo
rrelyea: review+
V2: Renamed template as well
none
V3: the patch as applied in the trunk none

Description Christopher Aillon 2011-02-08 17:02:42 UTC
This makes compilation of Firefox, Thunderbird, or XULRunner fail.

In file included from /usr/include/nss3/cms.h:52:0,
                 from ../../../../dist/system_wrappers/cms.h:3,
                 from nsNSSComponent.cpp:117:
/usr/include/nss3/cmst.h:185:31: error: expected unqualified-id before 'private'
/usr/include/nss3/cmst.h:185:30: error: expected ';' at end of member declaration
/usr/include/nss3/cmst.h:185:38: error: expected ':' before ';' token
In file included from ../../../../dist/system_wrappers/cms.h:3:0,
                 from nsNSSComponent.cpp:117:
/usr/include/nss3/cms.h:1174:45: error: expected ',' or '...' before 'template'

Comment 1 Elio Maldonado Batiz 2011-02-08 17:51:33 UTC
Created attachment 477661 [details]
Rename the offending field from private to privateInfo

Comment 2 Christopher Aillon 2011-02-08 17:56:26 UTC
(Note that after talking to Elio, I temporarily commented out applying the patches from our nss RPM in order to get some builds of Firefox going)

Comment 3 Bob Relyea 2011-02-08 18:59:24 UTC
Comment on attachment 477661 [details]
Rename the offending field from private to privateInfo

r+ rrelyea

Comment 4 Elio Maldonado Batiz 2011-02-10 20:02:50 UTC
Created attachment 478109 [details]
V2: Renamed template as well

Comment 5 Elio Maldonado Batiz 2011-02-11 01:58:23 UTC
Changes committed to trunk
Checking in cmscinfo.c;
/cvsroot/mozilla/security/nss/lib/smime/cmscinfo.c,v  <--  cmscinfo.c
new revision: 1.10; previous revision: 1.9
done
Checking in cmsdecode.c;
/cvsroot/mozilla/security/nss/lib/smime/cmsdecode.c,v  <--  cmsdecode.c
new revision: 1.12; previous revision: 1.11
done
Checking in cmsdigdata.c;
/cvsroot/mozilla/security/nss/lib/smime/cmsdigdata.c,v  <--  cmsdigdata.c
new revision: 1.7; previous revision: 1.6
done
Checking in cmsencdata.c;
/cvsroot/mozilla/security/nss/lib/smime/cmsencdata.c,v  <--  cmsencdata.c
new revision: 1.13; previous revision: 1.12
done
Checking in cmsencode.c;
/cvsroot/mozilla/security/nss/lib/smime/cmsencode.c,v  <--  cmsencode.c
new revision: 1.11; previous revision: 1.10
done
Checking in cmsenvdata.c;
/cvsroot/mozilla/security/nss/lib/smime/cmsenvdata.c,v  <--  cmsenvdata.c
new revision: 1.13; previous revision: 1.12
done
Checking in cmssigdata.c;
/cvsroot/mozilla/security/nss/lib/smime/cmssigdata.c,v  <--  cmssigdata.c
new revision: 1.31; previous revision: 1.30
done
Checking in cmst.h;
/cvsroot/mozilla/security/nss/lib/smime/cmst.h,v  <--  cmst.h
new revision: 1.13; previous revision: 1.12
done
Checking in cmsudf.c;
/cvsroot/mozilla/security/nss/lib/smime/cmsudf.c,v  <--  cmsudf.c
new revision: 1.3; previous revision: 1.2
done

Comment 6 Elio Maldonado Batiz 2011-02-11 02:24:45 UTC
Created attachment 478166 [details]
V3: the patch as applied in the trunk

Comment 7 Elio Maldonado Batiz 2011-02-11 02:28:10 UTC
Sorry, comments #5 and #6 where meant for the upstream bug.

Comment 8 Fedora Update System 2011-02-11 22:35:28 UTC
nss-3.12.9-10.fc15 has been submitted as an update for Fedora 15.
https://admin.fedoraproject.org/updates/nss-3.12.9-10.fc15

Comment 9 Fedora Update System 2011-02-13 03:23:54 UTC
nss-3.12.9-10.fc15 has been pushed to the Fedora 15 testing repository.  If problems still persist, please make note of it in this bug report.
 If you want to test the update, you can install it with 
 su -c 'yum --enablerepo=updates-testing update nss'.  You can provide feedback for this update here: https://admin.fedoraproject.org/updates/nss-3.12.9-10.fc15

Comment 10 Fedora Update System 2011-02-25 23:18:41 UTC
nss-softokn-3.12.9-6.fc15, nss-3.12.9-13.fc15 has been pushed to the Fedora 15 testing repository.  If problems still persist, please make note of it in this bug report.
 If you want to test the update, you can install it with 
 su -c 'yum --enablerepo=updates-testing update nss-softokn nss'.  You can provide feedback for this update here: https://admin.fedoraproject.org/updates/nss-softokn-3.12.9-6.fc15,nss-3.12.9-13.fc15

Comment 11 Fedora Update System 2011-03-01 06:46:02 UTC
nss-softokn-3.12.9-7.fc15, nss-3.12.9-13.fc15 has been pushed to the Fedora 15 testing repository.  If problems still persist, please make note of it in this bug report.
 If you want to test the update, you can install it with 
 su -c 'yum --enablerepo=updates-testing update nss-softokn nss'.  You can provide feedback for this update here: https://admin.fedoraproject.org/updates/nss-softokn-3.12.9-7.fc15,nss-3.12.9-13.fc15

Comment 12 Fedora Update System 2011-03-03 03:22:46 UTC
nss-softokn-3.12.9-7.fc15, nss-3.12.9-13.fc15 has been pushed to the Fedora 15 stable repository.  If problems still persist, please make note of it in this bug report.