summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/ca_root_nss/Makefile2
-rw-r--r--security/ca_root_nss/distinfo6
-rw-r--r--security/nss/Makefile2
-rw-r--r--security/nss/distinfo6
-rw-r--r--security/nss/files/patch-bug30198612
-rw-r--r--security/nss/files/patch-coreconf_command.mk2
-rw-r--r--security/nss/files/patch-lib_freebl_mpi_mpcpucache.c6
-rw-r--r--security/nss/files/patch-lib_softoken_pkcs11c.c36
8 files changed, 36 insertions, 36 deletions
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index c8dc66de27c6..499609ab39cb 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR}
# !!! Please DO NOT submit patches for new version until it has !!!
# !!! been committed there first. !!!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS= 3.26
+VERSION_NSS= 3.27
#NSS_SUFFIX= -with-ckbi-1.98
CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
BUNDLE_PROCESSOR= MAca-bundle.pl
diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo
index bd2a17782fd4..4c88f7fe5cd4 100644
--- a/security/ca_root_nss/distinfo
+++ b/security/ca_root_nss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470475306
-SHA256 (nss-3.26.tar.gz) = 91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564
-SIZE (nss-3.26.tar.gz) = 7386943
+TIMESTAMP = 1475035246
+SHA256 (nss-3.27.tar.gz) = 021aa936b06f5815474dd5c137f2325b3fe06caa38d9798ca53ec30b537301fa
+SIZE (nss-3.27.tar.gz) = 7397210
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 50fe5cc3819b..68a215268b53 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nss
-PORTVERSION= 3.26
+PORTVERSION= 3.27
#DISTVERSIONSUFFIX= -with-ckbi-1.98
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
diff --git a/security/nss/distinfo b/security/nss/distinfo
index bd2a17782fd4..4c88f7fe5cd4 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470475306
-SHA256 (nss-3.26.tar.gz) = 91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564
-SIZE (nss-3.26.tar.gz) = 7386943
+TIMESTAMP = 1475035246
+SHA256 (nss-3.27.tar.gz) = 021aa936b06f5815474dd5c137f2325b3fe06caa38d9798ca53ec30b537301fa
+SIZE (nss-3.27.tar.gz) = 7397210
diff --git a/security/nss/files/patch-bug301986 b/security/nss/files/patch-bug301986
index 0745e23e9172..9ae42321f152 100644
--- a/security/nss/files/patch-bug301986
+++ b/security/nss/files/patch-bug301986
@@ -1,11 +1,11 @@
--- lib/util/nssilckt.h~
+++ lib/util/nssilckt.h
-@@ -195,7 +195,7 @@ typedef enum {
+@@ -163,7 +163,7 @@ typedef enum {
** Declare the trace record
*/
struct pzTrace_s {
-- PRUint32 threadID; /* PR_GetThreadID() */
-+ pthread_t threadID; /* PR_GetThreadID() */
- nssILockOp op; /* operation being performed */
- nssILockType ltype; /* lock type identifier */
- PRIntervalTime callTime; /* time spent in function */
+- PRUint32 threadID; /* PR_GetThreadID() */
++ pthread_t threadID; /* PR_GetThreadID() */
+ nssILockOp op; /* operation being performed */
+ nssILockType ltype; /* lock type identifier */
+ PRIntervalTime callTime; /* time spent in function */
diff --git a/security/nss/files/patch-coreconf_command.mk b/security/nss/files/patch-coreconf_command.mk
index 08dcdad87410..43d432b0e432 100644
--- a/security/nss/files/patch-coreconf_command.mk
+++ b/security/nss/files/patch-coreconf_command.mk
@@ -3,7 +3,7 @@
@@ -12,7 +12,7 @@ AS = $(CC)
ASFLAGS += $(CFLAGS)
CCF = $(CC) $(CFLAGS)
- LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS)
+ LINK_DLL = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS)
-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
$(DEFINES) $(INCLUDES) $(XCFLAGS)
diff --git a/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c b/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
index 8b7d7d1be225..e8acd48c08c9 100644
--- a/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
+++ b/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
@@ -1,9 +1,9 @@
--- lib/freebl/mpi/mpcpucache.c.orig 2010-06-11 22:39:33.000000000 +0200
+++ lib/freebl/mpi/mpcpucache.c 2010-06-11 22:40:20.000000000 +0200
-@@ -733,6 +733,32 @@ s_mpi_getProcessorLineSize()
+@@ -705,6 +705,32 @@ s_mpi_getProcessorLineSize()
#endif
- #if defined(__ppc64__)
+ #if defined(__ppc64__)
+
+#if defined(__FreeBSD__)
+#include <sys/stddef.h>
@@ -33,7 +33,7 @@
/*
* Sigh, The PPC has some really nice features to help us determine cache
* size, since it had lots of direct control functions to do so. The POWER
-@@ -785,6 +811,7 @@ s_mpi_getProcessorLineSize()
+@@ -758,6 +784,7 @@ s_mpi_getProcessorLineSize()
}
return 0;
}
diff --git a/security/nss/files/patch-lib_softoken_pkcs11c.c b/security/nss/files/patch-lib_softoken_pkcs11c.c
index 8d65974a633a..7bb450ba5220 100644
--- a/security/nss/files/patch-lib_softoken_pkcs11c.c
+++ b/security/nss/files/patch-lib_softoken_pkcs11c.c
@@ -1,22 +1,22 @@
--- lib/softoken/pkcs11c.c.orig 2010-05-05 14:36:05.000000000 +0000
+++ lib/softoken/pkcs11c.c 2010-05-05 14:37:25.000000000 +0000
-@@ -4602,9 +4602,6 @@
- break;
+@@ -5679,9 +5679,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, S
+ break;
case NSSLOWKEYDSAKey:
- keyType = CKK_DSA;
-- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK :
-- CKR_KEY_TYPE_INCONSISTENT;
-- if(crv != CKR_OK) break;
- crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
- sizeof(keyType));
- if(crv != CKR_OK) break;
-@@ -4638,9 +4635,6 @@
- #ifdef NSS_ENABLE_ECC
+ keyType = CKK_DSA;
+- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;
+- if (crv != CKR_OK)
+- break;
+ crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
+ sizeof(keyType));
+ if (crv != CKR_OK)
+@@ -5722,9 +5719,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, S
+ #ifndef NSS_DISABLE_ECC
case NSSLOWKEYECKey:
- keyType = CKK_EC;
-- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK :
-- CKR_KEY_TYPE_INCONSISTENT;
-- if(crv != CKR_OK) break;
- crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
- sizeof(keyType));
- if(crv != CKR_OK) break;
+ keyType = CKK_EC;
+- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;
+- if (crv != CKR_OK)
+- break;
+ crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
+ sizeof(keyType));
+ if (crv != CKR_OK)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 21:16:48 +0000