Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] nss: update to 3.60.
Date: Sun, 20 Dec 2020 14:00:45 +0100	[thread overview]
Message-ID: <20201220130045.DFaRx7P09ixX4hRCMWD0ARG3oQKcYOGwJcwzUYp5ZXs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27297@inbox.vuxu.org>

[-- 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"

  reply	other threads:[~2020-12-20 13:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-20 12:49 [PR PATCH] " sgn
2020-12-20 13:00 ` sgn [this message]
2020-12-21 12:57 ` [PR PATCH] [Merged]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201220130045.DFaRx7P09ixX4hRCMWD0ARG3oQKcYOGwJcwzUYp5ZXs@z \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).