svn commit: r463940 - in branches/2018Q1/security: ca_root_nss nss nss/files

Jan Beich jbeich at FreeBSD.org
Fri Mar 9 07:59:18 UTC 2018 

Author: jbeich
Date: Fri Mar  9 07:59:17 2018
New Revision: 463940
URL: https://svnweb.freebsd.org/changeset/ports/463940

Log:
  MFH: r463696
  
  security/nss: update to 3.36
  
  Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.36_release_notes
  Changes:	https://hg.mozilla.org/projects/nss/shortlog/NSS_3_36_RTM
  ABI:		https://abi-laboratory.pro/tracker/timeline/nss/
  Approved by:	ports-secteam (riggs)

Added:
  branches/2018Q1/security/nss/files/patch-bug1443400
     - copied unchanged from r463696, head/security/nss/files/patch-bug1443400
Deleted:
  branches/2018Q1/security/nss/files/patch-bug1432455
Modified:
  branches/2018Q1/security/ca_root_nss/Makefile
  branches/2018Q1/security/ca_root_nss/distinfo
  branches/2018Q1/security/nss/Makefile
  branches/2018Q1/security/nss/distinfo
  branches/2018Q1/security/nss/pkg-plist
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/security/ca_root_nss/Makefile
==============================================================================
--- branches/2018Q1/security/ca_root_nss/Makefile	Fri Mar  9 07:58:05 2018	(r463939)
+++ branches/2018Q1/security/ca_root_nss/Makefile	Fri Mar  9 07:59:17 2018	(r463940)
@@ -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.35
+VERSION_NSS=	3.36
 #NSS_SUFFIX=	-with-ckbi-1.98
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl

Modified: branches/2018Q1/security/ca_root_nss/distinfo
==============================================================================
--- branches/2018Q1/security/ca_root_nss/distinfo	Fri Mar  9 07:58:05 2018	(r463939)
+++ branches/2018Q1/security/ca_root_nss/distinfo	Fri Mar  9 07:59:17 2018	(r463940)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516285199
-SHA256 (nss-3.35.tar.gz) = f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa
-SIZE (nss-3.35.tar.gz) = 9620041
+TIMESTAMP = 1520265512
+SHA256 (nss-3.36.tar.gz) = a33cc7b8299b5ce3acf03f617c7896932ae26927ff9fb7c71c1b69a200c30095
+SIZE (nss-3.36.tar.gz) = 23025578

Modified: branches/2018Q1/security/nss/Makefile
==============================================================================
--- branches/2018Q1/security/nss/Makefile	Fri Mar  9 07:58:05 2018	(r463939)
+++ branches/2018Q1/security/nss/Makefile	Fri Mar  9 07:59:17 2018	(r463940)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.35
+PORTVERSION=	3.36
 #DISTVERSIONSUFFIX=	-with-ckbi-1.98
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
@@ -41,7 +41,7 @@ DIST=		${WRKSRC:H}/dist
 
 EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite
 
-INSTALL_BINS=	certcgi certutil cmsutil crlutil derdump makepqg \
+INSTALL_BINS=	certutil cmsutil crlutil derdump makepqg \
 		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
 		p7verify pk12util rsaperf shlibsign signtool signver \
 		ssltap strsclnt symkeyutil vfychain vfyserv

Modified: branches/2018Q1/security/nss/distinfo
==============================================================================
--- branches/2018Q1/security/nss/distinfo	Fri Mar  9 07:58:05 2018	(r463939)
+++ branches/2018Q1/security/nss/distinfo	Fri Mar  9 07:59:17 2018	(r463940)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516285199
-SHA256 (nss-3.35.tar.gz) = f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa
-SIZE (nss-3.35.tar.gz) = 9620041
+TIMESTAMP = 1520265512
+SHA256 (nss-3.36.tar.gz) = a33cc7b8299b5ce3acf03f617c7896932ae26927ff9fb7c71c1b69a200c30095
+SIZE (nss-3.36.tar.gz) = 23025578

Copied: branches/2018Q1/security/nss/files/patch-bug1443400 (from r463696, head/security/nss/files/patch-bug1443400)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/security/nss/files/patch-bug1443400	Fri Mar  9 07:59:17 2018	(r463940, copy of r463696, head/security/nss/files/patch-bug1443400)
@@ -0,0 +1,69 @@
+Don't try to use getauxval() if unsupported by platform.
+
+diff --git lib/freebl/blinit.c lib/freebl/blinit.c
+index 4ac1c49adb..830d038374 100644
+--- lib/freebl/blinit.c
++++ lib/freebl/blinit.c
+@@ -92,22 +92,33 @@ CheckX86CPUSupport()
+ #endif /* NSS_X86_OR_X64 */
+ 
+ #if (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
+-#if defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
++#ifndef __has_include
++#define __has_include(x) 0
++#endif
++#if (__has_include(<sys/auxv.h>) || defined(__linux__)) && defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
+ #include <sys/auxv.h>
+ extern unsigned long getauxval(unsigned long type) __attribute__((weak));
+ #else
+ static unsigned long (*getauxval)(unsigned long) = NULL;
+-#define AT_HWCAP2
+-#define AT_HWCAP
++#define AT_HWCAP2 0
++#define AT_HWCAP 0
+ #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/
+ #endif /* (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__) */
+ 
+ #if defined(__aarch64__) && !defined(__ANDROID__)
+ // Defines from hwcap.h in Linux kernel - ARM64
++#ifndef HWCAP_AES
+ #define HWCAP_AES (1 << 3)
++#endif
++#ifndef HWCAP_PMULL
+ #define HWCAP_PMULL (1 << 4)
++#endif
++#ifndef HWCAP_SHA1
+ #define HWCAP_SHA1 (1 << 5)
++#endif
++#ifndef HWCAP_SHA2
+ #define HWCAP_SHA2 (1 << 6)
++#endif
+ 
+ void
+ CheckARMSupport()
+@@ -131,15 +142,25 @@ CheckARMSupport()
+ /*
+  * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
+  */
++#ifndef HWCAP_NEON
+ #define HWCAP_NEON (1 << 12)
++#endif
+ 
+ /*
+  * HWCAP2 flags - for elf_hwcap2 (in kernel) and AT_HWCAP2
+  */
++#ifndef HWCAP2_AES
+ #define HWCAP2_AES (1 << 0)
++#endif
++#ifndef HWCAP2_PMULL
+ #define HWCAP2_PMULL (1 << 1)
++#endif
++#ifndef HWCAP2_SHA1
+ #define HWCAP2_SHA1 (1 << 2)
++#endif
++#ifndef HWCAP2_SHA2
+ #define HWCAP2_SHA2 (1 << 3)
++#endif
+ 
+ void
+ CheckARMSupport()

Modified: branches/2018Q1/security/nss/pkg-plist
==============================================================================
--- branches/2018Q1/security/nss/pkg-plist	Fri Mar  9 07:58:05 2018	(r463939)
+++ branches/2018Q1/security/nss/pkg-plist	Fri Mar  9 07:59:17 2018	(r463940)
@@ -1,4 +1,3 @@
-bin/certcgi
 bin/certutil
 bin/cmsutil
 bin/crlutil

More information about the svn-ports-all mailing list