CVS commit: pkgsrc/devel/nss

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Dec  3 14:29:21 UTC 2019

Modified Files:
        pkgsrc/devel/nss: Makefile PLIST distinfo
        pkgsrc/devel/nss/patches: patch-me

Log Message:
Update to 3.47.1

Changelog:
NSS 3.47.1 includes:

* CVE-2019-11745 - EncryptUpdate should use maxout, not block size
* Bug 1590495 - Fix a crash that could be caused by client certificates during
startup
* Bug 1589810 - Fix compile-time warnings from uninitialized variables in a
perl script

NSS 3.47.1 requires NSPR 4.23 or newer. The HG tag is NSS_3_47_1_RTM.


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 pkgsrc/devel/nss/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/nss/PLIST
cvs rdiff -u -r1.101 -r1.102 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/nss/patches/patch-me

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nss/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.173 pkgsrc/devel/nss/Makefile:1.174
--- pkgsrc/devel/nss/Makefile:1.173     Fri Oct  4 12:35:15 2019
+++ pkgsrc/devel/nss/Makefile   Tue Dec  3 14:29:21 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2019/10/04 12:35:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.174 2019/12/03 14:29:21 ryoon Exp $
 
 DISTNAME=              nss-${NSS_RELEASE:S/.0$//}
-NSS_RELEASE=           3.46.1
+NSS_RELEASE=           3.47.1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
 
@@ -134,7 +134,7 @@ do-install:
 # For consistency of libxul.so link in www/firefox.
 BUILDLINK_API_DEPENDS.sqlite3+=        sqlite3>=3.8.4.2
 .include "../../databases/sqlite3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.19
+BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.23
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/devel/nss/PLIST
diff -u pkgsrc/devel/nss/PLIST:1.24 pkgsrc/devel/nss/PLIST:1.25
--- pkgsrc/devel/nss/PLIST:1.24 Sat Mar 17 01:07:15 2018
+++ pkgsrc/devel/nss/PLIST      Tue Dec  3 14:29:21 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2018/03/17 01:07:15 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.25 2019/12/03 14:29:21 ryoon Exp $
 bin/certutil
 bin/cmsutil
 bin/crlutil
@@ -129,6 +129,7 @@ include/nss/nss/utilrename.h
 lib/nss/libcrmf.a
 lib/nss/libfreebl3.so
 lib/nss/libnss3.so
+lib/nss/libnssckbi-testlib.so
 lib/nss/libnssckbi.so
 lib/nss/libnssdbm3.so
 lib/nss/libnssutil3.so

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.101 pkgsrc/devel/nss/distinfo:1.102
--- pkgsrc/devel/nss/distinfo:1.101     Fri Oct  4 12:35:15 2019
+++ pkgsrc/devel/nss/distinfo   Tue Dec  3 14:29:21 2019
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.101 2019/10/04 12:35:15 ryoon Exp $
+$NetBSD: distinfo,v 1.102 2019/12/03 14:29:21 ryoon Exp $
 
-SHA1 (nss-3.46.1.tar.gz) = d287396e2225bb8b1abcdf7929829ba85d6eba53
-RMD160 (nss-3.46.1.tar.gz) = 92b3fa81c5810cfe9cee81c30073abe0f3e704c2
-SHA512 (nss-3.46.1.tar.gz) = f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b
-Size (nss-3.46.1.tar.gz) = 76417797 bytes
+SHA1 (nss-3.47.1.tar.gz) = 527b6a50b31eed96d4d6ad71a1002404c8aa7458
+RMD160 (nss-3.47.1.tar.gz) = cc281100c6ae0cc0c9c45918f79b518cbc61b3d5
+SHA512 (nss-3.47.1.tar.gz) = ddee53f58929e5f3849c9f88a3a6735453a258c3c32a7e3e73cc949e0b7ad2dff81b21db31c9c5e1ef3eb79d63c31660e38ce76c06ca54a5681dd611dc2e2ae9
+Size (nss-3.47.1.tar.gz) = 76462846 bytes
 SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca
 SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
 SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
-SHA1 (patch-me) = 90310020f28bf57f8c550ecd8dea2d295d4999bd
+SHA1 (patch-me) = dd6adff2cd3ca61925b566210a8b9697348bd45e
 SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709
 SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834
 SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561

Index: pkgsrc/devel/nss/patches/patch-me
diff -u pkgsrc/devel/nss/patches/patch-me:1.4 pkgsrc/devel/nss/patches/patch-me:1.5
--- pkgsrc/devel/nss/patches/patch-me:1.4       Thu Sep 19 19:14:39 2019
+++ pkgsrc/devel/nss/patches/patch-me   Tue Dec  3 14:29:21 2019
@@ -1,31 +1,30 @@
-$NetBSD: patch-me,v 1.4 2019/09/19 19:14:39 tnn Exp $
+$NetBSD: patch-me,v 1.5 2019/12/03 14:29:21 ryoon Exp $
 
 Add DragonFly support.
 Always include GCM for aarch64.
 
---- nss/lib/freebl/Makefile.orig       2019-08-30 15:46:32.000000000 +0000
+--- nss/lib/freebl/Makefile.orig       2019-11-19 19:55:30.000000000 +0000
 +++ nss/lib/freebl/Makefile
-@@ -119,6 +119,9 @@ else
-         DEFINES += -DNSS_X86
- endif
+@@ -101,6 +101,9 @@ endif
+ ifdef NSS_NO_INIT_SUPPORT
+     DEFINES += -DNSS_NO_INIT_SUPPORT
  endif
 +ifeq ($(CPU_ARCH),aarch64)
 +    EXTRA_SRCS += gcm-aarch64.c
 +endif
  
- ifeq ($(OS_TARGET),OSF1)
-     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
-@@ -242,9 +245,6 @@ ifeq ($(CPU_ARCH),arm)
-     DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
-     MPI_SRCS += mpi_arm.c
+ ifdef FREEBL_PRELINK_COMMAND
+       DEFINES +=-DFREEBL_PRELINK_COMMAND=\"$(FREEBL_PRELINK_COMMAND)\"
+@@ -121,7 +124,7 @@ endif
  endif
--ifeq ($(CPU_ARCH),aarch64)
--    EXTRA_SRCS += gcm-aarch64.c
--endif
- ifeq ($(CPU_ARCH),ppc)
- ifdef USE_64
-     DEFINES += -DNSS_NO_INIT_SUPPORT
-@@ -301,7 +301,7 @@ endif
+ ifeq ($(CPU_ARCH),aarch64)
+     DEFINES += -DUSE_HW_AES
+-    EXTRA_SRCS += aes-armv8.c gcm-aarch64.c
++    EXTRA_SRCS += aes-armv8.c
+ endif
+ ifeq ($(CPU_ARCH),arm)
+     ifdef CC_IS_CLANG
+@@ -318,7 +321,7 @@ endif
  # to bind the blapi function references in FREEBLVector vector
  # (ldvector.c) to the blapi functions defined in the freebl
  # shared libraries.
@@ -34,7 +33,7 @@ Always include GCM for aarch64.
      MKSHLIB += -Wl,-Bsymbolic
  endif
  
-@@ -453,7 +453,11 @@ else
+@@ -470,7 +473,11 @@ else
      ifdef NS_USE_GCC
        LD = gcc
        AS = gcc