guix_mirror_bot pushed a commit to branch misc-world-rebuild in repository guix.
commit 4a82f409e91d0d7ce92a809dfb2b00c191620c47 Author: André Batista <[email protected]> AuthorDate: Fri May 15 20:25:11 2026 -0300 gnu: nss: Update to 3.112.5. 3.112.5 is the current ESR of NSS. * gnu/packages/patches/nss-disable-broken-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/nss.scm (nss): Update to 3.112.5. [source]<origin>{patches}: Remove the deleted patch. Add nss-3.115-disable-broken-tests.patch and nss-3.115-disable-pkix-ocsp-tests.patch. [arguments]<#:phases>{set-release-date}: Update GUIX_NSS_RELEASE_DATE environment variable to 2026-05-05. Change-Id: I376a275710d9335d4f6e37164f164ad420def5c1 Closes: https://codeberg.org/guix/guix/pulls/3509 Fixes: https://codeberg.org/guix/guix/pulls/4408 Merges: https://codeberg.org/guix/guix/pulls/8654 Reviewed-by: Ian Eure <[email protected]> Signed-off-by: Nguyễn Gia Phong <[email protected]> --- gnu/local.mk | 1 - gnu/packages/nss.scm | 7 +++-- .../patches/nss-disable-broken-tests.patch | 33 ---------------------- 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index f3dcdeb02e..06cea5718a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2002,7 +2002,6 @@ dist_patch_DATA = \ %D%/packages/patches/nss-getcwd-nonnull.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \ - %D%/packages/patches/nss-disable-broken-tests.patch \ %D%/packages/patches/nss-3.115-disable-broken-tests.patch \ %D%/packages/patches/nss-3.115-disable-pkix-ocsp-tests.patch \ %D%/packages/patches/ntp-fix-dereferencing-the-wrong-variable.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index f5a1327e47..2573c8b1fb 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -103,7 +103,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.101.4") ;update to latest ESR release + (version "3.112.5") ;update to latest ESR release (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -114,12 +114,13 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "1sqvh49qi9vq55sbg42c5n0kz6w6ni383hgiyhaym6drsmbzb86a")) + "03chsv0bjd2fi8lab241grbyqd4blapll5lbrpraddpd5mc8rjx4")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" "nss-increase-test-timeout.patch" - "nss-disable-broken-tests.patch")) + "nss-3.115-disable-broken-tests.patch" + "nss-3.115-disable-pkix-ocsp-tests.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/nss-disable-broken-tests.patch b/gnu/packages/patches/nss-disable-broken-tests.patch deleted file mode 100644 index 8d6e101471..0000000000 --- a/gnu/packages/patches/nss-disable-broken-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -These tests are broken in 3.101.3. - -See https://bugzilla.mozilla.org/show_bug.cgi?id=1964304 - ---- nss-3.101.3/nss/tests/tools/tools.sh 1969-12-31 16:00:01.000000000 -0800 -+++ nss-3.101.3/nss/tests/tools/tools.sh 2025-05-05 16:36:47.835447542 -0700 -@@ -540,26 +540,6 @@ - ret=$? - html_msg $ret 0 "Importing private key pbmac1 hmac-sha-512 from PKCS#12 file" - check_tmpfile -- -- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" -- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 -- ret=$? -- html_msg $ret 19 "Fail to list private key with bad iterator" -- check_tmpfile -- -- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" -- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 -- ret=$? -- echo "Fail to list private key with bad salt val=$ret" -- html_msg $ret 19 "Fail to import private key with bad salt" -- check_tmpfile -- -- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" -- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 -- ret=$? -- echo "Fail to import private key with no length val=$ret" -- html_msg $ret 19 "Fail to import private key with no length" -- check_tmpfile - } - - ############################## tools_p12 ############################### \ No newline at end of file
