diff options
Diffstat (limited to 'security/nss/files')
| -rw-r--r-- | security/nss/files/patch-bugzilla-702090 | 23 | ||||
| -rw-r--r-- | security/nss/files/patch-sysdb | 13 |
2 files changed, 5 insertions, 31 deletions
diff --git a/security/nss/files/patch-bugzilla-702090 b/security/nss/files/patch-bugzilla-702090 deleted file mode 100644 index 1b7a43db292a..000000000000 --- a/security/nss/files/patch-bugzilla-702090 +++ /dev/null @@ -1,23 +0,0 @@ -Taken from here: -https://bug702090.bugzilla.mozilla.org/attachment.cgi?id=575453 - ---- ../../security/nss/lib/util/pkcs11n.h.orig 2011-09-14 10:21:10.000000000 +0900 -+++ ../../security/nss/lib/util/pkcs11n.h 2011-11-19 00:45:01.131860104 +0900 -@@ -346,7 +346,7 @@ - * labels have never been accurate to what was really implemented. - * The new labels correctly reflect what the values effectively mean. - */ --#if __GNUC__ > 3 -+#if defined(__GNUC__) && (__GNUC__ > 3) - /* make GCC warn when we use these #defines */ - /* - * This is really painful because GCC doesn't allow us to mark random -@@ -362,7 +362,7 @@ - * 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));
\ No newline at end of file diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb index cfd68e7d52f5..7874a3ad9f09 100644 --- a/security/nss/files/patch-sysdb +++ b/security/nss/files/patch-sysdb @@ -81,17 +81,14 @@ --- lib/softoken/legacydb/config.mk.orig 2009-08-31 12:39:49.000000000 +0200 +++ lib/softoken/legacydb/config.mk 2009-08-31 12:40:03.000000000 +0200 -@@ -40,10 +40,6 @@ +@@ -40,7 +40,6 @@ - EXTRA_LIBS += $(CRYPTOLIB) + EXTRA_LIBS += \ + $(CRYPTOLIB) \ +- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \ + $(NULL) --ifndef NSS_DISABLE_DBM --EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) --endif -- # can't do this in manifest.mn because OS_TARGET isn't defined there. - ifeq (,$(filter-out WIN%,$(OS_TARGET))) - --- lib/certdb/xauthkid.c.orig 2009-08-31 12:43:13.000000000 +0200 +++ lib/certdb/xauthkid.c 2009-08-31 12:44:21.000000000 +0200 @@ -39,7 +39,7 @@ |