* [PR PATCH] nss: update to 3.60.
@ 2020-12-20 12:49 sgn
2020-12-20 13:00 ` [PR PATCH] [Updated] " sgn
2020-12-21 12:57 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2020-12-20 12:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1729 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages nss-update
https://github.com/void-linux/void-packages/pull/27297
nss: update to 3.60.
@q66 Something is being changed for ppc:
```diff
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index 2851474..269e34c 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -293,9 +293,12 @@ ifeq ($(CPU_ARCH),arm)
endif
ifeq ($(CPU_ARCH),ppc)
EXTRA_SRCS += gcm-ppc.c
- ASFILES += sha512-p8.s
ifdef USE_64
DEFINES += -DNSS_NO_INIT_SUPPORT
+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
+ ifeq ($(PPC_ABI),2)
+ ASFILES += sha512-p8.s
+ endif
endif # USE_64
endif # ppc
endif # Linux
diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c
index 2f2a476..82375fd 100644
--- a/nss/lib/freebl/blinit.c
+++ b/nss/lib/freebl/blinit.c
@@ -231,6 +231,15 @@ CheckARMSupport()
arm_sha1_support_ = ID_AA64ISAR0_SHA1_VAL(isar0) >= ID_AA64ISAR0_SHA1_BASE;
arm_sha2_support_ = ID_AA64ISAR0_SHA2_VAL(isar0) >= ID_AA64ISAR0_SHA2_BASE;
}
+#elif defined(__ARM_FEATURE_CRYPTO)
+ /*
+ * Although no feature detection, default compiler option allows ARM
+ * Crypto Extension.
+ */
+ arm_aes_support_ = PR_TRUE;
+ arm_pmull_support_ = PR_TRUE;
+ arm_sha1_support_ = PR_TRUE;
+ arm_sha2_support_ = PR_TRUE;
#endif
/* aarch64 must support NEON. */
arm_neon_support_ = PR_GetEnvSecure("NSS_DISABLE_ARM_NEON") == NULL;
```
harmless I think
A patch file from https://github.com/void-linux/void-packages/pull/27297.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-27297.patch --]
[-- Type: text/x-diff, Size: 1345 bytes --]
From 67dc1cdfdfce68743b3929dacda11fb4a8a5f451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 15 Dec 2020 15:32:23 +0700
Subject: [PATCH] nss: update to 3.60.
---
srcpkgs/nss/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 635e67a610e..aa36da37edd 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.29
pkgname=nss
-version=3.59
+version=3.60
revision=1
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://www.mozilla.org/projects/security/pki/nss"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24
+checksum=84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d
export NS_USE_GCC=1
export LIBRUNPATH=
@@ -27,7 +27,7 @@ do_build() {
local _native_use64 _target_use64
# Respect LDFLAGS
- vsed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+ vsed -e 's/[$](MKSHLIB) /&$(LDFLAGS) /g' \
-i nss/coreconf/rules.mk
export NATIVE_CC="$BUILD_CC"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] nss: update to 3.60.
2020-12-20 12:49 [PR PATCH] nss: update to 3.60 sgn
@ 2020-12-20 13:00 ` sgn
2020-12-21 12:57 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-12-20 13:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1734 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages nss-update
https://github.com/void-linux/void-packages/pull/27297
nss: update to 3.60.
@q66 Something is being changed for ppc:
```diff
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index 2851474..269e34c 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -293,9 +293,12 @@ ifeq ($(CPU_ARCH),arm)
endif
ifeq ($(CPU_ARCH),ppc)
EXTRA_SRCS += gcm-ppc.c
- ASFILES += sha512-p8.s
ifdef USE_64
DEFINES += -DNSS_NO_INIT_SUPPORT
+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
+ ifeq ($(PPC_ABI),2)
+ ASFILES += sha512-p8.s
+ endif
endif # USE_64
endif # ppc
endif # Linux
diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c
index 2f2a476..82375fd 100644
--- a/nss/lib/freebl/blinit.c
+++ b/nss/lib/freebl/blinit.c
@@ -231,6 +231,15 @@ CheckARMSupport()
arm_sha1_support_ = ID_AA64ISAR0_SHA1_VAL(isar0) >= ID_AA64ISAR0_SHA1_BASE;
arm_sha2_support_ = ID_AA64ISAR0_SHA2_VAL(isar0) >= ID_AA64ISAR0_SHA2_BASE;
}
+#elif defined(__ARM_FEATURE_CRYPTO)
+ /*
+ * Although no feature detection, default compiler option allows ARM
+ * Crypto Extension.
+ */
+ arm_aes_support_ = PR_TRUE;
+ arm_pmull_support_ = PR_TRUE;
+ arm_sha1_support_ = PR_TRUE;
+ arm_sha2_support_ = PR_TRUE;
#endif
/* aarch64 must support NEON. */
arm_neon_support_ = PR_GetEnvSecure("NSS_DISABLE_ARM_NEON") == NULL;
```
harmless I think
A patch file from https://github.com/void-linux/void-packages/pull/27297.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-27297.patch --]
[-- Type: text/x-diff, Size: 1498 bytes --]
From f8db09ee58ddeddb3526c2722b4778a655c4e11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 15 Dec 2020 15:32:23 +0700
Subject: [PATCH] nss: update to 3.60.
---
srcpkgs/nss/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 635e67a610e..d0afe409efc 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.29
pkgname=nss
-version=3.59
+version=3.60
revision=1
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -11,9 +11,9 @@ depends="nspr>=${_nsprver}"
short_desc="Mozilla Network Security Services"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
-homepage="https://www.mozilla.org/projects/security/pki/nss"
+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=e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24
+checksum=84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d
export NS_USE_GCC=1
export LIBRUNPATH=
@@ -27,7 +27,7 @@ do_build() {
local _native_use64 _target_use64
# Respect LDFLAGS
- vsed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+ vsed -e 's/[$](MKSHLIB) /&$(LDFLAGS) /g' \
-i nss/coreconf/rules.mk
export NATIVE_CC="$BUILD_CC"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: nss: update to 3.60.
2020-12-20 12:49 [PR PATCH] nss: update to 3.60 sgn
2020-12-20 13:00 ` [PR PATCH] [Updated] " sgn
@ 2020-12-21 12:57 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-12-21 12:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There's a merged pull request on the void-packages repository
nss: update to 3.60.
https://github.com/void-linux/void-packages/pull/27297
Description:
@q66 Something is being changed for ppc:
```diff
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index 2851474..269e34c 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -293,9 +293,12 @@ ifeq ($(CPU_ARCH),arm)
endif
ifeq ($(CPU_ARCH),ppc)
EXTRA_SRCS += gcm-ppc.c
- ASFILES += sha512-p8.s
ifdef USE_64
DEFINES += -DNSS_NO_INIT_SUPPORT
+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
+ ifeq ($(PPC_ABI),2)
+ ASFILES += sha512-p8.s
+ endif
endif # USE_64
endif # ppc
endif # Linux
diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c
index 2f2a476..82375fd 100644
--- a/nss/lib/freebl/blinit.c
+++ b/nss/lib/freebl/blinit.c
@@ -231,6 +231,15 @@ CheckARMSupport()
arm_sha1_support_ = ID_AA64ISAR0_SHA1_VAL(isar0) >= ID_AA64ISAR0_SHA1_BASE;
arm_sha2_support_ = ID_AA64ISAR0_SHA2_VAL(isar0) >= ID_AA64ISAR0_SHA2_BASE;
}
+#elif defined(__ARM_FEATURE_CRYPTO)
+ /*
+ * Although no feature detection, default compiler option allows ARM
+ * Crypto Extension.
+ */
+ arm_aes_support_ = PR_TRUE;
+ arm_pmull_support_ = PR_TRUE;
+ arm_sha1_support_ = PR_TRUE;
+ arm_sha2_support_ = PR_TRUE;
#endif
/* aarch64 must support NEON. */
arm_neon_support_ = PR_GetEnvSecure("NSS_DISABLE_ARM_NEON") == NULL;
```
harmless I think
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-21 12:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-20 12:49 [PR PATCH] nss: update to 3.60 sgn
2020-12-20 13:00 ` [PR PATCH] [Updated] " sgn
2020-12-21 12:57 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).