gentoo auto-resync : 02:05:2024 - 00:00:17

3 files changed, 39 insertions, 2 deletions

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 21496c7820ab..b1930bb5ef1f 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,11 +2,12 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.87-use-clang-as-bgo892686.patch 2693 BLAKE2B fe8a25c9c8599e0f3e630202c824b854ebfa5b3580e79a61f7172a93a5aad2df3754e2e5aba718a22bb2ad5102f4d638ca10508f0b66cf6e8f21da4ea52bf966 SHA512 67d231aa1b2433e5feeff59af6849eee78f6d5ebf601c0f7baaf0e1b5b44c25ca63f012ced677f5562bb45e3fc0dabe0210b123a78b56de4dfe11c5eaafac3bc
 AUX nss-3.90-remove-support-of-curve25519.patch 2740 BLAKE2B 6404d5030bafd276431bf6956ceef51c2af7a79a4a632f5893d9f3ab170c327ba8e17a8697ce8616cfc444f16dfd46ab51df66551f0e0751d6a97492be4c9c40 SHA512 44725be175e1e933ae4b5dbe8e17836ee60fe734daba641cceb6f63bfbecec486a722c07394beba6749464b1d1f0efc13a2f0f90365c9102f4eb0923888535ab
+AUX nss-3.90.2-backport-D180718.patch 1225 BLAKE2B f18e406371c6f3f9aedc1676344b7e15a128bdd52a46720767c04ca7520c9f5d098b5fbb07885eec7608a3fc038b8a2c20d2215de47d4774f83370ec7ee9b5ef SHA512 12780b6871ca7c4da164028f8b127c05f87caac6a92d0265b7d1ddfe2ac77ab7d584e7170c7f9b5ca48480fa900e2ff4e918fc0071d481b5fca95c939765933a
 AUX nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch 1325 BLAKE2B c128966b1ea2a73c6957cf53b447a20ff142c277337a74421065e1f77c1de74cac5cbed7c192064fc6c45205e562003a7152e39df7438a1583418625607fc2bc SHA512 5625e3e78e7700bcbb589c734d47b91ebe39315994bd422766ad9100405c36d930ad031be5cf80de6bb4d9914db5fe553ee658daf5a2e66e79d517c0a6d9ad32
 DIST nss-3.90.2.tar.gz 72215444 BLAKE2B 74b8eebf5f053dcebd9c6e6ef17c6113ac42a01f910f4ba621dadb09739d5a6090d022800d2c3a4bc0c58413f03512ca611ead1098488d303f1ee1e4bca5c222 SHA512 048a0c0a06fef8cd9c363ac511b9d6125ec131a306c5e093525a937f9e8740f1a2163f274c9a3907ed38331b2fb99b22b528b5e89da1e186c9ba9473d959ef4a
 DIST nss-3.99.tar.gz 76753982 BLAKE2B b6ce605232934644b6d80682615eac2fa171078fcdd75316ab2accc55caeaed5b548f16c2cef5cefcfb37b96a4d6eb918785be3aa195a561e46d2d3fd8fa217b SHA512 8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD nss-3.90.2-r1.ebuild 11705 BLAKE2B cf8738b38638de75f8894a23753868a179c192624380acf063d57c6e87e112878f6175740f4890cceddea405707ee99b7311d9c5ddf7f8dea19fea800ccfb949 SHA512 fbf24b47ba3eb842d02cfe5d588e692899b834306aad77daaccca03330f586ce80ad4862c59b75e656d7aa6aa8ae128e17fa4731e7f79d04944fba1a3f4a57a8
+EBUILD nss-3.90.2-r1.ebuild 11755 BLAKE2B a0d03e77096da206a06e0da3ff4cc0addc5b7fe0da3694035839208695b64e903beee8d1acdc0cc362b0ec83400407a19de28cff6d32cc3d75526002843e2d29 SHA512 f02adad57e6bafb01f6df327350f46c2779f498b767f8572914a6aa361c00b19ebe4c7cfcf47f57c771254338d8c9a9f3aeb4626b97ae22176bc0fbcdfac0fe0
 EBUILD nss-3.90.2.ebuild 11641 BLAKE2B acd00f630641008af848c854f7868fa4a0496bdaa6afd438cdcc9dd67b6baa44479132a6ffdb387cf5585d272ef4b4f850b0043a2104f17a624463e6ecaeb8db SHA512 1577699e91a6dbf0e3c3887647b0a2677471d2b6efbc3b3a095f6959c24551f2b785d375fd8f04342d8ac07f0ca541fd6f050097c3a4386054a3514c4a970376
 EBUILD nss-3.99.ebuild 11566 BLAKE2B b7640451c4426a43224e72afe53a494cf795be550933b3586c729155ae2d0dc42bcdee3930ac0f594c6ef4e807f8112f43c149232047d6522453d66196de7ed4 SHA512 311f94bd3925e163af2a852503fc09ccc57f9d3a68c0bd6357f2149f09bbe8acdd118df57f88e2fdf6af6a8f6da591a16ad0ed495fab7716929c4bf3185cc753
 MISC metadata.xml 603 BLAKE2B 74c5a84f8a860b6a43731ed83cd40373187236de7add14ca33f3417eb0cfc165aa5df5308dca14b4664bcfe453e0f328988df4459af5781da4cbcb7bfc00e93d SHA512 9d7fb0be71d18ad1da440de047f4430bd3b50a8584d8dccd43e5e4cdf050f5c5cfeb34cd82ea617f2419ff092908becd1508eb7efcf54f3cca8c7f36af9517bb
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..0ce14d18c580 100644
--- a/dev-libs/nss/nss-3.90.2-r1.ebuild
+++ b/dev-libs/nss/nss-3.90.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
 RESTRICT="!test? ( test )"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
@@ -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() {