Date: Sat, 17 Oct 2020 13:49:21 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552572 - head/security/py-python-nss/files Message-ID: <202010171349.09HDnLgQ049397@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Oct 17 13:49:21 2020 New Revision: 552572 URL: https://svnweb.freebsd.org/changeset/ports/552572 Log: 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 Added: head/security/py-python-nss/files/patch-src_py__nss.h (contents, props changed) Added: head/security/py-python-nss/files/patch-src_py__nss.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-python-nss/files/patch-src_py__nss.h Sat Oct 17 13:49:21 2020 (r552572) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010171349.09HDnLgQ049397>