* [PR PATCH] Nss update
@ 2021-12-27 15:01 sgn
2021-12-30 14:10 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 4+ messages in thread
From: sgn @ 2021-12-27 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1218 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/34718
Nss update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: <!-- **YES**|**briefly** --> **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34718.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-34718.patch --]
[-- Type: text/x-diff, Size: 2321 bytes --]
From 6773d1ce2509209cf35d6be1d70fd8405e028212 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: Mon, 27 Dec 2021 21:47:00 +0700
Subject: [PATCH 1/2] nspr: update to 4.33.
---
srcpkgs/nspr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index eefc49dfc5d4..d057e69e4136 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
# Template file for 'nspr'
pkgname=nspr
-version=4.32
+version=4.33
revision=1
build_wrksrc=nspr
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c
+checksum=b23ee315be0e50c2fb1aa374d17f2d2d9146a835b1a79c1918ea15d075a693d7
CFLAGS="-D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
From 0651129f37b40bab8f337c2748a4a7dd3063bd21 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: Mon, 27 Dec 2021 21:47:04 +0700
Subject: [PATCH 2/2] nss: update to 3.73.1.
---
srcpkgs/nss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 8f70796361e5..ed239be21deb 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.32
pkgname=nss
-version=3.73
+version=3.73.1
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://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5
+checksum=c768f9fe3129e8bcc2e9679456d7edd9453a225784a8fc7dc4501806f1fe9abe
export NS_USE_GCC=1
export LIBRUNPATH=
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: Nss update
2021-12-27 15:01 [PR PATCH] Nss update sgn
@ 2021-12-30 14:10 ` sgn
0 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-12-30 14:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]
There's a merged pull request on the void-packages repository
Nss update
https://github.com/void-linux/void-packages/pull/34718
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: <!-- **YES**|**briefly** --> **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PR PATCH] Nss update
@ 2022-05-31 16:50 sgn
0 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2022-05-31 16:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 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/37366
Nss update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37366.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-37366.patch --]
[-- Type: text/x-diff, Size: 2369 bytes --]
From cb3e30b99b8efe28128c6c300b85ab5d34ad8061 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, 31 May 2022 23:41:15 +0700
Subject: [PATCH 1/2] nspr: update to 4.34.
---
srcpkgs/nspr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index d057e69e4136..d85963d3f6c6 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
# Template file for 'nspr'
pkgname=nspr
-version=4.33
+version=4.34
revision=1
build_wrksrc=nspr
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=b23ee315be0e50c2fb1aa374d17f2d2d9146a835b1a79c1918ea15d075a693d7
+checksum=beef011cd15d8f40794984d17014366513cec5719bf1a78f5e8a3e3a1cebf99c
CFLAGS="-D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
From 90569aee213d57a41f2a0694dcb2fc013ffc1d56 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, 31 May 2022 23:41:19 +0700
Subject: [PATCH 2/2] nss: update to 3.79.
---
srcpkgs/nss/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 31d1b847a9d1..7ea39f1c3182 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,9 +1,9 @@
# Template file for 'nss'
-_nsprver=4.32
+_nsprver=4.34
pkgname=nss
-version=3.78
+version=3.79
revision=1
hostmakedepends="perl which"
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://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800
+checksum=ebdf2d6a96613b6fe70ad579e9f983e0e94e0110171cfb2999db633d3394a514
export NS_USE_GCC=1
export LIBRUNPATH=
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PR PATCH] Nss update
@ 2020-07-26 6:08 sgn
0 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2020-07-26 6:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 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/23841
Nss update
- [x] make check on x86_64
- [ ] make check on x86_64 sandy bridge (avx2 patch merged upstream)
- [ ] make check on x86_64-musl
- [ ] make check on i686
A patch file from https://github.com/void-linux/void-packages/pull/23841.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-23841.patch --]
[-- Type: text/x-diff, Size: 6954 bytes --]
From dd1f83866fc4bab4bf3531eda9b902532ae5b6b3 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: Sat, 25 Jul 2020 18:05:55 +0700
Subject: [PATCH 1/2] nspr: update to 4.27.
---
srcpkgs/nspr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index a1e3e7d1b7f..433498beb3c 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
# Template file for 'nspr'
pkgname=nspr
-version=4.26
+version=4.27
revision=1
build_wrksrc=nspr
build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d
+checksum=6d495192b6ab00a3c28db053492cf794329f7c0351a5728db198111a1816e89b
do_configure() {
CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
From 1e96aa3cef4a7f4a23f8127d5f0c1e178ea34691 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: Sun, 26 Jul 2020 10:26:50 +0700
Subject: [PATCH 2/2] nss: update to 3.55.
---
...-enable-AVX2-if-applicable-on-x86_64.patch | 80 -------------------
srcpkgs/nss/template | 27 ++++---
2 files changed, 16 insertions(+), 91 deletions(-)
delete mode 100644 srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch
diff --git a/srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch b/srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch
deleted file mode 100644
index f410c8ad855..00000000000
--- a/srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From f8d9ecea60d99c6143dcb9e2f8fe41c8e17e4d0f 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: Sun, 31 May 2020 12:13:08 +0700
-Subject: [PATCH] enable AVX2 if applicable on x86_64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There's a runtime check for AVX2 before using, see:
-
- lib/freebl/chacha20poly1305.c:140
- lib/freebl/blinit.c:117
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- nss/coreconf/arch.mk | 1 +
- nss/coreconf/config.mk | 2 ++
- nss/lib/freebl/Makefile | 9 +++++++--
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git nss/coreconf/arch.mk nss/coreconf/arch.mk
-index 790372d..cc13ced 100644
---- nss/coreconf/arch.mk
-+++ nss/coreconf/arch.mk
-@@ -116,6 +116,7 @@ ifeq ($(OS_ARCH),Linux)
- OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
- endif
- KERNEL = Linux
-+ include $(CORE_DEPTH)/coreconf/Linux.mk
- endif
-
- # Since all uses of OS_ARCH that follow affect only userland, we can
-diff --git nss/coreconf/config.mk nss/coreconf/config.mk
-index 39f755d..b65e684 100644
---- nss/coreconf/config.mk
-+++ nss/coreconf/config.mk
-@@ -149,8 +149,10 @@ DEFINES += -DNSS_DISABLE_DBM
- endif
-
- ifdef NSS_DISABLE_AVX2
-+ifneq ($(NSS_DISABLE_AVX2),0)
- DEFINES += -DNSS_DISABLE_AVX2
- endif
-+endif
-
- ifdef NSS_DISABLE_CHACHAPOLY
- DEFINES += -DNSS_DISABLE_CHACHAPOLY
-diff --git nss/lib/freebl/Makefile nss/lib/freebl/Makefile
-index 5f73844..8b98370 100644
---- nss/lib/freebl/Makefile
-+++ nss/lib/freebl/Makefile
-@@ -552,10 +552,12 @@ endif
- ifndef NSS_DISABLE_CHACHAPOLY
- ifeq ($(CPU_ARCH),x86_64)
- ifndef NSS_DISABLE_AVX2
-+ NSS_DISABLE_AVX2 = 0
-+ endif
-+ ifeq ($(NSS_DISABLE_AVX2),0)
- EXTRA_SRCS += Hacl_Poly1305_256.c Hacl_Chacha20_Vec256.c Hacl_Chacha20Poly1305_256.c
-- else
-- EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c
- endif # NSS_DISABLE_AVX2
-+ EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c
- endif # x86_64
-
- VERIFIED_SRCS += Hacl_Poly1305_32.c Hacl_Chacha20.c Hacl_Chacha20Poly1305_32.c
-@@ -737,6 +739,9 @@ $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20Poly1305_128$(OBJ_SUFFIX): CFLAGS += -mssse
- $(OBJDIR)/$(PROG_PREFIX)Hacl_Poly1305_128$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpclmul
-
- ifndef NSS_DISABLE_AVX2
-+ NSS_DISABLE_AVX2 = 0
-+endif
-+ifeq ($(NSS_DISABLE_AVX2),0)
- $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20Poly1305_256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx2 -maes
- $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20_Vec256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -maes
- $(OBJDIR)/$(PROG_PREFIX)Hacl_Poly1305_256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -maes -mpclmul
---
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index e4402440ed3..55b41037235 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,9 +1,9 @@
# Template file for 'nss'
-_nsprver=4.26
+_nsprver=4.27
pkgname=nss
-version=3.54
+version=3.55
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=dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43
+checksum=fc692e3db45a082ee6328cd989e795c171a00df9c518df090937f7604f850004
do_build() {
local _native_use64 _target_use64
@@ -50,17 +50,10 @@ do_build() {
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- aarch64*|ppc64*)
+ aarch64*|ppc64*|x86_64*)
_ARCH="${XBPS_TARGET_MACHINE%-*}"
CFLAGS+=" -DNS_PTR_GT_32"
;;
- armv7*)
- _ARCH="arm"
- # gcm-arm32-neon.c use mfpu=neon,
- # force mfpu=neon for everything else.
- CFLAGS+=" -mfpu=neon"
- CXXFLAGS+=" -mfpu=neon"
- ;;
arm*) _ARCH="arm";;
mips*) _ARCH="mips";;
ppc*) _ARCH="ppc";;
@@ -155,6 +148,18 @@ do_install() {
done
install -m644 dist/public/nss/*.h ${DESTDIR}/usr/include/nss
+
+ sed -ne '/Copyright/,/SUCH DAMAGE/p' nss/lib/dbm/src/db.c >dbm.LICENSE
+ vlicense dbm.LICENSE
+ sed -ne '/The MIT License/,\!// SOFTWARE[.]$!p' \
+ nss/lib/freebl/ecl/curve25519_32.c >fiat.LICENSE
+ vlicense fiat.LICENSE
+ sed -ne '/The MIT License/,/ [*] SOFTWARE[.]$/p' \
+ nss/lib/freebl/ecl/ecp_secp384r1.c >ecckiila.LICENSE
+ vlicense ecckiila.LICENSE
+ sed -ne '/The MIT License/,/ [*] SOFTWARE[.]$/p' \
+ nss/lib/freebl/verified/Hacl_Chacha20.c >hacl.LICENSE
+ vlicense hacl.LICENSE
}
nss-devel_package() {
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-31 16:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-27 15:01 [PR PATCH] Nss update sgn
2021-12-30 14:10 ` [PR PATCH] [Merged]: " sgn
-- strict thread matches above, loose matches on Subject: below --
2022-05-31 16:50 [PR PATCH] " sgn
2020-07-26 6:08 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).