* [PR PATCH] nss: update to 3.76.
@ 2022-03-12 12:14 sgn
2022-03-17 1:24 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2022-03-12 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1200 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/36109
nss: update to 3.76.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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/36109.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-36109.patch --]
[-- Type: text/x-diff, Size: 4019 bytes --]
From 96959c0df46f029e3a78402eb939eab85ec0af70 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: Thu, 10 Mar 2022 21:30:02 +0700
Subject: [PATCH] nss: update to 3.76.
---
srcpkgs/nss/patches/D136289.patch | 43 --------------------
srcpkgs/nss/patches/cpputil-databuffer.patch | 20 +++++++++
srcpkgs/nss/template | 4 +-
3 files changed, 22 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/nss/patches/D136289.patch
create mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch
diff --git a/srcpkgs/nss/patches/D136289.patch b/srcpkgs/nss/patches/D136289.patch
deleted file mode 100644
index a6d380515504..000000000000
--- a/srcpkgs/nss/patches/D136289.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1750624
-diff --git a/nss/tests/chains/chains.sh b/nss/tests/chains/chains.sh
---- a/nss/tests/chains/chains.sh
-+++ b/nss/tests/chains/chains.sh
-@@ -917,7 +917,7 @@
- done
-
- VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}"
-- VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
-+ VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
-
- TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}"
- echo "${SCRIPTNAME}: ${TESTNAME}"
-@@ -1118,6 +1118,7 @@
- ;;
- "verify")
- VERIFY="${VALUE}"
-+ VFY_TIME_OPT=
- TRUST=
- TRUST_AND_DB=
- POLICY=
-@@ -1126,6 +1127,9 @@
- REV_OPTS=
- USAGE_OPT=
- ;;
-+ "at_time")
-+ VFY_TIME_OPT="-b ${VALUE}"
-+ ;;
- "cert")
- VERIFY="${VERIFY} ${VALUE}"
- ;;
-diff --git a/nss/tests/chains/scenarios/realcerts.cfg b/nss/tests/chains/scenarios/realcerts.cfg
---- a/nss/tests/chains/scenarios/realcerts.cfg
-+++ b/nss/tests/chains/scenarios/realcerts.cfg
-@@ -22,6 +22,7 @@
-
- verify PayPalEE:x
- policy OID.2.16.840.1.114412.2.1
-+ at_time 2201010000Z
- result pass
-
- verify BrAirWaysBadSig:x
-
diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch
new file mode 100644
index 000000000000..44dd3f467882
--- /dev/null
+++ b/srcpkgs/nss/patches/cpputil-databuffer.patch
@@ -0,0 +1,20 @@
+Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478
+diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h
+index 8d34e1a..6aee509 100644
+--- a/nss/cpputil/databuffer.h
++++ b/nss/cpputil/databuffer.h
+@@ -33,11 +33,9 @@ class DataBuffer {
+ return *this;
+ }
+ DataBuffer& operator=(DataBuffer&& other) {
+- if (this == &other) {
+- data_ = other.data_;
+- len_ = other.len_;
+- other.data_ = nullptr;
+- other.len_ = 0;
++ if (this != &other) {
++ std::swap(data_, other.data_);
++ std::swap(len_, other.len_);
+ }
+ return *this;
+ }
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 52ce1074b303..f85cfe79a868 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.32
pkgname=nss
-version=3.75
+version=3.76
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=fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582
+checksum=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
export NS_USE_GCC=1
export LIBRUNPATH=
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: nss: update to 3.76.
2022-03-12 12:14 [PR PATCH] nss: update to 3.76 sgn
@ 2022-03-17 1:24 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2022-03-17 1:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]
There's a merged pull request on the void-packages repository
nss: update to 3.76.
https://github.com/void-linux/void-packages/pull/36109
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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] 2+ messages in thread
end of thread, other threads:[~2022-03-17 1:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-12 12:14 [PR PATCH] nss: update to 3.76 sgn
2022-03-17 1:24 ` [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).