commit: 8e4c015ebf4a0b5e74cf1a1f866181af2d5b892c
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 5 13:56:43 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 13:56:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4c015e
dev-libs/nss: add an upstream patch file to fix tests on 3.106
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...s-3.106-bmo-1927096-fix-broken-test-files.patch | 33 ++++++++++++++++++++++
dev-libs/nss/nss-3.106.ebuild | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git
a/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
b/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
new file mode 100644
index 000000000000..069e97e6aacf
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
@@ -0,0 +1,33 @@
+diff --git a/tests/tools/tools.sh b/tests/tools/tools.sh
+--- a/tests/tools/tools.sh
++++ b/tests/tools/tools.sh
+@@ -542,25 +542,25 @@
+ 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"
++ html_msg $ret 17 "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"
++ html_msg $ret 17 "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"
++ html_msg $ret 17 "Fail to import private key with no length"
+ check_tmpfile
+ }
+
+ ############################## tools_p12 ###############################
+ # local shell function to test basic functionality of pk12util
+
diff --git a/dev-libs/nss/nss-3.106.ebuild b/dev-libs/nss/nss-3.106.ebuild
index 0f041f606425..3c45869cb295 100644
--- a/dev-libs/nss/nss-3.106.ebuild
+++ b/dev-libs/nss/nss-3.106.ebuild
@@ -41,7 +41,7 @@ PATCHES=(
"${FILESDIR}"/nss-3.103-gentoo-fixes-add-pkgconfig-files.patch
"${FILESDIR}"/nss-3.21-gentoo-fixup-warnings.patch
"${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
- "${FILESDIR}"/nss-3.106-disable-broken-tests.patch
+ "${FILESDIR}"/nss-3.106-bmo-1927096-fix-broken-test-files.patch
)
src_prepare() {
