gentoo resync : 15.06.2021

2 files changed, 0 insertions, 129 deletions

diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index a5c91a72016d..ec89e2561cb6 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,4 +1,3 @@
-AUX nss-pem-1.0.5-nss-3.53.1-support.patch 5005 BLAKE2B 4cacfbc965c5c5add442e8a37a1c4ad5c567763aeec7ab567c7558fd4b343cfeeec952a5d4c5131f279d3a7794b753ba424c27398263d4b03751a7308eda118c SHA512 8a19a7831d92e45f101ca44e278b319bfd3884d4eb17ec268ca08ed08542ecf51f81be23079e30d5b87aaa467f4104c88d739043aa3c36989540a69a23f4ae13
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 EBUILD nss-pem-1.0.7.ebuild 702 BLAKE2B 410d9a2f78d5966dd5f26deba58716e841608cad779c9284fd77af7d0f0a0c76d5dfeea998237cca2130b2e955cc54a26e874534abef0f7c89571ebbef049a68 SHA512 11e2af21ddffc0f5266508e99d6c5881fd3d08d2c7edb68ea00c739fff075d2f26fdcf6a677fba2f60905d9c722acd6ec6bc2c92099b4398bd4b938c7f0e5495
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch b/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch
deleted file mode 100644
index 10cfd2cd0228..000000000000
--- a/dev-libs/nss-pem/files/nss-pem-1.0.5-nss-3.53.1-support.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From e14d5b53ad588e45b2bcffb778563daf2fead5df Mon Sep 17 00:00:00 2001
-From: Ian Kumlien <ian.kumlien@gmail.com>
-Date: Fri, 7 Aug 2020 15:57:17 +0200
-Subject: [PATCH] replace deprecated CK?_NETSCAPE_? constants
-
-... with the corresponding CK?_NSS_? constants
-
-Fixes: https://github.com/kdudka/nss-pem/issues/6
-Closes: https://github.com/kdudka/nss-pem/pull/7
----
- pfind.c   | 16 ++++++++--------
- pinst.c   |  8 ++++----
- pobject.c | 10 +++++-----
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/pfind.c b/pfind.c
-index 83d5b89..fa5dd4d 100644
---- a/pfind.c
-+++ b/pfind.c
-@@ -276,18 +276,18 @@ collect_objects(CK_ATTRIBUTE_PTR pTemplate,
-         type = pemBareKey;
-         plog("CKO_PRIVATE_KEY\n");
-         break;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         type = pemTrust;
--        plog("CKO_NETSCAPE_TRUST\n");
-+        plog("CKO_NSS_TRUST\n");
-         break;
--    case CKO_NETSCAPE_CRL:
--        plog("CKO_NETSCAPE_CRL\n");
-+    case CKO_NSS_CRL:
-+        plog("CKO_NSS_CRL\n");
-         goto done;
--    case CKO_NETSCAPE_SMIME:
--        plog("CKO_NETSCAPE_SMIME\n");
-+    case CKO_NSS_SMIME:
-+        plog("CKO_NSS_SMIME\n");
-         goto done;
--    case CKO_NETSCAPE_BUILTIN_ROOT_LIST:
--        plog("CKO_NETSCAPE_BUILTIN_ROOT_LIST\n");
-+    case CKO_NSS_BUILTIN_ROOT_LIST:
-+        plog("CKO_NSS_BUILTIN_ROOT_LIST\n");
-         goto done;
-     case CK_INVALID_HANDLE:
-         type = pemAll; /* look through all objectclasses - ignore the type field */
-diff --git a/pinst.c b/pinst.c
-index ef2d955..564458e 100644
---- a/pinst.c
-+++ b/pinst.c
-@@ -236,7 +236,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
-         /* more unique nicknames - https://bugzilla.redhat.com/689031#c66 */
-         nickname = filename;
-         break;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         plog("Creating trust nick %s id %ld in slot %ld\n", nickname, objid, slotID);
-         memset(&o->u.trust, 0, sizeof(o->u.trust));
-         break;
-@@ -265,7 +265,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
- 
-     switch (objClass) {
-     case CKO_CERTIFICATE:
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         if (SECSuccess != GetCertFields(o->derCert->data, o->derCert->len,
-                                         &issuer, &serial, &derSN, &subject,
-                                         &valid, &subjkey))
-@@ -344,7 +344,7 @@ derEncodingsMatch(CK_OBJECT_CLASS objClass, pemInternalObject * obj,
- 
-     switch (objClass) {
-     case CKO_CERTIFICATE:
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         result = SECITEM_CompareItem(obj->derCert, certDER);
-         break;
- 
-@@ -497,7 +497,7 @@ AddCertificate(char *certfile, char *keyfile, PRBool cacert,
-                                    nickname, 0, slotID, NULL);
-             if (o != NULL) {
-                 /* Add the CA trust object */
--                o = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust, objs[i], NULL,
-+                o = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust, objs[i], NULL,
-                                        nickname, 0, slotID, NULL);
-             }
-             if (o == NULL) {
-diff --git a/pobject.c b/pobject.c
-index f613678..a97f3e2 100644
---- a/pobject.c
-+++ b/pobject.c
-@@ -149,8 +149,8 @@ static const CK_KEY_TYPE ckk_rsa = CKK_RSA;
- static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
- static const CK_OBJECT_CLASS cko_private_key = CKO_PRIVATE_KEY;
- static const CK_OBJECT_CLASS cko_public_key = CKO_PUBLIC_KEY;
--static const CK_OBJECT_CLASS cko_trust = CKO_NETSCAPE_TRUST;
--static const CK_TRUST ckt_netscape_trusted = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-+static const CK_OBJECT_CLASS cko_trust = CKO_NSS_TRUST;
-+static const CK_TRUST ckt_netscape_trusted = CKT_NSS_TRUSTED_DELEGATOR;
- static const NSSItem pem_trueItem = {
-     (void *) &ck_true, (PRUint32) sizeof(CK_BBOOL)
- };
-@@ -578,7 +578,7 @@ pem_FetchAttribute
-         return pem_FetchCertAttribute(io, type);
-     case CKO_PRIVATE_KEY:
-         return pem_FetchPrivKeyAttribute(io, type, pError);
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         return pem_FetchTrustAttribute(io, type);
-     case CKO_PUBLIC_KEY:
-         return pem_FetchPubKeyAttribute(io, type);
-@@ -775,7 +775,7 @@ pem_mdObject_GetAttributeCount
-         return pubKeyAttrsCount;
-     case CKO_PRIVATE_KEY:
-         return privKeyAttrsCount;
--    case CKO_NETSCAPE_TRUST:
-+    case CKO_NSS_TRUST:
-         return trustAttrsCount;
-     default:
-         break;
-@@ -1168,7 +1168,7 @@ pem_CreateObject
-                 if (listItem->io != NULL) {
-                     /* Add the trust object */
-                     APPEND_LIST_ITEM(listItem);
--                    listItem->io = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust,
-+                    listItem->io = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust,
-                                                     derlist[c], NULL, nickname, 0,
-                                                      slotID, NULL);
-                 }