From owner-svn-ports-head@freebsd.org Wed Sep 28 08:23:41 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6DC38BEC40E; Wed, 28 Sep 2016 08:23:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 334F018F3; Wed, 28 Sep 2016 08:23:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8S8NeCV050468; Wed, 28 Sep 2016 08:23:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8S8NdWm050460; Wed, 28 Sep 2016 08:23:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609280823.u8S8NdWm050460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 28 Sep 2016 08:23:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422859 - in head/security: ca_root_nss nss nss/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Sep 2016 08:23:41 -0000 Author: jbeich Date: Wed Sep 28 08:23:39 2016 New Revision: 422859 URL: https://svnweb.freebsd.org/changeset/ports/422859 Log: security/nss: update to 3.27 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.27_release_notes Modified: head/security/ca_root_nss/Makefile (contents, props changed) head/security/ca_root_nss/distinfo (contents, props changed) head/security/nss/Makefile (contents, props changed) head/security/nss/distinfo (contents, props changed) head/security/nss/files/patch-bug301986 (contents, props changed) head/security/nss/files/patch-coreconf_command.mk (contents, props changed) head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c (contents, props changed) head/security/nss/files/patch-lib_softoken_pkcs11c.c (contents, props changed) Modified: head/security/ca_root_nss/Makefile ============================================================================== --- head/security/ca_root_nss/Makefile Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/ca_root_nss/Makefile Wed Sep 28 08:23:39 2016 (r422859) @@ -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 Modified: head/security/ca_root_nss/distinfo ============================================================================== --- head/security/ca_root_nss/distinfo Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/ca_root_nss/distinfo Wed Sep 28 08:23:39 2016 (r422859) @@ -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 Modified: head/security/nss/Makefile ============================================================================== --- head/security/nss/Makefile Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/nss/Makefile Wed Sep 28 08:23:39 2016 (r422859) @@ -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 Modified: head/security/nss/distinfo ============================================================================== --- head/security/nss/distinfo Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/nss/distinfo Wed Sep 28 08:23:39 2016 (r422859) @@ -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 Modified: head/security/nss/files/patch-bug301986 ============================================================================== --- head/security/nss/files/patch-bug301986 Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/nss/files/patch-bug301986 Wed Sep 28 08:23:39 2016 (r422859) @@ -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 */ Modified: head/security/nss/files/patch-coreconf_command.mk ============================================================================== --- head/security/nss/files/patch-coreconf_command.mk Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/nss/files/patch-coreconf_command.mk Wed Sep 28 08:23:39 2016 (r422859) @@ -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) Modified: head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c ============================================================================== --- head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c Wed Sep 28 08:23:39 2016 (r422859) @@ -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 @@ -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; } Modified: head/security/nss/files/patch-lib_softoken_pkcs11c.c ============================================================================== --- head/security/nss/files/patch-lib_softoken_pkcs11c.c Wed Sep 28 08:20:46 2016 (r422858) +++ head/security/nss/files/patch-lib_softoken_pkcs11c.c Wed Sep 28 08:23:39 2016 (r422859) @@ -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)