From 5eff0678927c6594cf31e6353bc56da82a9a5bf6 Mon Sep 17 00:00:00 2001
From: jbeich <jbeich@FreeBSD.org>
Date: Sat, 17 Oct 2020 13:49:58 +0000
Subject: [PATCH] MFH: r552572

security/py-python-nss: unbreak after r552532

In file included from src/py_nss.c:341:
src/py_nss.h:126:3: error: typedef redefinition with different types ('struct RSAPublicKey' vs 'struct RSAPublicKeyStr')
} RSAPublicKey;
  ^
/usr/local/include/nss/blapit.h:281:32: note: previous definition is here
typedef struct RSAPublicKeyStr RSAPublicKey;
                               ^
In file included from src/py_nss.c:341:
src/py_nss.h:136:3: error: typedef redefinition with different types ('struct DSAPublicKey' vs 'struct DSAPublicKeyStr')
} DSAPublicKey;
  ^
/usr/local/include/nss/blapit.h:323:32: note: previous definition is here
typedef struct DSAPublicKeyStr DSAPublicKey;
                               ^

Reported by:	pkg-fallout
Approved by:	ports-secteam blanket
---
 .../py-python-nss/files/patch-src_py__nss.h   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 security/py-python-nss/files/patch-src_py__nss.h

diff --git a/security/py-python-nss/files/patch-src_py__nss.h b/security/py-python-nss/files/patch-src_py__nss.h
new file mode 100644
index 000000000000..e612e0c0855f
--- /dev/null
+++ b/security/py-python-nss/files/patch-src_py__nss.h
@@ -0,0 +1,36 @@
+Rename structs to avoid conflict with C API after NSS 3.58 changes to pk11pub.h
+https://hg.mozilla.org/projects/nss/rev/6e3bc17f0508
+
+In file included from src/py_nss.c:341:
+src/py_nss.h:126:3: error: typedef redefinition with different types ('struct RSAPublicKey' vs 'struct RSAPublicKeyStr')
+} RSAPublicKey;
+  ^
+/usr/local/include/nss/blapit.h:281:32: note: previous definition is here
+typedef struct RSAPublicKeyStr RSAPublicKey;
+                               ^
+In file included from src/py_nss.c:341:
+src/py_nss.h:136:3: error: typedef redefinition with different types ('struct DSAPublicKey' vs 'struct DSAPublicKeyStr')
+} DSAPublicKey;
+  ^
+/usr/local/include/nss/blapit.h:323:32: note: previous definition is here
+typedef struct DSAPublicKeyStr DSAPublicKey;
+                               ^
+
+--- src/py_nss.h.orig	2016-02-16 16:40:14 UTC
++++ src/py_nss.h
+@@ -119,6 +119,7 @@ typedef struct {
+ /* ============================ RSAPublicKey Class ========================== */
+ /* ========================================================================== */
+ 
++#define RSAPublicKey PyRSAPublicKey
+ typedef struct {
+     PyObject_HEAD
+     PyObject *py_modulus;
+@@ -129,6 +130,7 @@ typedef struct {
+ /* ============================ DSAPublicKey Class ========================== */
+ /* ========================================================================== */
+ 
++#define DSAPublicKey PyDSAPublicKey
+ typedef struct {
+     PyObject_HEAD
+     PyObject *py_pqg_params;