ports/164655: [PATCH] security/nss: add upstream patch
Ruslan Mahmatkhanov
rm at FreeBSD.org
Tue Jan 31 05:10:10 UTC 2012
>Number: 164655
>Category: ports
>Synopsis: [PATCH] security/nss: add upstream patch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 31 05:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 10.0-CURRENT
>Organization:
>Environment:
10.0-CURRENT i386
>Description:
Add upstream patch, that fix "__GNUC_MINOR is not defined" build error that showing up when building some ports, that depend on nss. See ports/164391 for example. Patch was taken here:
https://bugzilla.mozilla.org/show_bug.cgi?id=702090
Buildlog: http://people.freebsd.org/~rm/nss-3.13.1_1.log
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/nss/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile 12 Jan 2012 23:41:27 -0000 1.61
+++ Makefile 31 Jan 2012 05:03:26 -0000
@@ -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
Index: files/patch-mozilla-security-nss-lib-util_pkcs11n.h
===================================================================
RCS file: files/patch-mozilla-security-nss-lib-util_pkcs11n.h
diff -N files/patch-mozilla-security-nss-lib-util_pkcs11n.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-mozilla-security-nss-lib-util_pkcs11n.h 31 Jan 2012 05:03:26 -0000
@@ -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));
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list