From dc20ddf3a8ddf9e19adac487e35b15fdf256989b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 Nov 2011 14:40:47 -0600 Subject: [PATCH] Fix __GNUC_MINOR mistype that caused users of NSS to fail to build --- gnuc-minor-def-fix.patch | 12 ++++++++++++ nss.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnuc-minor-def-fix.patch diff --git a/gnuc-minor-def-fix.patch b/gnuc-minor-def-fix.patch new file mode 100644 index 0000000..f210af2 --- /dev/null +++ b/gnuc-minor-def-fix.patch @@ -0,0 +1,12 @@ +diff -up nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h +--- nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo 2011-11-10 12:44:17.683967574 -0600 ++++ nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h 2011-11-10 12:44:24.146886778 -0600 +@@ -362,7 +362,7 @@ typedef CK_ULONG CK_TRUST; + * cast the resulting value to the deprecated type in the #define, thus + * producting the warning when the #define is used. + */ +-#if (__GNUC__ == 4) && (__GNUC_MINOR < 5) ++#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5) + /* The mac doesn't like the friendlier deprecate messages. I'm assuming this + * is a gcc version issue rather than mac or ppc specific */ + typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated)); diff --git a/nss.spec b/nss.spec index acf2cc1..ceea836 100644 --- a/nss.spec +++ b/nss.spec @@ -6,7 +6,7 @@ Summary: Network Security Services Name: nss Version: 3.13.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -60,6 +60,7 @@ Patch20: nsspem-createobject-initialize-pointer.patch Patch21: 0001-libnsspem-rhbz-734760.patch Patch22: nsspem-init-inform-not-thread-safe.patch Patch23: nss-ckbi-1.88.rtm.patch +Patch24: gnuc-minor-def-fix.patch %description @@ -141,6 +142,7 @@ low level services. %patch21 -p1 -b .734760 %patch22 -p0 -b .736410 %patch23 -p0 -b .ckbi188 +%patch24 -p1 -b .gnuc-minor %build @@ -551,6 +553,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %changelog +* Thu Nov 09 2011 Dan Williams - 3.13.1-3 +- Fix builds of packages that use NSS due to a small header file error + * Fri Nov 04 2011 Elio Maldonado - 3.13.1-2 - Fix broken dependencies by updating the nss-util and nss-softokn versions