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'
Created attachment 477661 [details] Rename the offending field from private to privateInfo
(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 on attachment 477661 [details] Rename the offending field from private to privateInfo r+ rrelyea
Created attachment 478109 [details] V2: Renamed template as well
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
Created attachment 478166 [details] V3: the patch as applied in the trunk
Sorry, comments #5 and #6 where meant for the upstream bug.
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
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
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
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
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.