aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-01-31 21:51:27 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-01-31 21:51:27 +0000
commit6ebf66408b2c7dcd9870ec0195d2e1e0fd81973d (patch)
tree9ed9105f2f1c4943abb494c75ee95d1ff54be06f /security
parent4f51b9d58b6d8e3f92e100d3e85d4440a64a8d05 (diff)
downloadports-6ebf66408b2c7dcd9870ec0195d2e1e0fd81973d.tar.gz
ports-6ebf66408b2c7dcd9870ec0195d2e1e0fd81973d.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/nss/Makefile1
-rw-r--r--security/nss/files/patch-bugzilla-70209023
2 files changed, 24 insertions, 0 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile
index c0fae2db94b4..5b51b96a69e7 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nss
PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
diff --git a/security/nss/files/patch-bugzilla-702090 b/security/nss/files/patch-bugzilla-702090
new file mode 100644
index 000000000000..1b7a43db292a
--- /dev/null
+++ b/security/nss/files/patch-bugzilla-702090
@@ -0,0 +1,23 @@
+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