cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r552572

Browse Source 
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
This commit is contained in:
Jan Beich 2020-10-17 13:49:58 +00:00
parent 99f60e3c4b
commit 90f311ca04
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=552573
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
security/py-python-nss/files/patch-src_py__nss.h Normal file
View File

@ -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;