git » nss.git » commit fc4f4de

diff --git a/.SRCINFO b/.SRCINFO
index 81ed6a0..1f4c18e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nss
 	pkgdesc = Network Security Services
-	pkgver = 3.121
+	pkgver = 3.124
 	pkgrel = 1
 	url = https://firefox-source-docs.mozilla.org/security/nss/index.html
 	arch = x86_64
@@ -17,16 +17,14 @@ pkgbase = nss
 	depends = sh
 	depends = sqlite
 	depends = zlib
-	source = hg+https://hg.mozilla.org/projects/nss#tag=NSS_3_121_RTM
+	source = hg+https://hg.mozilla.org/projects/nss#tag=NSS_3_124_RTM
 	source = bundle.sh
 	source = certdata2pem.py
-	source = 0001-Don-t-USE_ARM_GCM.patch
-	source = 0002-fix-armv8_c_lib-dependency.patch
-	b2sums = 8856d16c53b0791dbd938484aa50b12b603ff4e3c2235ed142fe3bcbc1c16d936388f3a30925dc255a6967d23b191a4a4a933a3a4bb1bff674a36f9e5e3bcaa0
+	source = 0001-fix-armv8_c_lib-dependency.patch
+	b2sums = 7829b6b34876ad5cf8a83b7ef2cc5c655151533140aa9d36b4f9594cabbc7aca22c453762260e0ae762abae90acec8e6f28b495dca29f3442a9a2983e22db3b5
 	b2sums = 4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6
 	b2sums = 6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510
-	b2sums = c7126ea70883cc4ab0bcb98d2a22062a8a84583b51f6ac2f1aa19451a59bc3ab0f49ecb6250f1a1910e6e009c93b6771692d0ac2523d181ddb020501ca987649
-	b2sums = 61119ff32d9573d176460e50447cd548211cad6ae63e8758ac42c74081513bf0243c0d81534c34ef2bfd34caff3b1022bb60457ebf3b111c3247b76b04a07eba
+	b2sums = 9b7ab15f613fb8886b6ca3aec617ee01e867efb74020fe0aa11abeb980d64d72e14fbb7f2a42284b621e485c692c40edbca7bf378c5a659f0fd2e90253ddcc2f
 
 pkgname = nss
 
