summaryrefslogtreecommitdiff
path: root/dev-libs/nss
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
commitabaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
treeeca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-libs/nss
parent24fd814c326e282c4321965c31f341dad77e270d (diff)
gentoo resync : 22.01.2021
Diffstat (limited to 'dev-libs/nss')
-rw-r--r--dev-libs/nss/Manifest9
-rw-r--r--dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch93
-rw-r--r--dev-libs/nss/nss-3.58-r2.ebuild2
-rw-r--r--dev-libs/nss/nss-3.60.1.ebuild (renamed from dev-libs/nss/nss-3.59-r1.ebuild)4
-rw-r--r--dev-libs/nss/nss-3.60.ebuild2
5 files changed, 7 insertions, 103 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 8e01e5e01099..7cce0aeffa90 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,12 +3,11 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7d074c0bacf47313998117734dafd1eb6a536db19bc8a329944d9fad51a6f9f90f81d98181272e0068bf852fea7ca928d2713 SHA512 859162070aa3c5e6e8be259f5e6648d37a5194a02958310f8caf56ff772dcaa4ebb26e4d754c99608fc7a45b641c5088cccd9e2c7d9c92c5ccc85c6b47320720
AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f44f714226364dbda760989e7e255ab93a79121238ccce2962c346c37971a8440e8cc16ac5555f78c15b7a1b72e7311a7b7257b254fefe7e9a75d94924 SHA512 79fff678895a5643b34c42a0b0d34299b1b63c19baf0bbeb43fcee6b7f01bb24baf7047261b16e913d39fe9e69a637c7dc2bba0fec9ceedd43fa4f5dcc99f38f
-AUX nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch 4053 BLAKE2B d4a9a30c8cbea3b37d8d72cf87c55485cd12caa3f68daaf9bcfd06e945386191549e3cab6a5c637b7e6ea598bba3c0f2cb86bdf51cae9d860bbb614b896402a5 SHA512 5af11e79e4f395e7037aa50d33db7f4fd2fecfdfe33c38865dcf1bad9de731e6d0d859720e8684b5d5ea194c1e86360428a98553fe5115a069ddd1fc95f4cb84
DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
+DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.58-r2.ebuild 9247 BLAKE2B 2c8dbc38e7581f41b24b086f4ecd622e8f25c86cfe739b2f870c6ba85d14ee58a3cb355cf13bdaa19d4a63ce16233592ebd2feec604263e4ee3a6ed40e5a7300 SHA512 e51811324812f83dc3ebd1cefd39a5a6f097c845fc1de5a89f2ad2091faafb05b44a1beca97f8430b55b8bd0cb86582dde4b77384839751bdd6b0e00638d0c4d
-EBUILD nss-3.59-r1.ebuild 9261 BLAKE2B d55319b75af75bade8b7436b3ba7e277fa84dd6cddceb7ec6243e1d69db32e124301a3860950fc39807c5aa5d745c9e8428b7bfcb384e6069f64a6e25a61b7bf SHA512 8f1fe0993c20ddc054226f70087d40e4191b28590a86490e369bc7772bae7b4d2a1afda9e1fe9f3ed0f9f62a5d44dd94f02cc2b200904dce764160e015dec148
-EBUILD nss-3.60.ebuild 9132 BLAKE2B 4393458b13b6623aacfe3e42cf959fb1c3db2c25785e38a3daadf4fb6a0ee26ebe9a5a012972542c683c54c343575f5cb77275d8acb61119cb17c3029e87a5bf SHA512 9fe34df067abc9bd255a1c06822a029237d3c20d4443ff15e940c6eb3db68aad66acacd6924bf44070e71812da9b383367ac097558568adda7a067451447e104
+EBUILD nss-3.58-r2.ebuild 9258 BLAKE2B 7a13994368b71fb33774476bc9fa0cbcc7c5d508818f0c2583a4dab276651ddb2a68fbaafecd8323defb597f9e2c4f3cfc27a1c53c6d313b8d6bd170b125d2aa SHA512 98790c6a951414a2bddea810b8611cb5040d2c4ac915e8a0f1327bb7693bbb023785cffaedfc1e1fda4bde7d9ca9f5828350939b4ffd1a3a536bde61d14fd012
+EBUILD nss-3.60.1.ebuild 9143 BLAKE2B 777c9ac48a0ff3d69dc95cddf680d8a044ddb749b122eb9711a119c073b62968971ca5f4f109c3f237c2365781875fb4927a778c755630448f236ab1a4a84c3b SHA512 da03ac79e91317200be2bb5b77fa5f9808ac07d0655cd38b55f72343b4e0ccd419e46be2b2021348569f531e2f1074dd2761e402f883f4c97af9326e9950ff67
+EBUILD nss-3.60.ebuild 9143 BLAKE2B 777c9ac48a0ff3d69dc95cddf680d8a044ddb749b122eb9711a119c073b62968971ca5f4f109c3f237c2365781875fb4927a778c755630448f236ab1a4a84c3b SHA512 da03ac79e91317200be2bb5b77fa5f9808ac07d0655cd38b55f72343b4e0ccd419e46be2b2021348569f531e2f1074dd2761e402f883f4c97af9326e9950ff67
MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
deleted file mode 100644
index be4ebfe47961..000000000000
--- a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-
-# HG changeset patch
-# User Kevin Jacobs <kjacobs@mozilla.com>
-# Date 1606813429 0
-# Node ID 19585ccc7a1f0f4e9a8d2b9c5ceeb408ea90acb9
-# Parent f1e48fbead3d9e69500d7aedc1ef6e4bf334f41e
-Bug 1679290 - Don't hold slot lock when taking session lock r=bbeurdouche
-
-[[ https://hg.mozilla.org/projects/nss/rev/0ed11a5835ac1556ff978362cd61069d48f4c5db | 0ed11a5835ac1556ff978362cd61069d48f4c5db ]] fixed a number of race conditions related to NSSSlot member accesses. Unfortunately the locking order that was imposed by that patch has been found to cause problems for at least one PKCS11 module, libnsspem.
-
-This patch drops nested locking in favor of unlocking/re-locking. While this isn't perfect, the original problem in bug 1663661 was that `slot->token` could become NULL, which we can easily check after reacquiring.
-
-Differential Revision: https://phabricator.services.mozilla.com/D98247
-
-diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c
---- a/lib/dev/devslot.c
-+++ b/lib/dev/devslot.c
-@@ -183,25 +183,32 @@ nssSlot_IsTokenPresent(
- if ((slot->ckFlags & CKF_TOKEN_PRESENT) == 0) {
- if (!slot->token) {
- /* token was never present */
- isPresent = PR_FALSE;
- goto done; /* slot lock held */
- }
- session = nssToken_GetDefaultSession(slot->token);
- if (session) {
-+ nssSlot_ExitMonitor(slot);
- nssSession_EnterMonitor(session);
- /* token is not present */
- if (session->handle != CK_INVALID_HANDLE) {
- /* session is valid, close and invalidate it */
- CKAPI(epv)
- ->C_CloseSession(session->handle);
- session->handle = CK_INVALID_HANDLE;
- }
- nssSession_ExitMonitor(session);
-+ nssSlot_EnterMonitor(slot);
-+ if (!slot->token) {
-+ /* Check token presence after re-acquiring lock */
-+ isPresent = PR_FALSE;
-+ goto done; /* slot lock held */
-+ }
- }
- if (slot->token->base.name[0] != 0) {
- /* notify the high-level cache that the token is removed */
- slot->token->base.name[0] = 0; /* XXX */
- nssToken_NotifyCertsNotVisible(slot->token);
- }
- slot->token->base.name[0] = 0; /* XXX */
- /* clear the token cache */
-@@ -218,34 +225,41 @@ nssSlot_IsTokenPresent(
- }
-
- /* token is present, use the session info to determine if the card
- * has been removed and reinserted.
- */
- session = nssToken_GetDefaultSession(slot->token);
- if (session) {
- PRBool tokenRemoved;
-+ nssSlot_ExitMonitor(slot);
- nssSession_EnterMonitor(session);
- if (session->handle != CK_INVALID_HANDLE) {
- CK_SESSION_INFO sessionInfo;
- ckrv = CKAPI(epv)->C_GetSessionInfo(session->handle, &sessionInfo);
- if (ckrv != CKR_OK) {
- /* session is screwy, close and invalidate it */
- CKAPI(epv)
- ->C_CloseSession(session->handle);
- session->handle = CK_INVALID_HANDLE;
- }
- }
- tokenRemoved = (session->handle == CK_INVALID_HANDLE);
- nssSession_ExitMonitor(session);
-+ nssSlot_EnterMonitor(slot);
- /* token not removed, finished */
- if (!tokenRemoved) {
- isPresent = PR_TRUE;
- goto done; /* slot lock held */
- }
-+ if (!slot->token) {
-+ /* Check token presence after re-acquiring lock */
-+ isPresent = PR_FALSE;
-+ goto done; /* slot lock held */
-+ }
- }
- /* the token has been removed, and reinserted, or the slot contains
- * a token it doesn't recognize. invalidate all the old
- * information we had on this token, if we can't refresh, clear
- * the present flag */
- nssToken_NotifyCertsNotVisible(slot->token);
- nssToken_Remove(slot->token);
- /* token has been removed, need to refresh with new session */
-
diff --git a/dev-libs/nss/nss-3.58-r2.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild
index ddd6a22d512c..f7bb97581f3b 100644
--- a/dev-libs/nss/nss-3.58-r2.ebuild
+++ b/dev-libs/nss/nss-3.58-r2.ebuild
@@ -9,7 +9,7 @@ NSPR_VER="4.29"
RTM_NAME="NSS_${PV//./_}_RTM"
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/"
+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/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
diff --git a/dev-libs/nss/nss-3.59-r1.ebuild b/dev-libs/nss/nss-3.60.1.ebuild
index 88811b3a5675..7ac46a177d7a 100644
--- a/dev-libs/nss/nss-3.59-r1.ebuild
+++ b/dev-libs/nss/nss-3.60.1.ebuild
@@ -9,7 +9,7 @@ NSPR_VER="4.29"
RTM_NAME="NSS_${PV//./_}_RTM"
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/"
+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/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
@@ -39,8 +39,6 @@ PATCHES=(
"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
- "${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
- "${FILESDIR}/${PN}-3.59-dont-hold-slot-lock-when-taking-session-lock.patch"
)
src_prepare() {
diff --git a/dev-libs/nss/nss-3.60.ebuild b/dev-libs/nss/nss-3.60.ebuild
index 314e496305cb..7ac46a177d7a 100644
--- a/dev-libs/nss/nss-3.60.ebuild
+++ b/dev-libs/nss/nss-3.60.ebuild
@@ -9,7 +9,7 @@ NSPR_VER="4.29"
RTM_NAME="NSS_${PV//./_}_RTM"
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/"
+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/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 04:50:35 +0000