diff options
Diffstat (limited to 'dev-libs/nss')
| -rw-r--r-- | dev-libs/nss/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch | 33 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.106.ebuild | 2 |
3 files changed, 36 insertions, 2 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index aa7479e027a8..2af269d3285a 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,4 +1,5 @@ AUX nss-3.103-gentoo-fixes-add-pkgconfig-files.patch 6214 BLAKE2B af2b685f5ef32b971abd27c9cf77aed0cee684863aae1d2dd3a1106814aa6a4df3a654012962ce0bbf5d0d354a349ee2366c6281c98ba5f3fe849dd5ec13d4c4 SHA512 cdf8bb84ee0192be165b0ddacc6a55295153d587d653381a4d92ca39e69a9f178ea9720bd68ef8193930149b17c26e2fe31e39a10d6b32e8f4a2edf9c89ab632 +AUX nss-3.106-bmo-1927096-fix-broken-test-files.patch 1600 BLAKE2B a0da0ad76060b575b57c2a323f4725ff8ae74488aa0dbb5e8626fef00cbf80fd3c016e8f0200466355ea0245d0416fe95dacd15c4d796215218c0e7f26a0bffe SHA512 54f69c0ee9ed125ef3230bfd2ce19c19ca7b256645f3cf7c2c93d412ec4dc45e2f5f008cff1ecafb33835e24624d81a2751a9f2829d31affc2e0ca05ed695146 AUX nss-3.106-disable-broken-tests.patch 1520 BLAKE2B 46396fbd21a111f9dd82f1e7ecfe48fd438f3bfdbf2ac35eabb142ece41c95940a88adb43dbabd0b2a71674d207f5a9ec64436674bd8530e98e35019525fb1f5 SHA512 243a5a0977300dcd980dcd8a6938e65d2ea9a3cd491a2a8e7a6b7760e89b15cd51d80d296fc4b74ac960c9460a9bb67a6f6cc8e41c8b0317d93153a518c475cd AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed @@ -15,6 +16,6 @@ DIST nss-3.90.2.tar.gz 72215444 BLAKE2B 74b8eebf5f053dcebd9c6e6ef17c6113ac42a01f DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 EBUILD nss-3.101.2.ebuild 11563 BLAKE2B f046b469b6de5e35004fa696d666abed7474a4ad8bc5b30760831bc1b9900a42d0d0e2819d7807657902857ec862ed699ffbf5eff8789a852babd257d2b7d3a3 SHA512 928136489f69750076e5f7b447b0d2233273b427bd8f9d4f086a862272d6ea1fa52292a54bc8e872fa72323ba7dbfb19b5296364e9a325601d6df160db265ad3 EBUILD nss-3.105.ebuild 11806 BLAKE2B d52058c3c43a743706d3aa996849634011b82b9309901869cbec9b094501334c617948ccc2bfacb758033c7bc6ece036142c910ab511c8c1c3bda2d3c64f656e SHA512 075359144c5ebfff3d265febf8c636e465ffa08876ebf6de0634db5bd0fdb593fad57c7eb81c6bff1c0ad3c3c48d571b06cd57aa7822c6066437efb4be17104a -EBUILD nss-3.106.ebuild 11858 BLAKE2B 09c46c2f54a7e4306f0ad30de03a9a15e4293644f4d6bd4286655a4bc17d399f77f2110afb8888390c371f60b1c1e85e65c6b1a85b0d149bb4c39f5ba93c85d5 SHA512 bb8790bd4047ada686fc134d1fc0aa489fc4e38f10b61e7838b9a02376f928beb6dd2484030f5ec3db31543742fb8f5fc28250daebdabcb0d6d0ccd20f0e9c00 +EBUILD nss-3.106.ebuild 11871 BLAKE2B d5074578d868a83a0f930cebb011a1179febe21900138add4d7aaf48880aba75c211093daa8546b8bfc51be054307e7a87a8e3603f379ef2ab5ff8b76e26ee5a SHA512 dd5e78c1b7f0615865fe01dc697889bc4f6620af26d4e36bdb89321fb1dc8f24ed0275802c124efa899bc081aeb72c0234ca67acfc8b6142394e87b8752982e7 EBUILD nss-3.90.2-r1.ebuild 11712 BLAKE2B 42f3fcfff8b8ff2d0c1c79785acabc538e36ae521a104b8cbb157e5f0ce8b8955819e6493f7f5a2252d9a3790d331c2c8802cc1fe016dc1f7753ec7709552436 SHA512 36c7cc15c4808bbdbb54192ecc67a985e64a8a3b71fbd045d3e52ac78890330513ab5f4ccd40cb3f7486a80acdba8fefeb1996b38b12d4b3b88afaa4b6979ca9 MISC metadata.xml 693 BLAKE2B c8be043e957f4d85411a10da490e67c9d37f5dd9fe37c112c92e8b666d828cabe75f5fe7c46e5b40dd872f082fb4463af79fb7eb3ad69b9e01c9c088edd750a8 SHA512 66374f8b8739c68a8a276159af3d493bb012b5ee722a939a1d87899d0307d572fcabf76ba71b4f34eeb83a414c0727182ef16f98418cbbbbd4aed311ac5be06b 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() { |