diff options
| author |   Matoro Mahri <matoro_gentoo@matoro.tk> | 2024-04-30 19:40:54 -0400 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2024-05-01 08:28:09 +0300 |
| commit | 6ec167750fc20acc225cf74b2fbc26bd3fcf3db0 (patch) | |
| tree | 9c63ebf5bc662ad78c0f2111055fb920961c0506 /dev-libs/nss | |
| parent | app-emulation/virtualbox-extpack-oracle: drop 7.0.12 (diff) | |
| download | gentoo-6ec167750fc20acc225cf74b2fbc26bd3fcf3db0.tar.gz gentoo-6ec167750fc20acc225cf74b2fbc26bd3fcf3db0.tar.bz2 gentoo-6ec167750fc20acc225cf74b2fbc26bd3fcf3db0.zip | |
dev-libs/nss: backport fix for test with low timeout
See: https://github.com/nss-dev/nss/commit/6ab861ba652985ce5985a3fb1ddc87a15aac5027
See: https://bugzilla.mozilla.org/show_bug.cgi?id=1835357
See: https://phabricator.services.mozilla.com/D180718
Bug: https://bugs.gentoo.org/928403
Signed-off-by: Matoro Mahri <matoro_gentoo@matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/36496
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-libs/nss')
| -rw-r--r-- | dev-libs/nss/files/nss-3.90.2-backport-D180718.patch | 35 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.90.2-r1.ebuild | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch b/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch new file mode 100644 index 000000000000..102ed5227488 --- /dev/null +++ b/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch @@ -0,0 +1,35 @@ +https://github.com/nss-dev/nss/commit/6ab861ba652985ce5985a3fb1ddc87a15aac5027 +https://bugzilla.mozilla.org/show_bug.cgi?id=1835357 +https://phabricator.services.mozilla.com/D180718 + +From 6ab861ba652985ce5985a3fb1ddc87a15aac5027 Mon Sep 17 00:00:00 2001 +From: Robert Relyea <rrelyea@redhat.com> +Date: Mon, 12 Jun 2023 11:18:03 -0700 +Subject: [PATCH] Bug 1835357 dbtests.sh failure in "certutil dump keys with + explicit default trust flags" r=jschanck + + Fix the time value so we don't fail on slower or overloaded platforms. + + bob + +Differential Revision: https://phabricator.services.mozilla.com/D180718 + +--HG-- +extra : rebase_source : 3fb50de29dbf5f635cae10e962eb995c25cd108a +--- + tests/dbtests/dbtests.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/dbtests/dbtests.sh b/tests/dbtests/dbtests.sh +index b0b195d4d0..c82ea85caf 100755 +--- a/tests/dbtests/dbtests.sh ++++ b/tests/dbtests/dbtests.sh +@@ -366,7 +366,7 @@ dbtest_main() + RARRAY=($dtime) + TIMEARRAY=(${RARRAY[1]//./ }) + echo "${TIMEARRAY[0]} seconds" +- test ${TIMEARRAY[0]} -lt 2 ++ test ${TIMEARRAY[0]} -lt 5 + ret=$? + html_msg ${ret} 0 "certutil dump keys with explicit default trust flags" + fi diff --git a/dev-libs/nss/nss-3.90.2-r1.ebuild b/dev-libs/nss/nss-3.90.2-r1.ebuild index 96f5c85ed19b..a7c0fa7d93eb 100644 --- a/dev-libs/nss/nss-3.90.2-r1.ebuild +++ b/dev-libs/nss/nss-3.90.2-r1.ebuild @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch "${FILESDIR}"/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch "${FILESDIR}"/nss-3.90-remove-support-of-curve25519.patch + "${FILESDIR}/${PN}-3.90.2-backport-D180718.patch" ) src_prepare() { |