summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2021-08-31 11:12:30 +0000
committerwiz <wiz@pkgsrc.org>2021-08-31 11:12:30 +0000
commit47ec76b31e430d7e101814873fb9058a7f6cedad (patch)
tree9e263029294c6450dd14f40ec6374b51fca77dcb /devel
parent114536a8e0a12e0b2a3e7d477e22ccd6bbb9303a (diff)
downloadpkgsrc-47ec76b31e430d7e101814873fb9058a7f6cedad.tar.gz
nss: update to 3.69.1.
Bugs fixed: - Bug 1722613 (Backout) - Disable DTLS 1.0 and 1.1 by default - Bug 1720226 (Backout) - integrity checks in key4.db not happening on private components with AES_CBC
Diffstat (limited to 'devel')
-rw-r--r--devel/nss/Makefile4
-rw-r--r--devel/nss/distinfo12
-rw-r--r--devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c7
3 files changed, 15 insertions, 8 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 2d97ae7634c..6ec479115d2 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.211 2021/08/14 00:32:17 tnn Exp $
+# $NetBSD: Makefile,v 1.212 2021/08/31 11:12:30 wiz Exp $
DISTNAME= nss-${NSS_RELEASE:S/.0$//}
-NSS_RELEASE= 3.69.0
+NSS_RELEASE= 3.69.1
CATEGORIES= devel security
MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 50cf19267e6..90b65abc9f9 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.135 2021/08/27 21:33:02 mrg Exp $
+$NetBSD: distinfo,v 1.136 2021/08/31 11:12:30 wiz Exp $
-SHA1 (nss-3.69.tar.gz) = e3c99a69ecf1073c473ce52a8b1532c56357c2b1
-RMD160 (nss-3.69.tar.gz) = 45db84366dcf41ea40b44ece97954a767f962963
-SHA512 (nss-3.69.tar.gz) = 9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf
-Size (nss-3.69.tar.gz) = 82427268 bytes
+SHA1 (nss-3.69.1.tar.gz) = 7fea2bd8db2f0125fa9bc58ead08164fbd7384c2
+RMD160 (nss-3.69.1.tar.gz) = 5ba111b08462c82f4e933acc74b6810f7a27dbad
+SHA512 (nss-3.69.1.tar.gz) = 26895e542e66bb99965da9832cd7f5b191336aa1027b2e90f194473dd8f6277909102f21833d988fa8d8b0e2178eaca9437b182d1155038abb0743eda2cc5697
+Size (nss-3.69.1.tar.gz) = 82426679 bytes
SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
SHA1 (patch-me) = ffb5f119764c158c0bd789bd18fc77c61f2e9d2b
SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0
@@ -14,7 +14,7 @@ SHA1 (patch-nss_coreconf_OpenBSD.mk) = 944f71fcaaa7d5b2b3ed008341b1392a65480f2b
SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7
SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b
-SHA1 (patch-nss_lib_freebl_sha256-armv8.c) = caf26a0cbe47a54ded4751d0258d7be34d1d9f29
+SHA1 (patch-nss_lib_freebl_sha256-armv8.c) = 1322fcbe79790d313af622e40a9139943d83134f
SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
diff --git a/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c b/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c
index 29a0fe43863..1ac8ae02f6b 100644
--- a/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c
+++ b/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c
@@ -1,3 +1,10 @@
+$NetBSD: patch-nss_lib_freebl_sha256-armv8.c,v 1.2 2021/08/31 11:12:30 wiz Exp $
+
+date: 2021-08-27 23:33:18 +0200; author: mrg; state: Exp; commitid: r84ANY9lYgSAJE6D;
+fix build on arm64eb: sha512.c and sha256-armv8.c both provided the
+same symbols. (sha256-x86.c has the same problem, but that file
+already requires little endian so is not a big deal.)
+
--- nss/lib/freebl/sha256-armv8.c.orig 2021-08-05 01:03:36.000000000 -0700
+++ nss/lib/freebl/sha256-armv8.c 2021-08-27 14:21:56.160037512 -0700
@@ -2,7 +2,7 @@