commit: d75783862503b381d47835d5c8d120b6853fffd1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Oct 17 12:29:51 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Oct 17 12:30:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7578386
dev-libs/nss: backport test fix to 3.91 (expired certs) Pull in fixed certs (test data) for test suite from upstream for 3.91 as it's the current stable version. Closes: https://bugs.gentoo.org/914837 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/nss/Manifest | 1 + dev-libs/nss/nss-3.91.ebuild | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 7f9e7fdaea7d..e4dfadfe5113 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,4 +1,5 @@ DIST nss-3.79.4.tar.gz 84826326 BLAKE2B c34b1ba2c24891bd316af27828dbcc6b193b7298fe6a965cfd42d6a37aa3c25ecb80c9b8c2195ba89d2ea395739def47ff5269f7964235c2883e5b33d67889e9 SHA512 194c7595871ada65c03dcea8f2ec75ea9d6da3ce270c956e8abb2d72b6465e14c7be7892532548b9ca6f319f557353b98facb6f3d620a3a3825d889170b02fa2 +DIST nss-3.91-fixed-certs.tar.xz 11300 BLAKE2B 85f191b85c7caf1ee24f92a2ff76f7660a1afd64d6c8d9da84f521aea18cb12bdf3d08426c47302a4b444b0e4b4ed2f2251ed8234d5bc0006b00cd4b97aacc51 SHA512 88d2a47ba160f93f2f2c88a1e2a591c516d19209bd77cc18111c8538d9cf86498cbfd57c7e36478819bde307d90ba31e0a12a9c17320ae5dc736d02959a32a3a DIST nss-3.91.tar.gz 72267945 BLAKE2B 7dcd680311a5503007c0bb738ec24b50e40841470592c2d8dd542b3bdf085a6e4816f1fab4cb6b86220ff3e39a828f57a0a9172e3d1c2c82537eab6558a50226 SHA512 65258a4ea0b8c06ec49dd411eabe860ad5d7c3873beb27f8f43e10ef6be020b1522112df9deaeed27f23fd72f13cc7554e9c1854cd97e4716de419f722aff020 DIST nss-3.92.tar.gz 72133646 BLAKE2B 251daae56ccf8b8f4fd0b4287fea2049b6e72d1fc57fe02fb3d4f0b8a083aaf00046844145721a1e7620ecfbdbbb93206591e47386c12662765c09cf99db42bc SHA512 dc317ec909433c9026f108b466bc436110b3c77edc3f73aef3d6dc6782f584c205053a368e4a134715bfdf63d2c1ae2185fc23238e5c2dca8f88ec185b1fec2a DIST nss-3.93.tar.gz 72281331 BLAKE2B 99e50f450a451f2b0bc0aad9b0fba405c987d88546d4aad6c490cb43dc274f23eb99d03d5fa8cf7ef16585abebfdae942fe1092d3f1c86816ba35e16ed3d490f SHA512 d96f13a70e825b39efadfe7c973c24c1e5ad43319bd813599010383e2b8434181f53489672f68fe79e2cb0c4d4ea0088499e588c3524eccf9298aafc57b94951 diff --git a/dev-libs/nss/nss-3.91.ebuild b/dev-libs/nss/nss-3.91.ebuild index 3cbea7fe57fa..19f9b1d315d8 100644 --- a/dev-libs/nss/nss-3.91.ebuild +++ b/dev-libs/nss/nss-3.91.ebuild @@ -8,10 +8,13 @@ inherit flag-o-matic multilib toolchain-funcs multilib-minimal NSPR_VER="4.35" RTM_NAME="NSS_${PV//./_}_RTM" +# nss-3.91-fixed-certs.tar.xz is a workaround for older NSS versions to +# fix tests for bug #914837. DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )" + cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch ) + test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.91-fixed-certs.tar.xz )" LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" @@ -82,6 +85,10 @@ src_prepare() { sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ cmd/platlibs.mk || die + if use test ; then + cp "${WORKDIR}"/${PN}-3.91-fixed-certs/* tests/libpkix/certs/ || die + fi + multilib_copy_sources strip-flags