diff --git a/0001-Don-t-USE_ARM_GCM.patch b/0001-Don-t-USE_ARM_GCM.patch
deleted file mode 100644
index 3ec5968..0000000
--- a/0001-Don-t-USE_ARM_GCM.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From faaa3c7faf81cd9d8a01700e933dcdaeec429107 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Sun, 3 May 2020 13:15:03 -0600
-Subject: [PATCH 1/2] Don't USE_ARM_GCM
-
----
- lib/freebl/gcm.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/lib/freebl/gcm.c b/lib/freebl/gcm.c
-index a2f63a6a8..f10a9a08f 100644
---- a/lib/freebl/gcm.c
-+++ b/lib/freebl/gcm.c
-@@ -22,10 +22,6 @@
- #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
-     (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
- #define USE_ARM_GCM
--#elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
--    !defined(NSS_DISABLE_ARM32_NEON)
--/* We don't test on big endian platform, so disable this on big endian. */
--#define USE_ARM_GCM
- #endif
- 
- #if defined(__ARM_NEON) || defined(__ARM_NEON__)
--- 
-2.51.2
-
diff --git a/0002-fix-armv8_c_lib-dependency.patch b/0001-fix-armv8_c_lib-dependency.patch
similarity index 71%
rename from 0002-fix-armv8_c_lib-dependency.patch
rename to 0001-fix-armv8_c_lib-dependency.patch
index 2e30847..5430147 100644
--- a/0002-fix-armv8_c_lib-dependency.patch
+++ b/0001-fix-armv8_c_lib-dependency.patch
@@ -1,25 +1,25 @@
-From 506dcf5e09690ac1d5ce02589a247a5e786aa0a7 Mon Sep 17 00:00:00 2001
+From 3dd5f3284dd9f45d4f1772ec926686508dd44e43 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 3 May 2020 13:08:54 -0600
-Subject: [PATCH 2/2] fix armv8_c_lib dependency
+Subject: [PATCH] fix armv8_c_lib dependency
 
 ---
  lib/freebl/freebl.gyp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp
-index 3d9969435..dea80a35d 100644
+index cf5616c0f..3ffa7de31 100644
 --- a/lib/freebl/freebl.gyp
 +++ b/lib/freebl/freebl.gyp
-@@ -603,7 +603,7 @@
-             'intel-gcm-wrap-nodepend_c_lib',
-           ]
-         }],
+@@ -388,7 +388,7 @@
+         'gcm.gyp:gcm-nodepend',
+       ],
+       'conditions': [
 -        [ 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', {
 +        [ '(disable_arm_hw_aes==0 or disable_arm_hw_sha1==0 or disable_arm_hw_sha2==0) and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
            'dependencies': [
              'armv8_c_lib',
            ],
 -- 
-2.51.2
+2.52.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 41a0853..d3f141d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=(
   nss
   ca-certificates-mozilla
 )
-pkgver=3.121
+pkgver=3.124
 pkgrel=1
 pkgdesc="Network Security Services"
 url="https://firefox-source-docs.mozilla.org/security/nss/index.html"
@@ -35,22 +35,20 @@ source=(
   "hg+https://hg.mozilla.org/projects/nss#tag=NSS_${pkgver//./_}_RTM"
   bundle.sh
   certdata2pem.py
-  0001-Don-t-USE_ARM_GCM.patch
-  0002-fix-armv8_c_lib-dependency.patch
+  0001-fix-armv8_c_lib-dependency.patch
 )
-b2sums=('8856d16c53b0791dbd938484aa50b12b603ff4e3c2235ed142fe3bcbc1c16d936388f3a30925dc255a6967d23b191a4a4a933a3a4bb1bff674a36f9e5e3bcaa0'
+b2sums=('7829b6b34876ad5cf8a83b7ef2cc5c655151533140aa9d36b4f9594cabbc7aca22c453762260e0ae762abae90acec8e6f28b495dca29f3442a9a2983e22db3b5'
         '4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6'
         '6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510'
-        'c7126ea70883cc4ab0bcb98d2a22062a8a84583b51f6ac2f1aa19451a59bc3ab0f49ecb6250f1a1910e6e009c93b6771692d0ac2523d181ddb020501ca987649'
-        '61119ff32d9573d176460e50447cd548211cad6ae63e8758ac42c74081513bf0243c0d81534c34ef2bfd34caff3b1022bb60457ebf3b111c3247b76b04a07eba')
+        '9b7ab15f613fb8886b6ca3aec617ee01e867efb74020fe0aa11abeb980d64d72e14fbb7f2a42284b621e485c692c40edbca7bf378c5a659f0fd2e90253ddcc2f')
 
 prepare() {
   mkdir -p certs
   ln -srft certs nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h}
 
   cd nss
-  patch -p1 -i "${srcdir}"/0001-Don-t-USE_ARM_GCM.patch
-  patch -p1 -i "${srcdir}"/0002-fix-armv8_c_lib-dependency.patch
+
+  patch -p1 -i "${srcdir}"/0001-fix-armv8_c_lib-dependency.patch
 }
 
 build() {
diff --git a/PKGBUILD.old b/PKGBUILD.old
index 8018340..391135f 100644
--- a/PKGBUILD.old
+++ b/PKGBUILD.old
@@ -11,7 +11,7 @@ pkgname=(
   nss
   ca-certificates-mozilla
 )
-pkgver=3.120
+pkgver=3.123.1
 pkgrel=1
 pkgdesc="Network Security Services"
 url="https://firefox-source-docs.mozilla.org/security/nss/index.html"
@@ -38,7 +38,7 @@ source=(
   0001-Don-t-USE_ARM_GCM.patch
   0002-fix-armv8_c_lib-dependency.patch
 )
-b2sums=('3e3f5db816f5a5ea5ca510c7c2916671e8dd5ec6096afb68b0b61641c10b50990761af7874c92aa0191ac3d3d888676a7c420fd91f5ba23fdffb00f8f919d32f'
+b2sums=('5ad88bee1c91fde4dc054e11b33ec3f7b7c776a253892283698bd954294e4d219e8055112dbc5c7510667265c4eb352c1b4c6e5abaf25a571fe627f62e3cc2cc'
         '4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6'
         '6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510'
         'c7126ea70883cc4ab0bcb98d2a22062a8a84583b51f6ac2f1aa19451a59bc3ab0f49ecb6250f1a1910e6e009c93b6771692d0ac2523d181ddb020501ca987649'