From 68a901787f0d705ac8fb4f8383bb2830f9aaea87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 23 Jun 2021 19:07:13 +0700 Subject: [PATCH] nss: update to 3.67. --- ...d26354548fc3f883a56e8bfafc78f5265ce8.patch | 34 ------------------- ...7b7cb5133302087980ef321a83670d383db1.patch | 27 --------------- srcpkgs/nss/template | 4 +-- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch delete mode 100644 srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch diff --git a/srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch b/srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch deleted file mode 100644 index dee246482deb..000000000000 --- a/srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 32ebd26354548fc3f883a56e8bfafc78f5265ce8 Mon Sep 17 00:00:00 2001 -From: mamonet -Date: Fri, 4 Jun 2021 09:36:15 +0000 -Subject: [PATCH] Bug 1566124 - Fix AES_GCM mode on ppc64le for messages of - length more than 255-byte r=beurdouche - -Differential Revision: https://phabricator.services.mozilla.com/D116274 - ---HG-- -extra : moz-landing-system : lando ---- - lib/freebl/ppc-gcm.s | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/freebl/ppc-gcm.s b/lib/freebl/ppc-gcm.s -index 4d5fff437..06ad5862c 100644 ---- a/nss/lib/freebl/ppc-gcm.s -+++ b/nss/lib/freebl/ppc-gcm.s -@@ -692,7 +692,6 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmCRYPT)@l - - mtctr 9 - -- li 10, 0 - li 25, 0x10 - li 26, 0x20 - li 27, 0x30 -@@ -703,6 +702,7 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmCRYPT)@l - - .align 5 - .L8x_loop: -+ li 10, 0 - VEC_LOAD_INC K, KS, 10 - - vadduwm CTR1, CTR, I1 diff --git a/srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch b/srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch deleted file mode 100644 index adf63004e540..000000000000 --- a/srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 73b47b7cb5133302087980ef321a83670d383db1 Mon Sep 17 00:00:00 2001 -From: mamonet -Date: Fri, 4 Jun 2021 09:36:15 +0000 -Subject: [PATCH] Bug 1566124 - Fix counter increase in ppc-gcm-wrap.c - r=bbeurdouche - -Differential Revision: https://phabricator.services.mozilla.com/D116297 - ---HG-- -extra : moz-landing-system : lando ---- - lib/freebl/ppc-gcm-wrap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/freebl/ppc-gcm-wrap.c b/lib/freebl/ppc-gcm-wrap.c -index ca3d8ee69..ac58744cb 100644 ---- a/nss/lib/freebl/ppc-gcm-wrap.c -+++ b/nss/lib/freebl/ppc-gcm-wrap.c -@@ -155,7 +155,7 @@ ppc_aes_gcmInitCounter(ppc_AES_GCMContext *gcm, - /* Promote the counter by 1 */ - gcm->CTR[14] += !(++gcm->CTR[15]); - gcm->CTR[13] += !(gcm->CTR[15]) && !(gcm->CTR[14]); -- gcm->CTR[12] += !(gcm->CTR[15]) && !(gcm->CTR[13]) && !(gcm->CTR[12]); -+ gcm->CTR[12] += !(gcm->CTR[15]) && !(gcm->CTR[14]) && !(gcm->CTR[13]); - - /* Now hash AAD - it would actually make sense to seperate the context - * creation from the AAD, because that would allow to reuse the H, which diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 24da85cec752..183762e506b9 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.30 pkgname=nss -version=3.66 +version=3.67 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=89a79e3a756cf0ac9ba645f4d4c0fc58d4133134401fb0b6c8a74c420bb4cdc9 +checksum=f6549a9148cd27b394b40c77fa73111d5ea23cdb51d796665de1b7458f88ce7f export NS_USE_GCC=1 export LIBRUNPATH=